diff --git a/src/main/java/com/application/DB/Constants.java b/src/main/java/com/application/DB/Constants.java
index 358727e026dc9e950e66b1481fe4b8d8a241d49c..ed2b28a7a2b93ac7805c5a478d46a44ae0cce66e 100644
--- a/src/main/java/com/application/DB/Constants.java
+++ b/src/main/java/com/application/DB/Constants.java
@@ -20,7 +20,7 @@ public final class Constants {
// Start- & end time
public static String START_TIME = "";
- public static String STOP_TIME = CURRENT_DATE;
+ public static String STOP_TIME = "";
// Boolean variable to tell if the drying process is finished
public static boolean IS_FINISHED = false;
@@ -31,6 +31,9 @@ public final class Constants {
public static String SAWSET = "";
public static String MOISTURE_GOAL = "";
+ // Number of manual moisture checks
+ public static int NUMBER_OF_CHECKS = 1;
+
// Number of wanted drying periods
public static int NUMBER_OF_PERIODS = 1;
diff --git a/src/main/java/com/application/DB/DB.java b/src/main/java/com/application/DB/DB.java
index c04f47ff9bdf534e0eb82c2c300940b08738e54f..3b0936d87144e8e6ed07c3435a08fc418b7e88e7 100644
--- a/src/main/java/com/application/DB/DB.java
+++ b/src/main/java/com/application/DB/DB.java
@@ -560,11 +560,11 @@ public class DB {
}
- public static void pushManMoisture(String moisture) throws Exception {
+ public static void pushManMoisture(String moisture, boolean finished) throws Exception {
// Sqlstatement
final String sqlStatement =
- "INSERT INTO " + PROJECT_ID + "." + LOCATION_ID + "." + MAN_MOISTURE_TABLE + "(moisture) " +
- "VALUES("+moisture+") ";
+ "INSERT INTO " + PROJECT_ID + "." + LOCATION_ID + "." + MAN_MOISTURE_TABLE + "(moisture,tree_species,dimensions,sawset,moisture_goal,no_moisture_checkstart_time,start_time,stop_time,finished) " +
+ "VALUES("+moisture+","+TREE_SPECIES+","+DIMENSIONS+","+SAWSET+","+MOISTURE_GOAL+","+NUMBER_OF_CHECKS+","+",) ";
System.out.println(sqlStatement);
diff --git a/src/main/java/com/application/GUI/LineChartFunctionality.java b/src/main/java/com/application/GUI/LineChartFunctionality.java
index 6803ed2ed4ff8e191b57edc0dffb28009a71e041..c5b42259e1085cbe135eb933243c8e890cfdf2a3 100644
--- a/src/main/java/com/application/GUI/LineChartFunctionality.java
+++ b/src/main/java/com/application/GUI/LineChartFunctionality.java
@@ -1,5 +1,6 @@
package com.application.GUI;
+import javafx.collections.ObservableList;
import javafx.scene.chart.CategoryAxis;
import javafx.scene.chart.LineChart;
import javafx.scene.chart.NumberAxis;
@@ -19,12 +20,14 @@ import static com.application.DB.Constants.ADJUST_REGRESSION;
public class LineChartFunctionality {
private static LineChart<String, Number> lineChart;
+ private static XYChart.Series<String, Number> liveDataSeries;
private static CategoryAxis xAxis;
private static NumberAxis yAxis;
private static final double CONFIDENCE_INTERVAL = 0.90;
public LineChartFunctionality() {
+ liveDataSeries = new XYChart.Series<String, Number>();
xAxis = new CategoryAxis();
yAxis = new NumberAxis();
lineChart = new LineChart<>(xAxis, yAxis);
@@ -33,11 +36,9 @@ public class LineChartFunctionality {
yAxis.setLabel("Kwh");
yAxis.setAnimated(false);
lineChart.setTitle("Drying Processes");
+ lineChart.getData().add(liveDataSeries);
}
- public static void setLineChart(LineChart<String, Number> lineChart) {
- LineChartFunctionality.lineChart = lineChart;
- }
public static LineChart<String, Number> getLineChart() {
return lineChart;
@@ -262,17 +263,14 @@ public class LineChartFunctionality {
public static void loadLiveData(Map<String, Number> userInput) throws Exception {
- clearLineChart();
int index = 0;
- XYChart.Series<String, Number> newSeries = new XYChart.Series<String, Number>();
-
for (Map.Entry<String, Number> entryKwh : userInput.entrySet()) {
Double kwhValue = entryKwh.getValue().doubleValue();
// Connect the data to a series
- newSeries.getData().add(new XYChart.Data<String, Number>(String.valueOf(index), kwhValue));
+
+ liveDataSeries.getData().add(new XYChart.Data<String, Number>(String.valueOf(index), kwhValue));
index++;
}
- updateLineChart(newSeries);
}
diff --git a/src/main/java/com/application/GUI/OutputPopUpWindow.java b/src/main/java/com/application/GUI/OutputPopUpWindow.java
index 1e602694014f31cc44073a819a2072621caf2741..94d7d93cae131313a583194d6286a8fa38104ffb 100644
--- a/src/main/java/com/application/GUI/OutputPopUpWindow.java
+++ b/src/main/java/com/application/GUI/OutputPopUpWindow.java
@@ -10,6 +10,9 @@ import javafx.scene.layout.VBox;
import javafx.stage.Modality;
import javafx.stage.Stage;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
import static com.application.DB.Constants.*;
public class OutputPopUpWindow {
@@ -37,13 +40,22 @@ public class OutputPopUpWindow {
Button countinueButton = new Button("Continue");
countinueButton.setId("inputButtonStart");
countinueButton.setAlignment(Pos.BOTTOM_CENTER);
+ countinueButton.setOnAction(e -> {
+ try {
+ STOP_TIME = "";
+ DB.pushManMoisture(moistureCheckTextField.getCharacters().toString(), false);
+ NUMBER_OF_CHECKS++;
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ });
Button finishButton = new Button("Finish");
finishButton.setId("inputButtonStart");
finishButton.setAlignment(Pos.BOTTOM_CENTER);
finishButton.setOnAction(e -> {
try {
- STOP_TIME = CURRENT_DATE;
- DB.pushManMoisture(moistureCheckTextField.getCharacters().toString());
+ STOP_TIME = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(LocalDateTime.now());
+ DB.pushManMoisture(moistureCheckTextField.getCharacters().toString(),true);
} catch (Exception ex) {
ex.printStackTrace();
}
diff --git a/target/classes/com/application/DB/Constants.class b/target/classes/com/application/DB/Constants.class
index 425d015ba2bd7ece15cdad5a9b158a717278a5fc..12b796c5c7f59d192a5504fb50d7263ec9fee188 100644
Binary files a/target/classes/com/application/DB/Constants.class and b/target/classes/com/application/DB/Constants.class differ
diff --git a/target/classes/com/application/DB/DB.class b/target/classes/com/application/DB/DB.class
index bf7c605220bd409ba991d7163a096e315aceca47..907ca7cd83870015b2dfa3d10e234e29292ea61b 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/InputPopUpWindow.class b/target/classes/com/application/GUI/InputPopUpWindow.class
index 7dee364a79ca5923136c8f23d251a0d675b5f7fd..22435a873bdd72d725141bb68ad28bf4d1bb7f2d 100644
Binary files a/target/classes/com/application/GUI/InputPopUpWindow.class and b/target/classes/com/application/GUI/InputPopUpWindow.class differ
diff --git a/target/classes/com/application/GUI/LineChartFunctionality.class b/target/classes/com/application/GUI/LineChartFunctionality.class
index 319d3a1d0580e0b3b0197b741a90a29fc96b1028..f70466837b2fd6c3753ca6494fe6f688c79c214e 100644
Binary files a/target/classes/com/application/GUI/LineChartFunctionality.class and b/target/classes/com/application/GUI/LineChartFunctionality.class differ
diff --git a/target/classes/com/application/GUI/OutputPopUpWindow.class b/target/classes/com/application/GUI/OutputPopUpWindow.class
index 5daf432fccb91d11d412a7bd30eb3075dc126f34..3ce6d7422da8fe27aa5bfd05cc8d07d7c6ca9408 100644
Binary files a/target/classes/com/application/GUI/OutputPopUpWindow.class and b/target/classes/com/application/GUI/OutputPopUpWindow.class differ