From 6c95109004acc78fd0e207a069266682739e7d53 Mon Sep 17 00:00:00 2001
From: msyu <msyu@mail.ru>
Date: Sat, 23 Aug 2025 18:55:50 +0300
Subject: [PATCH] 012 deals added

---
 Application.cfc |   2 +-
 deal_ls.cfm     | 120 ++++++++++++++++++++++++++++++++++++++++++++++++
 inc/menu.cfm    |   1 +
 3 files changed, 122 insertions(+), 1 deletion(-)
 create mode 100644 deal_ls.cfm

diff --git a/Application.cfc b/Application.cfc
index f12b0d1..18df00e 100644
--- a/Application.cfc
+++ b/Application.cfc
@@ -99,7 +99,7 @@
 		
 		
 		<cfset request.RECORDS_PER_PAGE=500/>
-		<cfset request.APP_VERSION="0.00.011"/>
+		<cfset request.APP_VERSION="0.00.012"/>
 		<cfset request.STAND=getStand()/>		
 		
 		<cflock scope="application" type="readonly" timeout=3>
diff --git a/deal_ls.cfm b/deal_ls.cfm
new file mode 100644
index 0000000..1b7a270
--- /dev/null
+++ b/deal_ls.cfm
@@ -0,0 +1,120 @@
+<cfsilent>
+<cfimport prefix="m" taglib="lib"/>
+<cfimport prefix="c" taglib="lib/controls"/>
+<cfimport prefix="d" taglib="lib/data"/>
+<cfimport prefix="layout" taglib="layout"/>
+</cfsilent><m:silent silent="No">
+
+<cffunction name="hideNonPositive">
+	<cfargument name="a"/>	
+	<cfreturn (a GT 0)? a : ""/>
+</cffunction>
+
+<m:prepare_ls entity="deals" accessObject="" pageInfoOut="pageInfo" trackOut="tr"/>
+
+<!--- <m:filter_settings target="#pageInfo.entity#_ls">
+	<m:filterparam filter=#filter# param="quickfilter" ftype="string" prefix="%" suffix="%" expression="((p.project like ?) OR (p.customer like ?) OR (p.customer_alias like ?) OR (p.contract_class_type like ?) OR (p.division like ?) OR (p.performer_short like ?))" default=""/>
+</m:filter_settings> --->
+<!--- <cfset pageInfo.settings.filter=#filter#/> --->
+	
+<cftry>
+	<cfquery name="qRead" datasource="#request.DS#">
+		with 
+		status(status, status_id, probability_pc) as (VALUES
+			('Закрыта неуспешно',7,0),('Закрыта успешно',6,100),('Договор подписан',5,100),('Договор на подписании',15,90),('Договор на согласовании',12,70),
+			('Тестирование',8,50),('Отправлено ТКП',10,20),('Внутреннее согласование',37,10),('Проработка решения',4,10),('Сбор потребностей',1,0)
+		)
+		select  
+		<d:field_set titleMapOut="titleMap" lengthOut="fieldCount">
+			<d:field title="ID" cfSqlType="CF_SQL_OTHER">d.__id</d:field>
+			<d:field title="Название">d.__name</d:field>
+			<d:field title="company_uid">d._companies</d:field>
+			<d:field title="Контрагент">k.__name as contragent</d:field>
+			<d:field title="WZ">k.id_klienta as wz</d:field>
+			<d:field title="status_id">d.__status_status</d:field>
+			<d:field title="Статус">s.status</d:field>
+			<d:field title="Вероятность%">s.probability_pc</d:field>
+
+		</d:field_set>
+		from elma.deals d 
+		left outer join elma.companies k on (d._companies=k.__id)
+		left outer join status s on (d.__status_status=s.status_id)
+		where 1=1 <m:filter_build filter=#pageInfo.settings.filter#/>
+		order by <m:order_build sortArray=#pageInfo.settings.sort.sortArray# fieldCount=#fieldCount#/>
+	</cfquery> 
+	
+
+	<cfcatch type="database">
+		<m:ls_catch catch=#cfcatch# status=#pageInfo.status#/>
+	</cfcatch>
+</cftry>
+
+<cfquery name="qCountTotal" datasource="#request.DS#">
+select count(*) as cnt from elma.deals d where 1=1
+</cfquery>
+
+</m:silent><!---
+-----------------------------------------------------------------------------------------
+-----------------------------------------------------------------------------------------
+-----------------------------------------------------------------------------------------
+---><cfif isDefined("output_xls")>
+	<layout:xml qRead=#qRead# titleMap=#titleMap# filename="#pageInfo.entity#.xml"/>
+	<cfabort/>
+	</cfif><cfif isDefined("output_json")>
+	<layout:json qRead=#qRead# titleMap=#titleMap# filename="#pageInfo.entity#.json"/>
+	<cfabort/>
+	</cfif><!--- 
+---><layout:page section="header" pageInfo=#pageInfo#>	
+	
+	<layout:attribute name="title">
+		<cfoutput><b>Сделки</b></cfoutput>
+	</layout:attribute>	
+	<!--- <layout:attribute name="controls"></layout:attribute> --->
+</layout:page>
+
+<cfif pageInfo.readPermitted() AND !pageInfo.status.errorState>
+
+	<layout:grid_summary
+		recordCount=#qRead.recordCount#
+		totalCount=#qCountTotal.cnt#
+		footerOut="gridFooter"	
+		excelLink="Yes"
+		jsonLink="Yes"
+	/>	
+	
+
+	<!--- так довольно громоздко, но можно обойтись без Dynamic Evaluation --->
+	<cfset queryAddColumn(qRead,'f_link_view_edit')/>
+	<cfset titleMap.f_link_view_edit={ordinal=#StructCount(titleMap)+1#}/><!--- *** Это легко забыть, потому что TitleMap никак не сцеплен с qRead. Напрашивается: упаковать их в одну обертку (но тогда обращение станет длиннее). Еще идея - назвать qRead и TitleMap так, чтобы была видна их связь.  --->
+	<!--- <cfdump var=#titleMap#/> --->
+	<cfset queryAddColumn(qRead,'f_link_del')/>
+	<cfset titleMap.f_link_del={ordinal=0}/>
+	<!--- <cfdump var=#titleMap#/> --->
+	<cfoutput query=#qRead# startRow=#pageInfo.nStart# maxRows=#pageInfo.recordsPerPage#>
+		<cfsavecontent variable="qRead.f_link_view_edit">
+			<a href="deal.cfm?__id=#__id#&#tr.fwx#" name="#__id#" title="просмотр" class="view"></a>
+		</cfsavecontent>
+
+	</cfoutput>
+	
+	<c:table query=#qRead# recordsPerPage=#pageInfo.recordsPerPage# nStart=#pageInfo.nStart# titleMap=#titleMap# sortArray=#pageInfo.settings.sort.sortArray# class="worktable wide">
+		<c:column width="1%" sortable="false"><!---*** class="c" не пробрасывается --->	
+			
+			<c:td field="f_link_view_edit" class="c"/>		   
+	
+		</c:column>	
+		<c:column width="10%" field="__id"><c:td class="l"/></c:column>
+		<c:column width="10%" field="__name"/>
+		<c:column width="10%" field="_companies"/>
+		<c:column width="10%" field="contragent"/>
+		<c:column width="5%" field="wz"/>		
+		<c:column width="3%" field="__status_status"><c:td class="c"/></c:column>
+		<c:column width="10%" field="status"><c:td class="c"/></c:column>
+		<c:column width="5%" field="probability_pc"><c:td class="c"/></c:column>
+
+	</c:table>
+	
+	<cfoutput>#gridFooter#</cfoutput>
+
+</cfif>
+<layout:page section="footer"/>
diff --git a/inc/menu.cfm b/inc/menu.cfm
index eb6620e..e33119e 100644
--- a/inc/menu.cfm
+++ b/inc/menu.cfm
@@ -13,6 +13,7 @@
 	<li class="menu-title">Реестры</li>
 	
  	<c:menu_item acl="" page="contract_ls.cfm" label="Договоры"/>
+ 	<c:menu_item acl="" page="deal_ls.cfm" label="Сделки"/>
 	<!---
 	<c:menu_item acl="" page="specification_ls.cfm" label="Спецификации"/>	
 	<c:menu_item acl="" page="agreement_ls.cfm" label="Сделки"/>