* added table to device page

* request devices from js from db

src/java/com/wasteinformationserver/Dateget.java

@@ -1,3 +1,6 @@
+/**
+ * dead code...
+ */
 package com.wasteinformationserver;
 
 import com.wasteinformationserver.basicutils.Log;

src/java/com/wasteinformationserver/main.java

@@ -10,11 +10,10 @@ import java.io.IOException;
 
 public class main {
     public static void main(String[] args) {
-
         Log.setLevel(Log.DEBUG);
-        Log.info("startup of WasteInformationServer");
+        Info.init();
 
-        Log.info("mem: " + Runtime.getRuntime().totalMemory());
+        Log.info("startup of WasteInformationServer");
 
         Runtime.getRuntime().addShutdownHook(new Thread(() -> {
             try {
@@ -27,7 +26,6 @@ public class main {
             }
         }));
 
-        Info.init();
         Log.info("Server version: " + Info.getVersion());
         Log.debug("Build date: " + Info.getBuilddate());
 
@@ -55,7 +53,5 @@ public class main {
         } catch (Exception e) {
             Log.error("An error occured in the class mqtt");
         }
-
-        Log.info("mem: " + Runtime.getRuntime().totalMemory());
     }
 }

src/java/com/wasteinformationserver/website/Webserver.java

@@ -2,10 +2,7 @@ package com.wasteinformationserver.website;
 
 import com.sun.net.httpserver.HttpServer;
 import com.wasteinformationserver.basicutils.Log;
-import com.wasteinformationserver.website.datarequests.AdminRequests;
+import com.wasteinformationserver.website.datarequests.*;
-import com.wasteinformationserver.website.datarequests.DataRequest;
-import com.wasteinformationserver.website.datarequests.NewDateRequest;
-import com.wasteinformationserver.website.datarequests.RegisterRequest;
 import com.wasteinformationserver.website.datarequests.login.CheckLoginState;
 import com.wasteinformationserver.website.datarequests.login.LoginRequest;
 
@@ -29,6 +26,7 @@ public class Webserver {
             server.createContext("/senddata/wastedata", new DataRequest());
             server.createContext("/senddata/admindata", new AdminRequests());
             server.createContext("/senddata/newdate", new NewDateRequest());
+            server.createContext("/senddata/Devicedata", new DeviceRequest());
 
             server.setExecutor(null); // creates a default executor
             server.start();

src/java/com/wasteinformationserver/website/datarequests/DeviceRequest.java

@@ -0,0 +1,43 @@
+package com.wasteinformationserver.website.datarequests;
+
+import com.wasteinformationserver.db.JDCB;
+import com.wasteinformationserver.website.basicrequest.PostRequest;
+
+import java.io.IOException;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.HashMap;
+
+public class DeviceRequest extends PostRequest {
+    @Override
+    public String request(HashMap<String, String> params) {
+
+        JDCB jdcb = null;
+        try {
+            jdcb = JDCB.getInstance();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        switch (params.get("action")) {
+            case "getdevices":
+                ResultSet set = jdcb.executeQuery("SELECT * from devices");
+                StringBuilder sb = new StringBuilder("{\"data\":[");
+                try {
+                    while (set.next()) {
+                        sb.append("{\"name\":\"" + set.getString("devicename") + "\"}");
+                        if (!set.isLast()) {
+                            sb.append(",");
+                        }
+                    }
+                    sb.append("]}");
+                    return sb.toString();
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
+
+                break;
+        }
+        return null;
+    }
+}

src/resources/wwwroot/device.html

@@ -186,21 +186,35 @@
                                 <table id="table-pickupdates" class="table table-bordered table-hover">
                                     <thead>
                                     <tr>
-                                        <th>City</th>
+                                        <th>Device ID</th>
+                                        <th>Devicename</th>
+                                        <th>Devicelocation</th>
                                         <th>Zone</th>
-                                        <th>Waste Type</th>
-                                        <th>Date</th>
                                         <th>X</th>
                                     </tr>
                                     </thead>
                                     <tbody id="picupdates-tablebody">
+                                    <tr>
+                                        <td>42</td>
+                                        <td>new Device</td>
+                                        <td>
+                                            <button type="button" class="btn btn-primary">Configure</button>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>42</td>
+                                        <td>lukis anziges</td>
+                                        <td>htl steyr</td>
+                                        <td>Steyr/2/Plastic</td>
+                                        <td>del</td>
+                                    </tr>
                                     </tbody>
                                     <tfoot>
                                     <tr>
-                                        <th>City</th>
+                                        <th>Device ID</th>
+                                        <th>Devicename</th>
+                                        <th>Devicelocation</th>
                                         <th>Zone</th>
-                                        <th>Waste Type</th>
-                                        <th>Date</th>
                                         <th>X</th>
                                     </tr>
                                     </tfoot>

src/resources/wwwroot/js/device.js

@@ -1,37 +1,8 @@
 $(document).ready(function () {
-    $('#btn-newdevice').click(function (e) {
-        e.preventDefault();
 
-        Swal.showLoading({
+    $.post('/senddata/Devicedata', 'action=getdevices', function (data) {
-                title: 'No connection to Database',
+
-                html: 'Setup DB here --> <a href="index.html">click<a/>.',
+        console.log(data);
-            });
+    }, 'json');
-
-        // Swal.fire({
-        //     type: "error",
-        //     title: 'No connection to Database',
-        //     html: 'Setup DB here --> <a href="index.html">click<a/>.',
-        //     onBeforeOpen: () => {
-        //         Swal.showLoading()
-        //     },
-        // }).then((result) => {
-        //     console.log('Popup closed. ')
-        //
-        // });
-
-
-        // $.post('/senddata/loginget', 'username=' + username + '&password=' + password, function (data) {
-        //
-        //     console.log(data);
-        //     if (data.status == "nodbconn"){
-        //
-        //     }
-        //     if (data.accept == true) {
-        //         console.log("successfully logged in!");
-        //         document.cookie = "username=" + username;
-        //         window.location = 'dashboard.html';
-        //     }
-        // }, 'json');
-    });
 });