From b1e7de952a1d1c128335e8c127bb18de7c3ab04a Mon Sep 17 00:00:00 2001 From: lukas-heiligenbrunner Date: Fri, 13 Dec 2019 14:57:59 +0100 Subject: [PATCH] * total cities label * color and icon improvements --- .../website/datarequests/DataRequest.java | 88 ++++++++----------- src/resources/wwwroot/dashboard.html | 14 +-- src/resources/wwwroot/js/dashboard.js | 20 ++--- 3 files changed, 49 insertions(+), 73 deletions(-) diff --git a/src/java/com/wasteinformationserver/website/datarequests/DataRequest.java b/src/java/com/wasteinformationserver/website/datarequests/DataRequest.java index 8705e3d..a35ed2e 100644 --- a/src/java/com/wasteinformationserver/website/datarequests/DataRequest.java +++ b/src/java/com/wasteinformationserver/website/datarequests/DataRequest.java @@ -156,59 +156,6 @@ public class DataRequest extends PostRequest { sb.append("\"status\" : \"error\""); } - sb.append(",\"query\":\"ok\""); - sb.append("}"); - break; - case "getcollectionnumber": //todo maybe combine all three to one - sb.append("{"); - - try { - set = jdcb.executeQuery("select * from pickupdates"); - set.last(); - sb.append("\"collectionnumber\":\"" + set.getRow() + "\""); - } catch (SQLException e) { - Log.error("sql exception: " + e.getMessage()); - sb.append("\"status\" : \"error\""); - } - - sb.append(",\"query\":\"ok\""); - sb.append("}"); - break; - case "getcollectioninfuture": - sb.append("{"); - - try { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - Date date = new Date(); - date = new Date(date.getTime()+1 * 24 * 60 * 60 * 1000); - - String time = sdf.format(date); - set = jdcb.executeQuery("SELECT * FROM `pickupdates` WHERE `pickupdate` BETWEEN '"+time+"' AND '2222-12-27'"); - set.last(); - sb.append("\"collectionnumber\":\"" + set.getRow() + "\""); - } catch (SQLException e) { - Log.error("sql exception: " + e.getMessage()); - sb.append("\"status\" : \"error\""); - } - - sb.append(",\"query\":\"ok\""); - sb.append("}"); - break; - case "getfinishedcollections": - sb.append("{"); - - try { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - Date date = new Date(); - String time = sdf.format(date); - set = jdcb.executeQuery("SELECT * FROM `pickupdates` WHERE `pickupdate` BETWEEN '0000-12-27' AND '"+time+"'"); - set.last(); - sb.append("\"collectionnumber\":\"" + set.getRow() + "\""); - } catch (SQLException e) { - Log.error("sql exception: " + e.getMessage()); - sb.append("\"status\" : \"error\""); - } - sb.append(",\"query\":\"ok\""); sb.append("}"); break; @@ -219,6 +166,41 @@ public class DataRequest extends PostRequest { sb.append(",\"buildtime\" : \""+ Info.getBuilddate()+"\""); + sb.append(",\"query\":\"ok\""); + sb.append("}"); + break; + case "getStartHeaderData": + sb.append("{"); + + try { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Date date = new Date(); + String time = sdf.format(date); + set = jdcb.executeQuery("SELECT * FROM `pickupdates` WHERE `pickupdate` BETWEEN '0000-12-27' AND '"+time+"'"); + set.last(); + sb.append("\"finshedcollections\":\"" + set.getRow() + "\""); + + sdf = new SimpleDateFormat("yyyy-MM-dd"); + date = new Date(); + date = new Date(date.getTime()+1 * 24 * 60 * 60 * 1000); + + time = sdf.format(date); + set = jdcb.executeQuery("SELECT * FROM `pickupdates` WHERE `pickupdate` BETWEEN '"+time+"' AND '2222-12-27'"); + set.last(); + sb.append(",\"futurecollections\":\"" + set.getRow() + "\""); + + set = jdcb.executeQuery("select * from pickupdates"); + set.last(); + sb.append(",\"collectionnumber\":\"" + set.getRow() + "\""); + + set = jdcb.executeQuery("select * from `cities`"); + set.last(); + sb.append(",\"citynumber\":\"" + set.getRow() + "\""); + } catch (SQLException e) { + Log.error("sql exception: " + e.getMessage()); + sb.append("\"status\" : \"error\""); + } + sb.append(",\"query\":\"ok\""); sb.append("}"); break; diff --git a/src/resources/wwwroot/dashboard.html b/src/resources/wwwroot/dashboard.html index 111ddb5..19c0ab4 100644 --- a/src/resources/wwwroot/dashboard.html +++ b/src/resources/wwwroot/dashboard.html @@ -145,14 +145,14 @@
-
+
-

53%

+

42

-

Verbundene Clients

+

total collect zones

- +
More info
@@ -167,7 +167,7 @@

Planned Collections

- +
More info
@@ -175,14 +175,14 @@
-
+

65

Finished Collections

- +
More info
diff --git a/src/resources/wwwroot/js/dashboard.js b/src/resources/wwwroot/js/dashboard.js index 0d180d4..adad1d1 100644 --- a/src/resources/wwwroot/js/dashboard.js +++ b/src/resources/wwwroot/js/dashboard.js @@ -13,21 +13,15 @@ $(document).ready(function () { }, 'json'); //load total collections - $.post('/senddata/wastedata', 'action=getcollectionnumber', function (data) { + $.post('/senddata/wastedata', 'action=getStartHeaderData', function (data) { console.log(data); $("#total-connection-labels").html(data.collectionnumber); - }, 'json'); - //load future collections - $.post('/senddata/wastedata', 'action=getcollectioninfuture', function (data) { - console.log(data); - $("#planed-collection-label").html(data.collectionnumber); - }, 'json'); + $("#planed-collection-label").html(data.futurecollections); - //load future collections - $.post('/senddata/wastedata', 'action=getfinishedcollections', function (data) { - console.log(data); - $("#finished-collection-label").html(data.collectionnumber); + $("#finished-collection-label").html(data.finshedcollections); + + $("#total-city-number-label").html(data.citynumber); }, 'json'); //load version footer @@ -161,8 +155,8 @@ $(document).ready(function () { }, "json"); }); } - citytable = $("#table-pickupdates").DataTable({ - "order": [[ 3, "desc" ]] + datetable = $("#table-pickupdates").DataTable({ + "order": [[ 3, "asc" ]] } ); //todo picupdates-tablebody