045 gpu

2026-04-17 15:02:54 +03:00
parent 2e0b71cf3f
commit c9a229cc8e
3 changed files with 114 additions and 6 deletions
@@ -159,13 +159,14 @@
 		--AND a.is_actual
 		--AND date_nop <= CURRENT_TIMESTAMP
 		AND COALESCE(date_end,CURRENT_TIMESTAMP) >= CURRENT_TIMESTAMP
+		AND s.probability_pc >=50
 		ORDER BY __index --, version::int
 	</cfquery>
 	

 	
 	<cfoutput>
-		<h3>Услуги по данным CRM (версии строк спецификации, только актуальные на сегодня) <!--- (#qService.recordCount#) ---></h3> 
+		<h3>Услуги по данным CRM (версии строк спецификации, только актуальные на сегодня, сделки с вероятностью от 50% (начиная с тестирования) <!--- (#qService.recordCount#) ---></h3> 
 	</cfoutput>			
 		

@@ -190,7 +191,7 @@
 			<tr<cfif NOT left(abstractive_service_code,4) EQ "iaas"> class="gray"</cfif>>
 				<td class="c"><a href="deal_service.cfm?__id=#__id#&#tr.fwx#" title="__id">#__index#</a></td>
 				<!--- <td class="c">#__name#</td> --->
-				<td class="l">#abstractive_service_code#.#modifier_code#</td>
+				<td class="l">#abstractive_service_code#<cfif len(modifier_code)>.#modifier_code#</cfif></td>
 				<td class="l">#user_description#</td>
 				<td style="padding:0; vertical-align:bottom;">
 					<table class="wide" style="height:100%">
@@ -225,11 +226,12 @@
 				<td class="c">#__index#</td> --->
 				<td class="c">#dateFormat(date_nop,'YYYY-MM-DD')#</td>
 				<td class="c<cfif isDate(date_end) AND date_end LT Now()> err</cfif>">#dateFormat(date_end,'YYYY-MM-DD')#</td>
-				<td class="#probability_pc#</td>
+				<td class="c">#probability_pc#</td>
 				<td class="c"><a href="additional_agreement.cfm?__id=#additional_agreement_uid#&#tr.fwx#">#additional_agreement#</a> (#status_id# #status#)</td>
 			</tr>
 		</cfoutput>		
 	</table>
+	<!--- <i>отображаются позиции сделок, начиная с тестирования</i> --->
 	
 	<cfquery name="qCompute">
 		select 
@@ -328,6 +330,7 @@
 		<thead>	
 			<tr>
 				<th width="10%">Организация</th>
+				<th width="10%">Статус организации</th>
 				<th width="10%">VDC</th>
 				<th width="10%">Кластер</th>
 				<th width="10%">Политика хранения</th>
@@ -354,6 +357,51 @@
 			</tr>
 		</cfoutput>		
 	</table>
+	
+	
+	<cfquery name="qGpu">
+		select 
+		 "Object_UUID"::text
+		,"Org"
+		,"OrgStatus"
+		,"OrgVDC"
+		,(select STRING_AGG(DISTINCT "Cluster",',') FROM vmreports.compute c 
+		WHERE ts=(select max(ts) from vmreports.compute)
+		AND g."Org"=c."Organization") as org_cluster
+		,"Name"
+		,"GPU"
+		FROM vmreports.vm_gpu g 
+		WHERE ts=(select max(ts) from vmreports.vm_gpu)
+		AND lower(g."ClientID")=lower(<cfqueryparam cfsqltype="cf_sql_varchar" value="#d.id_klienta#"/>)
+
+	</cfquery>		
+	
+	
+	<h3>GPU факт</h3>
+	<table class="worktable">	
+		<thead>	
+			<tr>
+				<th width="10%">Организация</th>
+				<th width="10%">Статус организации</th>
+				<th width="10%">VDC</th>
+				<th width="10%">Кластер</th>
+				<th width="10%">VM</th>
+				<th width="5%">GPU</th>
+			</tr>
+		</thead>
+		
+		<cfoutput query="qGpu">
+			<tr>
+				<td>#Org#</td>				
+				<td>#OrgStatus#</td>
+				<td>#OrgVDC#</td>
+				<td>#org_cluster#</td>
+				<td>#Name#</td>
+				<td>#GPU#</td>
+			</tr>
+		</cfoutput>
+	
+	</table>
 		
 	<!--- ----------------------------------------------------------------- --->
 	<!--- ----------------------------------------------------------------- --->