From 255ce141d96a24daac3b189744853aa521b31248 Mon Sep 17 00:00:00 2001
From: unknown <smishchuk@nubes.ru>
Date: Wed, 12 Aug 2026 11:34:27 +0300
Subject: [PATCH] 071 tests fixes

---
 Application.cfc            |  2 +-
 contragent.cfm             | 12 ++++++--
 layout/grid_summary.cfm    | 18 ++++++++----
 lib/controls/paginator.cfm |  4 +++
 test_storage_rpt.cfm       | 59 ++++++++++++++++++++++----------------
 5 files changed, 61 insertions(+), 34 deletions(-)

diff --git a/Application.cfc b/Application.cfc
index 6b9cc58..2b7537c 100644
--- a/Application.cfc
+++ b/Application.cfc
@@ -87,7 +87,7 @@
 		<!--- global settings --->
 
 		<cfset request.RECORDS_PER_PAGE=500/>
-		<cfset request.APP_VERSION="0.00.070"/>
+		<cfset request.APP_VERSION="0.00.071"/>
 		<cfset request.STAND=getStand()/>		
 		
 		<cflock scope="application" type="readonly" timeout=3>
diff --git a/contragent.cfm b/contragent.cfm
index e6a97eb..8ef99ea 100644
--- a/contragent.cfm
+++ b/contragent.cfm
@@ -17,15 +17,21 @@
 
 <m:prepare_detail entity="contragent" accessObject="" key="__id" pageInfoOut="pageInfo"/>
 
+<cfif isDefined("id_klienta") AND NOT isDefined("__id")>
+	<cfquery name="qResolveUid">
+		select __id::text as __id from elma.companies where id_klienta=<cfqueryparam cfsqltype="cf_sql_varchar" value="#id_klienta#"/>
+	</cfquery>
+	<cfif qResolveUid.recordCount>
+		<cfset __id=qResolveUid.__id/>
+	</cfif>
+</cfif>
+
 <d:bean readonly=true table="elma.companies" datasource="#request.DS#" output="d" status="status">
 	<d:param field="__id" type="uuid" key/>
 	<d:param field="__name" type="varchar" size="255" preprocessor=#cleanInput# forNull=""/>
 	<d:param field="_inn" type="varchar" size="255" preprocessor=#cleanInput# forNull=""/>
 	<d:param field="_kpp" type="varchar" size="255" preprocessor=#cleanInput# forNull=""/>
 	<d:param field="id_klienta" type="varchar" size="255" preprocessor=#cleanInput# forNull=""/>
-	<!--- *** билдер показывает... <d:param field="wz_id" type="varchar" size="255" preprocessor=#cleanInput# forNull=""/> --->
-	<!--- <d:param field="code_inn" type="varchar" size="255" preprocessor=#cleanInput# forNull=""/>
-	<d:param field="code_kpp" type="varchar" size="255" preprocessor=#cleanInput# forNull=""/> --->
 </d:bean>
 
 
diff --git a/layout/grid_summary.cfm b/layout/grid_summary.cfm
index 9f0ef16..45628cb 100644
--- a/layout/grid_summary.cfm
+++ b/layout/grid_summary.cfm
@@ -1,5 +1,6 @@
 <cfsilent>
 <!--- v0.03 20260402---> 
+<!--- v0.04 20260812---> 
 	<cfimport prefix="m" taglib="../lib"/>
 	<cfimport prefix="c" taglib="../lib/controls"/>
 
@@ -15,6 +16,7 @@
 	<cfparam name="ATTRIBUTES.buttonNew" default="No"/>
 	<cfparam name="ATTRIBUTES.buttonNewTitle" default="Создать"/>
 	<cfparam name="ATTRIBUTES.urlNew" default=""/>
+	<cfparam name="ATTRIBUTES.paginator" default=#(ATTRIBUTES.recordsPerPage GT 0)#/>
 	
 	<cfset UrlSuffix=""/>
 	<cfif len(ATTRIBUTES.addtionalUrlParams) GT 0>
@@ -63,9 +65,11 @@
 			</cfif>
 			
 		</div>
-		<div class="td r">		
-			#paginator.links#
-		</div>
+		<cfif ATTRIBUTES.paginator>
+			<div class="td r">		
+				#paginator.links#
+			</div>
+		</cfif>
 	</div>
 	</cfif>
 </cfoutput>
@@ -73,9 +77,11 @@
 <cfif len(ATTRIBUTES.footerOut)>
 	<cfsavecontent variable="CALLER.#ATTRIBUTES.footerOut#">
 	<cfoutput>
