011 some navigation

contract.cfm

@@ -15,7 +15,7 @@
 	<cfreturn htmlEditFormat(s)/>
 </cffunction>
 
-<m:prepare_detail entity="contract" accessObject="" key="contract_uid" pageInfoOut="pageInfo"/>
+<m:prepare_detail entity="contract" accessObject="" key="__id" pageInfoOut="pageInfo"/>
 
 <d:bean readonly=true table="elma.aggrements" datasource="#request.DS#" output="d" status="status">
 	<d:param field="__id" type="uuid" key/>
@@ -40,7 +40,7 @@
 	select 
 	__name as contragent
 	from elma.companies k
-	where k.__id=<cfqueryparam cfsqltype="cf_sql_other" value=#d.company_uid#/>
+	where k.__id=<cfqueryparam cfsqltype="cf_sql_other" value=#d.company_uid# null=#!isValid('guid',d.company_uid)#/>
 </cfquery>
 
 
@@ -101,55 +101,73 @@
 </div>
 
 </cfoutput>
-<!--- 
+
 <layout:page section="extension" closeForm="Yes"/>
 
-	 <cfif d.contragent_id GT 0>	
-		<cfquery name="qContract">
-			select 	 
-			 d.contract_id
-			,d.contract
-			,d.dt_contract
-			,(select count(*) from specification s where s.contract_id=d.contract_id) as spec_cnt
-			from contract d 
-			where d.contragent_id=<cfqueryparam cfsqltype="cf_sql_integer" value="#d.contragent_id#"/>
-			order by 1
+	 <cfif len(d.__id)>	
+		<cfquery name="qAdditionalAgreement">
+		select 
+		__id::text
+		,__name
+		,contract_uid::text
+		,is_actual
+		,last_aa
+		,deal_uid::text
+		,base_by::text
+		from elma.additional_agreements a
+		where a.contract_uid=<cfqueryparam cfsqltype="cf_sql_other" value="#d.__id#"/>
+		order by 1
 		</cfquery>
 		
 		<cfoutput>
-			<h4>Договоры (#qContract.recordCount#)</h4>
+			<h4>Дополнительные соглашения (#qAdditionalAgreement.recordCount#)</h4>
 		</cfoutput>			
-			
-		<table class="worktable">
+		<!--- <cfdump var=#qAdditionalAgreements#/> --->
+		<!--- <layout:render_query query=#qAdditionalAgreement#/> --->
+ 		<table class="worktable">
 			<thead>
 				<tr>
-					<th><c:link_add canWrite=#pageInfo.writePermitted()# entity="contract" id="#contragent_id#" extra="contragent_id=#d.contragent_id#" fwx=#tr.fwx#/></th>
-					<th>Номер договора</th>
-					<th>Дата договора</th>					
-					<th>Спецификаций</th>
-					<th></th>
+					<th>__id</th>
+					<th>__name</th>					
+					<th>contract_uid</th>
+					<th>is_actual</th>
+					<th>last_aa</th>
+					<th>deal_uid</th>
+					<th>base_by</th>
 				</tr>
 			</thead>
-			<cfoutput query="qContract">
+			<cfoutput query="qAdditionalAgreement">
 				<tr>
-					<td>
-						<c:link_view_edit canWrite=#pageInfo.writePermitted()# entity="contract" id=#contract_id# fwx=#tr.fwx#/>
-					</td> 
-					<td>#contract#</td> 				
-					<td class="c">
+
+					<td><a href="additional_agreement.cfm?__id=#__id#&#tr.fwx#">#__id#</a></td> 				
+					<td>#__name#</td> 				
+					<td>#contract_uid#</td> 				
+					<td>#is_actual#</td> 				
+					<td>#last_aa#</td> 				
+					<td><a href="deal.cfm?__id=#deal_uid#&#tr.fwx#">#deal_uid#</a></td> 				
+					<td>#base_by#</td> 				
+<!--- 					<td class="c">
 						#dateFormat(dt_contract,'YYYY-MM-DD')#
-					</td>				
-					<td class="c">
-						<cfif spec_cnt GT 0>#spec_cnt#</cfif>						
-						
-					</td> 		
-					<td class="c">
-						<c:link_del canWrite=#pageInfo.writePermitted()# entity="contract" id=#contract_id# fwx=#tr.fwx#/>
-					</td> 	
+					</td>	 --->
 				</tr>
 			</cfoutput>
 		</table>
-	</cfif>  --->
+	</cfif>  
+	<br/>
+	Мы не показываем тут сделки, поскольку связь со сделкой у договора не прямая и не обязательная. Сделки относятся к контрагенту, а не к договору. Сделка может быть связана с договором через дополнительное соглашение (включая нулевое соглашение, по умолчанию)
+<!--- 	<cfquery name="qDeal">
+		select 
+		 d.__id
+		,d.__name
+		,d._companies
+		,d._plannedDueDate
+		,d.kommentarii_k_sdelke
+		,d.__status_notify
+		,d.__debug
+		,d.is_corrective_transaction
+		,d.dt_load
+		from elma.deals d limit 10
+	</cfquery> --->
 	
 	
 <layout:page section="footer"/>