smishchuk/spec
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

018 fine debug

Browse Source
This commit is contained in:
msyu
2025-06-28 17:02:39 +03:00
parent a4f66bf6e8
commit 1c96679c29
7 changed files with 117 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
agreement.cfm
+7 -6
View File
@@ -218,7 +218,7 @@
<!--- для identity проверка существования записи простая, а тут как? В принципе, бин должен экспортировать флаг существования записи --->
<cfif d.agreement_version GE 0>
<cfquery name="qItem" datasource="#request.DS#">
select
select
iv.specification_item_uid
,iv.agreement_version /*лучше читается, когда все одинаково берется из резалтсета*/
,i.svc_id
@@ -291,9 +291,8 @@
join specification_item ii on (iiv.specification_item_uid=ii.specification_item_uid)
join specification isp on (ii.specification_id=isp.specification_id)
join agreement ia on (isp.contract_id=ia.contract_id AND iiv.agreement_version=ia.agreement_version)
where iiv.specification_item_uid=i.specification_item_uid
AND ia.is_actual
AND iiv.agreement_version <=<cfqueryparam cfsqltype="cf_sql_integer" value="#d.agreement_version#"/>
where iiv.specification_item_uid=i.specification_item_uid
AND iiv.agreement_version <= <cfqueryparam cfsqltype="cf_sql_integer" value="#d.agreement_version#"/>
)
order by i.specification_id
</cfquery>
@@ -322,6 +321,7 @@
<th>Имя для печати</th>
<th>Модель</th>
<th>Версия</th>
<th>Дата с</th>
<th>Дата по</th>
<th>Кол-во</th>
@@ -346,7 +346,7 @@
<cfoutput group="specification_item_uid">
<tr>
<td>
<a href="specification_item_version.cfm?specification_item_uid=#specification_item_uid#&agreement_version=#agreement_version#&#tr.fwx#" class=<cfif pageInfo.writePermitted()>"edit"<cfelse>"view"</cfif>></a>
<a href="specification_item_version.cfm?specification_item_uid=#specification_item_uid#&agreement_version=#d.agreement_version#&#tr.fwx#" class=<cfif pageInfo.writePermitted()>"edit"<cfelse>"view"</cfif>></a>
</td>
<td>
<a href="specification.cfm?specification_id=#specification_id#&#tr.fwx#">#specification#</a>
@@ -363,6 +363,7 @@
</td>
<td>#specification_item_version#</td>
<td class="c">#pricing_model_short#</td>
<td class="c">#agreement_version#</td>
<td class="c">#dateFormat(dt_from,'DD.MM.YYYY')#</td>
<td class="c">#dateFormat(dt_to,'DD.MM.YYYY')#</td>
@@ -383,7 +384,7 @@
<td class="c">
<cfif pageInfo.writePermitted()>
<a href="specification_item_version_del.cfm?specification_item_uid=#specification_item_uid#&agreement_version=#agreement_version#&#tr.fwx#" class="del"></a>
<a href="specification_item_version_del.cfm?specification_item_uid=#specification_item_uid#&agreement_version=#d.agreement_version#&#tr.fwx#" class="del"></a>
</cfif>
</td>
</tr>