064 interface improvements

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>