013 filters added

deal_service.cfm

@@ -141,6 +141,11 @@
 		<div class="th">Сделка</div>
 		<div class="td">
 			<cfquery name="qDeal">
+				with 
+				s(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.__id::text
 				,d.__name
@@ -149,17 +154,20 @@
 				,d.__index
 				,d.__status_status	
 				,c.id_klienta as wz
+				, s.status
+				, s.probability_pc
 				from elma.deals_services siv
 				join elma.deals d on (d.__id = ANY(siv.deal))
 				left outer join elma.companies c on (d._companies=c.__id)
+				left outer join s on (d.__status_status=s.status_id)
 				where siv.__id=<cfqueryparam cfsqltype="cf_sql_other" value=#d.__id#/> 
 			</cfquery>
 			<!--- <cfdump var=#qDeal#/> --->
 			<a href="deal.cfm?__id=#qDeal.__id#&#tr.fwx#">#qDeal.__id#</a> 
-			#qDeal.contragent# #qDeal.wz# 
-			#qDeal.__name# 
-			_plannedDueDate: <b>#dateFormat(qDeal._plannedDueDate,'DD.MM.YYYY')#</b>
-			status: <b>#qDeal.__status_status#</b>
+			#qDeal.contragent# | #qDeal.wz# |
+			#qDeal.__name# |
+			_plannedDueDate: <cfif len(qDeal._plannedDueDate)><b>#dateFormat(qDeal._plannedDueDate,'DD.MM.YYYY')#</b><cfelse>--</cfif>
+			<b>#qDeal.__status_status#: #qDeal.status# (#qDeal.probability_pc#%)</b> 
 		</div>
 	</div>