From e292df8bb8496c19f4f4681ab52eced237c32428 Mon Sep 17 00:00:00 2001
From: lukas-heiligenbrunner <lukas.heiligenbrunner@gmail.com>
Date: Fri, 15 Nov 2019 13:30:44 +0100
Subject: [PATCH] insert data in table of cities

---
 WasteInformationServer.iml                    |  3 ++
 resources/wwwroot/dashboard.html              | 27 ----------------
 resources/wwwroot/js/dashboard.js             | 28 ++++++++++------
 .../website/datarequests/DataRequest.java     | 32 +++++++++++++++++--
 4 files changed, 51 insertions(+), 39 deletions(-)

diff --git a/WasteInformationServer.iml b/WasteInformationServer.iml
index 5c65772..e180db6 100644
--- a/WasteInformationServer.iml
+++ b/WasteInformationServer.iml
@@ -12,5 +12,8 @@
     <orderEntry type="library" name="mysql-connector-java-5.1.44-bin" level="project" />
     <orderEntry type="library" name="mysql-connector-java-5.1.44-bin" level="project" />
     <orderEntry type="library" name="org.eclipse.paho.client.mqttv3-1.2.1" level="project" />
+    <orderEntry type="library" name="gson-2.8.6-javadoc" level="project" />
+    <orderEntry type="library" name="gson-2.8.6" level="project" />
+    <orderEntry type="library" name="gson-2.8.6-sources" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/resources/wwwroot/dashboard.html b/resources/wwwroot/dashboard.html
index 82ccbe6..7f0f019 100644
--- a/resources/wwwroot/dashboard.html
+++ b/resources/wwwroot/dashboard.html
@@ -335,20 +335,6 @@
                                     </tr>
                                     </thead>
                                     <tbody id="location-table-data">
-                                    <tr>
-                                        <td>Trident</td>
-                                        <td>Internet
-                                            Explorer 4.0
-                                        </td>
-                                        <td>Win 95+</td>
-                                    </tr>
-                                    <tr>
-                                        <td>Trident</td>
-                                        <td>Internet
-                                            Explorer 5.0
-                                        </td>
-                                        <td>Win 95+</td>
-                                    </tr>
                                     </tbody>
                                     <tfoot>
                                     <tr>
@@ -432,19 +418,6 @@
 <!-- DataTables -->
 <script src="lib/AdminLTE/plugins/datatables/jquery.dataTables.js"></script>
 <script src="lib/AdminLTE/plugins/datatables-bs4/js/dataTables.bootstrap4.js"></script>
-<script>
-    $(function () {
-        $("#example2").DataTable();
-        $('#example1').DataTable({
-            "paging": true,
-            "lengthChange": false,
-            "searching": false,
-            "ordering": true,
-            "info": true,
-            "autoWidth": false,
-        });
-    });
-</script>
 
 </body>
 </html>
