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

013 report improvements

Browse Source
This commit is contained in:
msyu 2025-06-22 11:50:54 +03:00
parent c1242c2c0c
commit ef3e2ca0e3
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Application.cfc
View File

@ -69,7 +69,7 @@
<!--- <cfset this.datasources["#this.datasource#"]=getDS("#this.datasource#","datasource_#this.datasource#")/> --->
<cfset request.RECORDS_PER_PAGE=500/>
<cfset request.APP_VERSION="0.00.012"/>
<cfset request.APP_VERSION="0.00.013"/>
<cflock scope="application" type="readonly" timeout=3>
<cfset request.APP_NAME=this.Name/>

2
agreement_ls.cfm
View File

@ -24,7 +24,7 @@
<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.probability_perc</d:field>
<d:field title="Соглашение">a.agreement</d:field>
<d:field title="Дата соглашения">a.dt_agreement</d:field>
<d:field title="Действует">a.is_actual</d:field>

19
specification_item_ls.cfm
View File

@ -24,18 +24,18 @@
<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.probability_perc</d:field>
<d:field title="Соглашение">a.agreement</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> --->
<d:field title="Спецификация">s.specification</d:field>
<d:field title="Спец-я">s.specification</d:field>
<d:field>si.specification_id</d:field>
<d:field title="Договор">d.contract</d:field>
<d:field title="Дата договора">d.dt_contract</d:field>
<d:field title="Контрагент">k.contragent</d:field>
<d:field title="Ключ строки">siv.specification_item_uid</d:field>
<d:field title="Сервис">svc.svc</d:field>
<d:field title="Сервис">siv.specification_item_version</d:field>
<d:field title="svc_id">si.svc_id</d:field>
<d:field title="Ц/обр">si.pricing_model_id</d:field>
<d:field title="Ц/обр">p.pricing_model_short</d:field>
@ -198,21 +198,22 @@ select count(*) as cnt from specification_item where 1=1
<c:td field="f_link_view_edit" class="c"/>
</c:column>
<c:column width="12%" field="f_deal_uid"/>
<c:column width="12%" field="f_specification_item_uid"/>
<c:column width="8%" field="f_deal_uid"/>
<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="7%" field="svc"/>
<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>
<c:column width="5%" field="dt_to" formatter=#function(dt){return dateformat(dt,"YYYY-MM-DD");}#><c:td class="c"/></c:column>
<c:column width="3%" field="agreement_version"><c:td class="c"/></c:column>
<c:column width="2%" field="dt_to" formatter=#function(dt){return dateformat(dt,"YYYY-MM-DD");}#><c:td class="c"/></c:column>
<c:column width="3%" field="quantity"><c:td class="r"/></c:column>
<c:column width="3%" field="price"><c:td class="r"/></c:column>
<c:column width="3%" field="cost"><c:td class="r"/></c:column>
<c:column width="3%" field="cost"><c:td class="r"/></c:column>
<c:column width="3%" field="agreement_version"><c:td class="c"/></c:column>
<c:column width="3%" field="f_version_prev"><c:td class="c"/></c:column>
<c:column width="3%" field="quantity_prev"><c:td class="r"/></c:column>
<c:column width="3%" field="price_prev"><c:td class="r"/></c:column>