You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/09/28 15:15:18 UTC
[46/69] [abbrv] stratos git commit: Print Data not available message
if table-gadget data is empty
Print Data not available message if table-gadget data is empty
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2a0c2a90
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2a0c2a90
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2a0c2a90
Branch: refs/heads/stratos-4.1.x
Commit: 2a0c2a90ea7dce9bb3aaa1102df7cea884869ec7
Parents: e0bd64e
Author: Thanuja <th...@wso2.com>
Authored: Wed Sep 23 14:36:34 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Sep 28 18:44:18 2015 +0530
----------------------------------------------------------------------
.../Member_Information/index.xml | 2 +-
.../Member_Information/js/main.js | 56 ++++++++++---------
.../Member_Status/index.xml | 2 +-
.../Member_Status/js/main.js | 58 +++++++++++---------
4 files changed, 62 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/2a0c2a90/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Information/Member_Information/index.xml
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Information/Member_Information/index.xml b/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Information/Member_Information/index.xml
index 93dfcc8..6fcb7d5 100644
--- a/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Information/Member_Information/index.xml
+++ b/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Information/Member_Information/index.xml
@@ -76,7 +76,7 @@
<div id="placeholder" class="demo-placeholder" style="height:90%"></div>
<script language="javascript" type="text/javascript">
if(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</p></b></td></tr><tr><td></td><td><p>The chart will be loaded once the dashboard receives events</p><td/></tr></table></div>');
+ 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>');
}
</script>
</body>
http://git-wip-us.apache.org/repos/asf/stratos/blob/2a0c2a90/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 b0a28fd..eb6771b 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
@@ -128,34 +128,36 @@ function makeRows(data) {
function drawChart(data) {
var dataTable = makeDataTable(data);
- gadgetConfig.chartConfig.width = $("#placeholder").width();
- gadgetConfig.chartConfig.height = $("#placeholder").height() - 65;
- var chartType = gadgetConfig.chartConfig.chartType;
- var xAxis = gadgetConfig.chartConfig.xAxis;
- var chart;
- jQuery("#noChart").html("");
- if (chartType === "bar" && dataTable.metadata.types[xAxis] === "N") {
- dataTable.metadata.types[xAxis] = "C";
- }
+ if (dataTable.data.length != 0) {
+ gadgetConfig.chartConfig.width = $("#placeholder").width();
+ gadgetConfig.chartConfig.height = $("#placeholder").height() - 65;
+ var chartType = gadgetConfig.chartConfig.chartType;
+ var xAxis = gadgetConfig.chartConfig.xAxis;
+ var chart;
+ jQuery("#noChart").html("");
+ if (chartType === "bar" && dataTable.metadata.types[xAxis] === "N") {
+ dataTable.metadata.types[xAxis] = "C";
+ }
- if (gadgetConfig.chartConfig.chartType === "tabular" || gadgetConfig.chartConfig.chartType === "singleNumber") {
- gadgetConfig.chartConfig.height = $("#placeholder").height();
- chart = igviz.draw("#placeholder", gadgetConfig.chartConfig, dataTable);
- chart.plot(dataTable.data);
-
- } else {
- chart = igviz.setUp("#placeholder", gadgetConfig.chartConfig, dataTable);
- chart.setXAxis({
- "labelAngle": -35,
- "labelAlign": "right",
- "labelDy": 0,
- "labelDx": 0,
- "titleDy": 25
- })
- .setYAxis({
- "titleDy": -30
- });
- chart.plot(dataTable.data);
+ if (gadgetConfig.chartConfig.chartType === "tabular" || gadgetConfig.chartConfig.chartType === "singleNumber") {
+ gadgetConfig.chartConfig.height = $("#placeholder").height();
+ chart = igviz.draw("#placeholder", gadgetConfig.chartConfig, dataTable);
+ chart.plot(dataTable.data);
+
+ } else {
+ chart = igviz.setUp("#placeholder", gadgetConfig.chartConfig, dataTable);
+ chart.setXAxis({
+ "labelAngle": -35,
+ "labelAlign": "right",
+ "labelDy": 0,
+ "labelDx": 0,
+ "titleDy": 25
+ })
+ .setYAxis({
+ "titleDy": -30
+ });
+ chart.plot(dataTable.data);
+ }
}
//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/2a0c2a90/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Status/Member_Status/index.xml
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Status/Member_Status/index.xml b/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Status/Member_Status/index.xml
index 0c29e11..adcb2c4 100644
--- a/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Status/Member_Status/index.xml
+++ b/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Status/Member_Status/index.xml
@@ -75,7 +75,7 @@
<div id="placeholder" class="demo-placeholder" style="height:90%"></div>
<script language="javascript" type="text/javascript">
if(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</p></b></td></tr><tr><td></td><td><p>The chart will be loaded once the dashboard receives events</p><td/></tr></table></div>');
+ 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>');
}
</script>
</body>
http://git-wip-us.apache.org/repos/asf/stratos/blob/2a0c2a90/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 312f2c9..46a5154 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
@@ -131,34 +131,38 @@ function makeRows(data) {
function drawChart(data) {
var dataTable = makeDataTable(data);
- gadgetConfig.chartConfig.width = $("#placeholder").width();
- gadgetConfig.chartConfig.height = $("#placeholder").height() - 65;
- var chartType = gadgetConfig.chartConfig.chartType;
- var xAxis = gadgetConfig.chartConfig.xAxis;
- var chart;
- jQuery("#noChart").html("");
- if (chartType === "bar" && dataTable.metadata.types[xAxis] === "N") {
- dataTable.metadata.types[xAxis] = "C";
- }
- if (gadgetConfig.chartConfig.chartType === "tabular" || gadgetConfig.chartConfig.chartType === "singleNumber") {
- gadgetConfig.chartConfig.height = $("#placeholder").height();
- chart = igviz.draw("#placeholder", gadgetConfig.chartConfig, dataTable);
- chart.plot(dataTable.data);
-
- } else {
- chart = igviz.setUp("#placeholder", gadgetConfig.chartConfig, dataTable);
- chart.setXAxis({
- "labelAngle": -35,
- "labelAlign": "right",
- "labelDy": 0,
- "labelDx": 0,
- "titleDy": 25
- })
- .setYAxis({
- "titleDy": -30
- });
- chart.plot(dataTable.data);
+ if (dataTable.data.length != 0) {
+
+ gadgetConfig.chartConfig.width = $("#placeholder").width();
+ gadgetConfig.chartConfig.height = $("#placeholder").height() - 65;
+ var chartType = gadgetConfig.chartConfig.chartType;
+ var xAxis = gadgetConfig.chartConfig.xAxis;
+ var chart;
+ jQuery("#noChart").html("");
+ if (chartType === "bar" && dataTable.metadata.types[xAxis] === "N") {
+ dataTable.metadata.types[xAxis] = "C";
+ }
+
+ if (gadgetConfig.chartConfig.chartType === "tabular" || gadgetConfig.chartConfig.chartType === "singleNumber") {
+ gadgetConfig.chartConfig.height = $("#placeholder").height();
+ chart = igviz.draw("#placeholder", gadgetConfig.chartConfig, dataTable);
+ chart.plot(dataTable.data);
+
+ } else {
+ chart = igviz.setUp("#placeholder", gadgetConfig.chartConfig, dataTable);
+ chart.setXAxis({
+ "labelAngle": -35,
+ "labelAlign": "right",
+ "labelDy": 0,
+ "labelDx": 0,
+ "titleDy": 25
+ })
+ .setYAxis({
+ "titleDy": -30
+ });
+ chart.plot(dataTable.data);
+ }
}
//releasing the latch so that we can request data again from the backend.
dataLoaded = true;