From 7ac2c852383d2621f662d8250864de45c4f421f8 Mon Sep 17 00:00:00 2001
From: unknown <smishchuk@nubes.ru>
Date: Tue, 28 Jul 2026 14:28:27 +0300
Subject: [PATCH] 064 interface improvements

---
 Application.cfc    |  8 ++------
 contragent_rpt.cfm |  2 +-
 payg.cfm           | 13 ++++++++-----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/Application.cfc b/Application.cfc
index 7e75e76..b826795 100644
--- a/Application.cfc
+++ b/Application.cfc
@@ -77,9 +77,7 @@
 		
 		<!--- https://www.jenkins.io/doc/book/system-administration/authenticating-scripted-clients/ 
 		The API token is available in your personal configuration page. Click your name on the top right corner on every page, then click "Configure" to see your API token. (The URL $root/me/configure is a good shortcut.) You can also change your API token from here.
-		--->
-
-		
+		--->		
 		
 		<cfset request.UNDEFINED_USR_ID=-1/>
 		<!--- request.ROOT_USR_ID=1 not used --->
@@ -89,7 +87,7 @@
 		<!--- global settings --->
 
 		<cfset request.RECORDS_PER_PAGE=500/>
-		<cfset request.APP_VERSION="0.00.064"/>
+		<cfset request.APP_VERSION="0.00.065"/>
 		<cfset request.STAND=getStand()/>		
 		
 		<cflock scope="application" type="readonly" timeout=3>
@@ -272,8 +270,6 @@
 				<cfinclude template="login.cfm" />	
 			</cfif>
 		</cfif>
-		
-
 
         <cfreturn />
     </cffunction>
diff --git a/contragent_rpt.cfm b/contragent_rpt.cfm
index 66f3361..af9feef 100644
--- a/contragent_rpt.cfm
+++ b/contragent_rpt.cfm
@@ -260,7 +260,7 @@
 		</thead>
 		
 		<cfoutput query="qService" group="siv_uid">
-			<tr<cfif NOT left(abstractive_service_code,4) EQ "iaas"> class="gray"</cfif>>
+			<tr<cfif NOT (left(abstractive_service_code,4) EQ "iaas" OR left(abstractive_service_code,7) EQ "paas.s3")> class="gray"</cfif>>
 				<td class="c"><a href="deal_service.cfm?__id=#siv_uid#&#tr.fwx#">#siv_index#</a></td>
 				<td class="l">#abstractive_service_code#<cfif len(modifier_code)>.#modifier_code#</cfif></td>
 				<td class="l">#user_description#</td>
diff --git a/payg.cfm b/payg.cfm
index 4f8d094..b83754f 100644
--- a/payg.cfm
+++ b/payg.cfm
@@ -397,7 +397,7 @@ ORDER BY wz,code
 
 <cfoutput>qCharge:#getTickCount()-request.startTickCount#</cfoutput><cfif !isDefined("output_xls") AND !isDefined("output_json")><cfflush/></cfif>
 <cfif isDefined("DEBUG")>
-	<cfdump var=#qCharge#/>
+	<!--- <cfdump var=#qCharge#/> --->
 	<cfif !isDefined("output_xls") AND !isDefined("output_json")><cfflush/></cfif>
 </cfif>
 
@@ -430,10 +430,9 @@ ORDER BY wz,code
 <form method="post" action="">
 Период с <input type="text" name="dt_start" value="#dateFormat(dt_start,'YYYY-MM-DD')#"/>
 по <input type="text" name="dt_finish" value="#dateFormat(dt_finish,'YYYY-MM-DD')#"/>
-Только контрагенты с PAYG* <input type="checkbox" name="only_articles_in_spec" value="1"<cfif only_articles_in_spec> checked</cfif>/>
+Только PAYG <input type="checkbox" name="only_articles_in_spec" value="1"<cfif only_articles_in_spec> checked</cfif>/>
 <input type="submit" style="cursor:pointer;"/>
 <input type="submit" name="DEBUG" value="DEBUG" style="cursor:pointer;"/>
-* любым PAYG, не только по облаку
 </form>
 Часов в периоде: <b>#hours#</b> Строк в отчете: <b>#qCharge.recordCount#</b><br/>
 Актуальность данных: 
@@ -483,13 +482,17 @@ S3 операции и трафик: <b>#dateFormat(qS3OpsTrfAge.dt_load,'YYYY-M
 		<cfset var acc=0/>			
 		<tr>
 			<td bgcolor="##ccc"></td>
-			<td bgcolor="##ccc" colspan="5" class="b"><a href="contragent.cfm?__id=#contragent_uid#&#tr.fwx#">#wz#</a> #contragent#</td>
+			<td bgcolor="##ccc" colspan="5" class="b">
+				<a href="contragent.cfm?__id=#contragent_uid#&#tr.fwx#">#wz#</a> 
+				#contragent#
+				<a href="contragent_rpt.cfm?__id=#contragent_uid#&#tr.fwx#">(сводка)</a>
+			</td>
 			<td></td>
 			<td bgcolor="##ccc" colspan="99"></td>
 		</tr>
 		<cfoutput>	
 		<cfset acc += (isNumeric(charge)) ? charge : 0/>
-		<tr>
+		<tr<cfif !len(unit)> class="gray"</cfif>>
 			<td>#currentRow#</a></td>
 			
 			<td>#code# <cfif !len(metric) and len(f_code)>(#f_code#)</cfif></td>