shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

B #5014: Fix cloud view widget with group vms (#155)

Browse Source 
(cherry picked from commit d4337e91bdbf66736b32b7dc8957e436f51f2b8a)
This commit is contained in:
Sergio Betanzos 2020-08-17 18:25:31 +02:00 committed by Tino Vazquez
parent 6e320afc28
commit ffa34b03e1
2 changed files with 103 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/sunstone/public/app/tabs/provision-tab.js
View File

@ -397,6 +397,17 @@ define(function(require) {
"start_time": start_time,
"end_time": end_time
};
OpenNebula.VM.accounting({
//timeout: true,
success: function(req, response){
var context = $("#provision_group_vms_dashboard");
Accounting.fillAccounting(context, req, response, false);
},
error: Notifier.onError,
data: options
});
OpenNebula.VM.list({
timeout: true,
success: function (request, item_list){

181
src/sunstone/public/app/tabs/provision-tab/dashboard/group-vms.hbs
View File

@ -13,104 +13,107 @@
{{! See the License for the specific language governing permissions and }}
{{! limitations under the License. }}
{{! -------------------------------------------------------------------------- }}
<div class="row" id="provision_group_vms_dashboard">
<div class="large-12 columns">
<h4>{{tr "Group Virtual Machines"}}</h4>
<div class="row">
<div class="large-3 medium-4 columns text-center">
<div class="row">
<div class="large-12 columns">
<h2>
<span id="provision_dashboard_group_total"> <i class="fas fa-spinner fa-spin"></i>
</span>
<br>
<small class="subheader">{{tr "TOTAL"}}</small>
</h2>
</div>
</div>
<div class="row">
<div class="large-12 columns">
<a href"#" class="medium button success provision_create_vm_button"> <i class="fas fa-lg fa-plus-square"/></a>
<a href"#" class="medium button provision_vms_list_button">
<i class="fas fa-lg fa-th"/></a>
</div>
</div>
</div>
<div class="large-9 medium-8 columns text-center">
<div class="large-10 medium-12 large-centered columns">
<div class="large-3 medium-3 small-6 columns">
<h4>
<span id="provision_dashboard_group_running">
<i class="fas fa-spinner fa-spin"></i>
</span><br>
<small class="subheader">{{tr "RUNNING"}}</small>
</h4>
</div>
<div class="large-3 medium-3 small-6 columns ">
<h4>
<span id="provision_dashboard_group_deploying" >
<i class="fas fa-spinner fa-spin"></i>
</span><br>
<small class="subheader">{{tr "DEPLOYING"}}</small>
</h4>
</div>
<div class="large-3 medium-3 small-6 columns">
<h4>
<span id="provision_dashboard_group_off">
<i class="fas fa-spinner fa-spin"></i>
</span><br>
<small class="subheader">{{tr "OFF"}}</small>
</h4>
</div>
<div class="large-3 medium-3 small-6 columns ">
<h4>
<span id="provision_dashboard_group_error">
<i class="fas fa-spinner fa-spin"></i>
</span><br>
<small class="subheader">{{tr "ERROR"}}</small>
</h4>
</div>
<br>
</div>
<div class="large-12 columns" id="dashboard_group_vm_accounting">
<div class="large-4 medium-12 columns text-center">
<input style="display:none;" value="vm" id="acct_group_by"/>
<div class="row">
<div class="large-12 columns graph_legend">
<span class="subheader">
<span>{{tr "CPU hours"}}</span>
<fieldset class="large-12 columns dashboard-fieldset" id="provision_group_vms_dashboard">
<div class="row">
<div class="large-12 columns">
<h4>{{tr "Group Virtual Machines"}}</h4>
<div class="row">
<div class="large-3 medium-4 columns text-center">
<div class="row">
<div class="large-12 columns">
<h2>
<span id="provision_dashboard_group_total"> <i class="fas fa-spinner fa-spin"></i>
</span>
</div>
<div class="large-12 columns">
<div class="large-12 columns centered graph" id="acct_cpu_graph" style="height: 100px;">{{> ./empty-graphs}}</div>
</div>
<br>
<small class="subheader">{{tr "TOTAL"}}</small>
</h2>
</div>
</div>
<div class="large-4 medium-12 columns text-center">
<div class="row">
<div class="large-12 columns graph_legend">
<span class="subheader">
<span>{{tr "Memory GB hours"}}</span>
</span>
</div>
<div class="large-12 columns">
<div class="large-12 columns centered graph" id="acct_mem_graph" style="height: 100px;">{{> ./empty-graphs}}</div>
</div>
<div class="row">
<div class="large-12 columns">
<a href"#" class="medium button success provision_create_vm_button"> <i class="fas fa-lg fa-plus-square"/></a>
<a href"#" class="medium button provision_vms_list_button">
<i class="fas fa-lg fa-th"/></a>
</div>
</div>
<div class="large-4 medium-12 columns text-center">
<div class="row">
<div class="large-12 columns graph_legend">
<span class="subheader">
<span>{{tr "Disk MB hours"}}</span>
</span>
</div>
<div class="large-9 medium-8 columns text-center">
<div class="large-10 medium-12 large-centered columns">
<div class="large-3 medium-3 small-6 columns">
<h4>
<span id="provision_dashboard_group_running">
<i class="fas fa-spinner fa-spin"></i>
</span><br>
<small class="subheader">{{tr "RUNNING"}}</small>
</h4>
</div>
<div class="large-3 medium-3 small-6 columns ">
<h4>
<span id="provision_dashboard_group_deploying" >
<i class="fas fa-spinner fa-spin"></i>
</span><br>
<small class="subheader">{{tr "DEPLOYING"}}</small>
</h4>
</div>
<div class="large-3 medium-3 small-6 columns">
<h4>
<span id="provision_dashboard_group_off">
<i class="fas fa-spinner fa-spin"></i>
</span><br>
<small class="subheader">{{tr "OFF"}}</small>
</h4>
</div>
<div class="large-3 medium-3 small-6 columns ">
<h4>
<span id="provision_dashboard_group_error">
<i class="fas fa-spinner fa-spin"></i>
</span><br>
<small class="subheader">{{tr "ERROR"}}</small>
</h4>
</div>
<br>
</div>
<div class="large-12 columns" id="dashboard_group_vm_accounting">
<div class="large-4 medium-12 columns text-center">
<input style="display:none;" value="vm" id="acct_group_by"/>
<div class="row">
<div class="large-12 columns graph_legend">
<span class="subheader">
<span>{{tr "CPU"}}</span>
</span>
</div>
<div class="large-12 columns">
<div class="large-12 columns centered graph" id="acct_cpu_graph" style="height: 100px;">{{> ./empty-graphs}}</div>
</div>
</div>
<div class="large-12 columns">
<div class="large-12 columns centered graph" id="acct_disk_graph" style="height: 100px;">{{> ./empty-graphs}}</div>
</div>
<div class="large-4 medium-12 columns text-center">
<div class="row">
<div class="large-12 columns graph_legend">
<span class="subheader">
<span>{{tr "Memory GB"}}</span>
</span>
</div>
<div class="large-12 columns">
<div class="large-12 columns centered graph" id="acct_mem_graph" style="height: 100px;">{{> ./empty-graphs}}</div>
</div>
</div>
</div>
<div class="large-4 medium-12 columns text-center">
<div class="row">
<div class="large-12 columns graph_legend">
<span class="subheader">
<span>{{tr "Disk MB"}}</span>
</span>
</div>
<div class="large-12 columns">
<div class="large-12 columns centered graph" id="acct_disk_graph" style="height: 100px;">{{> ./empty-graphs}}</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</fieldset>