Changing table gadgets column names using labels
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b267e407 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b267e407 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b267e407 Branch: refs/heads/stratos-4.1.x Commit: b267e4070b667956d1a846682530fec1a2aa4d20 Parents: 4c697f9 Author: Thanuja <[email protected]> Authored: Wed Sep 23 09:52:47 2015 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Mon Sep 28 18:44:18 2015 +0530 ---------------------------------------------------------------------- .../js/member-details-filter.js | 4 ++-- .../Member_Information/js/gadgetconf.js | 15 +++++++++++++-- .../Member_Information/js/main.js | 2 +- .../Member_Status/js/gadgetconf.js | 7 +++++-- .../Gadget_Member_Status/Member_Status/js/main.js | 2 +- .../Member_Status_Filter/js/member-status-filter.js | 4 ++-- 6 files changed, 24 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/b267e407/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Details_Filter/Member_Details_Filter/js/member-details-filter.js ---------------------------------------------------------------------- diff --git a/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Details_Filter/Member_Details_Filter/js/member-details-filter.js b/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Details_Filter/Member_Details_Filter/js/member-details-filter.js index f7ff1b4..8446afb 100644 --- a/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Details_Filter/Member_Details_Filter/js/member-details-filter.js +++ b/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Details_Filter/Member_Details_Filter/js/member-details-filter.js @@ -25,13 +25,13 @@ $(document).ready(function () { loadApplication(); - $('body').on('click', '#application-filter', function () { + $('body').on('change', '#application-filter', function () { var e = document.getElementById("application-filter"); applicationId = e.options[e.selectedIndex].text; loadCluster(applicationId); publish(); }) - $('body').on('click', '#cluster-filter', function () { + $('body').on('change', '#cluster-filter', function () { var e = document.getElementById("cluster-filter"); clusterId = e.options[e.selectedIndex].value; publish(); http://git-wip-us.apache.org/repos/asf/stratos/blob/b267e407/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Information/Member_Information/js/gadgetconf.js ---------------------------------------------------------------------- diff --git a/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Information/Member_Information/js/gadgetconf.js b/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Information/Member_Information/js/gadgetconf.js index 9a1f3b8..a8e3ff4 100644 --- a/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Information/Member_Information/js/gadgetconf.js +++ b/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Information/Member_Information/js/gadgetconf.js @@ -26,46 +26,57 @@ var gadgetConfig = { "columns": [ { "COLUMN_NAME": "MemberId", + "LABEL_NAME": "Member Id", "DATA_TYPE": "varchar" }, { "COLUMN_NAME": "InstanceType", + "LABEL_NAME": "Instance Type", "DATA_TYPE": "varchar" }, { "COLUMN_NAME": "ImageId", + "LABEL_NAME": "Image Id", "DATA_TYPE": "varchar" }, { "COLUMN_NAME": "HostName", + "LABEL_NAME": "Host Name", "DATA_TYPE": "varchar" }, { "COLUMN_NAME": "PrivateIPAddresses", + "LABEL_NAME": "Private IP Addresses", "DATA_TYPE": "varchar" }, { "COLUMN_NAME": "PublicIPAddresses", + "LABEL_NAME": "Public IP Addresses", "DATA_TYPE": "varchar" }, { "COLUMN_NAME": "Hypervisor", + "LABEL_NAME": "Hypervisor", "DATA_TYPE": "varchar" }, { "COLUMN_NAME": "CPU", - "DATA_TYPE": "int" + "LABEL_NAME": "CPU", + "DATA_TYPE": "varchar" }, { "COLUMN_NAME": "RAM", - "DATA_TYPE": "int" + "LABEL_NAME": "RAM", + "DATA_TYPE": "varchar" }, { "COLUMN_NAME": "OSName", + "LABEL_NAME": "OS Name", "DATA_TYPE": "varchar" }, { "COLUMN_NAME": "OSVersion", + "LABEL_NAME": "OS Version", "DATA_TYPE": "varchar" } ], http://git-wip-us.apache.org/repos/asf/stratos/blob/b267e407/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Information/Member_Information/js/main.js ---------------------------------------------------------------------- diff --git a/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Information/Member_Information/js/main.js b/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Information/Member_Information/js/main.js index 328940c..b0a28fd 100644 --- a/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Information/Member_Information/js/main.js +++ b/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Information/Member_Information/js/main.js @@ -100,7 +100,7 @@ function makeDataTable(data) { } else if (column.DATA_TYPE == "TIME" || column.DATA_TYPE == "time") { type = "T"; } - dataTable.addColumn(column.COLUMN_NAME, type); + dataTable.addColumn(column.LABEL_NAME, type); }); } data.forEach(function (row, index) { http://git-wip-us.apache.org/repos/asf/stratos/blob/b267e407/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Status/Member_Status/js/gadgetconf.js ---------------------------------------------------------------------- diff --git a/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Status/Member_Status/js/gadgetconf.js b/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Status/Member_Status/js/gadgetconf.js index 74a1cd8..7a47acc 100644 --- a/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Status/Member_Status/js/gadgetconf.js +++ b/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Status/Member_Status/js/gadgetconf.js @@ -25,15 +25,18 @@ var gadgetConfig = { "type": "batch", "columns": [ { - "COLUMN_NAME": "Time", + "COLUMN_NAME": "MemberId", + "LABEL_NAME": "Member Id", "DATA_TYPE": "varchar" }, { - "COLUMN_NAME": "MemberId", + "COLUMN_NAME": "Time", + "LABEL_NAME": "Time", "DATA_TYPE": "varchar" }, { "COLUMN_NAME": "MemberStatus", + "LABEL_NAME": "Member Status", "DATA_TYPE": "varchar" } ], http://git-wip-us.apache.org/repos/asf/stratos/blob/b267e407/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Status/Member_Status/js/main.js ---------------------------------------------------------------------- diff --git a/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Status/Member_Status/js/main.js b/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Status/Member_Status/js/main.js index cd256be..312f2c9 100644 --- a/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Status/Member_Status/js/main.js +++ b/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Status/Member_Status/js/main.js @@ -103,7 +103,7 @@ function makeDataTable(data) { } else if (column.DATA_TYPE == "TIME" || column.DATA_TYPE == "time") { type = "T"; } - dataTable.addColumn(column.COLUMN_NAME, type); + dataTable.addColumn(column.LABEL_NAME, type); }); } data.forEach(function (row, index) { http://git-wip-us.apache.org/repos/asf/stratos/blob/b267e407/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Status_Filter/Member_Status_Filter/js/member-status-filter.js ---------------------------------------------------------------------- diff --git a/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Status_Filter/Member_Status_Filter/js/member-status-filter.js b/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Status_Filter/Member_Status_Filter/js/member-status-filter.js index b79a2ac..8057e36 100644 --- a/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Status_Filter/Member_Status_Filter/js/member-status-filter.js +++ b/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Status_Filter/Member_Status_Filter/js/member-status-filter.js @@ -41,13 +41,13 @@ $(document).ready(function () { } } - $('body').on('click', '#application-filter', function () { + $('body').on('change', '#application-filter', function () { var e = document.getElementById("application-filter"); applicationId = e.options[e.selectedIndex].value; loadCluster(applicationId); publish(time); }) - $('body').on('click', '#cluster-filter', function () { + $('body').on('change', '#cluster-filter', function () { var e = document.getElementById("cluster-filter"); clusterId = e.options[e.selectedIndex].value; publish(time);
