Skip to content
Snippets Groups Projects
Commit 7decdece authored by Eilert Tunheim's avatar Eilert Tunheim
Browse files

Fixed isFinished boolean variable

parent 53ef870d
No related branches found
No related tags found
No related merge requests found
......@@ -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);
......
......@@ -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");
......
......@@ -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();
}
......
No preview for this file type
No preview for this file type
No preview for this file type
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment