diff --git a/src/main/java/com/application/GUI/LineChartFunctionality.java b/src/main/java/com/application/GUI/LineChartFunctionality.java index 60551dbe3830942e65a0fb56b388f3eec12523e9..c217acddfacbb8995ccae982a9d520961babb2ae 100644 --- a/src/main/java/com/application/GUI/LineChartFunctionality.java +++ b/src/main/java/com/application/GUI/LineChartFunctionality.java @@ -148,7 +148,7 @@ public class LineChartFunctionality { //System.out.println(String.format("Mean: %f", stats.getMean())); double lower = stats.getMean() - ci; double upper = stats.getMean() + ci; - System.out.println(String.format("Confidence Interval "+ Settings.CONFIDENCE_INTERVAL*100+"%%: %f, %f", lower, upper)); + //System.out.println(String.format("Confidence Interval "+ Settings.CONFIDENCE_INTERVAL*100+"%%: %f, %f", lower, upper)); // Deletes entries if they are out of bounds with the confidence interval entry.getValue().removeIf(value -> Double.compare(value, lower) < 0 || Double.compare(value, upper) > 0); diff --git a/src/main/java/com/application/GUI/PopUpWindows/LoginPopup.java b/src/main/java/com/application/GUI/PopUpWindows/LoginPopup.java index c9739a3f0918c62b84029f4b34760b2c792f5d57..878fba65da35b5725f2cea85d8767e1b059cd2c3 100644 --- a/src/main/java/com/application/GUI/PopUpWindows/LoginPopup.java +++ b/src/main/java/com/application/GUI/PopUpWindows/LoginPopup.java @@ -1,6 +1,5 @@ package com.application.GUI.PopUpWindows; -import com.application.DB.Account_handler; import javafx.geometry.Pos; import javafx.scene.Scene; import javafx.scene.control.*; @@ -39,6 +38,10 @@ public class LoginPopup { try { getAccountInformation(userNameTextField.getText(), hashPassword(getPasswordTextField().getText())); + if(getLogin().getText().equals("Admin")) { + LoginPopup.adminPopup(); + window.close(); + } } catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/java/com/application/Main.java b/src/main/java/com/application/Main.java index 180ed2106bb4e519bfe072fed9104906dec915df..d6b924dea24545310c2ad6ce08d9bb7d7a38dc0e 100644 --- a/src/main/java/com/application/Main.java +++ b/src/main/java/com/application/Main.java @@ -6,6 +6,7 @@ import com.application.GUI.Panes.LogoBar; import com.application.GUI.Panes.SideBar; import com.application.GUI.LineChartFunctionality; +import com.application.GUI.PopUpWindows.LoginPopup; import javafx.application.Application; import javafx.application.Platform; import javafx.scene.chart.LineChart; @@ -137,6 +138,7 @@ public class Main extends Application { primaryStage.show(); // Displays the input parameters popup window + LoginPopup.login(); InputPopup.display(); } diff --git a/target/classes/com/application/GUI/PopUpWindows/LoginPopup.class b/target/classes/com/application/GUI/PopUpWindows/LoginPopup.class index 698cb86ef53e3d533faa5e46e0a6a7d16ec3f077..d48a380678cdbcd7de915ccbd1bfb5ac516a2e67 100644 Binary files a/target/classes/com/application/GUI/PopUpWindows/LoginPopup.class and b/target/classes/com/application/GUI/PopUpWindows/LoginPopup.class differ diff --git a/target/classes/com/application/Main.class b/target/classes/com/application/Main.class index 244b717bc99e93eb858f4e4647e06c58e2fa7114..aa6c0575581b03ac72e0f15042a91c42bfd30150 100644 Binary files a/target/classes/com/application/Main.class and b/target/classes/com/application/Main.class differ