Merge pull request #42 from AmirWayne/Finishing

Post Submission
AmirMGhanem · Oct 17, 2020 · 44cd33a · 44cd33a
2 parents 8407837 + e914baf
commit 44cd33a
Show file tree

Hide file tree

Showing 60 changed files with 27 additions and 796 deletions.
diff --git a/src/main/java/Controller/AddMedicineToPatient.java b/src/main/java/Controller/AddMedicineToPatient.java
@@ -6,28 +6,20 @@
 import Model.Medicine;
 import Model.Patient;
 import Model.patient_medicine;
-import Util.FxmlLoader;
 import Util.MessageAlerter;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
 import javafx.scene.Node;
-import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.Spinner;
-import javafx.scene.layout.Pane;
-import javafx.stage.Stage;
-import javafx.stage.StageStyle;
-
 import java.io.IOException;
-import java.lang.reflect.Array;
 import java.net.URL;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.ResourceBundle;
 
-import static javafx.fxml.FXMLLoader.load;
 
 public class AddMedicineToPatient implements Initializable {
     MessageAlerter messageAlerter = new MessageAlerter();
@@ -54,8 +46,6 @@ public class AddMedicineToPatient implements Initializable {
 
     @FXML
     void onClickBtnAdd(ActionEvent event) throws IOException, SQLException {
-
-
         FXMLLoader loader = new FXMLLoader();
         loader.load(getClass().getResource("/FXML/MedicinePane.fxml").openStream());
         MedicinePaneController medicinePaneController = loader.getController();

diff --git a/src/main/java/Controller/AddPatientController.java b/src/main/java/Controller/AddPatientController.java
@@ -19,11 +19,9 @@
 import javafx.scene.control.DatePicker;
 import javafx.scene.control.TextField;
 import javafx.scene.layout.Pane;
-
 import java.io.IOException;
 import java.net.URL;
 import java.sql.SQLException;
-import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.ResourceBundle;

diff --git a/src/main/java/Controller/ConnectionController.java b/src/main/java/Controller/ConnectionController.java
diff --git a/src/main/java/Controller/DatabaseInformationController.java b/src/main/java/Controller/DatabaseInformationController.java
@@ -12,13 +12,8 @@
 import javafx.scene.control.TextField;
 import javafx.scene.layout.StackPane;
 import javafx.stage.DirectoryChooser;
-
-
 import java.io.*;
 import java.net.URL;
-import java.nio.channels.FileChannel;
-import java.sql.Connection;
-import java.sql.SQLException;
 import java.util.ResourceBundle;
 
 public class DatabaseInformationController implements Initializable {
@@ -47,12 +42,13 @@ public class DatabaseInformationController implements Initializable {
 
     @FXML
     void onClickBtnSave(ActionEvent event) {
-        //String url = "jdbc:mysql://localhost:" + TextfieldDBport.getText() + "/" + TextfieldName.getText();
-        //String user = TextfieldDBuser.getText();
-        //String pass = TextfieldPassword.getText();
-        //DatabaseConnector.setUser(user);
-        //DatabaseConnector.setPass(pass);
-        //DatabaseConnector.setUrl(url);
+        String url = "jdbc:mysql://localhost:" + TextfieldDBport.getText() + "/" + TextfieldName.getText();
+        String user = TextfieldDBuser.getText();
+        String pass = TextfieldPassword.getText();
+        DatabaseConnector.setUser(user);
+        DatabaseConnector.setPass(pass);
+        DatabaseConnector.setUrl(url);
+        System.out.println(DatabaseConnector.getUrl());
     }
 
     @FXML

diff --git a/src/main/java/Controller/MainController.java b/src/main/java/Controller/MainController.java
@@ -1,7 +1,4 @@
 package Controller;
-
-import DBH.patientDAO;
-import DBH.therapistDAO;
 import DBH.userInfoDAO;
 import Model.UserInfo;
 import Util.*;
@@ -12,8 +9,6 @@
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
 import javafx.concurrent.Task;
 import javafx.event.Event;
 import javafx.event.EventHandler;
@@ -43,8 +38,6 @@
 import java.util.Calendar;
 import java.util.ResourceBundle;
 
-
-
 public class MainController implements Initializable {
     @FXML
     private Button BtnLogIn;
@@ -147,7 +140,6 @@ protected Integer call() throws Exception {
     @FXML
     void OnClickLogin(ActionEvent event) throws InterruptedException, IOException, SQLException, ClassNotFoundException {
 
-
         for (UserInfo ui : users) {
             if (ui.getUsername().equals(TextFieldUsername.getText()) && ui.getPassword().equals(TextFieldPassword.getText())) {
                 ProgressBarLoading.setVisible(true);

diff --git a/src/main/java/Controller/MainPaneController.java b/src/main/java/Controller/MainPaneController.java
@@ -176,7 +176,7 @@ public void onSelectPatient(ActionEvent event) throws SQLException {
     }
 
 
-    public void BarChartInitilizer() {
+        public void BarChartInitilizer() {
         patientwaterdata = new BarChart.Data("Today", 0);
         patiermealdata = new BarChart.Data("Today", 0);
         patienttoiletdata = new BarChart.Data("Today", 0);
@@ -202,12 +202,7 @@ public void BarChartInitilizer() {
         BarChartNotifications.getData().addAll(chart.getData());
     }
 
-    public static void TerminateThread() {
-        if (t.isAlive()) {
-            t.stop();
-            System.out.println(t.getName() + "- terminated!!");
-        }
-    }
+
 
     public static void LaunchThread() {
         t.start();
@@ -233,8 +228,6 @@ public void TableInit() throws SQLException {
 
 
     public void manualRefreshingTable() throws SQLException {
-
-
         notificationArrayList = nDAO.selectAll();
         Collections.reverse(notificationArrayList);
         notificationObservable.setAll(notificationArrayList);
@@ -246,10 +239,7 @@ public void manualRefreshingTable() throws SQLException {
         int mealcount = 0;
         int toiletcount = 0;
         int emergencycount = 0;
-
-
         for (Notification n : notificationArrayList) {
-
             if (n.getRequest().getType().equals("Critical Urgency"))
                 highcount++;
             if (n.getRequest().getType().equals("Low Urgency"))
@@ -264,8 +254,6 @@ public void manualRefreshingTable() throws SQLException {
                 toiletcount++;
             if (n.getRequest().returnReq().equals("YOU"))
                 emergencycount++;
-
-
         }
 
 

diff --git a/src/main/java/Controller/MedicineCRUDController.java b/src/main/java/Controller/MedicineCRUDController.java
@@ -16,7 +16,6 @@
 import javafx.scene.control.TextArea;
 import javafx.scene.control.TextField;
 import javafx.scene.layout.Pane;
-
 import java.io.IOException;
 import java.net.URL;
 import java.sql.SQLException;

diff --git a/src/main/java/Controller/PatientPaneController.java b/src/main/java/Controller/PatientPaneController.java
@@ -5,22 +5,14 @@
 import Model.*;
 
 import Util.FilesHandler;
-
-import Util.FooterPageEvent;
 import Util.MessageAlerter;
 import Util.PdfExporter;
 import com.itextpdf.text.*;
-import com.itextpdf.text.Font;
-import com.itextpdf.text.Image;
-import com.itextpdf.text.pdf.PdfWriter;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-import javafx.embed.swing.SwingFXUtils;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
-import javafx.scene.Group;
-import javafx.scene.Scene;
 import javafx.scene.chart.BarChart;
 import javafx.scene.chart.CategoryAxis;
 import javafx.scene.chart.NumberAxis;
@@ -29,22 +21,13 @@
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.control.cell.PropertyValueFactory;
-import javafx.scene.image.WritableImage;
 import javafx.scene.layout.Pane;
-
-import javax.imageio.ImageIO;
-import java.awt.*;
-import java.awt.Robot;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.URL;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.ResourceBundle;
-import java.util.concurrent.TimeUnit;
 
 public class PatientPaneController implements Initializable, Util.JavafxPaneHandler {
 
@@ -142,22 +125,18 @@ void onSelectPatient(ActionEvent event) throws SQLException {
 
 
     @FXML
-    void OnClickPatientXML(ActionEvent event) throws IOException, SQLException, InterruptedException, DocumentException {
+    void OnClickPatientPDF(ActionEvent event) throws IOException, SQLException, InterruptedException, DocumentException {
         if (ChoicePatient.getValue().equals("ALL")) {
             pdfExporter.Snapshotter(PatientBarChart.getLayoutX(), PatientBarChart.getLayoutY(), PatientBarChart.getWidth(), PatientBarChart.getHeight());
             ma.MessageWithoutHeader("Exported", "Patients Exported To PDF");
             pdfExporter.SavePatientPDF();
             //----------------------------------------PDF CREATE ↓↓↓↓↓------------------------------
         } else
-            System.out.println("Barchart Not Screenshotted , please choose all before exporting");
-    }
-
-
-    @FXML
-    void OnClickPrint(ActionEvent event) {
+            ma.MessageWithoutHeader("Barchart Not Screenshotted", "please choose all before exporting");
 
     }
 
+
     @FXML
     void OnClickRemovePatient(ActionEvent event) throws SQLException {
         String id = PatientTable.getSelectionModel().getSelectedItem().getID();
@@ -235,13 +214,6 @@ private void TableInit() throws SQLException {
         JavafxTableFill();
         PatientTable.setItems(Patients);
 
-
-        /*
-        //Table Init
-
-        JavafxTableFill();
-        NurseTable.setItems(Therapist);
-         */
     }
 
     //Overrided by implementing JavafxPaneHandler