intermediate draft 4

specification_item.cfm

@@ -21,7 +21,7 @@
 	<d:param field="specification_item_uid" type="guid" key autoincrement/>
 	<d:param field="specification_id" type="integer" required/>
 	<d:param field="svc_id" type="integer" required/>
-	<!--- <d:param field="specification_item" type="varchar" size="1023" preprocessor=#cleanInput#/> можно было оставить здесь --->
+	<!--- <d:param field="specification_item" type="varchar" size="1023" preprocessor=#cleanInput#/> можно было оставить здесь, но мигрировали в версию --->
 	
 	<d:param field="creator_id" type="integer" value="#request.usr_id#" skipUpdate/>
 	<d:param field="updater_id" type="integer" value="#request.usr_id#" />
@@ -39,8 +39,12 @@
 />
 
 <cfquery name="qSpecification" datasource="#request.DS#">
-	select s.specification_id, s.specification
+	select s.specification_id, s.specification, s.contract_id
+	,d.contract, d.dt_contract, d.contragent_id
+	,k.contragent
 	from specification s 
+	join contract d on (s.contract_id=d.contract_id)
+	join contragent k on (d.contragent_id=k.contragent_id)
 	where s.specification_id=<cfqueryparam cfsqltype="cf_sql_integer" value="#d.specification_id#" null=#!isNumeric(d.specification_id)#/>
 </cfquery>
 
@@ -90,9 +94,11 @@
 <div class="detail">
 	
 	<div class="tr">
-		<div class="th">Спецификация (номер)</div>
+		<div class="th">Спецификация</div>
 		<div class="td">
-			<a href="specification.cfm?specification_id=#d.specification_id#&#tr.fwx#">#qSpecification.specification#</a>
+			<a href="specification.cfm?specification_id=#d.specification_id#&#tr.fwx#">#qSpecification.specification#[#d.specification_id#]</a>
+			<a href="contract.cfm?contract_id=#qSpecification.contract_id#&#tr.fwx#">#qSpecification.contract# #dateFormat(qSpecification.dt_contract,'DD.MM.YYYY')#</a>
+			<a href="contragent.cfm?contragent_id=#qSpecification.contragent_id#&#tr.fwx#">#qSpecification.contragent# </a>
 		</div>
 	</div>	
 	
@@ -161,10 +167,10 @@
 		,a.dt_agreement
 		,a.is_actual
 		from specification_item_version siv
-		join specification_item i on (siv.specification_item_uid=i.specification_item_uid)
-		join specification s on (i.specification_id=s.specification_id)
-		join contract d on (s.contract_id=d.contract_id)
-		join agreement a on (siv.agreement_version=a.agreement_version AND s.contract_id=a.contract_id)		
+		left join specification_item i on (siv.specification_item_uid=i.specification_item_uid)
+		left join specification s on (i.specification_id=s.specification_id)
+		left join contract d on (s.contract_id=d.contract_id)
+		left join agreement a on (siv.agreement_version=a.agreement_version AND s.contract_id=a.contract_id)		
 		where siv.specification_item_uid=<cfqueryparam cfsqltype="cf_sql_other" value="#d.specification_item_uid#"/>
 		order by siv.agreement_version desc
 	</cfquery>
@@ -177,7 +183,7 @@
 					<cfset addUrl="specification_item_version.cfm?agreement_version=-1&specification_item_uid=#d.specification_item_uid#&#tr.fwx#"/>
 					<button type="button" class="maincontrol" onclick="document.location.href='#addUrl#'">
 						<a href="#addUrl#">Создать</a>
-					</button> вопрос, где мы возьмем agreement_version? Или соглашение создавать автоматически?
+					</button>
 				</cfoutput>
 			</cfif>
 		</p>
@@ -186,12 +192,14 @@
 		<thead>
 			<tr>			
 				<th></th>
-				<th>Версия</th>	
-				<th>Допник</th>	
+				<th>Версия N</th>	
+				<th>Соглашение</th>
+				<th>Дата соглашения</th>
+				<th>Действует</th>	
 				<th>Дата с</th>	
-				<th>Дата по</th>	
+				<th>Дата по</th>					
 				<th>Услуга (для печати)</th>	
-				<th>Количество</th>
+				<th>Кол-во</th>
 				<th>Цена</th>
 				<th></th>
 			</tr>
@@ -199,19 +207,24 @@
 		<cfoutput query="qSpecificationItemVersion">
 			<tr>
 				<td>					
-					<a href="specification_item_param.cfm?specification_item_param_id=#specification_item_param_id#&#tr.fwx#">
+					<a href="specification_item_version.cfm?specification_item_uid=#specification_item_uid#&agreement_version=#agreement_version#&#tr.fwx#">
 						<img src="img/edit.gif"/>
 					</a>
 				</td> 
-				<td>#agreement_version#</td> 	
+				<td class="c"><a href="agreement.cfm?contract_id=#contract_id#&agreement_version=#agreement_version#&#tr.fwx#">#agreement_version#</a></td> 	
 				<td>#agreement#</td>				
-				<td class="r"><
-					#quantity#
-				</td> 	 				
+				<td class="c">#dateFormat(dt_agreement,'DD.MM.YYYY')#</td>				
+				<td><cfif is_actual GT 0><img src="img/ok.png"/></cfif></td>				
+				<td class="c">#dateFormat(dt_from, 'DD.MM.YYYY')#</td>				
+				<td class="c">#dateFormat(dt_to, 'DD.MM.YYYY')#</td>
+				<td class="r">#specification_item_version#</td> 	 				
+				<td class="r">#quantity#</td> 	 				
 				<td class="r">#price#</td> 				
 				<td class="c">
-					<cfif specification_item_param_id GT 0>
-						<c:link_del canWrite=#pageInfo.writePermitted()# entity="specification_item_param" id=#specification_item_param_id# fwx=#tr.fwx#/>
+					<cfif pageInfo.writePermitted()>
+						<a href="specification_item_version_del.cfm?specification_item_uid=#specification_item_uid#&agreement_version=#agreement_version#&#tr.fwx#">
+							<img src="img/del.gif"/>
+						</a>
 					</cfif>
 				</td> 				
 			</tr>