025 interface imptovements

contract.cfm

@@ -116,21 +116,25 @@
 			('Тестирование',8,50),('Отправлено ТКП',10,20),('Внутреннее согласование',37,10),('Проработка решения',4,10),('Сбор потребностей',1,0)
 		)	
 		select 
-		a.__id::text
+		 a.__id::text
 		,a.__name
-		,contract_uid::text
-		,is_actual
-		,last_aa
-		,index
-		,deal_uid::text
-		,base_by::text
+		,a.__index
+		,a.contract_uid::text
+		,a.is_actual
+		,a.last_aa
+		,a.index
+		,a.deal_uid::text
+		,a.base_by[1]::text as base_by_uid
+		,b.__name as base_by_name
+		,b.__index as base_by_index
 		,d.__name as deal
 		,d.__status_status as status_id
-		, s.status
-		, s.probability_pc
+		,s.status
+		,s.probability_pc
 		from elma.additional_agreements a
 		left outer join elma.deals d on (a.deal_uid=d.__id)
 		left outer join s on (d.__status_status=s.status_id)
+		left outer join elma.additional_agreements b on (a.base_by[1]=b.__id)
 		where a.contract_uid=<cfqueryparam cfsqltype="cf_sql_other" value="#d.__id#" null=#!isValid('guid',d.__id)#/>
 		order by 1
 		</cfquery>
@@ -143,10 +147,11 @@
  		<table class="worktable">
 			<thead>
 				<tr>
+					<th>__index</th>
 					<th>__id</th>
 					<th>__name</th>					
 					<th>версия</th>					
-					<th>contract_uid</th>
+					<!--- <th>contract_uid</th> --->
 					<th>is_actual</th>
 					<th>last_aa</th>
 					<th>deal_uid</th>
@@ -154,24 +159,30 @@
 					<th>status_id</th>
 					<th>status</th>
 					<th>вер-ть</th>
-					<th>base_by</th>
+					<th>base_by_index</th>
+					<th>base_by_uid</th>
+					<th>base_by_name</th>					
 				</tr>
 			</thead>
 			<cfoutput query="qAdditionalAgreement">
 				<tr>
 
+					<td><a href="additional_agreement.cfm?__id=#__id#&#tr.fwx#">#__index#</a></td> 				
 					<td><a href="additional_agreement.cfm?__id=#__id#&#tr.fwx#">#__id#</a></td> 				
 					<td>#__name#</td> 				
 					<td class="c">#index#</td> 				
-					<td>#contract_uid#</td> 				
+					<!--- <td>#contract_uid#</td>  --->				
 					<td class="c">#is_actual#</td> 				
 					<td class="c">#last_aa#</td> 				
 					<td><a href="deal.cfm?__id=#deal_uid#&#tr.fwx#">#deal_uid#</a></td> 				
 					<td>#deal#</td> 				
 					<td class="c">#status_id#</td>				
 					<td>#status#</td>				
-					<td class="r">#probability_pc#</td>				
-					<td>#base_by#</td> 				
+					<td class="r">#probability_pc#</td>
+					<td class="r"><a href="additional_agreement.cfm?__id=#base_by_uid#&#tr.fwx#">#base_by_index#</a></td>				
+					<td><a href="additional_agreement.cfm?__id=#base_by_uid#&#tr.fwx#">#base_by_uid#</a></td>
+					<td><a href="additional_agreement.cfm?__id=#base_by_uid#&#tr.fwx#">#base_by_name#</a></td> 				
+			
 <!--- 					<td class="c">
 						#dateFormat(dt_contract,'YYYY-MM-DD')#
 					</td>	 --->