diff --git a/resources/wwwroot/js/dashboard.js b/resources/wwwroot/js/dashboard.js
index 5a2f8f2..54be228 100644
--- a/resources/wwwroot/js/dashboard.js
+++ b/resources/wwwroot/js/dashboard.js
@@ -11,13 +11,25 @@ $(document).ready(function () {
     }, 'json');
 
     $.post('/senddata/wastedata', 'action=getAllCities', function (data) {
-        for (var i = 0; i < data.size; i++) {
+        console.log(data);
+        for (var i = 0; i < data.data.length; i++) {
             $('#location-table-data').append("<tr>" +
-                "<td>" + data[i].city + "</td>" +
-                "<td>" + data[i].zone + "</td>" +
-                "<td>" + data[i].wastetype + "</td>" +
+                "<td>" + data.data[i].cityname + "</td>" +
+                "<td>" + data.data[i].zone + "</td>" +
+                "<td>" + data.data[i].wastetype + "</td>" +
                 "</tr>");
         }
+        //todo entweda 1 od 2
+        $("#example2").DataTable();
+        $('#example1').DataTable({
+            "paging": true,
+            "lengthChange": false,
+            "searching": false,
+            "ordering": true,
+            "info": true,
+            "autoWidth": false,
+        });
+
     }, 'json');
 
 
@@ -36,9 +48,9 @@ $(document).ready(function () {
         var cityname = $("#new_city_cityname").val();
         var zonename = $("#new_city_zonename").val();
         var wastetype = $("#dropdown-wastetype").html();
-        console.log("storing: "+cityname + "--" + wastetype + "in db");
+        console.log("storing: " + cityname + "--" + wastetype + "in db");
 
-        $.post('/senddata/wastedata', 'action=newCity&wastetype=' + wastetype +"&cityname="+cityname+"&wastezone="+zonename, function (data) {
+        $.post('/senddata/wastedata', 'action=newCity&wastetype=' + wastetype + "&cityname=" + cityname + "&wastezone=" + zonename, function (data) {
             console.log(data);
         }, 'json');
 
@@ -50,8 +62,6 @@ $(document).ready(function () {
     });
 
 
-
-
     $('.btn-addtolist').click(function () {
         console.log("added new row to table");
         $('#addtable-body').append("<tr>" +
@@ -71,7 +81,7 @@ $(document).ready(function () {
 
         for (var i = 0; i < wastetypearr.length; i++) {
             console.log(wastetypearr[i].innerHTML);
-            $.post('/senddata/wastedata', 'action=senddata&wastetype=' + wastetypearr[i].innerHTML +"&wastetime="+wastetime[i].innerHTML+"&wasteregion="+wasteregionarr[i].innerHTML+"&wastezone="+wastezonearr[i].innerHTML, function (data) {
+            $.post('/senddata/wastedata', 'action=senddata&wastetype=' + wastetypearr[i].innerHTML + "&wastetime=" + wastetime[i].innerHTML + "&wasteregion=" + wasteregionarr[i].innerHTML + "&wastezone=" + wastezonearr[i].innerHTML, function (data) {
                 console.log(data);
             }, 'text');
         }
diff --git a/src/com/wasteinformationserver/website/datarequests/DataRequest.java b/src/com/wasteinformationserver/website/datarequests/DataRequest.java
index daf8a9c..fd40fda 100644
--- a/src/com/wasteinformationserver/website/datarequests/DataRequest.java
+++ b/src/com/wasteinformationserver/website/datarequests/DataRequest.java
@@ -1,5 +1,6 @@
 package com.wasteinformationserver.website.datarequests;
 
+import com.google.gson.Gson;
 import com.wasteinformationserver.basicutils.Log;
 import com.wasteinformationserver.db.JDCB;
 import com.wasteinformationserver.website.basicrequest.PostRequest;
@@ -11,6 +12,7 @@ import java.util.HashMap;
 public class DataRequest extends PostRequest {
     @Override
     public String request(HashMap<String, String> params) {
+        String result = "";
         switch (params.get("action")) {
             case "newCity":
                 Log.debug(params.toString());
@@ -35,10 +37,34 @@ public class DataRequest extends PostRequest {
                 break;
             case "getAllCities":
 
-                // TODO: 15.11.19 database call to get all data and store it as json. 
-                
+                // TODO: 15.11.19 database call to get all data and store it as json.
+                JDCB jdcbc = new JDCB("users", "kOpaIJUjkgb9ur6S", "wasteinformation");
+                Gson gson = new Gson();
+
+                StringBuilder builder = new StringBuilder();
+
+                ResultSet sett = jdcbc.executeQuery("select * from cities");
+                Log.debug(sett.toString());
+                builder.append("{\"data\":[");
+                try {
+                    while (sett.next()) {
+                        builder.append("{\"cityname\":\""+sett.getString("name")+"\"");
+                        builder.append(",\"wastetype\":\""+sett.getString("wastetype")+"\"");
+                        builder.append(",\"zone\":\""+sett.getString("zone")+"\"}");
+                        if (!sett.isLast()){
+                            builder.append(",");
+                        }
+
+//                        System.out.println(sett.getString("name"));
+                    }
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
+                builder.append("]}");
+                result= builder.toString();
+                Log.debug(result);
                 break;
         }
-        return "";
+        return result;
     }
 }