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

21 with asymmetric time and local version

Browse Source
This commit is contained in:
msyu
2025-07-11 10:21:05 +03:00
parent e96eedece5
commit 2d270ef24f
9 changed files with 240 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
specification_item_ls.cfm
+11 -13
View File
@@ -22,10 +22,10 @@
select /*переделать выборку версий через group by*/
<d:field_set titleMapOut="titleMap" lengthOut="fieldCount">
<d:field title="contract_id" cfSqlType="CF_SQL_INTEGER">a.contract_id</d:field>
<d:field title="Н-р согл." cfSqlType="CF_SQL_INTEGER">a.agreement_version</d:field>
<d:field title="Ключ сделки">a.deal_uid</d:field>
<d:field title="Вер-ть%">a.probability_perc</d:field>
<d:field title="Соглашение">a.agreement</d:field>
<d:field title="Сделка">a.agreement</d:field>
<d:field title="Соглашение">a.agreement_version</d:field>
<d:field title="Тип сделки">case when a.agreement_version = 0 then 'New sale' else 'Up sale' end as deal_type</d:field>
<!--- <d:field title="Дата соглашения">a.dt_specification_item</d:field> --->
<!--- <d:field title="Описание">a.descr</d:field> --->
@@ -145,8 +145,8 @@ select count(*) as cnt from specification_item where 1=1
<cfset queryAddColumn(qRead,'f_link_view_edit')/>
<cfset titleMap.f_link_view_edit={ordinal=#StructCount(titleMap)+1#}/><!--- *** Это легко забыть, потому что TitleMap никак не сцеплен с qRead. Напрашивается: упаковать их в одну обертку (но тогда обращение станет длиннее). Еще идея - назвать qRead и TitleMap так, чтобы была видна их связь. --->
<!--- <cfdump var=#titleMap#/> --->
<cfset queryAddColumn(qRead,'f_deal_uid')/>
<cfset titleMap.f_deal_uid=titleMap.deal_uid/>
<cfset queryAddColumn(qRead,'f_agreement_version')/>
<cfset titleMap.f_agreement_version=titleMap.agreement_version/>
<cfset queryAddColumn(qRead,'f_specification_item_uid')/>
<cfset titleMap.f_specification_item_uid=titleMap.specification_item_uid/>
@@ -169,8 +169,8 @@ select count(*) as cnt from specification_item where 1=1
<cfsavecontent variable="qRead.f_link_view_edit">
<a href="specification_item_version.cfm?specification_item_uid=#specification_item_uid#&agreement_version=#agreement_version#&#tr.fwx#" name="#specification_item_uid#" <cfif pageInfo.writePermitted()>title="редактировать" class="edit"<cfelse>title="просмотр" class="view"</cfif>></a>
</cfsavecontent>
<cfsavecontent variable="qRead.f_deal_uid">
<a href="agreement.cfm?contract_id=#contract_id#&agreement_version=#agreement_version#&#tr.fwx#">#deal_uid#</a>
<cfsavecontent variable="qRead.f_agreement_version">
<a href="agreement.cfm?contract_id=#contract_id#&agreement_version=#agreement_version#&#tr.fwx#">#agreement# [#agreement_version#]</a>
</cfsavecontent>
<cfsavecontent variable="qRead.f_specification_item_uid">
<a href="specification_item.cfm?specification_item_uid=#specification_item_uid#&#tr.fwx#">#specification_item_uid#</a>
@@ -194,15 +194,13 @@ select count(*) as cnt from specification_item where 1=1
<c:th><!--- <a href="specification_item.cfm?contract_id=&specification_item_version="><img src="img/add.gif"/></a> ---></c:th>
<c:td field="f_link_view_edit" class="c"/>
</c:column>
<c:column width="8%" field="f_deal_uid"/>
<c:column width="7%" field="contragent"/>
<c:column width="5%" field="f_contract"/>
<c:column width="2%" field="f_specification"/>
<c:column width="3%" field="f_agreement_version"/>
<c:column width="3%" field="deal_type"><c:td class="c"/></c:column>
<c:column width="8%" field="f_specification_item_uid"/>
<c:column width="3%" field="probability_perc"><c:td class="r"/></c:column>
<c:column width="2%" field="f_specification"/>
<c:column width="5%" field="f_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="7%" field="contragent"/>
<c:column width="3%" field="probability_perc"><c:td class="r"/></c:column>
<c:column width="7%" field="specification_item_version"/>
<c:column width="1%" field="pricing_model_short"/>
<c:column width="5%" field="dt_from" formatter=#function(dt){return dateformat(dt,"YYYY-MM-DD");}#><c:td class="c"/></c:column>