From c839c8506cca3aba2799942f360603237860abd0 Mon Sep 17 00:00:00 2001 From: Lukas-Heiligenbrunner Date: Fri, 28 Feb 2020 11:48:41 +0100 Subject: [PATCH] sidebar values improvement load header data on devicepage --- .../website/datarequests/DeviceRequest.kt | 23 ++++++---- src/resources/wwwroot/adminpanel.html | 18 +------- src/resources/wwwroot/dashboard.html | 18 +------- src/resources/wwwroot/device.html | 31 +++---------- src/resources/wwwroot/js/device.js | 46 ++++++++++--------- src/resources/wwwroot/user.html | 9 +--- 6 files changed, 49 insertions(+), 96 deletions(-) diff --git a/src/java/com/wasteinformationserver/website/datarequests/DeviceRequest.kt b/src/java/com/wasteinformationserver/website/datarequests/DeviceRequest.kt index 720e191..be9ff51 100644 --- a/src/java/com/wasteinformationserver/website/datarequests/DeviceRequest.kt +++ b/src/java/com/wasteinformationserver/website/datarequests/DeviceRequest.kt @@ -142,14 +142,6 @@ class DeviceRequest : PostRequest() { } sb.append("{\"status\":\"success\"}") } - "getDeviceNumber" -> try { - val numberset = jdbc!!.executeQuery("SELECT * FROM devices") - numberset.last() - val devicenr = numberset.row - sb.append("{\"devicenr\":\"$devicenr\"}") - } catch (e: SQLException) { - e.printStackTrace() - } "addtodb" -> { var cityid = -1 try { @@ -162,6 +154,21 @@ class DeviceRequest : PostRequest() { } sb.append("{\"success\":true}") } + "getheader" -> { + try { + var numberset = jdbc!!.executeQuery("SELECT * FROM devices") + numberset.last() + val devicenr = numberset.row + + numberset = jdbc!!.executeQuery("SELECT * FROM devices WHERE CityID=-1") + numberset.last() + val unconfigureddevices = numberset.row + + sb.append("{\"success\":true,\"devicenumber\":$devicenr, \"unconfigureddevices\":$unconfigureddevices}") + } catch (e: SQLException) { + e.printStackTrace() + } + } } return sb.toString() } diff --git a/src/resources/wwwroot/adminpanel.html b/src/resources/wwwroot/adminpanel.html index f271d11..1047f59 100644 --- a/src/resources/wwwroot/adminpanel.html +++ b/src/resources/wwwroot/adminpanel.html @@ -70,15 +70,6 @@