From e4fa4297dedaf95b2c19e62309decc7ce0f74370 Mon Sep 17 00:00:00 2001
From: msyu <msyu@mail.ru>
Date: Sat, 30 Aug 2025 08:46:34 +0300
Subject: [PATCH] 021 more interlinks

---
 deal_service.cfm | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/deal_service.cfm b/deal_service.cfm
index 7dff5c9..01b49cf 100644
--- a/deal_service.cfm
+++ b/deal_service.cfm
@@ -226,6 +226,7 @@
 				 d.__id::text
 				,d.__name
 				,c.__name as contragent
+				,c.__id as contragent_uid
 				,d."_plannedDueDate"
 				,d.__index
 				,d.__status_status	
@@ -240,8 +241,8 @@
 			</cfquery>
 			<!--- <cfdump var=#qDeal#/> --->
 			<cfif qDeal.recordCount>
-				<a href="deal.cfm?__id=#qDeal.__id#&#tr.fwx#">#qDeal.__id#</a> 
-				#qDeal.contragent# | #qDeal.wz# |
+				<a href="deal.cfm?__id=#qDeal.__id#&#tr.fwx#">#qDeal.__id#</a> |
+				<a href="contragent.cfm?__id=#qDeal.contragent_uid#&#tr.fwx#">#qDeal.contragent# #qDeal.wz#</a> |
 				#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> 
@@ -262,7 +263,10 @@
 				,a.last_aa 
 				,a.deal_uid::text 				
 				,c.__name as contract			
+				,c.agreement_id	
+				,c.date_of_aggrement	
 				,z.__name as contragent			
+				,z.__id as contragent_uid			
 				,z.id_klienta as wz			
 				from elma.deals_services siv
 				join elma.additional_agreements a on (a.__id = ANY(siv.additional_agreement))
@@ -273,8 +277,13 @@
 			</cfquery>
 			<!--- <cfdump var=#qAdditionalAgreement#/> ---> 
 			<cfif len(qAdditionalAgreement.__id)>
-				<a href="additional_agreement.cfm?__id=#qAdditionalAgreement.__id#&#tr.fwx#">#qAdditionalAgreement.__id#</a> #qAdditionalAgreement.contragent# #qAdditionalAgreement.wz# 
-				#qAdditionalAgreement.contract# #qAdditionalAgreement.additional_agreement# 
+				<a href="additional_agreement.cfm?__id=#qAdditionalAgreement.__id#&#tr.fwx#">#qAdditionalAgreement.__id#</a> |
+				<a href="contragent.cfm?__id=#qAdditionalAgreement.contragent_uid#&#tr.fwx#">#qAdditionalAgreement.contragent# #qAdditionalAgreement.wz#</a> |
+				<a href="contract.cfm?__id=#qAdditionalAgreement.contract_uid#&#tr.fwx#">#qAdditionalAgreement.contract# (#qAdditionalAgreement.agreement_id#)
+				#dateFormat(qAdditionalAgreement.date_of_aggrement,"YYYY-MM-DD")#
+				</a> |
+				#qAdditionalAgreement.additional_agreement# |
+				<br/>
 				is_actual: <b>#qAdditionalAgreement.is_actual#</b>
 				last_aa: <b>#qAdditionalAgreement.last_aa#</b>
 				base_by: <a href="additional_agreement.cfm?__id=#qAdditionalAgreement.base_by_uid#&#tr.fwx#">#qAdditionalAgreement.base_by_uid#</a>
@@ -285,7 +294,7 @@
 		
 
 	
-	<div class="tr">
+<!--- 	<div class="tr">
 		<div class="th">Параметры</div>
 		<div class="td">
 			<cfquery name="qParam">
@@ -295,15 +304,10 @@
 			</cfquery>
 			#qParam.params# (обратная ссылка)
 		</div>
-	</div>	
+	</div>	 --->
 	
 
 	
-<!--- 	<div class="tr">
-		<div class="th">Сделка</div>
-		<div class="td"><a href="deal.cfm?__id=#d.deal_uid#&#tr.fwx#">#d.deal_uid#</a></div>
-	</div> --->
-	
 </div>
 
 </cfoutput>