064 interface improvements

Application.cfc

@@ -79,8 +79,6 @@
 		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 --->
 		<cfset request.ANONYMOUS_USR_ID=2/>
@@ -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>
@@ -273,8 +271,6 @@
 			</cfif>
 		</cfif>
 
-
-
         <cfreturn />
     </cffunction>
 

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>

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>