-		<div class="wide r" style="margin:0.3em">
-			#paginator.links#
-		</div>
+		<cfif ATTRIBUTES.paginator>
+			<div class="wide r" style="margin:0.3em">
+				#paginator.links#
+			</div>
+		</cfif>
 	</cfoutput>
 	</cfsavecontent>
 </cfif>
diff --git a/lib/controls/paginator.cfm b/lib/controls/paginator.cfm
index be785fc..91304c4 100644
--- a/lib/controls/paginator.cfm
+++ b/lib/controls/paginator.cfm
@@ -1,3 +1,4 @@
+<!--- v0.05 2026-08-12---> 
 <cfparam name="nStart" type="integer" default="1"/>
 
 <cfparam name="ATTRIBUTES.recordCount" type="integer"/>
@@ -9,6 +10,9 @@
 <cfparam name="ATTRIBUTES.output" type="string" default="paginator"/>
 
 <!--- Исключение: рассчитанный индекс страницы превышает количество существующих страниц - надо возвращаться на первую --->
+<cfif NOT (ATTRIBUTES.recordsPerPage GT 0)>
+	<cfexit method="exittag"/>
+</cfif>
 
 <cfset nPages = Int((ATTRIBUTES.recordCount-1)/ATTRIBUTES.recordsPerPage)+1/>
 <cfset nCurrentPage = Int((nStart-1)/ATTRIBUTES.recordsPerPage)+1/>
diff --git a/test_storage_rpt.cfm b/test_storage_rpt.cfm
index f3bd9ef..ee96ba2 100644
--- a/test_storage_rpt.cfm
+++ b/test_storage_rpt.cfm
@@ -17,6 +17,7 @@ SELECT
     <d:field title="WZ">m.clientid AS wz</d:field>
     <d:field title="status">m.status</d:field> 
     <d:field title="End of Test">m.end_test_date</d:field>
+    <d:field title="End of Test">null as dt_end_of_test</d:field>
     <d:field title="VDC">v.name AS vdc</d:field> 
     <d:field title="Provider VDC">p.name AS provider_vdc</d:field>	
     <d:field title="code">CASE 
@@ -50,18 +51,38 @@ WHERE c.timestamp >= <cfqueryparam cfsqltype="cf_sql_timestamp" value=#dateAdd("
 GROUP BY 
     m.clientid, v.name, p.name, sp.name, t.name, 
     m.status, m.end_test_date, tm.ts
-ORDER BY 
+
+</cfquery>
+
+<!--- patch date --->
+<cfloop query="qStorage">	
+	<cftry>
+		<cfif len(qStorage.end_test_date)>
+			<cfset qStorage.dt_end_of_test = LSParseDateTime(qStorage.end_test_date,"ru","dd.MM.yyyy")/>
+		</cfif>
+		<cfcatch type="ANY">
+			<!--- <cfdump var=#cfcatch.message#> --->
+			<!--- <cfset qStorage.dt_end_of_test = javaCast("null", 0)/> --->
+		</cfcatch>
+	</cftry>
+</cfloop>
+
+<cfset db = new MemoryDbHelper()/>
+<cfset db.register("qStorage", qStorage, "inmem")/>
+<!--- лень переделывать, мы пользуемся аннотацией от первого запроса, просто добавляя ко второму сортировку --->
+<cfquery name="qRead" datasource="inmem">
+	select * from qStorage 
+	ORDER BY 
     <m:order_build sortArray=#pageInfo.settings.sort.sortArray# fieldCount=#fieldCount#/>
 </cfquery>
 
 
 
-
 <cfif isDefined("output_xls")>
-	<layout:xml qRead=#qCharge# titleMap=#titleMap# filename="#pageInfo.entity#.xml"/>
+	<layout:xml qRead=#qRead# titleMap=#titleMap# filename="#pageInfo.entity#.xml"/>
 	<cfabort/>
 	</cfif><cfif isDefined("output_json")>
-	<layout:json qRead=#qCharge# titleMap=#titleMap# filename="#pageInfo.entity#.json"/>
+	<layout:json qRead=#qRead# titleMap=#titleMap# filename="#pageInfo.entity#.json"/>
 	<cfabort/>
 	</cfif><!--- 
 ---><layout:page section="header" pageInfo=#pageInfo#>	
@@ -75,19 +96,11 @@ ORDER BY
 	</layout:attribute>
 </layout:page>
 
