Fix for print data not available message if table-gadget data is empty by including all scenarios
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2565bd55 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2565bd55 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2565bd55 Branch: refs/heads/stratos-4.1.x Commit: 2565bd55b78e4d531ecfbcb0cd0f7dd00a586284 Parents: 0c38460 Author: Thanuja <[email protected]> Authored: Thu Sep 24 19:44:18 2015 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Mon Sep 28 18:44:19 2015 +0530 ---------------------------------------------------------------------- .../Gadget_Member_Information/Member_Information/js/main.js | 4 ++++ .../Gadget_Member_Status/Member_Status/js/main.js | 3 +++ 2 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/2565bd55/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 eb6771b..f0e449e 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 @@ -159,6 +159,10 @@ function drawChart(data) { chart.plot(dataTable.data); } } + else { + jQuery("#placeholder").html(""); + jQuery("#placeholder").append('<div id="noChart"><table><tr><td style="padding:30px 20px 0px 20px"><img src="../../portal/images/noEvents.png" align="left" style="width:24;height:24"/></td><td><br/><b><p><br/> Data is not available for plotting with selected values</p></b></td></tr></table></div>'); + } //releasing the latch so that we can request data again from the backend. dataLoaded = true; } http://git-wip-us.apache.org/repos/asf/stratos/blob/2565bd55/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 46a5154..641f875 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 @@ -163,6 +163,9 @@ function drawChart(data) { }); chart.plot(dataTable.data); } + } else { + jQuery("#placeholder").html(""); + jQuery("#placeholder").append('<div id="noChart"><table><tr><td style="padding:30px 20px 0px 20px"><img src="../../portal/images/noEvents.png" align="left" style="width:24;height:24"/></td><td><br/><b><p><br/> Data is not available for plotting with selected values</p></b></td></tr></table></div>'); } //releasing the latch so that we can request data again from the backend. dataLoaded = true;
