diff --git a/src/main/java/com/application/DB/Constants.java b/src/main/java/com/application/DB/Constants.java index ff18115d3509932a857bad0b30071e3e3b5f1a58..5b391a979e419d0e846609c0c6284dcc88327725 100644 --- a/src/main/java/com/application/DB/Constants.java +++ b/src/main/java/com/application/DB/Constants.java @@ -25,11 +25,14 @@ public final class Constants { public static String MOISTURE_GOAL = ""; // Number of wanted drying periods - public static int NUMBER_OF_PERIODS = 1; + public static int NUMBER_OF_PERIODS = 3; // Database ID/name public static final String PROJECT_ID = "sf-drying-optimization"; + public static final int LOCATION_ID = 124; + public static final String MAN_MOISTURE_TABLE = "int_dk_manMoisture"; + // Location Valasen(124) // Project settings diff --git a/src/main/java/com/application/DB/DB.java b/src/main/java/com/application/DB/DB.java index 6b14b5690907b645ed3717a4f11d01a0b26a8e31..b58ff5ffd32ccce7bcbdbd7b4d431ed5dedde37c 100644 --- a/src/main/java/com/application/DB/DB.java +++ b/src/main/java/com/application/DB/DB.java @@ -580,4 +580,16 @@ public class DB { // Returns a treemap that sorts the dates incrementally return new TreeMap<>(sortedFinalResults); } + + + public static void pushManMoisture(String moisture) throws Exception { + // Sqlstatement + final String sqlStatement = + "INSERT INTO " + PROJECT_ID + "." + LOCATION_ID + "." + MAN_MOISTURE_TABLE + "(moisture) " + + "VALUES("+moisture+") "; + + System.out.println(sqlStatement); + + HelpingFunctions.createQueryJob(sqlStatement); + } } diff --git a/src/main/java/com/application/GUI/LineChartFunctionality.java b/src/main/java/com/application/GUI/LineChartFunctionality.java index 0bc011d3ceabfde64ec794211be23dc89270df61..e3742baf9ad7d59c1ccfce344ab231358ba2e3a9 100644 --- a/src/main/java/com/application/GUI/LineChartFunctionality.java +++ b/src/main/java/com/application/GUI/LineChartFunctionality.java @@ -186,9 +186,9 @@ public class LineChartFunctionality { } } - PythonInterpreter pythonInterpreter = new PythonInterpreter(); - //pythonInterpreter - + //PythonInterpreter.initialize(System.getProperties(),System.getProperties(), data); + //pythonInterpreter.execfile(LineChartFunctionality.class.getResource("/com.application/DataProcessing/NonlinearRegression.py").getFile()); + //pythonInterpreter.execfile(); XYChart.Series<String, Number> regressionSeries = new XYChart.Series<String, Number>(); diff --git a/src/main/java/com/application/GUI/OutputPopUpWindow.java b/src/main/java/com/application/GUI/OutputPopUpWindow.java index 7b651c7d1c8a567d32b66e0d3a6f61f55b6f6d63..8b9b7f49d1c7c5eeefcbbea77c7acf674f511c8e 100644 --- a/src/main/java/com/application/GUI/OutputPopUpWindow.java +++ b/src/main/java/com/application/GUI/OutputPopUpWindow.java @@ -1,5 +1,6 @@ package com.application.GUI; +import com.application.DB.DB; import javafx.geometry.Pos; import javafx.scene.Scene; import javafx.scene.control.Button; @@ -38,6 +39,13 @@ public class OutputPopUpWindow { Button finishButton = new Button("Finish"); finishButton.setId("inputButtonStart"); finishButton.setAlignment(Pos.BOTTOM_CENTER); + finishButton.setOnAction(e -> { + try { + DB.pushManMoisture(moistureCheckTextField.getCharacters().toString()); + } catch (Exception ex) { + ex.printStackTrace(); + } + }); VBox layout = new VBox(10); diff --git a/target/classes/com/application/DB/Constants.class b/target/classes/com/application/DB/Constants.class index b1c92708a53d5d9c8d893548aa6254494e72c3a3..f5909ab5d7a461cab06b56f7142d8e1181ed9157 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 dc3e7ef07457159c4cffad723fd086a463c4bef4..949b39818e8ff94d7dea7a70ca8b4731d1b0d7cc 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/LineChartFunctionality.class b/target/classes/com/application/GUI/LineChartFunctionality.class index 5a32389b113ac7d683fcb180754a030be228f01d..a0b277d214b91d1ddcbce90c8f0b144e1365c1b8 100644 Binary files a/target/classes/com/application/GUI/LineChartFunctionality.class and b/target/classes/com/application/GUI/LineChartFunctionality.class differ