You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/10/09 21:26:48 UTC
[5/8] stratos git commit: Changing message if there is no data
available for selected values
Changing message if there is no data available for selected values
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/09e7abb2
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/09e7abb2
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/09e7abb2
Branch: refs/heads/stratos-4.1.x
Commit: 09e7abb288eed60662c0391f894b17128b50bdb4
Parents: 2c8de71
Author: Thanuja <th...@wso2.com>
Authored: Tue Sep 29 22:21:58 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Sat Oct 10 00:51:09 2015 +0530
----------------------------------------------------------------------
.../Gadget_Member_Count/Member_Count/index.xml | 2 +-
.../Gadget_Member_Count/Member_Count/js/main.js | 42 ++++++++++----------
.../Member_Information/index.xml | 2 +-
.../Member_Information/js/main.js | 39 +++++++++---------
.../Member_Status/index.xml | 2 +-
.../Member_Status/js/main.js | 42 ++++++++++----------
6 files changed, 62 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/09e7abb2/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Count/Member_Count/index.xml
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Count/Member_Count/index.xml b/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Count/Member_Count/index.xml
index 915ad9a..a743efe 100644
--- a/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Count/Member_Count/index.xml
+++ b/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Count/Member_Count/index.xml
@@ -73,7 +73,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/>Please select an application and cluster to view data</p></b></td></tr></table></div>');
}
</script>
</body>
http://git-wip-us.apache.org/repos/asf/stratos/blob/09e7abb2/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Count/Member_Count/js/main.js
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Count/Member_Count/js/main.js b/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Count/Member_Count/js/main.js
index 0865932..86bf4db 100644
--- a/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Count/Member_Count/js/main.js
+++ b/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Count/Member_Count/js/main.js
@@ -69,28 +69,26 @@ function fetchData(callback) {
var cluster = clusterId;
var time = timeInterval;
- console.log("ApplicationId:" + application);
- console.log("ClusterId:" + cluster);
- console.log("Time interval:" + timeInterval);
-
- var request = {
- tableName: datasource,
- applicationId: application,
- clusterId: cluster,
- time: time
- };
- $.ajax({
- url: "/portal/apis/member-count",
- method: "GET",
- data: request,
- contentType: "application/json",
- success: function (data) {
- if (callback != null) {
- callback(makeRows(JSON.parse(data)));
+ if (application != "") {
+ var request = {
+ tableName: datasource,
+ applicationId: application,
+ clusterId: cluster,
+ time: time
+ };
+ $.ajax({
+ url: "/portal/apis/member-count",
+ method: "GET",
+ data: request,
+ contentType: "application/json",
+ success: function (data) {
+ if (callback != null) {
+ callback(makeRows(JSON.parse(data)));
+ }
}
- }
- });
- dataLoaded = false; //setting the latch to locked position so that we block data fetching until we receive the response from backend
+ });
+ dataLoaded = false; //setting the latch to locked position so that we block data fetching until we receive the response from backend
+ }
}
function makeDataTable(data) {
@@ -163,7 +161,7 @@ function drawChart(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/>Please select an application and cluster to view data</p></b></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 selected application, cluster and time interval</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/09e7abb2/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 6fcb7d5..75ce04c 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 with selected values</p></b></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/>Please select an application and cluster to view data</p></b></td></tr></table></div>');
}
</script>
</body>
http://git-wip-us.apache.org/repos/asf/stratos/blob/09e7abb2/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 0333f2b..54cfea1 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
@@ -68,26 +68,25 @@ function fetchData(callback) {
var application = applicationId;
var cluster = clusterId;
- console.log("ApplicationId:" + application);
- console.log("ClusterId:" + cluster);
-
- var request = {
- tableName: datasource,
- applicationId: application,
- clusterId: cluster
- };
- $.ajax({
- url: "/portal/apis/member-info",
- method: "GET",
- data: request,
- contentType: "application/json",
- success: function (data) {
- if (callback != null) {
- callback(makeRows(JSON.parse(data)));
+ if (application != "") {
+ var request = {
+ tableName: datasource,
+ applicationId: application,
+ clusterId: cluster
+ };
+ $.ajax({
+ url: "/portal/apis/member-info",
+ method: "GET",
+ data: request,
+ contentType: "application/json",
+ success: function (data) {
+ if (callback != null) {
+ callback(makeRows(JSON.parse(data)));
+ }
}
- }
- });
- dataLoaded = false; //setting the latch to locked position so that we block data fetching until we receive the response from backend
+ });
+ dataLoaded = false; //setting the latch to locked position so that we block data fetching until we receive the response from backend
+ }
}
function makeDataTable(data) {
@@ -161,7 +160,7 @@ function drawChart(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/>Please select an application and cluster to view data</p></b></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 selected application and cluster</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/09e7abb2/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 adcb2c4..137897c 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 with selected values</p></b></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/>Please select an application and cluster to view data</p></b></td></tr></table></div>');
}
</script>
</body>
http://git-wip-us.apache.org/repos/asf/stratos/blob/09e7abb2/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 d3aaf6d..a103dd6 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
@@ -69,28 +69,26 @@ function fetchData(callback) {
var cluster = clusterId;
var time = timeInterval;
- console.log("ApplicationId:" + application);
- console.log("ClusterId:" + cluster);
- console.log("Time interval:" + timeInterval);
-
- var request = {
- tableName: datasource,
- applicationId: application,
- clusterId: cluster,
- time: time
- };
- $.ajax({
- url: "/portal/apis/member-status",
- method: "GET",
- data: request,
- contentType: "application/json",
- success: function (data) {
- if (callback != null) {
- callback(makeRows(JSON.parse(data)));
+ if (application != "") {
+ var request = {
+ tableName: datasource,
+ applicationId: application,
+ clusterId: cluster,
+ time: time
+ };
+ $.ajax({
+ url: "/portal/apis/member-status",
+ method: "GET",
+ data: request,
+ contentType: "application/json",
+ success: function (data) {
+ if (callback != null) {
+ callback(makeRows(JSON.parse(data)));
+ }
}
- }
- });
- dataLoaded = false; //setting the latch to locked position so that we block data fetching until we receive the response from backend
+ });
+ dataLoaded = false; //setting the latch to locked position so that we block data fetching until we receive the response from backend
+ }
}
function makeDataTable(data) {
@@ -165,7 +163,7 @@ function drawChart(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/>Please select an application and cluster to view data</p></b></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 selected application, cluster and time interval</p></b></td></tr></table></div>');
}
//releasing the latch so that we can request data again from the backend.
dataLoaded = true;