From 1541e4806d153a8f76e137398ff89dc635d35464 Mon Sep 17 00:00:00 2001
From: unknown <smishchuk@nubes.ru>
Date: Tue, 20 Oct 2026 16:57:39 +0300
Subject: [PATCH] 095 strict filtering, deleted s3 instances removed

---
 Application.cfc |  2 +-
 payg.cfm        | 16 ++++++++++------
 s3_ls.cfm       |  1 +
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Application.cfc b/Application.cfc
index cca0adf..20d6560 100644
--- a/Application.cfc
+++ b/Application.cfc
@@ -89,7 +89,7 @@
 
 		<!--- global settings --->
 		<!--- *************************************************************************************************** --->
-		<cfset request.APP_VERSION="0.00.094"/> <!--- *********************************************************** --->
+		<cfset request.APP_VERSION="0.00.095"/> <!--- *********************************************************** --->
 		<!--- *************************************************************************************************** --->
 		<cfset request.STAND=getStand()/>
 		<cfset request.RECORDS_PER_PAGE=500/>		
diff --git a/payg.cfm b/payg.cfm
index 8e6aa4a..0ba9ed6 100644
--- a/payg.cfm
+++ b/payg.cfm
@@ -16,8 +16,9 @@
 <cfparam name="wz" default=""/>
 
 <!--- *** костыль --->
+<!--- нужно также позаботиться о передаче через url --->
 <cfparam name="only_articles_in_spec" default=0/>
-<cfset local.only_articles_in_spec=only_articles_in_spec/>
+<cfset local.only_articles_in_spec=only_articles_in_spec/><!--- *** некорректное название --->
 <cfparam name="inner_join" default=0/>
 <cfset local.inner_join=inner_join/>
 <!--- 	<cfparam name="local.only_articles_in_spec" type="boolean" default=#structIsEmpty(form)? true : (form?.only_articles_in_spec GT 0)# /> <!--- не вполне корректный способ определить наличие формы, если там все чекбоксы и ни один не выбран... --->
@@ -63,9 +64,7 @@
 		AS (VALUES
 			('Закрыта неуспешно',7,0),('Закрыта успешно',6,100),('Договор подписан',5,100),('Договор на подписании',15,90),('Договор на согласовании',12,70),
 			('Тестирование',8,50),('Отправлено ТКП',10,20),('Внутреннее согласование',37,10),('Проработка решения',4,10),('Сбор потребностей',1,0)
-		)	
-		
-		
+		)			
 	select upper(trim(k.id_klienta)) as wz, 
 	k.__id::text as contragent_uid, 
 	p.code, 
@@ -86,7 +85,7 @@
 	/*,p.__name as line_key*/, p.ed_izm, p.name as component, p.type, p.cnt*coalesce(siv.cnt,1) as component_quantity,
 	aa.__name as additional_agreement, aa.__id::text as additional_agreement_uid
 	--, aa.is_actual
-	,siv.end_customer as end_customer_uid
+	,siv.end_customer::text as end_customer_uid
 	,z.id_klienta as end_customer_wz
 	,z.__name as end_customer_name
 	--,ft.free_tier
@@ -117,6 +116,9 @@
 	</cfif>	
 	<cfif len(code)>
 		AND p.code like <cfqueryparam cfsqltype="cf_sql_varchar" value="%#code#%"/>
+	</cfif>		
+	<cfif local.only_articles_in_spec>
+		AND p.type=3
 	</cfif>
 	--AND k.id_klienta='WZ01031'
 	--AND k.id_klienta='WZ01112'
@@ -358,6 +360,7 @@ select
 
 <cfoutput>qS3OpsTrfAge:#getTickCount()-request.startTickCount#</cfoutput><cfif !isDefined("output_xls") AND !isDefined("output_json")><cfflush/></cfif>
 
+<!--- /*прибегаем к cmdb для разрешения инстанса, нейминг некорректен и ненадежен*/ --->
 <cfquery name="qS3User" datasource="cmdb" cachedWithin=#createTimeSpan(0, 0, 31, 0)#>
 	WITH current_state AS (
 		SELECT *, ROW_NUMBER() OVER (PARTITION BY instance_uid ORDER BY version DESC) as rn
@@ -367,6 +370,7 @@ select
 	FROM current_state s 
 	JOIN instance e on (s.instance_uid=e.instance_uid)
 	WHERE rn = 1 AND e.service_id=12
+	AND NOT cast(s.instance_data->>'isDeleted' as boolean)
 </cfquery>
 
 <cfoutput>qS3User:#getTickCount()-request.startTickCount#</cfoutput><cfif !isDefined("output_xls") AND !isDefined("output_json")><cfflush/></cfif>
@@ -820,7 +824,7 @@ S3 операции и трафик: <b<cfif datediff("h",qS3OpsTrfAge.dt_load,
 					<td class="r"></td>
 					
 					<td><a href="deal.cfm?__id=#deal_uid#&#tr.fwx#">#deal#</a></td>		
-					<td>#WZE#</td>		
+					<td><a href="contragent.cfm?id_klienta=#WZE#&#tr.fwx#">#WZE#</a></td>		
 					
 					<td>#component#</td>
 					<td>#user_description#</td>	
diff --git a/s3_ls.cfm b/s3_ls.cfm
index 77d5afe..ffc1513 100644
--- a/s3_ls.cfm
+++ b/s3_ls.cfm
@@ -54,6 +54,7 @@
 		left join contract d on (p.contract_id=d.contract_id)
 		left join contragent k on (d.contragent_id=k.contragent_id)
 		WHERE rn = 1 AND e.service_id=12
+		AND NOT cast(s.instance_data->>'isDeleted' as boolean) /*не вдаваясь в другие статусы*/
 	</cfquery>
 	<!--- <cfdump var=#qRead#/> --->