diff --git a/src/main/java/com/application/DB/Constants.java b/src/main/java/com/application/DB/Constants.java
index f579213647b1b32a8ae43b917092ed061f096dc4..4c7abb95039f8e54fa497bea9af88469015d1ba1 100644
--- a/src/main/java/com/application/DB/Constants.java
+++ b/src/main/java/com/application/DB/Constants.java
@@ -29,6 +29,7 @@ public final class Constants {
public static final String PROJECT_ID = "sf-drying-optimization";
+ /*
// Location Valasen(124)
// Project settings
public static final int LOCATION_ID = 124;
@@ -50,10 +51,12 @@ public final class Constants {
public static final int VALUE_ID = 51;
public static final int LIMIT = 1000;
+ */
+
+
-/*
// Location Arjang(174)
// Project settings
public static final int LOCATION_ID = 174;
@@ -66,7 +69,8 @@ public final class Constants {
public static final String START_DRYING_NAME = "DryingStarted";
public static final String STOP_DRYING_NAME = "DryingCompleted";
public static final String KILIN_NAME = "KilinId";
- public static int KILIN_ID = 17;
+ //public static int KILIN_ID = 18;
+ public static int KILIN_ID = 18133;
// Swappconsensordata
public static final String KWH_NAME = "RealValue";
@@ -75,8 +79,6 @@ public final class Constants {
public static final int VALUE_ID = 19;
public static final int LIMIT = 1000;
- */
-
diff --git a/src/main/java/com/application/DB/DB.java b/src/main/java/com/application/DB/DB.java
index 7a59c47830ed487538df2856789e32b00ec9fc89..0392a00b38628eaff02cfa5b8f7a854020258913 100644
--- a/src/main/java/com/application/DB/DB.java
+++ b/src/main/java/com/application/DB/DB.java
@@ -6,10 +6,7 @@ import com.google.cloud.bigquery.*;
import java.io.File;
import java.io.FileInputStream;
-import java.sql.Timestamp;
import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
import java.util.*;
@@ -279,6 +276,7 @@ public class DB {
extraInputParameter += "AND CalculatedStart BETWEEN \"1990-01-01 00:00:00\" AND \"" + TODAYS_DATE + "\" ";
}
if(LOCATION_ID == 174){
+ // KILIN_ID starts at 0 not 1 in the database.
KILIN_ID -= 1;
}
diff --git a/src/main/java/com/application/GUI/Input.java b/src/main/java/com/application/GUI/Input.java
new file mode 100644
index 0000000000000000000000000000000000000000..5f948f1745dd6ed893d8aa28eecba15979332ecc
--- /dev/null
+++ b/src/main/java/com/application/GUI/Input.java
@@ -0,0 +1,52 @@
+package com.application.GUI;
+
+import javafx.geometry.Pos;
+import javafx.scene.*;
+import javafx.scene.control.*;
+import javafx.scene.layout.*;
+import javafx.stage.*;
+
+
+/**
+ * This class handles the popup input window
+ */
+public class Input {
+
+ public static void display()
+ {
+ Stage popupwindow=new Stage();
+
+ popupwindow.initModality(Modality.APPLICATION_MODAL);
+ popupwindow.setTitle("Input Parameters");
+
+
+ Label inputLabel= new Label("Input");
+ inputLabel.setAlignment(Pos.TOP_CENTER);
+
+
+ Button close= new Button("Close this pop up window");
+ close.setAlignment(Pos.BOTTOM_CENTER);
+
+ close.setOnAction(e -> popupwindow.close());
+
+
+
+ BorderPane layout= new BorderPane();
+ //layout.set(inputLabel);
+ //layout.setCenter();
+ //layout.setBottom(close);
+
+
+
+ layout.getChildren().addAll(inputLabel, close);
+
+
+ Scene scene1= new Scene(layout, 300, 250);
+
+ popupwindow.setScene(scene1);
+
+ popupwindow.showAndWait();
+
+ }
+
+}
diff --git a/src/main/java/com/application/Main.java b/src/main/java/com/application/Main.java
index 38ca17b63fdd5e2f0899c012690ddeb37180f705..73d3dfc5d5a202bb73c4bbe5e1fd759a1d3e6881 100644
--- a/src/main/java/com/application/Main.java
+++ b/src/main/java/com/application/Main.java
@@ -1,9 +1,9 @@
package com.application;
import com.application.DB.DB;
-
+import com.application.GUI.Input;
import com.application.GUI.RingProgressIndicator;
-import com.sun.corba.se.spi.orbutil.threadpool.Work;
+
import javafx.application.Application;
import javafx.application.Platform;
import javafx.scene.chart.LineChart;
@@ -133,6 +133,7 @@ public class Main extends Application {
Menu menuEdit = new Menu("Edit");
Menu menuHelp = new Menu("Help");
+
// Adding the menus to the menubar
menuBar.getMenus().add(menuFile);
menuBar.getMenus().add(menuEdit);
@@ -155,6 +156,7 @@ public class Main extends Application {
TextField treeSpeciesText = new TextField();
treeSpeciesText.setId("sideBarLabelText");
treeSpeciesText.setPromptText("Bjørk");
+ treeSpeciesText.getText();
Label dimensionsLabel = new Label("Width x Height");
dimensionsLabel.setId("sideBarLabelText");
@@ -176,6 +178,7 @@ public class Main extends Application {
Button finish = new Button("Finish");
finish.setId("sideBarButtonFinish");
+ finish.setOnAction(e -> Input.display());
// Creating the circular progressbar
RingProgressIndicator ringProgressIndicator = new RingProgressIndicator();
diff --git a/target/classes/com/application/DB/Constants.class b/target/classes/com/application/DB/Constants.class
index ee6bb5b8f6913b4ea14d678801b18091462f88b2..fb8b19188b18e5a1db449153c03e34c3e6da09c9 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 6b2a20d0bbb3a84153fc114c22d49e9754330191..b64f31c04a61860d9b2e4ac3a60b4f114f3d1935 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/Main$1WorkerThread.class b/target/classes/com/application/Main$1WorkerThread.class
index fc1cb79295b938a5ba6bc65d216611f6e1d0be64..9abb12eca1a252de3954b0675b49e8a0237e772b 100644
Binary files a/target/classes/com/application/Main$1WorkerThread.class and b/target/classes/com/application/Main$1WorkerThread.class differ
diff --git a/target/classes/com/application/Main.class b/target/classes/com/application/Main.class
index 23a916a35e825fce2f8a9fed85331c992bbed12d..0d5b4b05146df4bdf444faab24858fda26ff690c 100644
Binary files a/target/classes/com/application/Main.class and b/target/classes/com/application/Main.class differ