From af9d5662b18c50a8af76d61b12be894763d2f7bb Mon Sep 17 00:00:00 2001
From: Lukas Heiligenbrunner <lukas.heiligenbrunner@gmail.com>
Date: Fri, 24 Apr 2020 15:32:33 +0200
Subject: [PATCH] dependencie error popup corrections table reload after
 deleting corrections

---
 src/java/com/wasteinformationserver/db/JDBC.java | 6 ++----
 src/resources/wwwroot/js/dashboard.js            | 8 ++++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/java/com/wasteinformationserver/db/JDBC.java b/src/java/com/wasteinformationserver/db/JDBC.java
index a4f3f88..0a7dc11 100644
--- a/src/java/com/wasteinformationserver/db/JDBC.java
+++ b/src/java/com/wasteinformationserver/db/JDBC.java
@@ -168,17 +168,15 @@ public class JDBC {
      */
     public int executeUpdate(String sql) throws SQLException {
         try {
-            conn.isValid(5);
+            conn.isValid(2);
             PreparedStatement stmt = conn.prepareStatement(sql);
             return stmt.executeUpdate();
         } catch (SQLNonTransientConnectionException ee) {
             if (logintodb(usernamec, passwordc, dbnamec, ipc, portc)) {
                 return this.executeUpdate(sql);
             } else {
-                throw new SQLException();
+                throw new SQLNonTransientConnectionException();
             }
-        } catch (SQLException e) {
-            throw new SQLException();
         }
     }
 
diff --git a/src/resources/wwwroot/js/dashboard.js b/src/resources/wwwroot/js/dashboard.js
index 7702ca5..8c7583e 100644
--- a/src/resources/wwwroot/js/dashboard.js
+++ b/src/resources/wwwroot/js/dashboard.js
@@ -269,7 +269,7 @@ class Dashboard {
                 }
 
                 $(".delbtn").click(function (event) {
-                    var id = event.target.getAttribute("dataid");
+                    const id = event.target.getAttribute("dataid");
                     console.log("clicked btn data " + id);
                     $.post('/senddata/wastedata', 'action=deletecity&id=' + id, function (data) {
                         console.log(data);
@@ -283,12 +283,12 @@ class Dashboard {
                                 console.log('Popup closed. ')
 
                             });
-                            reloadtable();
+                            _this.reloadtable();
                         } else if (data.status === "dependenciesnotdeleted") {
                             Swal.fire({
                                 icon: "warning",
                                 title: 'This city is a dependency of a date',
-                                html: 'Do you want do delete it anyway with all dependencies?',
+                                html: 'Please delete all dependencies first!',
                             }).then((result) => {
                                 console.log('Popup closed. ')
 
@@ -353,7 +353,7 @@ class Dashboard {
                                 console.log('Popup closed. ')
 
                             });
-                            reloadDateTable();
+                            _this.reloadDateTable();
                         } else if (data.status == "dependenciesnotdeleted") {
                             Swal.fire({
                                 icon: "warning",