-<!--- <cfdump var=#qReconciliation# abort=true/> --->
 
-<!--- <cfoutput>
-
-<br/> --->
-<!--- <a href="#request.thisPage#?output_xls" title="экспорт в Excel" style="margin-left:.5em; height:100%;" target="_blank"><img src="img/xls.gif" style="vertical-align:text-bottom;"/></a>
-
-<a href="#request.thisPage#?output_json" title="экспорт в json" style="margin-left:.5em; height:100%;" target="_blank"><img src="img/json.svg" style="vertical-align:text-bottom;" width="13" height="13"/></a>
-</cfoutput>
-<cfoutput><b>#qStorage.recordCount#</b></cfoutput> --->
 
 <layout:grid_summary
 		recordCount=#qStorage.recordCount#
+		recordsPerPage=0
 		footerOut="gridFooter"	
 		excelLink="Yes"
 		jsonLink="Yes"
@@ -96,11 +109,11 @@ ORDER BY
 
 <table class="worktable">	
 	<layout:grid_head titleMap=#titleMap# sortArray=#pageInfo.settings.sort.sortArray#>	
-		<tr>
 			<th><layout:column_head name="tenant"/></th>		
 			<th><layout:column_head name="wz"/></th>		
 			<th><layout:column_head name="status"/></th>
-			<th><layout:column_head name="end_test_date"/></th>			
+			<!--- <th><layout:column_head name="end_test_date"/></th> --->			
+			<th><layout:column_head name="dt_end_of_test"/></th>			
 			<th><layout:column_head name="vdc"/></th>			
 			<th><layout:column_head name="provider_vdc"/></th>
 			<th><layout:column_head name="code"/></th>
@@ -108,25 +121,23 @@ ORDER BY
 			<th><layout:column_head name="limit_gb"/></th>
 			<th><layout:column_head name="alloc_gb"/></th>						
 			<th><layout:column_head name="ts"/></th>				
-		</tr>
 	</layout:grid_head>
-		
-	<cfoutput query="qStorage">	
+	<cfoutput query="qRead">	
 		<tr>			
 <!--- 			<td><a href="contragent.cfm?__id=#company_uid#&#tr.fwx#">#WZ#</a><a href="contragent_rpt.cfm?__id=#company_uid#&#tr.fwx#" style="float:right"><img src="img/view.gif" title="сводка по контрагенту"/></a></td> --->
 			<td>#tenant#</td>
-			<td>#wz#</td>
-			<td<cfif NOT (status EQ "prod" OR status EQ "internal-test")> class="b"</cfif>>#status#</td>			
-			<td<cfif NOT (status EQ "prod" OR status EQ "internal-test") AND isDate(end_test_date) AND end_test_date LE Now()> class="b err"</cfif>>#end_test_date#</td>
+			<td class="c"><a href="contragent.cfm?id_klienta=#UCASE(wz)#&#tr.fwx#">#wz#</td>
+			<td<cfif NOT (status EQ "prod" OR status EQ "internal-test")> class="b"</cfif>>#status#</td>
+			<!--- <td>#end_test_date#</td> --->
+			<td class="c<cfif NOT (status EQ "prod" OR status EQ "internal-test") AND isDate(dt_end_of_test) AND dt_end_of_test LE Now()> b err</cfif>">#dateFormat(dt_end_of_test,"YYYY-MM-DD")#</td>
 			<td>#VDC#</td>
 			<td>#provider_vdc#</td>			
 			<td>#code#</td>
 			<td>#storage_profile#</td>
-			<td<cfif NOT (status EQ "prod" OR status EQ "internal-test") AND isDate(end_test_date) AND end_test_date LE Now()> class="b err"</cfif>>#limit_gb#</td>
-			<td<cfif NOT (status EQ "prod" OR status EQ "internal-test") AND isDate(end_test_date) AND end_test_date LE Now()> class="b err"</cfif>>#alloc_gb#</td>
+			<td class="r<cfif NOT (status EQ "prod" OR status EQ "internal-test") AND isDate(dt_end_of_test) AND dt_end_of_test LE Now()> b err</cfif>">#limit_gb#</td>
+			<td class="r<cfif NOT (status EQ "prod" OR status EQ "internal-test") AND isDate(dt_end_of_test) AND dt_end_of_test LE Now()> b err</cfif>">#alloc_gb#</td>
 			<td>#dateFormaT(ts,"YYYY-MM-DD")# #timeFormaT(ts,"HH-MM")#</td>			
 		</tr>
-
 	</cfoutput>
 
 </table>