diff --git a/src/main/java/com/application/DB/DB.java b/src/main/java/com/application/DB/DB.java index 614228a3199798bf3f3113b51263491a4f07c9ee..42574d67d24a06ba2c196f62e5ef95b8feda1521 100644 --- a/src/main/java/com/application/DB/DB.java +++ b/src/main/java/com/application/DB/DB.java @@ -6,6 +6,7 @@ import org.joda.time.DateTime; import java.util.*; import static com.application.DB.Constants.*; +import static com.application.DB.HelpingFunctions.IS_FINISHED; import static com.application.DB.HelpingFunctions.getNoOfChambers; /** @@ -566,7 +567,7 @@ public class DB { } - public static void pushManMoisture(String moisture, boolean finished) throws Exception { + public static void pushManMoisture(String moisture) throws Exception { String startTime = null; String stopTime = null; @@ -606,7 +607,7 @@ public class DB { // Sqlstatement final String sqlStatement = "INSERT INTO " + PROJECT_ID + "." + LOCATION_ID + "." + MAN_MOISTURE_TABLE + "(moisture,tree_species,dimensions,sawset,moisture_goal,no_moisture_check,start_time,stop_time,finished) " + - "VALUES("+moisture+","+treeSpecies+","+dimensions+","+sawset+","+moistureGoal+","+NUMBER_OF_CHECKS+","+startTime+","+stopTime+","+finished+") "; + "VALUES("+moisture+","+treeSpecies+","+dimensions+","+sawset+","+moistureGoal+","+NUMBER_OF_CHECKS+","+startTime+","+stopTime+","+IS_FINISHED+") "; System.out.println(sqlStatement); diff --git a/src/main/java/com/application/GUI/OutputPopUpWindow.java b/src/main/java/com/application/GUI/OutputPopUpWindow.java index 13f3d6a90cfbe6423575193fce8b914daf88732d..321ebdc2b1d5900b03b6d7ea4d3404a43e1ff1db 100644 --- a/src/main/java/com/application/GUI/OutputPopUpWindow.java +++ b/src/main/java/com/application/GUI/OutputPopUpWindow.java @@ -15,6 +15,7 @@ import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import static com.application.DB.Constants.*; +import static com.application.DB.HelpingFunctions.IS_FINISHED; public class OutputPopUpWindow { @@ -48,7 +49,7 @@ public class OutputPopUpWindow { if(!moistureCheckTextField.getCharacters().toString().isEmpty() && !moistureCheckTextField.getCharacters().toString().equals("Please enter a value")) { HelpingFunctions.STOP_TIME = null; - DB.pushManMoisture(moistureCheckTextField.getCharacters().toString(), false); + DB.pushManMoisture(moistureCheckTextField.getCharacters().toString()); NUMBER_OF_CHECKS++; window.close(); } else { @@ -66,8 +67,9 @@ public class OutputPopUpWindow { try { if(!moistureCheckTextField.getCharacters().toString().isEmpty() && !moistureCheckTextField.getCharacters().toString().equals("Please enter a value")) { + IS_FINISHED = true; HelpingFunctions.STOP_TIME = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(LocalDateTime.now()); - DB.pushManMoisture(moistureCheckTextField.getCharacters().toString(),true); + DB.pushManMoisture(moistureCheckTextField.getCharacters().toString()); window.close(); } else { moistureCheckTextField.setPromptText("Please enter a value"); diff --git a/src/main/java/com/application/Main.java b/src/main/java/com/application/Main.java index 1fff3b6691be398ca9af13b3a2b374864e275d86..222383388cf064d9ba7e3e5e7642a14a70a72057 100644 --- a/src/main/java/com/application/Main.java +++ b/src/main/java/com/application/Main.java @@ -233,7 +233,7 @@ public class Main extends Application { while (!IS_FINISHED) { try { - Thread.sleep(1000L * NUMBER_OF_SECONDS_LIVE_DATA); + Thread.sleep(500L * NUMBER_OF_SECONDS_LIVE_DATA); } catch (InterruptedException e) { e.printStackTrace(); } diff --git a/target/classes/com/application/DB/DB.class b/target/classes/com/application/DB/DB.class index fe602725abb76a5f28ac86b93ded577f0a26ae0a..26a1f36fce1a238184b8a29e8cb4e0d4a150c8f8 100644 Binary files a/target/classes/com/application/DB/DB.class and b/target/classes/com/application/DB/DB.class differ diff --git a/target/classes/com/application/GUI/OutputPopUpWindow.class b/target/classes/com/application/GUI/OutputPopUpWindow.class index c16bf4ace2945df72d5db9f7d92fd70762c028a4..27d06e89690bd8ca3dda77884ecb9438ad689235 100644 Binary files a/target/classes/com/application/GUI/OutputPopUpWindow.class and b/target/classes/com/application/GUI/OutputPopUpWindow.class differ diff --git a/target/classes/com/application/Main$1WorkerThread.class b/target/classes/com/application/Main$1WorkerThread.class index 5baa6649cabf1566f0fdee9c1d63c138cbe1bca7..e8cca2d060725d070d2d935b0729639bbfc300ef 100644 Binary files a/target/classes/com/application/Main$1WorkerThread.class and b/target/classes/com/application/Main$1WorkerThread.class differ