agreement list added

contract_ls.cfm

@@ -26,7 +26,8 @@
 			<d:field title="Номер договора">d.contract</d:field>
 			<d:field title="Дата договора">d.dt_contract</d:field>
 			<d:field title="Описание">d.descr</d:field>
-			<d:field title="Соглашений">(select count(*) from agreement s where s.contract_id=d.contract_id) as spec_cnt</d:field>
+			<d:field title="Соглашений">(select count(*) from agreement s where s.contract_id=d.contract_id) as agreement_cnt</d:field>
+			<d:field title="Спецификаций">(select count(*) from specification s where s.contract_id=d.contract_id) as spec_cnt</d:field>
 		</d:field_set>
 		from contract d 
 		join contragent c on (d.contragent_id=c.contragent_id)
@@ -97,13 +98,13 @@ select count(*) as cnt from contract where 1=1
 		<c:column width="1%" sortable="false"><!---*** class="c" не пробрасывается --->	
 			<c:th><c:link_add canWrite=#pageInfo.writePermitted()# entity=#pageInfo.entity# fwx=#tr.fwx#/></c:th>
 			<c:td field="f_link_view_edit" class="c"/>		   
-			<!--- 	<a href="#CALLER.pageInfo.entity#.cfm?#CALLER.pageInfo.entity#_id=#contract_id#&#CALLER.tr.fwx#" name="#contract_id#" <cfif pageInfo.writePermitted()>title="редактировать"  class="edit"<cfelse>title="просмотр" class="view"</cfif>></a> --->
 		</c:column>	
 		<c:column width="2%" field="contract_id"><c:td class="r"/></c:column>
 		<c:column width="10%" field="contragent"/>
 		<c:column width="10%" field="contract"/>		
 		<c:column width="5%" field="dt_contract" formatter=#function(dt){return dateformat(dt,"YYYY-MM-DD");}#><c:td class="c"/></c:column>
 		<c:column width="15%" field="descr"/>
+		<c:column width="2%" field="agreement_cnt" formatter=#hideNonPositive#><c:td class="c"/></c:column>
 		<c:column width="2%" field="spec_cnt" formatter=#hideNonPositive#><c:td class="c"/></c:column>
 		<c:column width="1%" sortable="false">
 			<c:td field="f_link_del" class="c"/>