From 198a811e7934712e40611a04150ae95c4dd7d450 Mon Sep 17 00:00:00 2001
From: Eilert Tunheim <emtunhei@stud.ntnu.no>
Date: Mon, 2 May 2022 10:12:46 +0200
Subject: [PATCH] modified the graphing of the live data, could still be a bug

---
 .../java/com/application/DB/Constants.java    |   5 ++++-
 src/main/java/com/application/DB/DB.java      |   6 +++---
 .../GUI/LineChartFunctionality.java           |  14 ++++++--------
 .../application/GUI/OutputPopUpWindow.java    |  16 ++++++++++++++--
 .../com/application/DB/Constants.class        | Bin 6568 -> 6612 bytes
 target/classes/com/application/DB/DB.class    | Bin 15444 -> 15871 bytes
 .../application/GUI/InputPopUpWindow.class    | Bin 8009 -> 8009 bytes
 .../GUI/LineChartFunctionality.class          | Bin 11202 -> 11558 bytes
 .../application/GUI/OutputPopUpWindow.class   | Bin 3757 -> 4336 bytes
 9 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/application/DB/Constants.java b/src/main/java/com/application/DB/Constants.java
index 358727e..ed2b28a 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 c04f47f..3b0936d 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 6803ed2..c5b4225 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 1e60269..94d7d93 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
GIT binary patch
delta 2603
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
W3;_&v3~3DW8FCpI8J2^K#}xo#Xq9IG

