From b8ef7ea5b02bbefe55854b618ab662c0c09c58aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Fri, 22 May 2015 11:36:15 +0200 Subject: [PATCH] Feature #3748: User and Group showback panel --- src/sunstone/etc/sunstone-views/admin.yaml | 2 +- src/sunstone/public/app/tabs/groups-tab.js | 3 +- .../app/tabs/groups-tab/panels/showback.js | 58 +++++ .../groups-tab/panels/showback/panelId.js | 3 + src/sunstone/public/app/tabs/users-tab.js | 3 +- .../app/tabs/users-tab/panels/showback.js | 58 +++++ .../tabs/users-tab/panels/showback/panelId.js | 3 + src/sunstone/public/app/utils/locale.js | 10 +- src/sunstone/public/app/utils/showback.js | 231 ++++++++++++++++++ .../public/app/utils/showback/html.hbs | 82 +++++++ 10 files changed, 448 insertions(+), 5 deletions(-) create mode 100644 src/sunstone/public/app/tabs/groups-tab/panels/showback.js create mode 100644 src/sunstone/public/app/tabs/groups-tab/panels/showback/panelId.js create mode 100644 src/sunstone/public/app/tabs/users-tab/panels/showback.js create mode 100644 src/sunstone/public/app/tabs/users-tab/panels/showback/panelId.js create mode 100644 src/sunstone/public/app/utils/showback.js create mode 100644 src/sunstone/public/app/utils/showback/html.hbs diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml index 6bdc981d50..53f63de361 100644 --- a/src/sunstone/etc/sunstone-views/admin.yaml +++ b/src/sunstone/etc/sunstone-views/admin.yaml @@ -84,7 +84,7 @@ tabs: group_quotas_tab: true group_providers_tab: true group_accounting_tab: true - group_shoback_tab: true + group_showback_tab: true table_columns: - 0 # Checkbox - 1 # ID diff --git a/src/sunstone/public/app/tabs/groups-tab.js b/src/sunstone/public/app/tabs/groups-tab.js index a9f0864f72..4ed5dfca82 100644 --- a/src/sunstone/public/app/tabs/groups-tab.js +++ b/src/sunstone/public/app/tabs/groups-tab.js @@ -13,7 +13,8 @@ define(function(require) { var _panels = [ require('./groups-tab/panels/info'), require('./groups-tab/panels/quotas'), - require('./groups-tab/panels/accounting') + require('./groups-tab/panels/accounting'), + require('./groups-tab/panels/showback') ]; var Tab = { diff --git a/src/sunstone/public/app/tabs/groups-tab/panels/showback.js b/src/sunstone/public/app/tabs/groups-tab/panels/showback.js new file mode 100644 index 0000000000..411092bda2 --- /dev/null +++ b/src/sunstone/public/app/tabs/groups-tab/panels/showback.js @@ -0,0 +1,58 @@ +define(function(require) { + /* + DEPENDENCIES + */ + + var Locale = require('utils/locale'); + var Config = require('sunstone-config'); + var Showback = require('utils/showback'); + + /* + CONSTANTS + */ + + var TAB_ID = require('../tabId'); + var PANEL_ID = require('./showback/panelId'); + var RESOURCE = "Group"; + var XML_ROOT = "GROUP"; + + /* + CONSTRUCTOR + */ + + function Panel(info) { + this.title = Locale.tr("Showback"); + this.icon = "fa-money"; + + this.element = info[XML_ROOT]; + + if (!Config.isFeatureEnabled("showback")) { + throw "Showback is disabled in the configuration"; + } + + return this; + } + + Panel.PANEL_ID = PANEL_ID; + Panel.prototype.html = _html; + Panel.prototype.setup = _setup; + + return Panel; + + /* + FUNCTION DEFINITIONS + */ + + function _html() { + return Showback.html(); + } + + function _setup(context) { + Showback.setup( + context, + { fixed_user: "", + fixed_group: this.element.ID + } + ); + } +}); diff --git a/src/sunstone/public/app/tabs/groups-tab/panels/showback/panelId.js b/src/sunstone/public/app/tabs/groups-tab/panels/showback/panelId.js new file mode 100644 index 0000000000..d2e851958b --- /dev/null +++ b/src/sunstone/public/app/tabs/groups-tab/panels/showback/panelId.js @@ -0,0 +1,3 @@ +define(function(require){ + return 'group_showback_tab'; +}) \ No newline at end of file diff --git a/src/sunstone/public/app/tabs/users-tab.js b/src/sunstone/public/app/tabs/users-tab.js index 22f1b26b02..65688e0241 100644 --- a/src/sunstone/public/app/tabs/users-tab.js +++ b/src/sunstone/public/app/tabs/users-tab.js @@ -13,7 +13,8 @@ define(function(require) { var _panels = [ require('./users-tab/panels/info'), require('./users-tab/panels/quotas'), - require('./users-tab/panels/accounting') + require('./users-tab/panels/accounting'), + require('./users-tab/panels/showback') ]; var Tab = { diff --git a/src/sunstone/public/app/tabs/users-tab/panels/showback.js b/src/sunstone/public/app/tabs/users-tab/panels/showback.js new file mode 100644 index 0000000000..aa2877cbf9 --- /dev/null +++ b/src/sunstone/public/app/tabs/users-tab/panels/showback.js @@ -0,0 +1,58 @@ +define(function(require) { + /* + DEPENDENCIES + */ + + var Locale = require('utils/locale'); + var Config = require('sunstone-config'); + var Showback = require('utils/showback'); + + /* + CONSTANTS + */ + + var TAB_ID = require('../tabId'); + var PANEL_ID = require('./showback/panelId'); + var RESOURCE = "User"; + var XML_ROOT = "USER"; + + /* + CONSTRUCTOR + */ + + function Panel(info) { + this.title = Locale.tr("Showback"); + this.icon = "fa-money"; + + this.element = info[XML_ROOT]; + + if (!Config.isFeatureEnabled("showback")) { + throw "Showback is disabled in the configuration"; + } + + return this; + } + + Panel.PANEL_ID = PANEL_ID; + Panel.prototype.html = _html; + Panel.prototype.setup = _setup; + + return Panel; + + /* + FUNCTION DEFINITIONS + */ + + function _html() { + return Showback.html(); + } + + function _setup(context) { + Showback.setup( + context, + { fixed_user: this.element.ID, + fixed_group: "" + } + ); + } +}); diff --git a/src/sunstone/public/app/tabs/users-tab/panels/showback/panelId.js b/src/sunstone/public/app/tabs/users-tab/panels/showback/panelId.js new file mode 100644 index 0000000000..6918840d76 --- /dev/null +++ b/src/sunstone/public/app/tabs/users-tab/panels/showback/panelId.js @@ -0,0 +1,3 @@ +define(function(require){ + return 'user_showback_tab'; +}) \ No newline at end of file diff --git a/src/sunstone/public/app/utils/locale.js b/src/sunstone/public/app/utils/locale.js index c31e104dc6..dccc8dd857 100644 --- a/src/sunstone/public/app/utils/locale.js +++ b/src/sunstone/public/app/utils/locale.js @@ -1,5 +1,10 @@ define(function(require) { - var tr = function (str) { + var MONTHS = new Array( + tr("January"),tr("February"),tr("March"),tr("April"),tr("May"), + tr("June"),tr("July"),tr("August"),tr("September"),tr("October"), + tr("November"),tr("December")); + + function tr(str) { // TODO Add locale from the locale folder // var tmp = locale[str]; var tmp; @@ -10,6 +15,7 @@ define(function(require) { }; return { - 'tr': tr + 'tr': tr, + 'months': MONTHS } }); diff --git a/src/sunstone/public/app/utils/showback.js b/src/sunstone/public/app/utils/showback.js new file mode 100644 index 0000000000..f5805ecbca --- /dev/null +++ b/src/sunstone/public/app/utils/showback.js @@ -0,0 +1,231 @@ +define(function(require) { + + var TemplateHTML = require('hbs!./showback/html'); + var Locale = require('utils/locale'); + var OpenNebulaVM = require('opennebula/vm'); + var Notifier = require('utils/notifier'); + var ResourceSelect = require('utils/resource-select'); + + require('flot'); + require('flot.stack'); + require('flot.resize'); + require('flot.tooltip'); + require('flot.time'); + + function _html(){ + var html = TemplateHTML({}); + + return html; + } + + // context is a jQuery selector + // The following options can be set: + // fixed_user fix an owner user ID. Use "" to fix to "any user" + // fixed_group fix an owner group ID. Use "" to fix to "any group" + function _setup(context, opt) { + if (opt == undefined){ + opt = {}; + } + + //-------------------------------------------------------------------------- + // VM owner: all, group, user + //-------------------------------------------------------------------------- + + if (opt.fixed_user != undefined){ + $("#showback_user_container", context).hide(); + } else { + ResourceSelect.insert("#showback_user_select", context, "User", -1, false, + ''); + } + + if (opt.fixed_group != undefined){ + $("#showback_group_container", context).hide(); + } else { + ResourceSelect.insert("#showback_group_select", context, "Group", "", true); + } + + showback_dataTable = $("#showback_datatable",context).dataTable({ + "bSortClasses" : false, + "bDeferRender": true, + "iDisplayLength": 6, + "sDom": "t<'row collapse'<'small-12 columns'p>>", + "aoColumnDefs": [ + { "bVisible": false, "aTargets": [0,1,2]} + ] + }); + + showback_dataTable.fnSort( [ [0, "desc"] ] ); + + showback_vms_dataTable = $("#showback_vms_datatable",context).dataTable({ + "bSortClasses" : false, + "bDeferRender": true + }); + + showback_dataTable.on("click", "tbody tr", function(){ + var cells = showback_dataTable.fnGetData(this); + var year = cells[1]; + var month = cells[2]; + + showback_vms_dataTable.fnClearTable(); + showback_vms_dataTable.fnAddData( + showback_dataTable.data("vms_per_date")[year][month].VMS); + + $("#showback_vms_title", context).text( + Locale.months[month-1] + " " + year + " " + Locale.tr("VMs")); + $(".showback_vms_table", context).show(); + $(".showback_select_a_row", context).hide(); + }); + + //-------------------------------------------------------------------------- + // Submit request + //-------------------------------------------------------------------------- + + $("#showback_submit", context).on("click", function(){ + var options = {}; + + var userfilter; + var group; + + if (opt.fixed_user != undefined){ + userfilter = opt.fixed_user; + } else { + userfilter = $("#showback_user_select .resource_list_select", context).val(); + } + + if (opt.fixed_group != undefined){ + group = opt.fixed_group; + } else { + group = $("#showback_group_select .resource_list_select", context).val(); + } + + if(userfilter != ""){ + options.userfilter = userfilter; + } + + if(group != ""){ + options.group = group; + } + + OpenNebulaVM.showback({ + // timeout: true, + success: function(req, response){ + _fillShowback(context, req, response); + }, + error: Notifier.onError, + data: options + }); + + return false; + }); + } + + function _fillShowback(context, req, response) { + $("#showback_no_data", context).hide(); + + if(response.SHOWBACK_RECORDS == undefined){ + $("#showback_placeholder", context).show(); + $("#showback_content", context).hide(); + + $("#showback_no_data", context).show(); + return false; + } + + var vms_per_date = {}; + $.each(response.SHOWBACK_RECORDS.SHOWBACK, function(index, showback){ + if (vms_per_date[showback.YEAR] == undefined) { + vms_per_date[showback.YEAR] = {}; + } + + if (vms_per_date[showback.YEAR][showback.MONTH] == undefined) { + vms_per_date[showback.YEAR][showback.MONTH] = { + "VMS": [], + "TOTAL": 0 + }; + } + + vms_per_date[showback.YEAR][showback.MONTH].VMS.push( + [ showback.VMID, + showback.VMNAME, + showback.UNAME, + showback.HOURS, + showback.TOTAL_COST + ]); + + vms_per_date[showback.YEAR][showback.MONTH].TOTAL += parseFloat(showback.TOTAL_COST); + }); + + var series = [] + var showback_data = []; + $.each(vms_per_date, function(year, months){ + $.each(months, function(month, value){ + series.push( + [ (new Date(year, month-1)).getTime(), + year, + month, + Locale.months[month-1] + " " + year, value.TOTAL.toFixed(2) + ]); + + showback_data.push([(new Date(year, month-1)), value.TOTAL.toFixed(2) ]); + }); + }); + + showback_dataTable.fnClearTable(); + if (series.length > 0) { + showback_dataTable.data("vms_per_date", vms_per_date); + showback_dataTable.fnAddData(series); + } + + var showback_plot_series = []; + showback_plot_series.push( + { + label: Locale.tr("Showback"), + data: showback_data + }); + + var options = { + // colors: [ "#cdebf5", "#2ba6cb", "#6f6f6f" ] + colors: [ "#2ba6cb", "#707D85", "#AC5A62" ], + legend: { + show: false + }, + xaxis : { + mode: "time", + color: "#efefef", + size: 8, + minTickSize: [1, "month"] + }, + yaxis : { + show: false + }, + series: { + bars: { + show: true, + lineWidth: 0, + barWidth: 24 * 60 * 60 * 1000 * 20, + fill: true, + align: "left" + } + }, + grid: { + borderWidth: 1, + borderColor: "#efefef", + hoverable: true + } + //tooltip: true, + //tooltipOpts: { + // content: "%x" + //} + }; + + var showback_plot = $.plot( + $("#showback_graph", context), showback_plot_series, options); + + $("#showback_placeholder", context).hide(); + $("#showback_content", context).show(); + } + + return { + 'html': _html, + 'setup': _setup + }; +}); diff --git a/src/sunstone/public/app/utils/showback/html.hbs b/src/sunstone/public/app/utils/showback/html.hbs new file mode 100644 index 0000000000..ad157afaf5 --- /dev/null +++ b/src/sunstone/public/app/utils/showback/html.hbs @@ -0,0 +1,82 @@ +
+
+ +
+
+
+ +
+
+
+ +
+
+
+
+
+
+ + + + + +
+
+
+
+ \ No newline at end of file