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

019 some version navigation

Browse Source
This commit is contained in:
msyu
2025-08-29 23:46:53 +03:00
parent 791a652a9b
commit db421e12fd
4 changed files with 255 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
additional_agreement.cfm
+32 -27
View File
@@ -58,7 +58,7 @@
,k.id_klienta as wz
from elma.aggrements c
left outer join elma.companies k on (c.company_uid=k.__id)
where c.__id=<cfqueryparam cfsqltype="cf_sql_other" value=#d.contract_uid#/>
where c.__id=<cfqueryparam cfsqltype="cf_sql_other" value=#d.contract_uid# null=#!isValid("guid",d.contract_uid)#/>
</cfquery>
@@ -126,7 +126,7 @@
from elma.additional_agreements a
left outer join elma.deals d on (a.deal_uid=d.__id)
left outer join s on (d.__status_status=s.status_id)
where a.contract_uid=<cfqueryparam cfsqltype="cf_sql_other" value=#d.contract_uid#/>
where a.contract_uid=<cfqueryparam cfsqltype="cf_sql_other" value=#d.contract_uid# null=#!isValid("guid",d.contract_uid)#/>
order by index
</cfquery>
<cfloop query=#qVer#>
@@ -143,9 +143,12 @@
<div class="tr">
<div class="th">Договор</div>
<div class="td"><a href="contract.cfm?__id=#d.contract_uid#&#tr.fwx#"><b>#qDecoration.contract#</b> #dateFormat(qDecoration.date_of_aggrement,'DD.MM.YYYY')#
[#d.contract_uid#]</a>
#qDecoration.contragent# #qDecoration.wz#
<div class="td">
<cfif len(d.contract_uid)>
<a href="contract.cfm?__id=#d.contract_uid#&#tr.fwx#"><b>#qDecoration.contract#</b> #dateFormat(qDecoration.date_of_aggrement,'DD.MM.YYYY')#
[#d.contract_uid#]</a>
#qDecoration.contragent# #qDecoration.wz#
</cfif>
</div>
</div>
@@ -162,25 +165,27 @@
<div class="tr">
<div class="th">Сделка</div>
<div class="td">
<a href="deal.cfm?__id=#d.deal_uid#&#tr.fwx#">#d.deal_uid#</a>
<cfquery name="qDeal">
with
s(status, status_id, probability_pc) as (VALUES
('Закрыта неуспешно',7,0),('Закрыта успешно',6,100),('Договор подписан',5,100),('Договор на подписании',15,90),('Договор на согласовании',12,70),
('Тестирование',8,50),('Отправлено ТКП',10,20),('Внутреннее согласование',37,10),('Проработка решения',4,10),('Сбор потребностей',1,0)
)
select d.__id::text
, d.__name
, d.__status_status
, s.status
, s.probability_pc
from elma.deals d
left outer join s on (d.__status_status=s.status_id)
where d.__id=<cfqueryparam cfsqltype="cf_sql_other" value=#d.deal_uid#/>
</cfquery>
#qDeal.__name#
(#qDeal.status#:
#qDeal.probability_pc#%)
<cfif len(d.deal_uid)>
<a href="deal.cfm?__id=#d.deal_uid#&#tr.fwx#">#d.deal_uid#</a>
<cfquery name="qDeal">
with
s(status, status_id, probability_pc) as (VALUES
('Закрыта неуспешно',7,0),('Закрыта успешно',6,100),('Договор подписан',5,100),('Договор на подписании',15,90),('Договор на согласовании',12,70),
('Тестирование',8,50),('Отправлено ТКП',10,20),('Внутреннее согласование',37,10),('Проработка решения',4,10),('Сбор потребностей',1,0)
)
select d.__id::text
, d.__name
, d.__status_status
, s.status
, s.probability_pc
from elma.deals d
left outer join s on (d.__status_status=s.status_id)
where d.__id=<cfqueryparam cfsqltype="cf_sql_other" value=#d.deal_uid# null=#!isValid("guid",d.deal_uid)#/>
</cfquery>
#qDeal.__name#
(#qDeal.status#:
#qDeal.probability_pc#%)
</cfif>
</div>
</div>
@@ -190,7 +195,7 @@
<cfquery name="qService_">
select services_::text
from elma.additional_agreements a
where a.__id=<cfqueryparam cfsqltype="cf_sql_other" value=#d.__id#/>
where a.__id=<cfqueryparam cfsqltype="cf_sql_other" value=#d.__id# null=#!isValid("guid",d.__id)#/>
</cfquery>
#qService_.services_# (обратная ссылка)
</div>
@@ -204,7 +209,7 @@
, b.__name
from elma.additional_agreements a
join elma.additional_agreements b on (b.__id = ANY(a.base_by))
where a.__id=<cfqueryparam cfsqltype="cf_sql_other" value=#d.__id#/>
where a.__id=<cfqueryparam cfsqltype="cf_sql_other" value=#d.__id# null=#!isValid("guid",d.__id)#/>
</cfquery>
<a href="additional_agreement.cfm?__id=#qBaseBy.__id#&#tr.fwx#">#qBaseBy.__id#</a>
#qBaseBy.__name#
@@ -239,7 +244,7 @@
,siv.is_easy
,siv.params::text
from elma.deals_services siv
where <cfqueryparam cfsqltype="cf_sql_other" value="#d.__id#"/>=ANY(siv.additional_agreement)
where <cfqueryparam cfsqltype="cf_sql_other" value="#d.__id#" null=#!isValid("guid",d.__id)#/>=ANY(siv.additional_agreement)
order by type
</cfquery>