015 improvements

deal.cfm

@@ -40,12 +40,20 @@
 
 <!--- decoration --->
 <cfquery name="qDecoration" datasource="#request.DS#">
+	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 
 	 k.__name as contragent
 	,k.id_klienta as wz
 	,d."_plannedDueDate" as _plannedDueDate
+	,s.status
+	,s.probability_pc
 	from elma.deals d 
 	left outer join elma.companies k on (d._companies=k.__id)
+	left outer join s on (d.__status_status=s.status_id)
 	where d.__id=<cfqueryparam cfsqltype="cf_sql_other" value=#d.__id#/>
 </cfquery> 
 
@@ -104,7 +112,7 @@
 	
 	<div class="tr">
 		<div class="th">Статус</div>
-		<div class="td">#d.__status_status#</div>
+		<div class="td">#d.__status_status#: #qDecoration.status# (#qDecoration.probability_pc#%)</div>
 	</div>	
 	
 	<div class="tr">
@@ -145,15 +153,17 @@
 			,siv.date_end
 			,siv.is_easy
 			,siv.params::text
-			,siv.additional_agreement::text
+			,a.__id::text as additional_agreement_uid
+			,a.__name as additional_agreement
 			from elma.deals_services siv
+			left outer join elma.additional_agreements a on (a.__id=ANY(siv.additional_agreement))
 			where <cfqueryparam cfsqltype="cf_sql_other" value="#d.__id#"/>=ANY(siv.deal) 
-			--and siv.is_actual
+			and siv.is_actual
 			order by version::int
 		</cfquery>
 		
 		<cfoutput>
-			<h4>Услуги (строки спецификации) (#qService.recordCount#)</h4>
+			<h4>Услуги (версии строк спецификации, только актуальные) (#qService.recordCount#)</h4>
 		</cfoutput>			
 			
 		<!--- <layout:render_query query=#qService#/> --->
@@ -164,7 +174,7 @@
 					<!--- <th>__name</th> --->
 					<th>user_description</th>
 					<th>Кол-во</th>
-					<th>Скидка</th>
+					<th>Скидка%</th>
 					<th>abstractive_service_code</th>
 					<th>modifier_code</th>					
 					<th>is_actual</th>
@@ -178,6 +188,7 @@
 					<th>date_end</th>
 					<th>is_easy</th>
 					<th>params</th>
+					<!--- <th>additional_agreement_uid</th> --->
 					<th>additional_agreement</th>
 				</tr>
 			</thead>
@@ -200,9 +211,10 @@
 					<td class="c">#__index#</td>
 					<td class="c">#dateFormat(date_nop,'YYYY-MM-DD')#</td>
 					<td class="c">#dateFormat(date_end,'YYYY-MM-DD')#</td>
-					<td class="c"><cfif is_easy GT 0>Простая<cfelse>Композитная</cfif></td>
+					<td class="c"><cfif is_easy GT 0>Простая<cfelseif is_easy EQ 0>Композитная<cfelse>is_easy=#is_easy#</cfif></td>
 					<td class="c">#params#</td>
-					<td class="c">#additional_agreement#</td>
+					<!--- <td class="c">#additional_agreement_uid#</td> --->
+					<td class="c"><a href="additional_agreement.cfm?__id=#additional_agreement_uid#&#tr.fwx#">#additional_agreement#</a></td>
 				</tr>
 			</cfoutput>		
 		</table>