delta 2482
zcmca&yu!Ht)W2Q(7#J8#82)iF*f1<-XIR0-zyzXKaxqvktm0x|VOR|kSp#CN1rh5w
z7}kSCHh?%AIT$v9=*=7qTR0fDaxiS;VA#&Vu!DnPCkMkW4u;)a40{;%ax$<m?BihA
z&%tnjgW(_t!yyia!yvIET%HUp3`ao*90L)@IT%iGFr4IIIK{zm8l>P12g6wqeU5|S
zJQu?ShKpPbml!UCSXV&8S2-B2f#~a;3@j7(sS2|*JYZ*d$i?u8;V~D31;Z0|hNqKR
z8QUf=ViaLw^qjnfF^=)sWML*P#^;mmm|7TLY(C8Nf{F3v<~6KyS()n?>L>efn_9nO
zc+JDm!_daV@P^?n55sH_YXU<XBLinxVoq*qNoH~}55qf#_dE=fL88pw<rzE-GeAs*
z$qRX8C*S1G<o>|J@QUFh4?_w=>SSLYd!cNGR33)8Ad}{Sh=mMoljre7iIg&=GBR)m
zr6%TtCFYc-@-S2~q)z7HmGJn)!|<8m3p>MC9)@oW-+35*F#P0Uuw}4gWMJT7uxGI2
zVQ>Hujtovb49*~y3y5$95pE#Doxy{L!IQybav`q{_b(oX-wc0v80r}QZeGEg!&Gm>
zz`&r-APF*%fq{V&WFVM!V6X$zjtov<+8N4sfzqx}+6_v(GkAd2d4g$41}_G021W)S
z1_lNu244nA27d-SI6r_vk|B`61H`WfD+pqcWC%u55W*nI5Q@YXV31@8L*h#@NHT;Y
z@ue9g86uGQvJ8?8kx2X~21$l!h=p+bV!-nC5Et?@NHWBN1t5Hog>guHK?X^NcqG0M
zgCs)&5?_Qtk|7a^FUlavkc4DmGJ_;2{uvk<(!dT#XOLvb0I9Es1`)_dnIHiuALOGf
zBtFPT*$k;D2IL@Fkjo&+kcXsRi9wPfABnHbAjwdG#0Pn(kim|j9u`L+9~B`fP+^c{
zC`RI|GDtF%AXy0VQ7M{(%8=BnGe|O&Bk@5VszBm{JXFb$T94wRDkKHf43Z2rNEX&I
z@G~$m)G>f`G%zqQ7&9<3FfuSOuxf2*VB81})kX#e1}+9B1_lN`1{MYZh9(A376B__
zXl7^ur_WY~HU=gJkO8?2%nXc^#f0^ILHdLkSQr=>N*Fj8N*P2M${3Ux%HjGs7-SjR
z89Epk7&@UQLPWY47@+al&A<gJCO{@no+xaMWMVA?2SXi$1VcT8215gqiAoH;XeNS0
z`rsz^GjK9YfVg$Cq=+t(i7gBq46O`;3~dZj4DCoJieQ)s5}61$aS{U;sFVV`QB_=P
z@?H_8dXUfM7}yyY7`hoa7<w248G0F{82T8L8TuJ?7$!1UGE73U!I)tRnwvo)$Tn~?
zOl6n`vVnntK?WQ>3=Axr7$i0@FfcGOfNWy}i%x@t8xO;D1};!}3DPq8kGRC-CQ-RS
zkTNj_Rt5%!SqvNuvl#>#<}gSx%w<q!Sb*dhS%#Ttjsc0FI%XEcF_S-vipqjag;>4>
zVma9E+0Y=KC@enNN=yYQm{&1yFsx>fU|7ST!LSy|UL}S(X!e3cP$O<G)YR2t$Pu@Z
zfrDWagCN6Z1}TOuNG5`!2{mznM38;L#V`+QqN=zLQl#x*;9%IvAjq(bL5g8FgEGS&
z1|5cd43-T0kxVycn2+XOkO;EroD2&f;e;A#YUq)67!q!fNLvVX&>wL#u!A5GcASBO
z;RJ&q!$}4yhEoj63}=uWBFnG{%^@HWREI3a<`4~Zhg^U-gkd@Z2g4GEdI1JTP=;pY
zVqjwcfqjz?N(eJ=V$hv@O+vn2fNL{@`ECY_NY=d!mXXXHI~Z7lBUuF4K=cj<tL+Td
zn;9e!@&d*niAWX!3lI%cAcv$t5F`=FA|M2!VG7ic6bOSPB3T5$bOcO=2B?gJ<N+%N
zJ_ZH`VFo@1F$Q4<aRx~SDF#^vSq3ErIR<qGc?KN@1qMR~Wd>6QH3lmNSB5ACUxsRi
RWQI8mSqzK}OTlH`G617+c&PvY

diff --git a/target/classes/com/application/DB/DB.class b/target/classes/com/application/DB/DB.class
index bf7c605220bd409ba991d7163a096e315aceca47..907ca7cd83870015b2dfa3d10e234e29292ea61b 100644
GIT binary patch
delta 7087
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
Clu1AU

delta 6537
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

diff --git a/target/classes/com/application/GUI/InputPopUpWindow.class b/target/classes/com/application/GUI/InputPopUpWindow.class
index 7dee364a79ca5923136c8f23d251a0d675b5f7fd..22435a873bdd72d725141bb68ad28bf4d1bb7f2d 100644
GIT binary patch
delta 95
zcmX?UchYV{vZQQ2<2uFy#!rkzjK3I5n7A2BnG_hynA8}{nY0)yHaAF4XA%`=xWg#I
z@Q_i0;R&M{!!t&4hS!YJlXYZ%i}En&F!D0!GYT*mG4e4OGx9T-GYW3Dk>zCq0K|3`
AZvX%Q

delta 95
zcmX?UchYV{vZQP&<2uGN#!rkDjK3JGn7A3MnG_gnnA8|+nY0+|HaAF4XA+fUxWg#L
z@Q_iC;R&M*!!t%%hS!XWlXYZ%iwZI5FbXs1Gm0@7F^Vu4Gm0{pGm3Avk>zCq0NPF!
A=Kufz

diff --git a/target/classes/com/application/GUI/LineChartFunctionality.class b/target/classes/com/application/GUI/LineChartFunctionality.class
index 319d3a1d0580e0b3b0197b741a90a29fc96b1028..f70466837b2fd6c3753ca6494fe6f688c79c214e 100644
GIT binary patch
delta 5768
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

delta 5627
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

diff --git a/target/classes/com/application/GUI/OutputPopUpWindow.class b/target/classes/com/application/GUI/OutputPopUpWindow.class
index 5daf432fccb91d11d412a7bd30eb3075dc126f34..3ce6d7422da8fe27aa5bfd05cc8d07d7c6ca9408 100644
GIT binary patch
delta 1977
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
UU}C6YU}mUgsAH&yvYHv{0nnJVy#N3J

delta 1426
zcmeyMxK_6Q)W2Q(7#J8#7;bYh*fPYiGsJT-Ffqh&G9)l0f>=o$49Ormg`FXli-Ch7
zje{W_L}zd^WHMxdSlJv5IUEeRAbuV@Lp~RSAVVC8$N&-9><k4Q424__q9C0`AR4T*
z7{tovV5lz<VqjpX0`aQZ8EV)ZR2aa3i$R{D7DQx&h&pzLdTxdWhDLUVCN_tr17Ia=
z4)qRT1{Z@mLo<kIVP|ONU})oFXlLl)V(4V(0_o`nxxNQP^l~!vG4z9o2_UCU<Yt(}
zATpVYVG6@kc7|zO3|0)&*%@ZAGtAtq!+4F6(O~jhc9qHM%sGtHCU0ieV76nhpL~y5
zTxAvy!)%5*JPdOg<}otx`Q~R9my{NzDmZ7PCTH_7%x74@$RIV@o=J4F9t*pI9f-@3
znO9I+5|UrQ!?2KH0XxGY9)`sXOL!QTGAx@M%A&}&oM8zggWP0$Cb`M8SnRA;fVgaK
znR%JT8H@}9PWkyI#U(|F1-_{z8Tl#2{A>&>1sGQGvoWj|U|7S$u$EyR55szf4U7yD
zlh-gwxbiUAF>K^v*u=1zkwGvku`DsILccgUH7`})FFz%fonZ?P!&ZiEj0{33a={=K
zAg$YZ7<Mpho?Oi8AGMQ*VHd-0c7{DX40{>&@i6RXIKabjkl_#y!(j${c7`K73`ZG`
z@h}_*5hoZ<vNN3GVK~jOkDcKR55rlI$Av*w=;tKnrR%#^B&QaXWaj7bFq~ts-|WQ}
z!Kiee;Q}LrxP}i%Ra%99YFTPtiM}g{wAKvcVz6PjIQa<sjLnH04UCg7aLMcOIEMxW
zx%!2~yEulpGBOB(HA0LJE-A{)OSfiZ;0zA&4~P%(^mU!g$6YJSUr>~pR}x&3n4BF_
zl$e~#&Txr`;WEQ@9)=Kx(8+hXO&M=a7Up@$cx&=s9-kN+23v57VrF1uuw$@iU}ONL
zFntC_21W)323D=@42&BY7#Nrs92poG*uaAP3{DIT3_M^qD}ytG3j+fKCxa_YGviGL
zb_Nax21droOL>dxcQc4a3dw9|5VvBLWEGOw#vm!lx`{z*8-uhYtL`oaSq6q}405{}
z<Re8G6t*)cS+Pm7ZDJ7E#-J?8wv9oBV=sehB(rvKB#TaPB&%+4B%35la3s4VYw%76
zH717e-3;oHl58Rj8X^o@+ZlAM*d^JwG3W~E3F&WRFxbXmxU-(Yh>0Ow3nXl;wT;09
z;h8)JX$A%cVFnHc5e9w+Q3g>42?luvNd{F0DFz(|Sq3u(IR+aBc?M?&1qN>hMTS5I
zC58wFRfc2+HHIt(b%r7a4Tf3<O@<Z*EruQjZHDO#rVNW2%otWPm@`~puw;11V8!r_
zq28L|4}%RO1A{F%)Pfi|7&sVyGPp6gGcYj7GdyDOVDMyMWH4hm&EUo0$-u<m&9IHZ
zo56>HnIV~B9)mA~9|H?REkg@~KZ73wE5l-jIEDa*Kn6C3hYSh~K@7nR>;hb%h=oR6
z69XdyGXn#I^d<(=%?xH*+v*w2cQRNoGVEZmT+YDZtFw*4dLuaIgcw8_tQeTV@hZi@
z#=yX!%fQB<#~{RD$RNs~&mhKNz#zq71a`Fo12cmd0}DeKLpTEy$aJs^LFq=CA%Y>2
zfsrAKfq{XYfhm-oA)1AOnIQ(8WMUbvF~~D8a4|44Tw%DuaFs!lp%j{O${3g#${8vc
FDgmFM9_j!9

-- 
GitLab