089 xl json dates, gpu fixes

This commit is contained in:
2026-09-28 18:22:17 +03:00
parent d6193481e1
commit 669eaec34f
7 changed files with 119 additions and 19 deletions
+26 -8
View File
@@ -8,21 +8,39 @@
<m:prepare_ls entity="crm2cloud" accessObject="" pageInfoOut="pageInfo" trackOut="tr"/>
<cfset this.nullSupport = true/>
<cfquery name="qGPU" datasource="billing-vc" cachedWithin=#createTimeSpan(0, 0, 25, 0)#>
select obj_uuid, obj_id, client_id as WZ, vcd, org, org_vdc, vcenter, gpu, dt_load, dt_load_ts, org_status, cluster as clus, is_template
<cfquery name="qRead" datasource="billing-vc" cachedWithin=#createTimeSpan(0, 0, 25, 0)#>
select
<d:field_set titleMapOut="titleMap" lengthOut="fieldCount">
<d:field>obj_uuid::text as obj_uuid</d:field>
<d:field>obj_id</d:field>
<d:field>client_id as WZ</d:field>
<d:field>vcd</d:field>
<d:field>org</d:field>
<d:field>org_vdc</d:field>
<d:field>vcenter</d:field>
<d:field>gpu::text as gpu</d:field>
<d:field cfSqlType="CF_SQL_TIMESTAMP">dt_load</d:field>
<d:field cfSqlType="CF_SQL_TIMESTAMP">dt_load_ts</d:field>
<d:field>org_status</d:field>
<d:field>cluster as clus</d:field>
<d:field cfSqlType="CF_SQL_BOOLEAN" formatter=#request.castToBoolSimple#>is_template</d:field>
<d:field cfSqlType="CF_SQL_BOOLEAN" formatter=#request.castToBoolSimple#>(1=1) as t1</d:field>
<d:field cfSqlType="CF_SQL_BOOLEAN" formatter=#request.castToBoolSimple#>(1=0) as t2</d:field>
<d:field cfSqlType="CF_SQL_BOOLEAN" formatter=#request.castToBoolSimple#>(1=null) as t3</d:field>
</d:field_set>
from gpu.vm
order by client_id
</cfquery>
<!--- <cfdump var=#qGPU# abort=true/> --->
<!--- <cfdump var=#qRead# abort=true/> --->
<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#>
@@ -45,7 +63,7 @@ order by client_id
<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>#qGPU.recordCount#</b></cfoutput>
<cfoutput><b>#qRead.recordCount#</b></cfoutput>
<table class="worktable">
<thead>
<tr>
@@ -62,7 +80,7 @@ order by client_id
</tr>
</thead>
<cfoutput query="qGPU">
<cfoutput query="qRead">
<tr>
<td><a href="contragent.cfm?wz=#WZ#&#tr.fwx#">#WZ#</a></td>
<td>#obj_uuid#</td>