smishchuk/payg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

042 visual improvements

Browse Source
This commit is contained in:
smishchuk
2026-04-07 20:44:04 +03:00
parent aca4f461d5
commit 515b6cd90d
2 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Application.cfc
+1 -1
View File
@@ -76,7 +76,7 @@
<!--- global settings ---> <!--- global settings --->
<cfset request.RECORDS_PER_PAGE=500/> <cfset request.RECORDS_PER_PAGE=500/>
<cfset request.APP_VERSION="0.00.041"/> <cfset request.APP_VERSION="0.00.042"/>
<cfset request.STAND=getStand()/> <cfset request.STAND=getStand()/>
<cflock scope="application" type="readonly" timeout=3> <cflock scope="application" type="readonly" timeout=3>
cloud_capacity.cfm
+27 -29
View File
@@ -152,8 +152,6 @@ from qRead
<cfif isDefined("output_xls")> <cfif isDefined("output_xls")>
<layout:xml qRead=#qRead# titleMap=#titleMap# filename="#pageInfo.entity#.xml"/> <layout:xml qRead=#qRead# titleMap=#titleMap# filename="#pageInfo.entity#.xml"/>
<cfabort/> <cfabort/>
@@ -177,28 +175,27 @@ from qRead
<h3>Свободно</h3> <h3>Свободно</h3>
<table class="worktable"> <table class="worktable">
<thead> <thead>
<layout:grid_head titleMap=#titleMap# sortArray=#pageInfo.settings.sort.sortArray#> <layout:grid_head titleMap=#titleMap# sortArray=#pageInfo.settings.sort.sortArray#>
<th width="5%"><layout:column_head name="cluster_v1"/></th> <th width="5%"><layout:column_head name="cluster_v1"/></th>
<th width="5%"><layout:column_head name="cluster_v2"/></th> <th width="5%"><layout:column_head name="cluster_v2"/></th>
<th width="7%"><layout:column_head name="commercial_name"/></th> <th width="10%"><layout:column_head name="commercial_name"/></th>
<th width="3%"><layout:column_head name="ghz"/></th> <!--- <th width="3%"><layout:column_head name="ghz"/></th> --->
<th width="3%"><layout:column_head name="hosts_total"/></th> <th width="3%"><layout:column_head name="hosts_total"/></th>
<th width="3%">RAM GB</th> <th width="5%">RAM GB</th>
<th width="3%">CPU GHz (текущий резерв)</th> <th width="5%">CPU GHz (текущий резерв)</th>
<th width="3%">Ядра (текущий резерв | 20%)</th> <th width="5%">Ядра 20% (текущий резерв)</th>
<th width="3%">Ядра (текущий резерв | 50%)</th> <th width="5%">Ядра 50% (текущий резерв)</th>
<th width="3%">Ядра (текущий резерв | 80%)</th> <th width="5%">Ядра 80% (текущий резерв)</th>
<th width="3%">CPU GHz (жесткий резерв)</th> <th width="5%">CPU GHz (жесткий резерв)</th>
<th width="3%">Ядра (жесткий резерв | 20%)</th> <th width="5%">Ядра 20% (жесткий резерв)</th>
<th width="3%">Ядра (жесткий резерв | 50%)</th> <th width="5%">Ядра 50% (жесткий резерв)</th>
<th width="3%">Ядра (жесткий резерв | 80%)</th> <th width="5%">Ядра 80% (жесткий резерв)</th>
<th width="3%">ВМ размещено</th> <th width="3%">ВМ размещено</th>
</layout:grid_head> </layout:grid_head>
</thead> </thead>
@@ -206,31 +203,32 @@ from qRead
<tr> <tr>
<td>#cluster_v1#</td> <td>#cluster_v1#</td>
<td>#cluster_v2#</td> <td>#cluster_v2#</td>
<td>#commercial_name#</td> <td style="font-size:130%">#commercial_name#</td>
<td class="r">#numberFormat(ghz,".0")#</td> <!--- <td class="r" style="font-size:120%">#numberFormat(ghz,".0")#</td> --->
<td class="r">#hosts_total#</td> <td class="r">#hosts_total#</td>
<td class="r<cfif RAM_Capacity-vm_ram_alloc LE 0> err</cfif>">#numberFormat(RAM_Capacity-vm_ram_alloc,"0")#</td> <td class="r<cfif RAM_Capacity-vm_ram_alloc LE 0> err</cfif>" style="font-size:130%">#numberFormat(RAM_Capacity-vm_ram_alloc,"0")#</td>
<td class="r<cfif GHz_Capacity-vm_ghz_reserved LE 0> err</cfif>">#numberFormat(GHz_Capacity-vm_ghz_reserved,".0")#</td> <td class="r<cfif GHz_Capacity-vm_ghz_reserved LE 0> err</cfif>" style="font-size:130%">#numberFormat(GHz_Capacity-vm_ghz_reserved,".0")#</td>
<td class="r<cfif GHz_Capacity-vm_ghz_reserved LE 0> err</cfif>">#numberFormat((GHz_Capacity-vm_ghz_reserved)/ghz/0.2,"0")#</td> <td class="r<cfif GHz_Capacity-vm_ghz_reserved LE 0> err</cfif>" style="font-size:130%">#numberFormat((GHz_Capacity-vm_ghz_reserved)/ghz/0.2,"0")#</td>
<td class="r<cfif GHz_Capacity-vm_ghz_reserved LE 0> err</cfif>">#numberFormat((GHz_Capacity-vm_ghz_reserved)/ghz/0.5,"0")#</td> <td class="r<cfif GHz_Capacity-vm_ghz_reserved LE 0> err</cfif>" style="font-size:130%">#numberFormat((GHz_Capacity-vm_ghz_reserved)/ghz/0.5,"0")#</td>
<td class="r<cfif GHz_Capacity-vm_ghz_reserved LE 0> err</cfif>">#numberFormat((GHz_Capacity-vm_ghz_reserved)/ghz/0.8,"0")#</td> <td class="r<cfif GHz_Capacity-vm_ghz_reserved LE 0> err</cfif>" style="font-size:130%">#numberFormat((GHz_Capacity-vm_ghz_reserved)/ghz/0.8,"0")#</td>
<td class="r<cfif GHz_Capacity-vm_ghz_promised LE 0> err</cfif>">#numberFormat(GHz_Capacity-vm_ghz_promised,".0")#</td> <td class="r<cfif GHz_Capacity-vm_ghz_promised LE 0> err</cfif>" style="font-size:130%">#numberFormat(GHz_Capacity-vm_ghz_promised,".0")#</td>
<td class="r<cfif GHz_Capacity-vm_ghz_promised LE 0> err</cfif>">#numberFormat((GHz_Capacity-vm_ghz_promised)/ghz/0.2,"0")#</td> <td class="r<cfif GHz_Capacity-vm_ghz_promised LE 0> err</cfif>" style="font-size:130%">#numberFormat((GHz_Capacity-vm_ghz_promised)/ghz/0.2,"0")#</td>
<td class="r<cfif GHz_Capacity-vm_ghz_promised LE 0> err</cfif>">#numberFormat((GHz_Capacity-vm_ghz_promised)/ghz/0.5,"0")#</td> <td class="r<cfif GHz_Capacity-vm_ghz_promised LE 0> err</cfif>" style="font-size:130%">#numberFormat((GHz_Capacity-vm_ghz_promised)/ghz/0.5,"0")#</td>
<td class="r<cfif GHz_Capacity-vm_ghz_promised LE 0> err</cfif>">#numberFormat((GHz_Capacity-vm_ghz_promised)/ghz/0.8,"0")#</td> <td class="r<cfif GHz_Capacity-vm_ghz_promised LE 0> err</cfif>" style="font-size:130%">#numberFormat((GHz_Capacity-vm_ghz_promised)/ghz/0.8,"0")#</td>
<td class="r">#vms#</td> <td class="r">#vms#</td>
</tr> </tr>
</cfoutput> </cfoutput>
</table> </table>
<i>Жесткий резерв - если включим минимальное резервирование 20%</i> <i>Жесткий резерв - если включим минимальное резервирование 20%</i><br/>
<i>Доступная память указана по выделенному объему (используется меньше, доступно больше)</i>
<h3>Использование</h3> <h3>Использование подробно</h3>
<layout:grid_summary <layout:grid_summary
recordCount=#qRead.recordCount# recordCount=#qRead.recordCount#