From e914baf3a6b6c992c47f53041bffe6c7531d59d2 Mon Sep 17 00:00:00 2001
From: AmirWayne <Amirwayne95@gmail.com>
Date: Sat, 17 Oct 2020 15:36:23 +0300
Subject: [PATCH] Post Submission

---
 .../java/Controller/AddMedicineToPatient.java |  10 -
 .../java/Controller/AddPatientController.java |   2 -
 .../java/Controller/ConnectionController.java |  66 ------
 .../DatabaseInformationController.java        |  18 +-
 src/main/java/Controller/MainController.java  |   8 -
 .../java/Controller/MainPaneController.java   |  16 +-
 .../Controller/MedicineCRUDController.java    |   1 -
 .../Controller/PatientPaneController.java     |  34 +--
 .../java/Controller/ReportsController.java    | 215 ------------------
 .../java/Controller/SettingsController.java   |   3 +-
 .../java/Controller/SplashController.java     |   2 +-
 .../Controller/TherapistPaneController.java   |   4 -
 src/main/java/DBH/AllergyDAO.java             |  28 +--
 src/main/java/DBH/mealDAO.java                |  31 +--
 src/main/java/Model/Address.java              |  12 +-
 src/main/java/Model/Meal.java                 |   2 +-
 src/main/java/Model/Notification.java         |   3 -
 src/main/java/Model/Report.java               |  41 ----
 src/main/java/Util/CssFile.java               |   2 +-
 src/main/java/Util/MessageAlerter.java        |   9 -
 src/main/java/Util/PdfExporter.java           |   3 +-
 src/main/java/Util/TableExporter.java         |   9 -
 src/main/resources/FXML/ConnectionPane.fxml   |  41 ----
 .../resources/FXML/PatientManagementPane.fxml |   3 +-
 src/main/resources/FXML/Reports.fxml          | 108 ---------
 src/main/resources/Files/PDF/TableExport.pdf  | Bin 28306 -> 28306 bytes
 .../resources/Files/PDF/TherapistsPDF.pdf     | Bin 588823 -> 588823 bytes
 .../Controller/AddMedicineToPatient.class     | Bin 4402 -> 4402 bytes
 .../Controller/AddPatientController.class     | Bin 8274 -> 8274 bytes
 .../Controller/ConnectionController.class     | Bin 2735 -> 0 bytes
 .../DatabaseInformationController.class       | Bin 3708 -> 4153 bytes
 .../Controller/MainController$1$1.class       | Bin 1121 -> 1121 bytes
 .../classes/Controller/MainController$1.class | Bin 763 -> 763 bytes
 .../classes/Controller/MainController$2.class | Bin 1832 -> 1832 bytes
 .../classes/Controller/MainController$3.class | Bin 1200 -> 1200 bytes
 .../classes/Controller/MainController.class   | Bin 16396 -> 16396 bytes
 .../Controller/MainPaneController$1.class     | Bin 1462 -> 1462 bytes
 .../Controller/MainPaneController$2.class     | Bin 1697 -> 1697 bytes
 .../Controller/MainPaneController$3.class     | Bin 1553 -> 1553 bytes
 .../Controller/MainPaneController.class       | Bin 16285 -> 16106 bytes
 .../Controller/MedicineCRUDController.class   | Bin 9868 -> 9868 bytes
 .../Controller/PatientPaneController.class    | Bin 11897 -> 11808 bytes
 .../Controller/ReportsController.class        | Bin 5895 -> 0 bytes
 .../Controller/SettingsController.class       | Bin 10235 -> 10247 bytes
 .../SplashController$SplashScreen.class       | Bin 995 -> 995 bytes
 .../Controller/TherapistPaneController.class  | Bin 12148 -> 12148 bytes
 target/classes/DBH/AllergyDAO.class           | Bin 6073 -> 5669 bytes
 target/classes/DBH/mealDAO.class              | Bin 4821 -> 4417 bytes
 target/classes/FXML/ConnectionPane.fxml       |  41 ----
 .../classes/FXML/PatientManagementPane.fxml   |   3 +-
 target/classes/FXML/Reports.fxml              | 108 ---------
 target/classes/Files/PDF/TableExport.pdf      | Bin 28306 -> 28306 bytes
 target/classes/Files/PDF/TherapistsPDF.pdf    | Bin 588823 -> 588823 bytes
 .../META-INF/EHMS-Project.kotlin_module       | Bin 16 -> 16 bytes
 target/classes/Model/Address.class            | Bin 2968 -> 2968 bytes
 target/classes/Model/Notification.class       | Bin 2646 -> 2646 bytes
 target/classes/Model/Report.class             | Bin 1819 -> 0 bytes
 target/classes/Util/MessageAlerter.class      | Bin 1394 -> 1394 bytes
 target/classes/Util/PdfExporter.class         | Bin 8124 -> 8124 bytes
 target/classes/Util/TableExporter.class       | Bin 9203 -> 9203 bytes
 60 files changed, 27 insertions(+), 796 deletions(-)
 delete mode 100644 src/main/java/Controller/ConnectionController.java
 delete mode 100644 src/main/java/Controller/ReportsController.java
 delete mode 100644 src/main/java/Model/Report.java
 delete mode 100644 src/main/resources/FXML/ConnectionPane.fxml
 delete mode 100644 src/main/resources/FXML/Reports.fxml
 delete mode 100644 target/classes/Controller/ConnectionController.class
 delete mode 100644 target/classes/Controller/ReportsController.class
 delete mode 100644 target/classes/FXML/ConnectionPane.fxml
 delete mode 100644 target/classes/FXML/Reports.fxml
 delete mode 100644 target/classes/Model/Report.class

diff --git a/src/main/java/Controller/AddMedicineToPatient.java b/src/main/java/Controller/AddMedicineToPatient.java
index aa22603..bd7cdf8 100644
--- 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
index 3f85712..849c46a 100644
--- 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
deleted file mode 100644
index 9c4a213..0000000
--- a/src/main/java/Controller/ConnectionController.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package Controller;
-
-import DBH.userInfoDAO;
-import Model.UserInfo;
-import Util.MessageAlerter;
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
-import javafx.fxml.Initializable;
-import javafx.scene.control.Button;
-import javafx.scene.control.TextField;
-import javafx.scene.layout.Pane;
-
-import java.io.IOException;
-import java.net.URL;
-import java.sql.SQLException;
-import java.util.ResourceBundle;
-
-public class ConnectionController implements Initializable {
-
-    DBH.userInfoDAO uiDAo= new userInfoDAO();
-
-
-    @FXML
-    private Pane parent;
-
-    @FXML
-    private Button BtnRegister;
-
-    @FXML
-    private TextField TextFieldRegisterUser;
-
-    @FXML
-    private TextField TextFieldRegisterPass;
-
-
-
-    @FXML
-    void OnClickBtnRegister(ActionEvent event) throws SQLException {
-        UserInfo ui = new UserInfo(TextFieldRegisterUser.getText(),TextFieldRegisterPass.getText());
-        uiDAo.inserUser(ui);
-    }
-
-    @Override
-    public void initialize(URL url, ResourceBundle resourceBundle) {
-        CssStyler();
-    }
-
-    private void CssStyler() {
-        FXMLLoader loader = new FXMLLoader();
-
-        try {
-            loader.load(getClass().getResource("/FXML/Settings.fxml").openStream());
-            SettingsController settingsController = loader.getController();
-            if (settingsController.getToggleMode()) {
-                String css = this.getClass().getResource("/Css/darkmode.css").toExternalForm();
-                parent.getStylesheets().add(css);
-            } else {
-                String css = this.getClass().getResource("/Css/lightmode.css").toExternalForm();
-                parent.getStylesheets().add(css);
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-}
diff --git a/src/main/java/Controller/DatabaseInformationController.java b/src/main/java/Controller/DatabaseInformationController.java
index d99fbeb..92f883b 100644
--- 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
index 4a9e0be..c987101 100644
--- 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
index 97e0f12..0288d8b 100644
--- 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
index c5cbe83..97f7412 100644
--- 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
index f9636cc..2b115a7 100644
--- 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
diff --git a/src/main/java/Controller/ReportsController.java b/src/main/java/Controller/ReportsController.java
deleted file mode 100644
index 620118a..0000000
--- a/src/main/java/Controller/ReportsController.java
+++ /dev/null
@@ -1,215 +0,0 @@
-package Controller;
-
-import Model.Report;
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
-import javafx.fxml.Initializable;
-import javafx.scene.control.*;
-import javafx.scene.control.Button;
-import javafx.scene.control.TextField;
-import javafx.scene.image.ImageView;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.Pane;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.printing.PDFPageable;
-
-import javax.print.PrintService;
-import javax.print.PrintServiceLookup;
-import javax.swing.*;
-import java.awt.*;
-import java.awt.desktop.PrintFilesEvent;
-import java.awt.desktop.PrintFilesHandler;
-import java.awt.print.*;
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.ResourceBundle;
-
-public class ReportsController implements Initializable {
-    @FXML
-    private Pane parent;
-    @FXML
-    private TextField TextFieldID;
-
-    @FXML
-    private RadioButton RadioTherapist;
-
-    @FXML
-    private RadioButton RadioPatient;
-
-    @FXML
-    private RadioButton RadioStaff;
-
-    @FXML
-    private Button BtnPreview;
-
-    @FXML
-    private Button BtnClear;
-
-    @FXML
-    private CheckBox CheckBoxMedicine;
-
-    @FXML
-    private CheckBox CheckBoxAllergies;
-
-    @FXML
-    private CheckBox CheckBoxMeals;
-
-    @FXML
-    private CheckBox CheckBoxRequests;
-
-    @FXML
-    private CheckBox CheckBoxPresonalInfo;
-
-    @FXML
-    private CheckBox CheckBoxAddress;
-
-    @FXML
-    private CheckBox CheckBoxHR;
-
-    @FXML
-    private CheckBox CheckBoxSchedule;
-
-    @FXML
-    private Button BtnDeSelectAll;
-
-    @FXML
-    private Button BtnSelectAll;
-
-    @FXML
-    private ImageView ImageViewTherapistExportPDF1;
-
-    @FXML
-    private ImageView ImageViewTherapistExportPDF2;
-
-    @FXML
-    private ImageView ImageViewTherapistExportFile1;
-
-    @FXML
-    private ImageView ImageViewTherapistExportFile2;
-    public ArrayList<Report> ALREPORTS = new ArrayList<Report>();
-    ToggleGroup radioGroup;
-
-
-    PrinterJob job = PrinterJob.getPrinterJob();
-
-    @FXML
-    void OnClickClear(ActionEvent event) {
-        CheckBoxMedicine.setSelected(false);
-        CheckBoxAllergies.setSelected(false);
-        CheckBoxMeals.setSelected(false);
-        CheckBoxRequests.setSelected(false);
-        CheckBoxPresonalInfo.setSelected(false);
-        CheckBoxAddress.setSelected(false);
-        CheckBoxHR.setSelected(false);
-        CheckBoxSchedule.setSelected(false);
-        RadioTherapist.setSelected(false);
-        RadioStaff.setSelected(false);
-        RadioPatient.setSelected(false);
-        TextFieldID.setText("");
-    }
-
-    @FXML
-    void OnClickDeSelectAll(ActionEvent event) {
-        CheckBoxMedicine.setSelected(false);
-        CheckBoxAllergies.setSelected(false);
-        CheckBoxMeals.setSelected(false);
-        CheckBoxRequests.setSelected(false);
-        CheckBoxPresonalInfo.setSelected(false);
-        CheckBoxAddress.setSelected(false);
-        CheckBoxHR.setSelected(false);
-        CheckBoxSchedule.setSelected(false);
-    }
-
-    @FXML
-    void OnClickPreview(ActionEvent event) {
-
-        RadioButton selectedRadioButton = (RadioButton) radioGroup.getSelectedToggle();
-        String toogleGroupValue = selectedRadioButton.getText();
-        if (CheckBoxMedicine.isSelected())
-            TextFieldID.setText(toogleGroupValue);
-    }
-
-    @FXML
-    void OnClickSelectAll(ActionEvent event) {
-        CheckBoxMedicine.setSelected(true);
-        CheckBoxAllergies.setSelected(true);
-        CheckBoxMeals.setSelected(true);
-        CheckBoxRequests.setSelected(true);
-        CheckBoxPresonalInfo.setSelected(true);
-        CheckBoxAddress.setSelected(true);
-        CheckBoxHR.setSelected(true);
-        CheckBoxSchedule.setSelected(true);
-    }
-
-
-    @FXML
-    void TherapistFileClick(MouseEvent event) {
-
-    }
-
-    @FXML
-    void TherapistPDFClick(MouseEvent event) {
-
-
-    }
-
-    @FXML
-    void onClickFile(MouseEvent event) {
-
-    }
-
-    @FXML
-    void onClickPDF(MouseEvent event) throws PrinterException, IOException {
-        JFileChooser chooser = new JFileChooser();
-        chooser.showOpenDialog(null);
-        File f = chooser.getSelectedFile();
-        String filename = f.getAbsolutePath();
-        System.out.println(filename);
-
-
-
-
-        // Desktop desktop = Desktop.getDesktop();
-        //  desktop.print(new File("src/main/resources/Files/PDF/PatientPDF.pdf"));
-
-    }
-
-    @FXML
-    void onClickPrint(MouseEvent event) {
-       
-    }
-
-    //Overrided by implementing Initializable
-    @Override
-    public void initialize(URL url, ResourceBundle resourceBundle) {
-        radioGroup = new ToggleGroup();
-        RadioPatient.setToggleGroup(radioGroup);
-        RadioStaff.setToggleGroup(radioGroup);
-        RadioTherapist.setToggleGroup(radioGroup);
-        CssStyler();
-
-    }
-
-    private void CssStyler() {
-        FXMLLoader loader = new FXMLLoader();
-
-        try {
-            loader.load(getClass().getResource("/FXML/Settings.fxml").openStream());
-
-            SettingsController settingsController = loader.getController();
-
-            if (settingsController.getToggleMode()) {
-                String css = this.getClass().getResource("/Css/darkmode.css").toExternalForm();
-                parent.getStylesheets().add(css);
-            } else {
-                String css = this.getClass().getResource("/Css/lightmode.css").toExternalForm();
-                parent.getStylesheets().add(css);
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-}
diff --git a/src/main/java/Controller/SettingsController.java b/src/main/java/Controller/SettingsController.java
index 6f29698..d625485 100644
--- a/src/main/java/Controller/SettingsController.java
+++ b/src/main/java/Controller/SettingsController.java
@@ -226,8 +226,7 @@ void OnClickDefault(ActionEvent event) throws IOException {
                 "has been disarmed \n" +
                 "you are using the default [Css/lightmode.css] style");
     }
-
-    public void OnClickSave(ActionEvent event) throws IOException, URISyntaxException {
+@FXML public void OnClickSave(ActionEvent event) throws IOException, URISyntaxException {
         CssFile cssfile = new CssFile();
         String url = ("src/main/resources/Css/userDesign.css");
         //------------------------------------------
diff --git a/src/main/java/Controller/SplashController.java b/src/main/java/Controller/SplashController.java
index 9739979..1fe236d 100644
--- a/src/main/java/Controller/SplashController.java
+++ b/src/main/java/Controller/SplashController.java
@@ -31,7 +31,7 @@ class SplashScreen extends Thread {
         @Override
         public void run() {
             try{
-                Thread.sleep(5000);
+                Thread.sleep(1000);
                 Platform.runLater(new Runnable() {
                     @Override
                     public void run() {
diff --git a/src/main/java/Controller/TherapistPaneController.java b/src/main/java/Controller/TherapistPaneController.java
index 97608bb..bf10413 100644
--- a/src/main/java/Controller/TherapistPaneController.java
+++ b/src/main/java/Controller/TherapistPaneController.java
@@ -3,7 +3,6 @@
 import Model.*;
 import Util.*;
 import com.itextpdf.text.*;
-import com.itextpdf.text.pdf.PdfWriter;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.collections.FXCollections;
@@ -21,9 +20,6 @@
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import javafx.stage.Window;
-
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
 import java.io.*;
 import java.net.URISyntaxException;
 import java.net.URL;
diff --git a/src/main/java/DBH/AllergyDAO.java b/src/main/java/DBH/AllergyDAO.java
index fcbe693..abbcd5c 100644
--- a/src/main/java/DBH/AllergyDAO.java
+++ b/src/main/java/DBH/AllergyDAO.java
@@ -15,7 +15,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class AllergyDAO implements JPQLHandler {
+public class AllergyDAO  {
 
     static Connection con = DatabaseConnector.getConnection();
 
@@ -117,21 +117,6 @@ public void removeAllergyByName(String name) throws SQLException {
         ps.executeUpdate();
         ps.close();
     }
-    @Override
-    public void SelectQuery() {
-
-    }
-
-    @Override
-    public void InsertQuery() {
-
-    }
-
-    @Override
-    public void RemoveQuery() {
-
-    }
-
 
     public int getCount() throws SQLException {
         int numberRow = 0;
@@ -145,17 +130,6 @@ public int getCount() throws SQLException {
     }
 
 
-    @Override
-    public int CountQuery() {
-        return 0;
-    }
-
-    @Override
-    public List SelectAllQuery() {
-        return null;
-    }
-
-
     public ArrayList<String> AllergiesPDF() throws SQLException {
         ArrayList<String> list = new ArrayList<String>();
         String sql = "select * from allergy";
diff --git a/src/main/java/DBH/mealDAO.java b/src/main/java/DBH/mealDAO.java
index ef8ffa0..dd77ffe 100644
--- a/src/main/java/DBH/mealDAO.java
+++ b/src/main/java/DBH/mealDAO.java
@@ -14,13 +14,11 @@
 import java.util.Calendar;
 import java.util.List;
 
-public class mealDAO implements JPQLHandler {
+public class mealDAO  {
 
     static Connection con = DatabaseConnector.getConnection();
 
 
-
-
     public int insertMeal(Meal m) throws SQLException {
 
         String sql = "insert into meal(name, weight) values(?,?)";
@@ -110,33 +108,6 @@ public int getCount() throws SQLException {
     }
 
 
-
-    @Override
-    public void SelectQuery() {
-
-    }
-
-    @Override
-    public void InsertQuery() {
-
-    }
-
-    @Override
-    public void RemoveQuery() {
-
-    }
-
-    @Override
-    public int CountQuery() {
-        return 0;
-    }
-
-    @Override
-    public List SelectAllQuery() {
-        return null;
-    }
-
-
     public ArrayList<String> MealPDF() throws SQLException {
         ArrayList<String> list = new ArrayList<String>();
         String sql = "select * from meal";
diff --git a/src/main/java/Model/Address.java b/src/main/java/Model/Address.java
index bafa3bb..a6da315 100644
--- a/src/main/java/Model/Address.java
+++ b/src/main/java/Model/Address.java
@@ -13,7 +13,7 @@ public Address(String city) {
         setCity(city);
     }
 
-    public Address(int addresscode,String city, String street, int houseNum) {
+    public Address(int addresscode, String city, String street, int houseNum) {
         setAddresscode(addresscode);
         setCity(city);
         setStreet(street);
@@ -24,7 +24,7 @@ public Address() {
 
     }
 
-    public Address(String city , String street , int houseNum){
+    public Address(String city, String street, int houseNum) {
         setCity(city);
         setStreet(street);
         setHouseNum(houseNum);
@@ -49,7 +49,6 @@ public void setCity(String city) {
     }
 
 
-
     public String getStreet() {
         return street;
     }
@@ -66,9 +65,9 @@ public void setHouseNum(int houseNum) {
         this.houseNum = houseNum;
     }
 
-public String getAddressOrganized(){
-        return getAddresscode()+"|"+getCity()+"|"+getStreet()+"|"+getHouseNum();
-}
+    public String getAddressOrganized() {
+        return getAddresscode() + "|" + getCity() + "|" + getStreet() + "|" + getHouseNum();
+    }
 
 
     //--------------------Equals And Hash Code----------------------
@@ -99,3 +98,4 @@ public String toString() {
                 '}';
     }
 }
+
diff --git a/src/main/java/Model/Meal.java b/src/main/java/Model/Meal.java
index 43db79a..0ac3419 100644
--- a/src/main/java/Model/Meal.java
+++ b/src/main/java/Model/Meal.java
@@ -40,4 +40,4 @@ public String toString() {
                 ", weight=" + weight +
                 '}';
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/Model/Notification.java b/src/main/java/Model/Notification.java
index 308291a..27e5484 100644
--- a/src/main/java/Model/Notification.java
+++ b/src/main/java/Model/Notification.java
@@ -11,9 +11,6 @@ public class Notification {
     private String isTreated;
     private Therapist therapist;
 
-
-
-
     public Notification() {
 
     }
diff --git a/src/main/java/Model/Report.java b/src/main/java/Model/Report.java
deleted file mode 100644
index 8c012fb..0000000
--- a/src/main/java/Model/Report.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package Model;
-
-import java.util.ArrayList;
-
-public class Report {
-
-    private String reportType;
-    private ArrayList<Object> list;
-
-    public Report() {
-    }
-
-    public Report(String reportType, ArrayList<Object> list) {
-        this.reportType = reportType;
-        this.list = list;
-    }
-
-    public String getReportType() {
-        return reportType;
-    }
-
-    public void setReportType(String reportType) {
-        this.reportType = reportType;
-    }
-
-    public ArrayList<Object> getList() {
-        return list;
-    }
-
-    public void setList(ArrayList<Object> list) {
-        this.list = list;
-    }
-
-    @Override
-    public String toString() {
-        return "Report{" +
-                "reportType='" + reportType + '\'' +
-                ", list=" + list +
-                '}';
-    }
-}
diff --git a/src/main/java/Util/CssFile.java b/src/main/java/Util/CssFile.java
index 4fc8f5f..774edd9 100644
--- a/src/main/java/Util/CssFile.java
+++ b/src/main/java/Util/CssFile.java
@@ -4,7 +4,7 @@
 
 public class CssFile {
 
-    public void CreateFile(String url, String design) {
+        public void CreateFile(String url, String design) {
 
         try {
             FileWriter fw = new FileWriter(url);
diff --git a/src/main/java/Util/MessageAlerter.java b/src/main/java/Util/MessageAlerter.java
index d9c81fe..68f1fa6 100644
--- a/src/main/java/Util/MessageAlerter.java
+++ b/src/main/java/Util/MessageAlerter.java
@@ -3,12 +3,6 @@
 import javafx.scene.control.Alert;
 
 public class MessageAlerter {
-
-
-    //Stage stage = (Stage) dialog.getDialogPane().getScene().getWindow();
-    //stage.getIcons().add(new Image(this.getClass().getResource("login.png").toString()));
-
-
     public void ShowWarningMessage(String title, String header, String Content) {
         Alert alert = new Alert(Alert.AlertType.WARNING);
         alert.setTitle(title);
@@ -26,9 +20,6 @@ public void ShowErrorMessage(String title, String header, String Content) {
     }
 
 
-
-
-
     public void MessageWithoutHeader(String title, String Content) {
         Alert alert = new Alert(Alert.AlertType.INFORMATION);
         alert.setTitle(title);
diff --git a/src/main/java/Util/PdfExporter.java b/src/main/java/Util/PdfExporter.java
index d3c324a..aebe824 100644
--- a/src/main/java/Util/PdfExporter.java
+++ b/src/main/java/Util/PdfExporter.java
@@ -27,7 +27,6 @@
 
 public class PdfExporter {
 
-
     public void ScreenShot(String url) throws AWTException, IOException {
         Date d = new Date();
         Robot robot = new Robot();
@@ -55,7 +54,7 @@ public void Snapshotter(double x, double y, double width, double height) {
         }
     }
 
-    public void SaveTherapistPDF() throws IOException, DocumentException, SQLException {
+        public void SaveTherapistPDF() throws IOException, DocumentException, SQLException {
         DBH.therapistDAO TDBH = new DBH.therapistDAO();
         //Create PDF, Initilaize and Open
         Document document = new Document();
diff --git a/src/main/java/Util/TableExporter.java b/src/main/java/Util/TableExporter.java
index 83590b0..d28313e 100644
--- a/src/main/java/Util/TableExporter.java
+++ b/src/main/java/Util/TableExporter.java
@@ -5,23 +5,14 @@
 import com.itextpdf.io.image.ImageData;
 import com.itextpdf.io.image.ImageDataFactory;
 import com.itextpdf.kernel.color.Color;
-
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.PdfWriter;
-
 import com.itextpdf.layout.Document;
-
 import com.itextpdf.layout.element.Cell;
-
 import com.itextpdf.layout.element.Paragraph;
 import com.itextpdf.layout.property.HorizontalAlignment;
 import com.itextpdf.layout.property.VerticalAlignment;
-import com.itextpdf.text.BaseColor;
 import com.itextpdf.text.Chunk;
-import com.itextpdf.text.Font;
-import com.itextpdf.text.FontFactory;
-
-
 import java.io.FileNotFoundException;
 import java.net.MalformedURLException;
 import java.sql.SQLException;
diff --git a/src/main/resources/FXML/ConnectionPane.fxml b/src/main/resources/FXML/ConnectionPane.fxml
deleted file mode 100644
index f5e63eb..0000000
--- a/src/main/resources/FXML/ConnectionPane.fxml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.Separator?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.Pane?>
-<?import javafx.scene.text.Font?>
-
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="795.0" prefWidth="1267.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="Controller.ConnectionController">
-   <children>
-      <Pane fx:id="parent" layoutX="2.0" layoutY="-5.0" prefHeight="805.0" prefWidth="1264.0" styleClass="ParentPane" stylesheets="@../Css/lightmode.css">
-         <children>
-            <Pane layoutY="47.0" prefHeight="62.0" prefWidth="1248.0" styleClass="TopPane">
-               <children>
-                  <Label alignment="CENTER" layoutX="14.0" layoutY="10.0" prefHeight="37.0" prefWidth="269.0" text="Connection" textAlignment="CENTER" textFill="WHITE">
-                     <font>
-                        <Font name="Arial Bold Italic" size="32.0" />
-                     </font>
-                  </Label>
-               </children>
-            </Pane>
-            <Label layoutX="106.0" layoutY="188.0" prefHeight="34.0" prefWidth="84.0" text="Username:" textOverrun="CLIP">
-               <font>
-                  <Font name="Guttman Yad" size="17.0" />
-               </font>
-            </Label>
-            <Label layoutX="106.0" layoutY="228.0" prefHeight="34.0" prefWidth="84.0" text="Password:" textOverrun="CLIP">
-               <font>
-                  <Font name="Guttman Yad" size="17.0" />
-               </font>
-            </Label>
-            <Button fx:id="BtnRegister" layoutX="449.0" layoutY="255.0" mnemonicParsing="false" onAction="#OnClickBtnRegister" styleClass="Button" text="Register" />
-            <Separator layoutX="64.0" layoutY="326.0" prefHeight="0.0" prefWidth="1091.0" styleClass="Separator" />
-            <TextField fx:id="TextFieldRegisterUser" layoutX="198.0" layoutY="197.0" styleClass="TextField" />
-            <TextField fx:id="TextFieldRegisterPass" layoutX="198.0" layoutY="235.0" styleClass="TextField" />
-         </children>
-      </Pane>
-   </children>
-</AnchorPane>
diff --git a/src/main/resources/FXML/PatientManagementPane.fxml b/src/main/resources/FXML/PatientManagementPane.fxml
index a5f3900..d56a005 100644
--- a/src/main/resources/FXML/PatientManagementPane.fxml
+++ b/src/main/resources/FXML/PatientManagementPane.fxml
@@ -35,7 +35,7 @@
                </columns>
             </TableView>
             <Button fx:id="BtnPatientFile" layoutX="741.0" layoutY="541.0" mnemonicParsing="false" onAction="#OnClickToFile" prefHeight="30.0" prefWidth="180.0" styleClass="Button" text="Export To File" />
-            <Button fx:id="BtnPatientXML" layoutX="739.0" layoutY="628.0" mnemonicParsing="false" onAction="#OnClickPatientXML" prefHeight="30.0" prefWidth="180.0" styleClass="Button" text="Export To PDF" />
+            <Button fx:id="BtnPatientXML" layoutX="739.0" layoutY="628.0" mnemonicParsing="false" onAction="#OnClickPatientPDF" prefHeight="30.0" prefWidth="180.0" styleClass="Button" text="Export To PDF" />
             <Button fx:id="BtnRemovePatient" layoutX="741.0" layoutY="498.0" mnemonicParsing="false" onAction="#OnClickRemovePatient" prefHeight="30.0" prefWidth="180.0" styleClass="Button" text="Remove Patient" />
             <Label layoutX="76.0" layoutY="457.0" text="Choose Patient :" textOverrun="CLIP">
                <font>
@@ -61,7 +61,6 @@
                   <Font name="Guttman Yad" size="17.0" />
                </font>
             </Label>
-            <Button fx:id="BtnPrint" layoutX="741.0" layoutY="668.0" mnemonicParsing="false" onAction="#OnClickPrint" prefHeight="30.0" prefWidth="180.0" styleClass="Button" text="Print Patient Chart" />
             <Button fx:id="BtnSpecPatientFile" layoutX="740.0" layoutY="584.0" mnemonicParsing="false" onAction="#OnClickSpecToFile" prefHeight="30.0" prefWidth="180.0" styleClass="Button" text="Export Specific" />
          </children>
       </Pane>
diff --git a/src/main/resources/FXML/Reports.fxml b/src/main/resources/FXML/Reports.fxml
deleted file mode 100644
index 4c720d2..0000000
--- a/src/main/resources/FXML/Reports.fxml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.Group?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.CheckBox?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.RadioButton?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.image.Image?>
-<?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.Pane?>
-<?import javafx.scene.text.Font?>
-
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="795.0" prefWidth="1267.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="Controller.ReportsController">
-   <children>
-      <Pane fx:id="parent" layoutY="-5.0" prefHeight="805.0" prefWidth="1264.0" styleClass="ParentPane" stylesheets="@../Css/lightmode.css">
-         <children>
-            <Pane layoutY="47.0" prefHeight="62.0" prefWidth="1248.0" styleClass="TopPane">
-               <children>
-                  <Label alignment="CENTER" layoutX="14.0" layoutY="10.0" prefHeight="37.0" prefWidth="151.0" text="Reports" textAlignment="CENTER" textFill="WHITE">
-                     <font>
-                        <Font name="Arial Bold Italic" size="32.0" />
-                     </font>
-                  </Label>
-               </children>
-            </Pane>
-            <Label layoutX="71.0" layoutY="182.0" prefHeight="34.0" prefWidth="57.0" text="ID :" textOverrun="CLIP">
-               <font>
-                  <Font name="Guttman Yad" size="17.0" />
-               </font>
-            </Label>
-            <TextField fx:id="TextFieldID" layoutX="107.0" layoutY="187.0" styleClass="TextField" />
-            <Group layoutX="71.0" layoutY="226.0">
-               <children>
-                  <RadioButton fx:id="RadioTherapist" mnemonicParsing="false" styleClass="RadioButton" text="Therapist" />
-                  <RadioButton fx:id="RadioPatient" layoutY="24.0" mnemonicParsing="false" styleClass="RadioButton" text="Patient" />
-                  <RadioButton fx:id="RadioStaff" layoutY="48.0" mnemonicParsing="false" styleClass="RadioButton" text="Staff" />
-               </children>
-            </Group>
-            <Button fx:id="BtnPreview" layoutX="212.0" layoutY="300.0" mnemonicParsing="false" onAction="#OnClickPreview" prefHeight="33.0" prefWidth="128.0" styleClass="Button" text="Preview " />
-            <Button fx:id="BtnClear" layoutX="73.0" layoutY="300.0" mnemonicParsing="false" onAction="#OnClickClear" prefHeight="33.0" prefWidth="128.0" styleClass="Button" text="Clear" />
-            <CheckBox fx:id="CheckBoxMedicine" layoutX="629.0" layoutY="203.0" mnemonicParsing="false" styleClass="CheckBox" text="Medicines" />
-            <CheckBox fx:id="CheckBoxAllergies" layoutX="629.0" layoutY="228.0" mnemonicParsing="false" styleClass="CheckBox" text="Allergies" />
-            <CheckBox fx:id="CheckBoxMeals" layoutX="629.0" layoutY="253.0" mnemonicParsing="false" styleClass="CheckBox" text="Meals" />
-            <CheckBox fx:id="CheckBoxRequests" layoutX="629.0" layoutY="278.0" mnemonicParsing="false" styleClass="CheckBox" text="Last Requests" />
-            <CheckBox fx:id="CheckBoxPresonalInfo" layoutX="508.0" layoutY="203.0" mnemonicParsing="false" styleClass="CheckBox" text="Personal info" />
-            <CheckBox fx:id="CheckBoxAddress" layoutX="508.0" layoutY="228.0" mnemonicParsing="false" styleClass="CheckBox" text="Address" />
-            <CheckBox fx:id="CheckBoxHR" layoutX="508.0" layoutY="253.0" mnemonicParsing="false" styleClass="CheckBox" text="HR" />
-            <CheckBox fx:id="CheckBoxSchedule" layoutX="508.0" layoutY="278.0" mnemonicParsing="false" styleClass="CheckBox" text="Schedule" />
-            <Button fx:id="BtnDeSelectAll" layoutX="773.0" layoutY="251.0" mnemonicParsing="false" onAction="#OnClickDeSelectAll" prefHeight="33.0" prefWidth="128.0" styleClass="Button" text="Deselect All" />
-            <Button fx:id="BtnSelectAll" layoutX="773.0" layoutY="210.0" mnemonicParsing="false" onAction="#OnClickSelectAll" prefHeight="33.0" prefWidth="128.0" styleClass="Button" text="Select All" />
-            <Pane layoutX="130.0" layoutY="449.0" onMouseClicked="#onClickPDF" prefHeight="200.0" prefWidth="200.0" style="-fx-border-color: #000000; -fx-background-color: #59b7ff;">
-               <children>
-                  <ImageView fx:id="ImageViewTherapistExportPDF1" fitHeight="106.0" fitWidth="84.0" layoutX="42.0" layoutY="44.0" onMouseClicked="#TherapistPDFClick" pickOnBounds="true" preserveRatio="true">
-                     <image>
-                        <Image url="@../Images/Export.png" />
-                     </image>
-                  </ImageView>
-                  <ImageView fx:id="ImageViewTherapistExportPDF2" fitHeight="47.0" fitWidth="63.0" layoutX="118.0" layoutY="65.0" onMouseClicked="#TherapistPDFClick" pickOnBounds="true" preserveRatio="true">
-                     <image>
-                        <Image url="@../Images/pdf.png" />
-                     </image>
-                  </ImageView>
-                  <Label layoutX="29.0" layoutY="144.0" text="Export PDF">
-                     <font>
-                        <Font name="System Bold Italic" size="28.0" />
-                     </font>
-                  </Label>
-               </children>
-            </Pane>
-            <Pane layoutX="394.0" layoutY="449.0" onMouseClicked="#onClickFile" prefHeight="200.0" prefWidth="200.0" style="-fx-border-color: #000000; -fx-background-color: #59b7ff;">
-               <children>
-                  <Label layoutX="31.0" layoutY="148.0" text="Export File">
-                     <font>
-                        <Font name="System Bold Italic" size="28.0" />
-                     </font>
-                  </Label>
-                  <ImageView fx:id="ImageViewTherapistExportFile1" fitHeight="106.0" fitWidth="84.0" layoutX="28.0" layoutY="43.0" onMouseClicked="#TherapistFileClick" pickOnBounds="true" preserveRatio="true">
-                     <image>
-                        <Image url="@../Images/Export.png" />
-                     </image>
-                  </ImageView>
-                  <ImageView fx:id="ImageViewTherapistExportFile2" fitHeight="63.0" fitWidth="64.0" layoutX="113.0" layoutY="51.0" onMouseClicked="#TherapistFileClick" pickOnBounds="true" preserveRatio="true">
-                     <image>
-                        <Image url="@../Images/txt.png" />
-                     </image>
-                  </ImageView>
-               </children>
-            </Pane>
-            <Pane layoutX="660.0" layoutY="449.0" onMouseClicked="#onClickPrint" prefHeight="200.0" prefWidth="200.0" style="-fx-border-color: #000000; -fx-background-color: #59b7ff;">
-               <children>
-                  <Label layoutX="62.0" layoutY="148.0" text="Print">
-                     <font>
-                        <Font name="System Bold Italic" size="28.0" />
-                     </font>
-                  </Label>
-                  <ImageView fitHeight="127.0" fitWidth="151.0" layoutX="37.0" layoutY="21.0" onMouseClicked="#TherapistFileClick" pickOnBounds="true" preserveRatio="true">
-                     <image>
-                        <Image url="@../Images/print.png" />
-                     </image>
-                  </ImageView>
-               </children>
-            </Pane>
-         </children>
-      </Pane>
-   </children>
-</AnchorPane>
diff --git a/src/main/resources/Files/PDF/TableExport.pdf b/src/main/resources/Files/PDF/TableExport.pdf
index 4c234fb6e8e29c13c9e1688205b6754ee4ce401b..b567c263d0bed581d6a0b861ab3232e21e188a61 100644
GIT binary patch
delta 107
zcmbPqmvPcv#tq9^I1EjV3=9m6EhevLk%V(LUtqDybTUm%Hcm4zNHVZAH#9OawoFS)
aOtCaEGc+<wNlY|1wy?7yq++s9o*Mv^Umj`z

delta 107
zcmbPqmvPcv#tq9^I1J1UEe*|$%qFjAk%V(LUtqDybTUs%OfpF|FfuktGE7ZMHc7QK
aH%d%4v^2IfPqH*lv9z-xq++s9o*Mwd*&k8>

diff --git a/src/main/resources/Files/PDF/TherapistsPDF.pdf b/src/main/resources/Files/PDF/TherapistsPDF.pdf
index 1d7d025496b449be97f4f2ac4f9a4301f1476b3b..37642fca8554805d796510f0f410e2577d2a8953 100644
GIT binary patch
delta 144
zcmbRKLwWiS<%Sl<7N!>F7M2#)7Pc1lEgS{EG!0FS3=9m6&9n`S)eQ{PHT8Y-Q(O{D
zQZ-zxj0}tn3=Lokw$J><A;jotXaQ7gVQHCUY+zuNnr4}7m}+X2WM-ahWRYfUZfIy{
MLqNs!H@`Ww0oL6pwEzGB

delta 144
zcmbRKLwWiS<%Sl<7N!>F7M2#)7Pc1lEgS{EG!4uREe*|$OtcM*)eQ{PHT8Y-Q(O{D
zQZ-zxj0}tn3=Lokw$J><A;jpIW|Wqcnv!UoYL=8_VxDGVnPO&{n3`g4Zfum6YLIAX
NXG1{6^f$jbv;lOWEHwZC

diff --git a/target/classes/Controller/AddMedicineToPatient.class b/target/classes/Controller/AddMedicineToPatient.class
index 59777243f292042d94748e97880dc8a62422e610..e9e192e936d1f357e2c628e1396a48cb60c1b9a2 100644
GIT binary patch
delta 156
zcmWNKISRsH7(}0-AV|nxiBaPc)J71uh&v)Ku@F}*auaJi+uTABLTo*Oy_L0vcmYd4
zrWhDz-UL=)`7g~(5XL|!DN0c!O_dBivdqZcewrDY)`(J<QiD8AO4yWXQK8L}4lZ4e
zGC0xaB7T+3XTY5y4@Nv0^Je0?`X}O`Sa^;)8!KY0iL(*ro&sCB-U<ESebxLA`xzVl

delta 156
zcmdm_v`J~hZC+Ug1{MZI27U%51}O$*22}<X1_K5)25Sa&1~&$c%|Cc$8C|UzI2ddg
zBpGah3hjWB_6*t#4h(t>P7J;b&J0luE)10nt_;mU4Xc3kTA<hl26u)%3?2-p7`zy+
zGWak&W$>FE#s88uh(UlMc(R8;mt-UZH&CY-Lp0FLIH095K&xXJOc)X-zZP%@09(Et
AOaK4?

diff --git a/target/classes/Controller/AddPatientController.class b/target/classes/Controller/AddPatientController.class
index c9fded07d17a466234d0f24329c592940dc80dbe..14e9697a7e091cf845282ccad2bdf267a0e8d422 100644
GIT binary patch
delta 370
zcmWNNxi7<U7>A!1gCjAJNU5TZ5Q&CJ3<fOXJ_ffsD;14US0r6pF&JD;e(s16XB{P4
zos43WNKIn#2N?JdyxW`ilh5~ko^P}!TJzvGSuDhnO%gezV8ucnMdVXX0aX+l>n5MI
zo&*{+ZNyBIX3dn)LItf<(?&h*AzQjF#@j(Wog~sl2Hh0Xqf;+V`tZ}wF?PZX@WK#p
z4D-nde~d~j4ly$(xj3bTap_<}9Js{Aq<EN;eWoRVTW*+<AhYtwoIEoxuPn$1i}H;}
zmI1r*W&TO<s*F!LmW=nzW?3<ovQmvw%Tw7Z$*ifuI%#aE>ZaoRsl!m>Ev4LMkR2TC
z;$=^heIqT)B}dx-tv%8APSxp*T+a1lE~w;EwXf7KpxtZjDIK@kz0)f}4!GAetlLN3
MhIk-iM6wV60iRP=IsgCw

delta 370
zcmWNN$t%PG6vsag2TM6n!Wd)5u1usH9B>ga*6eH67?NG2#+Z{bwqKUPLCL<aIXKEq
ziIZIX0S^2J-t~Ro_x1U__x$(#tD#7<g#fICU?Yrp%p{UR5?LgZORC|GoV6AcM2V&j
zOq7y98R?XhO$B*WQbg6QJ<9IqswI#*f~hB(2GVGxmL_^=W|<atY2}VKo@wWm4nFDR
zk1p}2TTJwbjb16GPpavcP6ouupiDC)K8EF(5jka4E*O&=#^s3#d0|pMn38X1!~--N
zU#6cRx5~^ZhsSt}amc*kjtw_5%=ejILRnOWB_fn2jupjUrI0mhSXbH&rQ1{@A1=0Z
zW7~*`b;_>xe+%~X-o82==!*{ZF-PQZtlB5)cdFep?VU5sg?2Al;7TuC>(+y&cbeYo
K<k5Jr?EC{5Xjb9?

diff --git a/target/classes/Controller/ConnectionController.class b/target/classes/Controller/ConnectionController.class
deleted file mode 100644
index 5940d051b0dae7878ffd1b553504ca8e90f21a1f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2735
zcmaJ@X;Tze6g`gt8ir;O6qQ5;6C(pkCnm0AP*x=wL;(jiYcum0T6(&%yN96J_kI7A
zUy#pMC1WL4rSdsHDOE}3yzZVEHd9m8{rbN9?sD$A_sw7b{{9DmllU=-IwUmI>u5lu
zK*w!!%`|M&DHt=0w`DF6XgqH@Rxm7(=uc%eGzqkik6t!PzVxP?C3k#eCJ7CRX0$-p
z(5j;i?E;6!Tqp2c+m@cer9)Ge>(qn-4JB)Q#1+_;*<voOVV6MLw40Z<aXogU%y;S7
zjXeT;=H+@YX-PXjD+`t%NKa`A^k!7_OY4T8la4fUQ3OU+JDtQ{?9;GcM-LtoIQakS
z0$M=^>a@V_{#0l@f@Uu8ET@oGF&)rxaOaq=n!cYz2YMB>eF8`Ow_DgQNo5t9Pw03O
zM+BNJhnYp$b@gX9Ly}HSB^kj{9sR0w&11el7u+S_8U_Tq<K&jsi?%U&V>**@&AjxI
zNFkw$eq6^841p%*IA$|efv!zShQf3cp5aDlz?hRkz`Xq-WiyFq@tlT}I!@s<IZ-1{
zY^{ZcXQl6!yqpv`yhHXeq>c=X>$4eF=Pb@?Nb5L{=LPi8V!SDkbXTQA;H6m<*jtIz
za*ZixwG>1fG?Bsu9TzboP;WC~fmG~xi{{31MobS6kLei4gg~o8rOM!~^^Xr|xFm3(
zrd9>0CQ4!wQ#xM2i;>NFw@|R9sv~J!Ng`~wQP;Jl=`f0ET+uM2<0`JPJ8HPb8boF>
z(#@K7iFVkRx0*0VU4s-b@}{>^q=TWH;@??Z*O66hZwuUsb@qy5+LNwVROG#(<0fvg
z#aB&FI;43|NXTjj+2&oh6c|@cM>4LL@rs65b-aex1@^`Cidt=hA{`OCkcj@WlmU5l
zBu<oeb7~@lqrm5YA-C7eMO$Xr#OW3+BBvp*Lt;swFLv<g6U^Mqv%-5eQY$WvLS$K>
zGepF;3d=zS5)HRW=nz#!iJ6J@oLp72DG3X<j-u+N_Ek1GlQ45D^PZWL8aSx-#}S1c
zHN}}|nYMLL#m~Ljk`q`(nYDb2f)U4Y15;UL`kfU}tF4$8Xc-Nh%Jd?MDk_^N*JvpS
zT!-5AV<BVOGnON-l!}Yen~(f<X55@<XHCyi-?6YhShnc5FH_^;jx(5sJ7=6R+sdtM
zjwS+><&tZpg)tHqY(lNmsVpaVDBi%9?P>ybC5zX|){(_Nt^)3Bc%Rh^OX1(Kjk#-?
z>K^sftrH?lcn9MWS4Kq$mr)8V+o+6~(UOz5Wf)(g<k_TQq*OUVffrAsNVO9Gj%LU$
zwoj#Yo2EX6emn?k`0~Qrh<0UC))a`fP(2?7wV8R`YgEHZ-C_GGOsJA2n%mTA4f!~2
zuEu3f&V{pe(h3PkSKBVxA%!ja*y(i;aCi?v-Oha0sm7;lmFq^n?}RcB{x%tJ+-)-6
zcw1!k{N^7BJ_A}BMuID#W8eYAz(Z&^AE5bHB=3h_N_?st2<SpREv<2-NBVdJ>-+-l
z;vQ`%TT9eQ@ZI|m9XAJlL1!7=d_B(B100&>GI^|w!wWUrZJ~ZYx_KEK!a!)hH?mQ+
z--|c#7JYUzlDF{=qj{G;R2J`T!bIQ$d`PK^<PzU1k_Kk=RLxzK$`B758(cM1T{Yk%
ze9WUfh)?h-UDc@zJ2EPIXtJJr#fL}{rNPYLKpDq6pDyD>8E48EUKlK6^iNDqGt0|m
zWPU<ls4*LA%wHh@3uU}?{5P0&Soj$S!`;FocAJ!$mHTwwgggoyc?qa`oI)#~Cn!CM
z{ru{~X$;~Fe`k4vox>E;yhYCQ%tf9W#xgFz#z>g(Fq1h$UVVnoX)Rk_^<fNO;7g{v
u%oM-E*IY5t7?>uG`ET$oBl(U}GT|RgX-H|9{2M)^8Z1?e@3~cnAN~VkJhkTl

diff --git a/target/classes/Controller/DatabaseInformationController.class b/target/classes/Controller/DatabaseInformationController.class
index 2cf1caed971ce086e50eef067214715c0d37a426..5c40bb7e4c16b8b69b9eeaff0f3baea1c83eff6c 100644
GIT binary patch
literal 4153
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

delta 1758
zcmZuy`BPg}6#j0u7hW!fq%AZofgq(VTWpb15GpN%Ld%*I1Zhh{ctB`KAPE%LsBNu#
z#pk|T7i`sPr3NfBPIVk-^e^zQaK`ahr+V%S1Z$kh%RM>wob!F(IcHwJEB>oM{`L0F
z?*Y_eWl_GCDZ>hzgsmLguwDIA*Ibm#V4d>K`^FbsQNI#WT;1U@MMe(n9C^rBJ^C_B
zAsiBlIEvv^&*_^o?n0@Aog8KAFM8*|ZiejsSRm-~_I0`!X2Ow}5|ObBdhu1kQ3(@+
zNzra3R5NT9c&?x?G~seD_?4MhARIE|ZU(d4<LU7@olZ0Msm+Fbc8_|(aKyBqqYeku
zD~7)O1_qwQQX=yKKM}2mUP2Q?q58YIFiS?Gz->e`#~~b64;kw!S}8|E41`^6fuLeW
z8$l_P)6weaY*0oE+BuBqVAPQxjN7&k2-h)=PINIy6H2Vt7n@XFELXNsBYQY{(Wg$a
z0`-=0kGURRj^pT8|1j3e8L;4fjzJ79{#bW#7$+p0<Txej<Y=s0eKFstFRHYJLm|Z<
z3rE%gsAn=x!zW>s!!M{f7JqZZ={Bmwjw=f>QCZ;_#}Gr7aEu3(;8^S7xv1#%FeW(y
z8+7~0C*sd=1Vy|x72oTNM$d*LV<IEO5#GoUevvWD5fK?YnQ@dL`aPW@I>s?4qD|C}
z{zy;+pXFE(!I`P@-M(oW$S@w_czC0<@JV=d`Krm!miL?U7<*ss%kUcXbCIBWIpgA%
zt1>>v7ZSb{eZ8jE$v?5L)dEYIVVPm4I%{#rrJdpMnYkGW->M-?P5cp<p~GW{gW+)+
zh>6Z8=+p_dX+G*$nvZCw`ABz~?@63X^9`1!1p-@;wNAvS(K)ZSa%cPk`DCI6?0^B)
zc#14e1%Yf_#M5*F&)`{#I8RnBJtCG}*9?&?lmQ2{#GK@1Dv{wiJpUhdzzeBz9iZ(I
z^{f>MWZyzg0y`2YNT6i1ev(`x(P{b@hBbv@{a=h1Qy7;>mYyISYuGikf<0Z836w9v
z+Eso7vMuhi?X}e;P<vgI!Kp`86fT72ku;!{2I;1bbkI#3k!VLDj%h^7sj!)zOL&Pi
zWFr%ccv(~9NRe}_lT)dZ1YM7Ws?0m~Ar8DkRP|bSZ&NjiBE4&<C#v^$t)Y?5gWXju
zf%_T^YiJp=xmR$c!6;0-A%UYe(G3Wf$!_==TPp2FyD0(B60$XYoAR(Os|*<g(M{BQ
zh;+Ocx#&X)JTzM`8t5(I#sK{q)HJpy`K0uC*Y%jG2e0BaO?L}k#~V~UmtJUZ;w{op
zg1vZ~EF;x);2p9|5FIFj?r$nDNw7$;N~o6*Z<NrI{D{4Km!b?biTCbk62k}hki238
zFA$~}XAQ|4Sj7VgjF2_9iixB(wTkJaHM5Fn(wbkzgJf;)RC2T@Y4Jx+(SOVcu{@34
z@L?ZDHQmKYjFj#gT*gP*hScC=e4=sqlvwDngwN<S)7=$%zJdUe$@&I2kbwOkhORmH

diff --git a/target/classes/Controller/MainController$1$1.class b/target/classes/Controller/MainController$1$1.class
index fc0c7d07bdd4a86321b025c081ab12b7c606a742..bf1fb23043ae6104318b7cec69de9a37046c4a20 100644
GIT binary patch
delta 41
vcmaFJ@sMMKJu_qNWC!LX!A1s7h9(9fhGqsahDHV%hStfOnPY)+f-C_5?92**

delta 41
vcmaFJ@sMMKJu_p=WC!LX!43vahE4_{hAsv%h7JZ9hMvirnPY)+f-C_5@NWvT

diff --git a/target/classes/Controller/MainController$1.class b/target/classes/Controller/MainController$1.class
index 66813ed9324ee9f45904dec34bab3ecbfd6eceb7..c6dcec78e3333d46ed749fe00fa50ce45a622cee 100644
GIT binary patch
delta 19
acmey(`kQq_CKF@T<SZsH#@fkSncM(OH3seg

delta 19
acmey(`kQq_CKF@h<SZsH#+J!jncM(Or3U-}

diff --git a/target/classes/Controller/MainController$2.class b/target/classes/Controller/MainController$2.class
index 2896cf2bf27e55ac5911a600ec7bedc7fba63081..788fbe54532af0e793f590f6e8ac655d86f93c68 100644
GIT binary patch
delta 49
zcmZ3%w}NlOK~~1;lMk_0NzP&rVVJ`p&oGxkjbQ<UCc``iZHD;_1`LZPhq6rps(Hm`
F2LN)l4srkh

delta 49
zcmZ3%w}NlOK~~23lMk_0NiJd#VOYW-&#;t1jbR0YCc`oYZHDCx1`Mkvhq6rps(Hm`
F2LO334!QsU

diff --git a/target/classes/Controller/MainController$3.class b/target/classes/Controller/MainController$3.class
index 2630346e4a076b8372fdd2492e44eb9ed7a9b11a..93368b0ca4077660263cb858c757498ff43c30cc 100644
GIT binary patch
delta 27
jcmdnMxq)*7BMam1$xJNKockD981^$rG8~wk#^MD4Z661M

delta 27
jcmdnMxq)*7BMal<$xJNKoW~eg7>+YYGMt#4#^MD4ZjT3|

diff --git a/target/classes/Controller/MainController.class b/target/classes/Controller/MainController.class
index 337ce00b9adff82935565c6acde2dac62e6f3886..c91fbba54f2bf3feb5a6585422eb5e45bad4371e 100644
GIT binary patch
delta 930
zcmW-ec}&i69LL|Esj2i#KSv4A)ErMwdb*#`A-10!E5f3lr5VW?8GpD-VvA6HDjP*i
zm?Knd?)xY?Hup8h<{Yu1KV0*kzrMe{-tX7%`}uyqB?VGaAV>Uch8=E*MrSzD6NAtn
z%QVOqFL64<mf$`V?nu<Vw#)X-=!H@wpbR5Wjua@yqXKEDL=LKui!I1U9SX5mD}uHe
z`{98D@WDa&;Sl<uUWeK9jiaOuq>ZFaq{sA*z0^1XFPuaKE+Ph(5R1#YFu2fq9i7mO
zZfJoOHxP(cPIeO^xW(3O^%<Dvc^@6{03GpA=MOCI{uJJL#{WKN_XW@M5^;E~-XTjZ
zZ{dq~{L6bLAGADVuH`dH8_)BFGkjGq$2!Y5_~SeCAKbrPYaHoa@DrZ+1p~hs{bBT1
zUxoQ=K<Hv^cLZx{bhx&KnpzR+(vmP!Bg2x^H{7Ln!ZNir+%)>aQ~JS>{_vLp2o#$J
zMr>4{2$y<9np)3w57*>Kmzq(ge&qT($~2N`rO+BnYaFdqTBEff+BDLbOky&bNjj4Z
zCL^`C)9yY6Zjz;AoK4Q@=p@<bEHltma^NR3(Mx8bkIY7}%t5rwMZC;|DGM-CaxqHg
zBU$n^Dkj%`5j<qE*2V01F5%Zw_{cK!kmU%F6$p}*2$xkDEcqBF1@u-URSJ<VYcN%c
zFiX~I(V$vqG0pWfH_$Ahxsm23nwx2s(k!D{PE%=C(5$3cr5S^_I;v^bz#`i@_YU-w
zTJ)8j2$5ZI%5KC;9cSKy39=8<<UnJ<5O1*_rgDUv9p!a2@H!fKye1y+7>3JnwZ=`<
z>ey`SNw!Y0b(*a+Y@KE699!qvy1-Uz;1xEmvT=>qb)DNbBSu;fCpVBJH!(?WH+sd}
z#BrCkd#v4uuRMTN9-^N-f<qo-qC7#SJVmxVL!Lax5_zRr38yV@_$qJt7Vpqa-s|wh
jB+VTfYxzX_nY4}c%YXWl^c(4S(jTPlq<Lc3hD6st+k)=s

delta 929
zcmW-eS4>n<6h-%m5D}QbL<AKlf{Ft&149{9iY*UpU_%rq_NXx`iXEegfL$?`qoNe`
zLqLfj0qkfZ_Ky9--eO5aO>D8n9l!3&+Iziw?!5)MQjjY(0amjEZb*O+644&L5Q01n
zwI)hGooY>TPlh{Ew8DBWtPp|Ni6rboGK!FfVhl$KGEj<X*o`dg!E#g~ABS{XXtB8#
z9;kya>Jfm$=!hfQCv3U-IOz$}lcWu#r?e?-v-u1>(TFHqK^(3k9@lhkw|q+zyl@MC
zxD5;LAQ*Q!**(~BpREV#8=leXF<RgWTH>kB4qw;iCA{&9|9#Ew8^q!*&-7lsZA(ne
z@W)5~<r9<7y45z*^p)fr&-0x#{7_H(YSS;Y!*Aw)xc^@*wP&hEglka50*#JzX>)|3
zO_3?;i1E{cNJFz7W7Xy`%$?9mI>Rho&`v@SEL}Cvu}Q0=TskAl(9~#`dPE!go@+VR
zwJ|O=Vhr<OTB)?sXbqt?RD+`i>I)_#nPe~-#bh*-%>PMltYIF<WIU4zOeQj!#H7D=
zaE7^0g_}&%LC$*TOnAvG_(&F7%WMS590W=>I?7yhlX-}h`AC!nFk~_M%R&s0MM#w#
zjfu;0UkVRdre$%J&Rl-w!B_IpR#qTLRw7hZ!6B>BL)M^=tfjXO!(=@&WdkNk0jA4F
zUD<uFa|_L_G?nHyn%imapjk+BC(T_ni)a?pETLISbGMG^QDomovkWFF=iC)&FZ<D1
z4!|araLPf%OBH9X#t5mwWT~qQ>gg?(qg0M@v*Wyu6TFU-JYEBjcM5&wv|19<wIqIu
zrID?(Y@K84JX;soy2#cgwl1@EE%-VcH`utz>uTb*w-6_{ksx=FBKI&#9@KdzTE+g5
zwMVQyhQB<4MV_LIJcC`HBVAr#th~e&d4+6wjU0KW<C7XpANVTGe2b6plTX^WcZz29
hiZ^{B{Yv_c^!tDMlk^wqZ_+=ce@U~&p|!nT{{RyJ@J0Xt

diff --git a/target/classes/Controller/MainPaneController$1.class b/target/classes/Controller/MainPaneController$1.class
index 840f94777a5be0d7808de6155f6d56147c8dfaca..7270929d1e550e727dc45862ba766f1d6a5a3546 100644
GIT binary patch
delta 61
zcmdnSy^VWAEDK}N<T#dU)lvpF#xe$O#&QN>#tH^$#wrE{#%cy-#u^4)###nr#ySQ|
P#>UD2SSo?)D_HFSy9y3g

delta 61
zcmdnSy^VWAEDK}Z<T#dU)kX$3#wG@C#%2a##uf%?#x@28#&!l}#tsHu#!d!f#x4d+
P#@@;QSSo?)D_HFS%UTZR

diff --git a/target/classes/Controller/MainPaneController$2.class b/target/classes/Controller/MainPaneController$2.class
index c7178525f2d06916c003c94952883b234e7c7b9b..5e968fdfe8680a9d6b790cd0204d1727464e444d 100644
GIT binary patch
delta 81
zcmZ3;yO4LoZx+VZ$$wZ@S#~h6F?KR=Gj=fuGj=mbF!nGgGWId3F-~C6WSqoc%s83B
lhH(mm8{<?4f5vGHk&M$Bk{D+)WH8R2e4n)$Xht%d9RPDN6(Rrt

delta 81
zcmV-X0IvU`4WSLN`vd`zll%m#Ig|hf0hIs?0hRz00ha(60hj<G0h$0N0h|CS0iFOe
n0iOUo0iXaz0igg-0ipm|0iyt70i^(F0jHDS1%m;RlVb)xl0_Bn

diff --git a/target/classes/Controller/MainPaneController$3.class b/target/classes/Controller/MainPaneController$3.class
index d7698074b1bc93fd8d6574b46928260e1ca1ed28..247582af1d62c3a4798005a5a6fe53408159cea2 100644
GIT binary patch
delta 63
zcmbQpGm&S*Hx|a_lfSdf)m_EF$+(6=kZ~=865~1sO~&;M28<gR%o#T_I52KuaAw@Z
T;KI0>!2`(lX52RUAZq{sUSSdg

delta 63
zcmbQpGm&S*Hx|atlfSdf)!oLx$+&|-kZ~u265}ogO~%~}28??c%o+DGI4~YyaAw@c
T;KI0{!2`(lW;`_cAZq{sa3vC-

diff --git a/target/classes/Controller/MainPaneController.class b/target/classes/Controller/MainPaneController.class
index 7884650b1ebca8270b456aafd4fc150d7cbca177..fdec4a990660e0d339f0d533dbe37bf01e60c9da 100644
GIT binary patch
delta 6809
zcmahN33!y%ab|Y2{~j-Q0=a;2g%EN;AP~7jxDDY5S2$ggC0W>HA-iBeVWmYxL_q&)
z6|0qM3ksI|Pe{BgSgoLFTNMz+TT~E5kVELae~*L!Hs7~-^JeDFn>Xis|Kq-s%dBr+
zX?PI;@(fWst(p~0>MPdx*f5XRUgNdE4{%0-9|imbXVuHrzNYg6et`>Wf7>wICAh4>
zuL7>XRduZ`-)aFu6i8@Lzp!;Th9P9DCz9gTY?0hvK`<0As<NUHEdpZTsugW06bu&_
zfsqKQ%$cgL5xtY51;(HOK`C^*CN5dvhylbnf$`W%JtES42?7&?<e?5vSqyI)CwEQ}
z*hUfruN!CgIvv&CQA1<E;HRbvY%i%1P1It06$>}|>74|24vL-Vta6yK3xcuS?sZ7n
zT?J-Hs<p5KD^=rQbh#Nb5iCwmU@F<N1?KSKH-*QBhxx_k3hc?4SHk0MCXBN(Pj7*J
z)Dz(erdtH|#eVA5@PW1gI8ebs0taJ(`jRn0y)9y>Z72>?aJaw`I8xmn(LZgpz+2%9
z1e3?%EpWN4a6gU_SPV|KRE5JUEoH`WYIJ0L)&vAwk^A=4Ni`LY>arzfoXF=M<0yA7
zstV$ywvz=;!KrFVWUg%*PFHY-z?nEp-4NN|cbh;vPUZ7f>8scbcDbTVV7WvqF8A$0
z++2Yb5@)V**j+)SQ{X&(z1Qt@IlMu%OJJ2mTW)6q)&#L`feR!y+)?H5YdkPWsuAcx
zFFV5HT<So;QC8@UizV`Qj;HjlqZC}i9-n7lY|nAJbB6O~X1qhaH!7_|En2Kti^~Q2
zq>UokMg?;`Zr38OgQKHT!4>M^sP^Vs{Jp@Hc(-~ns*U9yT&>`}0@tXi(QU`yB_-U2
z_X}JHCe~qr%f3Xx4G6LNelB};Mb5C=GRFe1(_L-F^|;y!Zd3*S0See2yx}OXqsn80
z<M^<^KjI_m`sl9d8wEZF%UOGSIfu~Wto=x5MP<-0R-A@^=KR1X)lZ`HO<M#$gU_mM
zWAbd<@HqwlE^s@?$gG%*?mO9F0SBiRITkxyR@{cW1@3{Xyg3KSM5ou~kVs8n9oDP$
zF)8WWut8uW)+0nQN0EJw!{wRm^f>3Z92R^5UsUiVfiL4L>gAZe=56>7fv@3ybzp4w
zp05l1CqBz@G|uTLtmMj2Q08?mW^2F6xCxGhiyR)WCsjtFM@IQu0uQR2ViWOgwJ|n1
z{18N0Arjve_#XaS{VcX)r~k4UbB0eHQ<PKU@Oquq6`t(5wN-qG5AZ_;j|e=9$JC6t
z5w_#_v4WonJb|C8cgE$L58>wmzrZim=i~B{58>AWzkxEg1)ICjUG1%LyIhVM1;15A
zd?(ZQ0#D&-wRe2F<qZC);7<b2sul6wO(*f3!1L<k@ri^N)cW|g9gpKBftO{dM0nl9
zYB@fu?XKbO8ZKEU@ruB!1nPzO3=5G#A)}x$HM3QhVlHdZIfWiiPPx5iewDl2kzMBT
zn8|_=qoZByTW=7rkS!QI9IT_pHU$q^DO^y5x~Wyd*eF5KGTtmKw#2)HPs0YKSV3_*
zcA}k~HLBX_mDpB-T1#xyXwHDSwS|>#XPJYuz{S~0iGq?SSv9xro7_fFTbVL4C=1<-
zs(JAf#3gYJwO41hPKxMAofPUUC`|@Wl3uhowvH`G7u1!K`7C;*_&pvdtyV~)Hd2L5
zL0M9TXuk?Wo%V_vdzI8dp&a#8>!hgl6mFqh>ZwpKL3z|$?Gcusc25{*wo$&ITd1$P
zI-wwM0QDC%KxU3$B}?2j-mx|1e0Cf_g9HthTNpizjRA#*a66zvgg)xqiS5;Pi3w>o
z8YXDCY$OpJ*o6+4Yq-74>#kW617;c`^&BN=v^q1fTSAebF;bc+vM;JGtDIQL<-A;>
zvFekFoy^5Fp0kf8sBa~9HBFS@B=u5a3QkcIk~+th3YsP@r0^cHdnhzR9hcO}G@ZsP
zG@AvqxAd^mEIFH_KAn_fDJSNcE2u&}mNd-d6f}?Kt6h@246cF-g{rwMjp3Ma<xH$}
z)Yum|Jzgu>x$00Atl|PsHG({PM6yL>ud8wDwML;u>bhih=<er|Q^Iy1O<it`IAW!v
zbWEX-xINQxwW9ND?LXl&VpeL2?BkB|_U$80^r@9Tqt6xkLeQ7=)oy#55yQSgNK02Q
zb#Ch$J7=Dw%-fIozLggHPS88_Mijllh|?1BgP^zd*^hGelb}QT>}NSUC+MI)`$f(!
z2zpDOU6QlQg8s=fg|5iiRY9-Q{wUfXsThb627{p2Xg_C$7*$>Es3~;WJsyWgF|d!4
zRC`RUnw8$iC=fcUr_)-iJJKQyiXlSXklxearN!!j^q#(2zP%7F0fM10Ou{e{!U4&T
zU&`}ao6Yawd2zG(oje!K=F3>ZcwG+22FWv!-B2I7{plmOF@5CL2N1yw-0pM)cQSQV
z*Umm}TRbOOepr#^44ZiL={RottZuD@>8=(uzC49!D_YR_S`?!Ft_6+nM9pb(qoxh{
z=F^;b4UO+iH>L57C`9{xiw*fc6r#0MCI@{tC-QyhrVF{*U1u$BJ1udvlJ33^x2ieL
z=QlOo(;OMVaZ$W(F_*cPIQRfQ3@N($+SAj$w5BCL-A8LfxV(U`!39+zA@^S+#0+1<
zH|&Z;-~y{VYn^(m+k?1Xb!YZV-oO;W6o3`<06oYfK^Supt=qjn(}v7;IICi;WE%+z
zRKRRf=?`Frp71a|L=Q77z{SwgU+9k<kX%CH96iDiG5st(%8&spaE3NAWTeN`d$MzV
zf8v!!K1nwJ9;YY3K<gMYfL9ZbVHtIRI~gEa&;L1r`Turau!E#Bt^7=ZjhUVPOi!|)
zkkD&vfOyb<a?YT~SXLNI*qxt)@_2o_kMK!}y>#rQfW#u$?l(Tn<Q67PPH+&iX%i=`
z0ggdC`U|_wNKf%fX+NDtPs?Kxmwnbm9wuMc5+Gq0e5t|7U2s|ler|ws02*AB=R;aA
zvnYa>0=&aZ4?}BskI~$Rr5hM~LfVPP`!e<*G@`LI7EN_%*3im`s0NH>VLIHp0h5Ao
zas##v!tENcLlExh7myYbklyIiMRp5evKp{^kiAC(_VU9T=J9s<8GB%?hW(pdlgkDG
zcpsuUlH0IRy2262gQHNuW|{yWK^YteH+&3t@Hu?&DXf9dbQk)=?mjknYmU1n&+*a!
z>OZ==FgLc-kiEdi1ZzDO%B>~14@VJ9X{L<2B{x5_C>F<Ru;fuNtwc<;Xs}vC#*Gi)
zs2Q$A6+Nf>CMDmaVJVB5-6jCcNeKXs_^<#}8E*<e^W%*Hs5)MekTiiokIr?_k>Rhv
z#<>>5*_H|?p&NV)S@0d?!1vGtPH}vlhCckv?F(l($bW<xK7Q*~!C6=UKf?+Rh?Q_2
z9^yyuBX9w>z(v>!m!J_Y!;A1M9OB3CVYmt>I1D~Vgs;#DKVTSKKoh@%E&Lj`Vk>^>
zrZSX);ktciaK_Dm)q1{KIL^8SLOTnt(BC)@2O;ZrnKm;>tl>r4!jOUWJWtOsWMpm6
z(z6VONu6mcLnhYz6m4Tj;Us>#S7x&$Cf+U>_iwWtBU@wy8+W1fn1+k~0$Gh%%b~lp
z4)4@(S&^J^%-uPr5$`I^)bMv2uByZPinBCayBQ*iI9s}D_<)`!GWzqOAFdA=JdHO4
zi~(N+2Y(92L1&DIUf2rqIRW}%0`$j37>>!hA!KH!Knguaf9Evn46(GGcJP^dasKY4
zU94+=u+nbYqbJ!2znSPU-qH+){2>aixAM1vKB06h;<Zwtq>K#T9_XZDAVizRW>a?P
zd5x)H!}gGf9h*gdQedM{$>PB0TXrDlH}NL2A{4Rt=4tq#;RRT_4<C|o&zLqEOxO#z
zWT<0$r}`eu)L`yDe3WUMuO4fP%2u+XVHb$Tbhc4f=z|$>D`x5{$okm_qV*CkD{E1+
zQ`>+pLnj5MUxc)4(vmOWe(kW1A=VDVGaAu1jh*_Z$U1ytFHYjQoR-AlCLJ+5fEXW#
zPw9v`IwIx)KmUCHObxO-{PTx`+?D?M!8rV@zPj4<0?RjWSWPM^HOka2DfNZ%IH#l@
zUN2ID)cJm@qoh<4D@#gEJXA}bF$`?xxY{bmSlprEE(sYm+$%?ehWq5W3!m5URfZ05
zWJ=xxvG|6c_dtO6K!DeGAi%8QznY9c8RFSK-T5`z15z;;dSFk^xLz<8^I$gi<`;Y)
zSd00v18;$P><h2*W$jHI0Po^JIEI5b%Ll_LEP!)31g>BqnsF%S_Hf;KseaoB^4YhR
zd-q=MO9(q)CTR?j-j}40bsBLi_0t%lkW1w)nV*0hcHCre84Hy;yR#7wmDb@qMcpzq
zJRFPv(eQl@Khp5CDQvc{UdEHsgx_iSLm(u59CvJ_pC5$|{uRIID=roX*s=nl2@{y>
zSB)^pNT!=Gb`3CYgm$__;#S8xTrbf)CQ~Dy*vZE;bIsh!_k4dr9?fN#KjVOzKV~Ii
z5p=*Y(38Jn^~JF;634-091o>9fnW3`un;GL4=1rVCc{RY0$XqfY{hA?4X3krX6Y7}
zcb}0ELG@fh46rZ+ZDh#jM|OZ!w2vCt=G(Zg?50MB*qQ++nc*3Fo?c*E%eoQ=VZTDD
zf`=45nSK#E4^hY}uR<@<O95|m<kiv}%QNaIGDD*n{>5kPp#)C;RvM+$Q#*}1FrtgB
zL2We32w*howi(P^M5#O5A9hg>jruT@uTejV@H@kg7|26<MgtXagQuZ9iQ>r!|D=va
z*3+#!bv1G!k1cBiIc5heJe>PIU>Sec^vz{6SMVFK655~>vT+{dVin}!eCUlXHhDD+
zMK?^s1uz2_@;h@SEXF5cDQ<#g_>^wm3>My7x7r>V+ORxeH3_{;udsV1^eX*>BUai^
z0b0am*~rt;;0t!0Vy<_RGo=x}Ep4RYQnuZ=Ix5)>U-GppmL_X7wPj)6%-_K3AsHKV
zJ^WXa6#wo~B;SjEe{kR9*96P9G}3e_cjgYB_^+mNe>TP4x&;5d)DqI)LI?OAf-H+4
zqu0xtC1u^#B+D<V<~K!I<tsNJY7ndClV^@^Bzq~xNZHHa)2LD-R~@-q$c2xa9WtKY
zq<;Z_FOx6mX3}mbY{3nL9S;hVx7Q|V{5t<FX|RHO)eWQ_4NAL47(e{~pRl{@eAgfJ
z$PK0OM}^;%wpycwH&E@v8w%r376D;C>4fXdrr$nqAnk)2NHf!6dN&{~heb(Y+_%8m
z(t&Bs7KhP$^1T*i_R+s-!gZ_bKxv9~J*>EyZ(zax7!R$c|L|h}GoxwiYo1;=T^wj6
zKKX<*(0^Gr(fjlPk5l;-^dYPCF`Zz_*L0G;4?w3v(3uc)HUymyK^H^Nubg<g6ay!c
zLDt04eEECY5N1&LO}pO^*56>}o7FVjCJ~g2HiKnwA{8?u|IzfoI4dxgGu;XngUt|b
Ih=j!d0T02S6#xJL

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

diff --git a/target/classes/Controller/MedicineCRUDController.class b/target/classes/Controller/MedicineCRUDController.class
index bf5f9a2229aa8290af8765ea173ce13a00bfda3a..17f0a21640d3c524a9b8eb2d316df94da8d68090 100644
GIT binary patch
delta 560
zcmWNONo<T^9L9ftijgveq|wo@?bM`}^gt-$U`?gOa8RWsvD6+*M=Y_Wl2Y3^$g7qT
zRB1$uiSJOc)sl!1RK<mZP_?xv7m3)O>zn_x{oZ&q9!<2TdZ{E)NH1m+Vh&-7$f20w
z%w;U|T=!7hgargxNM9Dwj}js*W++P-#ZtzxOn1xmvVs^ZDQ6WGtfrDR)UcL1O7V&L
zx%~s?Z6wGh(%DQlTNuVx$+wZuc4kuMiql?(%SmIW;wu=zZYHvaD0>yKPqF)DdBDx`
zPI!k@xKf1=tMC!|RjKq*vN$H+<1U!q5<W>Xr%2&68B{ZfGfYyQ0?w+^Id)L%`eZbF
z7u2VoAzWl6m&oI?5G0t-6%F-$%S^G{2Ay0blWQ`$uGKdf%}trz(pjSx-`1c;jk%-c
zcUAcwj{E+!aE=XrDCr|fA4~c~IG-|uCSiOgWKBZVtnJUW@P(_++GVe51`e<(ueIzA
zy?HAREz-RchgQb(p2>V*Dj%87C(-(>k7{EB?TY=vLB5K|H)`pif$u!vhbxV&x1X*x
z(vkN|pZ8m&{)o_D_4vmagM2dztrJDonG#DPW?d+=uEebyRTkj9^`y>{ska^^Ea*bn
G>;3~5`ifxy

delta 560
zcmWNOYiP}J9L7Ii8_vR+sKv4Wwlk->v==l(Ubr@m9A22qhO`ZH3EQG+ZY$<`Qu;NQ
zSut~~<8pKq%iI-3*vJccAv3oP!y6@+=hd%%eV^z1JfCkQ90|v|273V#SwJ!i2~bFo
zBC=UT4vU${5|<R{oKlRB5(ZMrAeIqgIipy?ILesBO3kj)?`kSo!w%N6i*?koo+iqP
z>NiehJa>rCyej-`B8_UY*vx3QNWPVPwlS9)SCslHxRX?BwSG5a*uzxz5@w$k?APju
zY!A43UV~Ssz=st0umT^E-!X+gN+$L4ZE*gy_TX{)aDo&XN#`WP6=fQyDB!eWouP)a
zZa{jQ7ge4MjN~F?xkMf@VYtjv1uo%A+%i%u_nJnU$>6$7TGaXm<GCrbTN=BqZg;5C
zTg_cHzo*#uaXg663TE4gN0L64^ogWTh4UG6Xr-7oVQUqx=j#7LEnm9E%vyWhG;FBN
zc%x=-=})^jypyg&9NsgT4@~DHGx@}9K8seTj@89RzG&@N4)RUFyVdMFSNXw1e!B9|
z2K(hYLfv`4b-X_!^;d-ckz+8yjC||Cd`qCv5-GKwR9G*zTW=!fqu!D@XMUpAm-E(-
Km?gVFR^@+fiiza_

diff --git a/target/classes/Controller/PatientPaneController.class b/target/classes/Controller/PatientPaneController.class
index 3a8a09b7b113949166f5d1c034dde46714a2b115..eb14664868f71c934ecb81e0faeb779a275f7eab 100644
GIT binary patch
delta 4858
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
A-T(jq

delta 4802
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
E0sWq<dH?_b

diff --git a/target/classes/Controller/ReportsController.class b/target/classes/Controller/ReportsController.class
deleted file mode 100644
index c39bcadc882bdcc5b0218a56f0c7a0fd61fa85ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5895
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

diff --git a/target/classes/Controller/SettingsController.class b/target/classes/Controller/SettingsController.class
index 4d26177ec7b3cb0aaa077f1bfcc4a4ed786e159d..bbf9831a9bad32536992f5b015a1ded243f738e0 100644
GIT binary patch
delta 120
zcmV-;0EhqkPlr&j^dSKQv-Kf(0Zrxr2mt2*3;^i>7y#-3MF8voQ2^}#egN+PiU9Bc
zw*c}0!vOOD%mDQO*Z}qc1pxQ~5&-!D9{~ITE&%-jIRO3vL;(K*O#uM`S^)x+x+AI#
a0X_f#00sa70Y3l$lVl_?0R^*_BxVDbnj_c%

delta 107
zcmV-x0F?iSQ2S4?^dSKPv-Kf(0Zr!s2mt5+3;^l?7y#=4MF8ypQ2_1$egN<QiU9Ed
zw*d11!vORE%mDTP*Z}td1pxU05&-%E9{~LUE&%=kIRO6wL;(N+O#uP{S^)!-x+AKS
Na3nAR2D70gW&_s>B69!$

diff --git a/target/classes/Controller/SplashController$SplashScreen.class b/target/classes/Controller/SplashController$SplashScreen.class
index f2e9cfda18d10827b6bfc4034a878058c186c812..50ea509f836c339f51ce0d7c29f3a535404accc5 100644
GIT binary patch
delta 13
VcmaFN{+NBjLMG-H8y7n;0{|)C1&ROw

delta 13
UcmaFN{+NBjLMGvkjf)+a0VrPuIsgCw

diff --git a/target/classes/Controller/TherapistPaneController.class b/target/classes/Controller/TherapistPaneController.class
index 3ac1b89e0967585734ece7c4bb2a125e06349538..96c38e9d128bd43710a6edd1db1899ed23bbbb72 100644
GIT binary patch
delta 522
zcmW-dSxA&&6o#Llk{SxaYATgM`pv1)nZJ!lLkc6Y$cru_rpy`0HteR-_Mio#g=jnN
zBD7gyHE4f9R+=pa6%{RxW@6n`7u|H>MG!<U-5k!xIp6!f=NU*0B$|_MFqgrMX9O<U
z<dKiZ6ee4pTjGSR#VyMyAcI2t<JO1b3}vY{mobh?a#_was+dKBIV8=`>kn0v$x3Og
zBFbu}vxXAZYNtkZouwwEBkLK&Mn<!VvD8YZPM(|fe+vuQ%3`*WRKJ29b}PRzuv?CM
z7{y+z4A%tqGlT<-<e<F?w-+DL>!{Kk)7%)taVef4hm%q~#UxJak~7TUEVDUBIp?XM
zo;VGD=fol>bb$aD337=rmzl~HjT?2!RheJ2?8u?4l)yC0phX6EWN=#sz6|dAZIK+O
z?4GjS7qbT<_fWUCi9|c|dBhSr#OX2BJYfS**~K#s)2Rf{xy~zY@PeDXl=y2uR9Nm5
zzZ16ilKCK+kIbWsMWltdTiAMp=o9<s)q$UtwvQ(IN%4hNzFI>x9{9#EzAN7k`x~9>
s{It?ok@L&8#}-(VH{9OFN}V3d^eUWg)u7dSGoAGRu0vgy{q}bL18~QPEdT%j

delta 520
zcmW-dOKi+h6vlryG)yd{7>_m+$$xZenE87&qLqdaO^I1ph*Z=RU7&=BiAP)M1`Ce`
z$Gb|1dX=V(R}-pey%H4*r4K`}!NO)15{dX?b93%J=l;I$eA#3+*;eHR!wjW>kwnO&
zP}NMPQ)DTx)J?IQURjP$4%6(9*BGi~IIA?7WIR<&WVL43Fo(6wquSEpOlTdstQTVg
zF={AcBc*K8pUryRVy%;UqbY{4oiXfU96Q9>NtjywuVV@IEMvFGbs{#{je_RD9x3i+
zH2Z92q$Y5HVH{)>hpZ>kQF25#lbfUJpI|J<L_AJDCq+EPWKQGL$Slq<mnO<NOM-J$
za6a8#SnNU<3D8WCOIrLgGq|GmRjqbS;w_dJ-9O=$g1Ie$I}*4rfx8m8CxQ0#!)U%M
zdmwKe%Ipyyo!a%Wl6b-*p0b=SR?tl~&)CXy8h9b!FXiZ!WZuxiYp&Bn8*kI0spYQZ
zonq@1=Djc<SV$jB>8Fwb#WqNaj|w5fVLowz&vN*MR=(2CH*1Pj1imwZAM*Fp{>B!#
pUp7Bp?6OuHU+gm06;HT9%k>j(Kxfdl`LkXB|Eg0}pZ)gh{{ceMiCq8y

diff --git a/target/classes/DBH/AllergyDAO.class b/target/classes/DBH/AllergyDAO.class
index 31c96f112bfe036178541dc014ece880a28453f7..39d788a14d787af4fdd4f7fea31be363d6751e33 100644
GIT binary patch
delta 1361
zcmZ9MS!|S56vuzxEd7RA+d?}cDQzv1$W&?r#u(IuC4nFW(uWp=2NI+4fndZ36w$^9
zcg5u@o5GY$l&#dFl+_IvKoD_PTu}7EcOMi3{_p)R(}u~+{qA?~Ip=@==lsv?Z`<0M
zK7R4Q5#UDt>`TuN&4c0DV2|lcT?mf!cMR(c%$f8Ub6sXv{@XO)@qNe-Ssv#{b3Svl
z@KZo4XbPJ22~zxG_GL?n-vX{RHM!Add^U`SoHzMgdn3e1F@ib)L7sxvVFV<p(pol)
za?Pb4ouy?5wInFAQM;^ep_)x>)-zxWTV+u;J99IF9`kpuWwy1Ns5o$wx3as}*(U3_
zZr<QcdE^+!c6R7wyl{82O9;E=laN)fev_G^yRx|}->106!klg!ccE;TQbQkaX?MG9
zY}_h3h0w1Up=^3QYKk@N<!!~P<^|r-F2*PxbNF$_vfSY(XyZQiF`$h1%e!7yk>`Pm
z=RutvD(bS8<R#fxg=9i*ao@w{zrxj{1~Y$GW-;EA@B2L97_?XSiov<+K?X}I45l;9
zGw9&v3WE)vL4tK+@PT4wdC4;<@`Pt_4J$l@68B%hAoBdM;^`Qe-kSQr=6h8`W=O50
zjE~CpBR*E{Wpklsu`<4=w$x>7ew*qG3o5-_;CpG$K5@N_GmlTTi%UndeNK~Ta$QXh
zK?*oVmqYlgcA^j(hc`~O2;<asXsIByFjvv6TAEy3tCo7NmcdE~9H-qyYaKDUyGId5
zyZ$fN*+c5)3TgUbsrC_?>6XeKb^48zd4tD_>HLIrV|8ERGsmVN`;$(YMMk>1COD+%
zMPiq<B-Q*N<Zwt!$V@93n^NJjZclmL-dlIf<<y}WL*toJ-!eR@d3%Zmo)*Tl;{6;G
zSjnwC&m3v=4qjv#Mwz}W%U5`YRg_t+daqGtuW2sUO9f@e<8DpnGOwewyt`aiLdBTn
zbd*A*2RzLbd;BP5L^c}0It_3%fDOFrX*LV&b3rAQ+Da$5sv$#RW1Lp0qPv5Vg)K{)
zorwvAmuJEkMiuJTfWSqr4{1=v?i~9sv42E<u!WKIzEE+_M1MPq*C+)02?to)Pi>#J
ofo2+KfT|hiOTESTim&y|Yxj*T&bswye$`o8@8|eE!5@tLAB*n<Z2$lO

delta 1773
zcmZ`(X>3$g7(MsROyBg)bfz7kBSLM*CJlBfLj!~us$ok6EP<9tS^U$KF@cN)y0DrI
z{s2L?hL-@^1ZWimL`x|GWmA+zP*DUIR%Kr$B>Vys@Z9?zuM<)xdGFo1_dDNrzUABv
zMeQ-;_~ShX0QASbR%3#mtz*4F=G%2s60wnE%1Vb<R!>gEYs@PByx49I^8P2jZ7WG1
zCwlqD#uM?Xy0ZFs%^U&Wi0aySjq|TO{@%2iadl=k7zM?~&}sG6Pfr6Da&RJHgG0Su
zDV<t5vocmMqn1vots7|WFj@kC8~6v8bX@jhA+DG+e20S91iT_o<nbrGxM2?SN5yS(
zy1!7|H5>iK5rK8k;6+z-V@^N-LG>2!APoXd<{f_|+RQzJc0dSjgz+g?ex3rE_zWBP
z71)T+Y0+d3$QUk~&G{Mmqoh?o`T+*mR&uoon`!Oh$rgM;L<S166<>0vH`4JHS{Pv)
zF>YG5@)?XFJZm!VXSC99b6|8*`hADCHON96c5w9;ZKU5cjAMka=|iW@dONBYYp@f$
z=qnQq*v*xO9$28_yHJ3+D!v;r%s@N#knvukvuR}^_c_S@+&f@S4`z#R%(AQ(a?(?n
z9wbJ?ceMQ;vlZig!4@)3WOgvFb{M~jVK(D(yyh@oYcqD^6EZ$TUw*8#8He$q&G==!
zZ!?af_8G<&^00$cjKic>1kV#hk*33^W3G-89WsX(dvw&=%HRmGNAUx5X)+gPC78j3
ztZ0R-`5UY+Fv;oVB)gY#@0jYP3*&K|D;MWzl+AG<@>EwnDYX*#5fv&zeW)KJYzgJ6
zt`@TEK)w?pA7kiEPD`HhE2kyfo|X>Y0zX-^N^F#mkWVXL8sy;0F$U(P46U#O2>k2-
zlg~xY?-Y5$K|U9_pi|&4D3+O%lAJ@Sjy|rE&<e9>m*S+P`;wa7#XS3nr%R~ErBvK9
zM6jF+X;3~bRrRsc(769AXI^SHij%4nLE8VOR24>dH6w1wTPqCh311$Lf#3w_$k#Da
z4!bO8@~P%dkt4Owts;J9`83y7`A#Y5s+8<Br=X|t`?E+PU8f=&J4OD1A#Np`b6t+9
zLX`7T0!8d45g!A0BP@r3BD`t}dD-;k_`OcikESdpGU-`N_XCdFB9>wa^I6C1V<WcH
zVkdWY@!hThzssv^mMuhs=n6H)I(?KXA$nN|YR<aXymVyU9X`6ZZY)W}y0LQ5XxBD^
z)%cSnJfyZ<DK;(T7Lh*wVqL7W{Tv<Hi<p#TU+7AbQjb<QxJXi;z+=3sBZqCODtH9#
zA(QWz`GcyaXIPxG&LHNhP67IEeB6eRRDeinSXWl}oPwRl1%3l;%0*gSRqyM#$vuPr
LZ{dy`|DyZ<i=s^B

diff --git a/target/classes/DBH/mealDAO.class b/target/classes/DBH/mealDAO.class
index db7d4584768855217634160d19b93287a8fab6c6..1ebb777fb0c1a5c9c1a54a5d7126ef583aab7388 100644
GIT binary patch
delta 1410
zcmZWpSx*yT6g|^z+9^=cKm`E>1Y*ll5s5~uih^hW!L7kYkOV{|vACe(hKT#F<F2^l
zh8yyLOQJFHi6>utP=AVvc)o9@*l3f^-1+7%=iGble9QTqrH%f6{}I4!3=L@+c0FkS
zsvOikj#1^*@DE3|qW3um5*}(8z#|op<IsjDda3J+@=X8b@+&X&Jk4i&r65E1X&EgF
z9MzFXM^`5@p~1qm3Y>^X0xcJ9I~=@5_*BHZ!n@r!0%eGX1)aQ#*FYk+@)~D2U>mmc
zNx=?u(JP{V*D891Zw6FeC&P+VmY6~-4cR>PV;W{6OXetHNub2cA*`L)#avc;>_#{9
z#Ul@Uu$L!(LfnV_u;Bn>Z1n2kzZZx2j*yiJ5<U?A0KMPcC@~bmP2U+L>7$j8BorW>
z<nj<eIcqFKF{)X0CHvceQi&-@mgU4QkO*{P6P**Q(1*jU=|-K2E(w(;x^x6_1V@SM
z7-QI*3KkUs#~E;fM=7w3v9?`>rlLs2Nfl`-<^qK=d`{ERf-?*`i;&=@e~Q~2!(<-w
zml0c#Gg!csi`da}J}t&lEWvW3siPG_)i{$NyB1~AU^1~`4S}6w6_w15J|{B9=yM7d
znoLaCv&LA-z}*moJMbUw^UQbw7o`e*#@9>SS!@GPLoT(HSsk@dk6czQ!fMRHTCxa@
zV+AW4Y7&;A1Yzk?30BO<C0bVIDVA7m%;1!ou*YCga2Z!5hQWjqi6NB}1=cY#Og*iq
z3Yw_J4b)(>tnFi0!A?eNXA@O7xmc-GQBkNc+3ZfN_O4>OsKeM1-i1~I*0PCBHE-a`
ze+Q2RwFP>kCr4s1wxNZ7t@PXo4>#3|O<crwDxgE+Ft#CJ;;``i8uc#L(vRyBhll<*
z<TiLY6GLxeN?su@uN;yRGoobK7Eg3nZW_Cy2NHWFrc&|(_u9$oZdOg=CZ}_cGueAT
z)n7?%gjlzc+?!dojlJH&lw$j<sGUmgw3w3UZl{UbNlwu%X&v8^u-UzIu7pJ0!y+qi
zi^=WLg&_<P+E2oQQktNY3CBPCLU!PI{*J*|ncIxMBR@}K98;M?{M5H-ABIbOzm%Bo
h*CbeTahHb{+{1m|oqYX(|ECz_lSb<~Ug9-U{s09Ly&eDn

delta 1760
zcmah}Sx*yD6#nkCWlCF$Xaq6ff`Vv`pdxCFD6T-7$l^wDNyUm_1qF(`#T~_c-1mLo
z5O)(3qfaI#zWD4<@YxsjyLYCwD#nMobC<Jx=bZ1Hw^^UFT_3)`dIMk_UUs<#I8t@2
z5$H9qwLX+rR$k#R2{bMb1)Ggr$0xDf_~!T^4s^dy@QWIERWKB+ZLJ6gn>Pr!OB-8)
z&9PHuaCK8#(0X%CZwfa?pS-48aVTWH_RbydZwRyn^1{-kzrLk)lHqmU^xkvfJ|5_J
z=s_JG8Sk9$#bcu*(Pw`ukZpW*X4`Z;H@+l}o-fb@0Vk5+WgK4a9Z2B1mZv=a1^<o_
z&mp?F(a_9QJ_9Le;p#C3(26im0&Q4FskO#(*UX5N9RQtcf7p;g7n$hCn;{qkAF?nS
zLzRsJx&#U=8*;ZE8)(Z$iH+Dqdr26E&Dg>l9}=+@5!lgA9XqAA@!Nr&d?RGhOTh<f
zUc<<BFHsmq!A)5ogB;1-DD-7unY29&V=xV4QA&?~6rvL2QH==-QxT(_M(h%aL|0>>
zbD|2nu$w;JD7Vn{#ViY5CW^2J9mKVlI?RoSPNl*=Ds&nto<2GIb!6z62;yj`j2Xc}
z?lc^t&|xf)kr-v3hB)k#DOW@^Q<?Q*q+>dBID<DcF`K^2P(m!F)GUi(FJhje*sCq<
zcFZG`BlMy(Rx`6H)HO4kPU|N2PNGSNHueWshYpvHY8^4$`G4U)N{a@Lsk*O7s!+JI
z7&tJ8v6Pckm1IB_axj;fpU(_0#1v*)@<-+w^lb7+?#$ZD-EmcW8z$ofcQ)D?qp;d(
z!Kql_h{Gaq5~mb~LT^E><X(Sedl5AklR-;a_W)VAjLfT5zDF>tU?!u!hY-~!#$qEs
zrANuTR4Y5}l#H_NG<hpI{?S_;$MF@st0PxdA{q5aLjwk56|1~j`7$}4Z~4-Ae}*iU
z&E~^d<tv%;=M=}&nD<|mNQ3r+=42s6Tp3bT=#eO<^QtRl)B5<y{`{+9!wQJmu)+c&
zaN+-o8+%l|C>0}WPW;nlq({w5%%3@6M)EJQYPNfFjhikz;xx4w*vq)`yJkK#@#qiL
zjviI7nj^wEm%L3Ct&qh94v<I(*~*7Vj>8-ZM_2@dDLlruI?jeVfhD9>fW)f9X*9A_
zlC&jkpjjMclB$xvYb=0H7C$;1g0bOH6B`ayW?3V2G6&aKbw_kg5QbE}&gf+KWyqQj
zMuKX-yjaz_0Xf=EiTJs3gW5M^WgMt73g|CT-;G2$wnbcG`@oiiTfEe88+Z73^7$^m
QE_Czc;_eBa;RVuv0w2xxKmY&$

diff --git a/target/classes/FXML/ConnectionPane.fxml b/target/classes/FXML/ConnectionPane.fxml
deleted file mode 100644
index f5e63eb..0000000
--- a/target/classes/FXML/ConnectionPane.fxml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.Separator?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.Pane?>
-<?import javafx.scene.text.Font?>
-
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="795.0" prefWidth="1267.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="Controller.ConnectionController">
-   <children>
-      <Pane fx:id="parent" layoutX="2.0" layoutY="-5.0" prefHeight="805.0" prefWidth="1264.0" styleClass="ParentPane" stylesheets="@../Css/lightmode.css">
-         <children>
-            <Pane layoutY="47.0" prefHeight="62.0" prefWidth="1248.0" styleClass="TopPane">
-               <children>
-                  <Label alignment="CENTER" layoutX="14.0" layoutY="10.0" prefHeight="37.0" prefWidth="269.0" text="Connection" textAlignment="CENTER" textFill="WHITE">
-                     <font>
-                        <Font name="Arial Bold Italic" size="32.0" />
-                     </font>
-                  </Label>
-               </children>
-            </Pane>
-            <Label layoutX="106.0" layoutY="188.0" prefHeight="34.0" prefWidth="84.0" text="Username:" textOverrun="CLIP">
-               <font>
-                  <Font name="Guttman Yad" size="17.0" />
-               </font>
-            </Label>
-            <Label layoutX="106.0" layoutY="228.0" prefHeight="34.0" prefWidth="84.0" text="Password:" textOverrun="CLIP">
-               <font>
-                  <Font name="Guttman Yad" size="17.0" />
-               </font>
-            </Label>
-            <Button fx:id="BtnRegister" layoutX="449.0" layoutY="255.0" mnemonicParsing="false" onAction="#OnClickBtnRegister" styleClass="Button" text="Register" />
-            <Separator layoutX="64.0" layoutY="326.0" prefHeight="0.0" prefWidth="1091.0" styleClass="Separator" />
-            <TextField fx:id="TextFieldRegisterUser" layoutX="198.0" layoutY="197.0" styleClass="TextField" />
-            <TextField fx:id="TextFieldRegisterPass" layoutX="198.0" layoutY="235.0" styleClass="TextField" />
-         </children>
-      </Pane>
-   </children>
-</AnchorPane>
diff --git a/target/classes/FXML/PatientManagementPane.fxml b/target/classes/FXML/PatientManagementPane.fxml
index a5f3900..d56a005 100644
--- a/target/classes/FXML/PatientManagementPane.fxml
+++ b/target/classes/FXML/PatientManagementPane.fxml
@@ -35,7 +35,7 @@
                </columns>
             </TableView>
             <Button fx:id="BtnPatientFile" layoutX="741.0" layoutY="541.0" mnemonicParsing="false" onAction="#OnClickToFile" prefHeight="30.0" prefWidth="180.0" styleClass="Button" text="Export To File" />
-            <Button fx:id="BtnPatientXML" layoutX="739.0" layoutY="628.0" mnemonicParsing="false" onAction="#OnClickPatientXML" prefHeight="30.0" prefWidth="180.0" styleClass="Button" text="Export To PDF" />
+            <Button fx:id="BtnPatientXML" layoutX="739.0" layoutY="628.0" mnemonicParsing="false" onAction="#OnClickPatientPDF" prefHeight="30.0" prefWidth="180.0" styleClass="Button" text="Export To PDF" />
             <Button fx:id="BtnRemovePatient" layoutX="741.0" layoutY="498.0" mnemonicParsing="false" onAction="#OnClickRemovePatient" prefHeight="30.0" prefWidth="180.0" styleClass="Button" text="Remove Patient" />
             <Label layoutX="76.0" layoutY="457.0" text="Choose Patient :" textOverrun="CLIP">
                <font>
@@ -61,7 +61,6 @@
                   <Font name="Guttman Yad" size="17.0" />
                </font>
             </Label>
-            <Button fx:id="BtnPrint" layoutX="741.0" layoutY="668.0" mnemonicParsing="false" onAction="#OnClickPrint" prefHeight="30.0" prefWidth="180.0" styleClass="Button" text="Print Patient Chart" />
             <Button fx:id="BtnSpecPatientFile" layoutX="740.0" layoutY="584.0" mnemonicParsing="false" onAction="#OnClickSpecToFile" prefHeight="30.0" prefWidth="180.0" styleClass="Button" text="Export Specific" />
          </children>
       </Pane>
diff --git a/target/classes/FXML/Reports.fxml b/target/classes/FXML/Reports.fxml
deleted file mode 100644
index 4c720d2..0000000
--- a/target/classes/FXML/Reports.fxml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.Group?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.CheckBox?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.RadioButton?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.image.Image?>
-<?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.Pane?>
-<?import javafx.scene.text.Font?>
-
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="795.0" prefWidth="1267.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="Controller.ReportsController">
-   <children>
-      <Pane fx:id="parent" layoutY="-5.0" prefHeight="805.0" prefWidth="1264.0" styleClass="ParentPane" stylesheets="@../Css/lightmode.css">
-         <children>
-            <Pane layoutY="47.0" prefHeight="62.0" prefWidth="1248.0" styleClass="TopPane">
-               <children>
-                  <Label alignment="CENTER" layoutX="14.0" layoutY="10.0" prefHeight="37.0" prefWidth="151.0" text="Reports" textAlignment="CENTER" textFill="WHITE">
-                     <font>
-                        <Font name="Arial Bold Italic" size="32.0" />
-                     </font>
-                  </Label>
-               </children>
-            </Pane>
-            <Label layoutX="71.0" layoutY="182.0" prefHeight="34.0" prefWidth="57.0" text="ID :" textOverrun="CLIP">
-               <font>
-                  <Font name="Guttman Yad" size="17.0" />
-               </font>
-            </Label>
-            <TextField fx:id="TextFieldID" layoutX="107.0" layoutY="187.0" styleClass="TextField" />
-            <Group layoutX="71.0" layoutY="226.0">
-               <children>
-                  <RadioButton fx:id="RadioTherapist" mnemonicParsing="false" styleClass="RadioButton" text="Therapist" />
-                  <RadioButton fx:id="RadioPatient" layoutY="24.0" mnemonicParsing="false" styleClass="RadioButton" text="Patient" />
-                  <RadioButton fx:id="RadioStaff" layoutY="48.0" mnemonicParsing="false" styleClass="RadioButton" text="Staff" />
-               </children>
-            </Group>
-            <Button fx:id="BtnPreview" layoutX="212.0" layoutY="300.0" mnemonicParsing="false" onAction="#OnClickPreview" prefHeight="33.0" prefWidth="128.0" styleClass="Button" text="Preview " />
-            <Button fx:id="BtnClear" layoutX="73.0" layoutY="300.0" mnemonicParsing="false" onAction="#OnClickClear" prefHeight="33.0" prefWidth="128.0" styleClass="Button" text="Clear" />
-            <CheckBox fx:id="CheckBoxMedicine" layoutX="629.0" layoutY="203.0" mnemonicParsing="false" styleClass="CheckBox" text="Medicines" />
-            <CheckBox fx:id="CheckBoxAllergies" layoutX="629.0" layoutY="228.0" mnemonicParsing="false" styleClass="CheckBox" text="Allergies" />
-            <CheckBox fx:id="CheckBoxMeals" layoutX="629.0" layoutY="253.0" mnemonicParsing="false" styleClass="CheckBox" text="Meals" />
-            <CheckBox fx:id="CheckBoxRequests" layoutX="629.0" layoutY="278.0" mnemonicParsing="false" styleClass="CheckBox" text="Last Requests" />
-            <CheckBox fx:id="CheckBoxPresonalInfo" layoutX="508.0" layoutY="203.0" mnemonicParsing="false" styleClass="CheckBox" text="Personal info" />
-            <CheckBox fx:id="CheckBoxAddress" layoutX="508.0" layoutY="228.0" mnemonicParsing="false" styleClass="CheckBox" text="Address" />
-            <CheckBox fx:id="CheckBoxHR" layoutX="508.0" layoutY="253.0" mnemonicParsing="false" styleClass="CheckBox" text="HR" />
-            <CheckBox fx:id="CheckBoxSchedule" layoutX="508.0" layoutY="278.0" mnemonicParsing="false" styleClass="CheckBox" text="Schedule" />
-            <Button fx:id="BtnDeSelectAll" layoutX="773.0" layoutY="251.0" mnemonicParsing="false" onAction="#OnClickDeSelectAll" prefHeight="33.0" prefWidth="128.0" styleClass="Button" text="Deselect All" />
-            <Button fx:id="BtnSelectAll" layoutX="773.0" layoutY="210.0" mnemonicParsing="false" onAction="#OnClickSelectAll" prefHeight="33.0" prefWidth="128.0" styleClass="Button" text="Select All" />
-            <Pane layoutX="130.0" layoutY="449.0" onMouseClicked="#onClickPDF" prefHeight="200.0" prefWidth="200.0" style="-fx-border-color: #000000; -fx-background-color: #59b7ff;">
-               <children>
-                  <ImageView fx:id="ImageViewTherapistExportPDF1" fitHeight="106.0" fitWidth="84.0" layoutX="42.0" layoutY="44.0" onMouseClicked="#TherapistPDFClick" pickOnBounds="true" preserveRatio="true">
-                     <image>
-                        <Image url="@../Images/Export.png" />
-                     </image>
-                  </ImageView>
-                  <ImageView fx:id="ImageViewTherapistExportPDF2" fitHeight="47.0" fitWidth="63.0" layoutX="118.0" layoutY="65.0" onMouseClicked="#TherapistPDFClick" pickOnBounds="true" preserveRatio="true">
-                     <image>
-                        <Image url="@../Images/pdf.png" />
-                     </image>
-                  </ImageView>
-                  <Label layoutX="29.0" layoutY="144.0" text="Export PDF">
-                     <font>
-                        <Font name="System Bold Italic" size="28.0" />
-                     </font>
-                  </Label>
-               </children>
-            </Pane>
-            <Pane layoutX="394.0" layoutY="449.0" onMouseClicked="#onClickFile" prefHeight="200.0" prefWidth="200.0" style="-fx-border-color: #000000; -fx-background-color: #59b7ff;">
-               <children>
-                  <Label layoutX="31.0" layoutY="148.0" text="Export File">
-                     <font>
-                        <Font name="System Bold Italic" size="28.0" />
-                     </font>
-                  </Label>
-                  <ImageView fx:id="ImageViewTherapistExportFile1" fitHeight="106.0" fitWidth="84.0" layoutX="28.0" layoutY="43.0" onMouseClicked="#TherapistFileClick" pickOnBounds="true" preserveRatio="true">
-                     <image>
-                        <Image url="@../Images/Export.png" />
-                     </image>
-                  </ImageView>
-                  <ImageView fx:id="ImageViewTherapistExportFile2" fitHeight="63.0" fitWidth="64.0" layoutX="113.0" layoutY="51.0" onMouseClicked="#TherapistFileClick" pickOnBounds="true" preserveRatio="true">
-                     <image>
-                        <Image url="@../Images/txt.png" />
-                     </image>
-                  </ImageView>
-               </children>
-            </Pane>
-            <Pane layoutX="660.0" layoutY="449.0" onMouseClicked="#onClickPrint" prefHeight="200.0" prefWidth="200.0" style="-fx-border-color: #000000; -fx-background-color: #59b7ff;">
-               <children>
-                  <Label layoutX="62.0" layoutY="148.0" text="Print">
-                     <font>
-                        <Font name="System Bold Italic" size="28.0" />
-                     </font>
-                  </Label>
-                  <ImageView fitHeight="127.0" fitWidth="151.0" layoutX="37.0" layoutY="21.0" onMouseClicked="#TherapistFileClick" pickOnBounds="true" preserveRatio="true">
-                     <image>
-                        <Image url="@../Images/print.png" />
-                     </image>
-                  </ImageView>
-               </children>
-            </Pane>
-         </children>
-      </Pane>
-   </children>
-</AnchorPane>
diff --git a/target/classes/Files/PDF/TableExport.pdf b/target/classes/Files/PDF/TableExport.pdf
index 4c234fb6e8e29c13c9e1688205b6754ee4ce401b..b567c263d0bed581d6a0b861ab3232e21e188a61 100644
GIT binary patch
delta 107
zcmbPqmvPcv#tq9^I1EjV3=9m6EhevLk%V(LUtqDybTUm%Hcm4zNHVZAH#9OawoFS)
aOtCaEGc+<wNlY|1wy?7yq++s9o*Mv^Umj`z

delta 107
zcmbPqmvPcv#tq9^I1J1UEe*|$%qFjAk%V(LUtqDybTUs%OfpF|FfuktGE7ZMHc7QK
aH%d%4v^2IfPqH*lv9z-xq++s9o*Mwd*&k8>

diff --git a/target/classes/Files/PDF/TherapistsPDF.pdf b/target/classes/Files/PDF/TherapistsPDF.pdf
index 1d7d025496b449be97f4f2ac4f9a4301f1476b3b..37642fca8554805d796510f0f410e2577d2a8953 100644
GIT binary patch
delta 144
zcmbRKLwWiS<%Sl<7N!>F7M2#)7Pc1lEgS{EG!0FS3=9m6&9n`S)eQ{PHT8Y-Q(O{D
zQZ-zxj0}tn3=Lokw$J><A;jotXaQ7gVQHCUY+zuNnr4}7m}+X2WM-ahWRYfUZfIy{
MLqNs!H@`Ww0oL6pwEzGB

delta 144
zcmbRKLwWiS<%Sl<7N!>F7M2#)7Pc1lEgS{EG!4uREe*|$OtcM*)eQ{PHT8Y-Q(O{D
zQZ-zxj0}tn3=Lokw$J><A;jpIW|Wqcnv!UoYL=8_VxDGVnPO&{n3`g4Zfum6YLIAX
NXG1{6^f$jbv;lOWEHwZC

diff --git a/target/classes/META-INF/EHMS-Project.kotlin_module b/target/classes/META-INF/EHMS-Project.kotlin_module
index 2983af70661ad375cc499ebc4da5a68ca46c532e..a49347afef10a9b5f95305e1058ba36adec7d6dd 100644
GIT binary patch
literal 16
RcmZQzU|?ooU|@t|0RRA102TlM

literal 16
RcmZQzU|?ooU|@t|egFVe02KfL

diff --git a/target/classes/Model/Address.class b/target/classes/Model/Address.class
index 1755274cd76637e26695916e86b4d28008463d4a..46d302092dc387658c9672f82f76875f535fa91d 100644
GIT binary patch
delta 95
zcmbOsK0|!NSq?_i$>%t1SuGh@8LTD?aJn(tP7dd^WpxDdoq&At$s0Hw7+oiS<ZP7m
wWngFUV~}9*XOLwGU@%|^WUylhV(?@LnB2`(#~41Di`$nm2B=baayGXv06XOtEC2ui

delta 95
zcmbOsK0|!NSq?_C$>%t1S*;jY8LTG@aJn(tO%CU@Wpx7boq>Gu$s0Hw7~Lj+<ZP7m
wV_;|SXOLhBV31`9WH4X|Vz6TfX7FSPoZQV-#~3l0i`$nm7N}BqayGXv06x(cJOBUy

diff --git a/target/classes/Model/Notification.class b/target/classes/Model/Notification.class
index 41195174fdd6864ebec3f0e7eb5f32f2258c5093..6b62cf73d7b92758943781d7f23e9adadc4329eb 100644
GIT binary patch
delta 193
zcmca6a!q8zM^;uo1{MZ^$psvuleyWPB!z%HVFpeH5e7a6Q6Ni<L6Sk7L7qWkavED6
zqcm9ED>e;Qc?MPng~<!p#V6~r>oY2Y#f#ZBSk-~z8bEP3Ms2XzAE1~%P|N_V)`3Hx
z(HJOh%W4i3vjB^o1d3UM)$(y_u-XH~9l+v2ocfH;VDafdad)7&2Uz?zrvszUWEn0i
E0Id=!T>t<8

delta 193
zcmca6a!q8zM^;ur1{Mb4$psvuleyWPBt?NdF$PWsaRxpH2?k*XNg$MBkY|vdoW_>N
zC<j*eicN!6iGh_tdGZ2w@yUAZ`iyE|@nUujRxO~oHc;G+Q4cKk2PkF)6f*{^b>Prv
zGy{s;vRVPftifU@fns)GwS1f!tWH32XRvq>r#_<_SbREA+zTk~4Hm!6>A>heS%%9B
E0M5)Qu>b%7

diff --git a/target/classes/Model/Report.class b/target/classes/Model/Report.class
deleted file mode 100644
index 759de5e5e215b23d295d83884b46a75700d9e1f0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1819
zcma)7YflqF6g|^Imq#CnJVgZ*1PW3WA83I@Nr)yzjS&3cr=@Jl(q)(IPDzOIfA}*r
zk(ltoAK;HNp4nOGwycIU-I>nbd+s^+-nsq#=j<1NCn)zIg|vZ=EIN@9=sPfv&5~of
zwbHxY1FI?pGAp)g%Qb=Y?A%T_y3lQ)CyQQW1+tsop5>H2SVx{u(;h$EY@Zxi0{xXH
z)|T{bw^ml(`78?P6X<a4fG&gDsv&Ks^wRgulM0W^{Uq0)#dQn_3?G_xYu$6Jru=Bj
zeeMEjx-t+b&t49Z2sd}xPM~|suDPac_~aTHw6a)<dFf=7*UBWmPR#;^itSo&8;84=
zzisY1p<u6SIy<IstKZRKhupVGHD8HmiYUb^bKemds<a?8y%GA_6;TqU%n><Pv!t$`
zF519sVy<#QtJz>eTm@$kP8E<<I|pjbDV5JBze%J>L`K$#BT>vYKoxc&@l_(CGVhX}
zZb)|Qme=sB)`qPL*sC+KsQQ*y;g#pfK>Fs<rX}~iy`Yf6Vh>7qVBn$Z%|`-L%@()a
zW3O(NG_Y>h4YMje|3u(xJYA8Y27PV1dyW-MRXnfWI4Z|FF1j+YlNLu+t_1T>G5e@z
z;{}Z%)=kIRvZYn-!efEkTK4DW<z1Z-GYb>yg06}$yyb6P*YejLGYG7}z%zmAOS+Tf
z7<f+f|C@5YXziHfa7gjqr}*J;33r?n;EV|OLom4Kl;U%kCrexf*UsWki0`4v2%l=8
zsb>d4M!CysBiz6ke<^^Qv`_$bu4%3X1yGzng;88MMNUDbp`iK+0_6D2qnlGJPc{m2
zLc2wf1PJ*mE(JB)2z!fr9ax<V@kDF5O#<We*9uBpwSpfozR@KWhE)Q={z_s$i93<=
z8m*PmOvt=l|1foqga|4)tuDxBBC-N^F~xT(6LBKBb|Pa5M6{Y|Qn`nj2;@E23qr9h
z>Vk}u(8NCo=_)sKmI-rqUiVo>nY+l@GGnOp<crK1zqvD91KK%H#W?39>1h<{m%=<2
WxONfcKEF%+6IAUY@D$5<fziLHn2+ZG

diff --git a/target/classes/Util/MessageAlerter.class b/target/classes/Util/MessageAlerter.class
index 4765168ded0343d83b5b9140d361887e9647ab64..40c5868d322b52f044c1bd023dab2edbbaa462c6 100644
GIT binary patch
delta 89
zcmeyw^@(f4GiFhC1|9|u1|bGc1_=f(1~~?91{DUL$-kLfMEQX-0zer-po|buMi?j~
j0+g|xe38XTR060{5-2alAj%*OBxM-n8DuAGuzCRikOB<?

delta 89
zcmeyw^@(f4GiFg<1|9}J1|bH11_=fM1~~>n1{DUO$-kLfL`8uzVn7*jpo|1iMiM9^
j1(dO!e38XTRFQ$3K?$fsnL!jJ&Y;R5&!9G0gVhTFqkIj3

diff --git a/target/classes/Util/PdfExporter.class b/target/classes/Util/PdfExporter.class
index 7e8ca79b4f95d037bff35f662dfa4962e2a192ad..a28d2c2431d55a7d1e286b4aea1b176c9ceab2dc 100644
GIT binary patch
delta 458
zcmWO2%S#kc7>4oZb7dQGlS1HKb4D#2F@-@>No7)Vvchb<<PAX`D@@J%FsUeNc$u^a
zQi?2XA>yE`L5MakT#Ebfk8t5a-_1E34(EG*oJdKeWUntSBZ+8|i6w<HQh7ugb)?ft
z27YccL?)9sLaT9?&Kz!V2Pb#QBNsRKsKA9+rxz69BcCSj(?((VF#f^<ZVfKd;9?Sa
zpwXpdE8*gyo|bE^poU7GYxm)yOX=5CDOk-1-F)XUyVP>1z!6XQ%Ttbd#+hE6Q*TCt
zMf1{PXta2mESY9=&|<l~vI1JIIEFSWr`<esSPfla_pOzvK(|c2GWlidlj)62Z)NJ2
z>77giDi5kKAk#4IjL^fVOk=Du&JQN|qwm-!zyU!blKx|g6Q((3hX2fR#hfKDZ|N*p
z7K`TMqZP7br7W8#l@;@{YW0MynNQZqn)S18BYd_AzF3g2VSmD=Ilpm}4H-9a=qJil
X_VSZ%ws_AkNq(!ot>R87KWXk7fskGG

delta 458
zcmW;J&r1_v9LMqZ*OOj`mmCDswPv{_ZJA9Boz+&;Ru=vkj?HQgC7EL77OQlc786U_
z)+`a6KS<MqM5CQXAYD3ml<v_V(V>HW@$@`AJkRIz;`<bxMd#O%ifS{ZoT3~HS2;~P
zR_;+vm@`B;ON<&Ov1QT~|83_fqYfMOT;u}H*m3KwlLmY^@Y6_u%RHnhUoifY#1##0
z(co4paURFla!nt(^r@Tc+`!9Cx^?wy?I0bDa!U)nyy7-%++kP43*6<0lJ@B0m)`zO
z4}bBA&?lw%#Xvxe1jS6h)No(wc_50A76T!1F(4ko;$<k`d@@y%7*<n6O(SX=Rnr)?
zJXX_FHI1t&s_ijtiK;11i02IRLQh_jWrB4b#SRI+F~xUP7MbBEv+VPl1K#k5B!|q2
ziFvW|R?hKG>@0|b_tHj6JQmW@Nk)44AVIPcW>KE-QQ~}(36^A<<$T1H6Wa<W$f<Ev
e$G@&0v!Rpt%p*2=#+GWnFwM5M?qn`iC655&TV7%S

diff --git a/target/classes/Util/TableExporter.class b/target/classes/Util/TableExporter.class
index d0b4f0bb8d235a16e9ccfbef97b816971d86e37d..89e1e85c45c53b661e09465df121479839c8268e 100644
GIT binary patch
delta 617
zcmWN|TTG5&0KoD8^S;mXywB?<(;{Ieha}~cltaz&iwIHCNC|~RIV*jP9HI!7QwpUJ
ztG;1sbHSJm7q-j=T^Ytkvo>^L)7|gp*W>B&w0!dy0lx44`K~t*!(jRoL;ynxWEjB=
zC!7&P_bG>w>|_*0jHZM!loLWVW2qyQ+l-@)Fgh5|`@Zpm2muqsKqiV%CW$yEizKFq
z93n*_Q$+<)qMm7@ooMlf81aee;<uL>qL-QCAG0h;tYwI^{FrS8F~=IsJS&^|Rs{>J
z4m{Rp;%z?`+A%D$vq-SZSZr6Z#I7aLZepq3$}+p1<@Pg@?ANTYzp~Q)L$Y*8k%LH;
zA*_<qSS>xI$yC<J4Ax5TX3}K=>trDr@+g_IjP<gLEZN2e`I3$D1DoV8vXvx91+iI$
zvqjBit4bkP<+4qA$y1eVS553tPsmqqDNvp4R9);+U)Zg>*`xllR}1#(e(cx&9MBOI
z>R5_&A_u)XonoDbR~K_gmvdNO<A`qLsBWP|KjxTz%5nXQ6S|X=x{FfX%PGf?(@rpD
zPBi6C0%x2|&N{oOa7sDn)NtPMalv^(rSp+0r<-b{xM%{oWQK6rjN*z3=c<XK#>A0)
z&BRk{mQ!caxNdfH!<2B-R8nsmXfO}BWuDV$-qB<}bI1JTuIZ)O72I=O?z;nMaf4`e
VgK2Za@VSvZbYpnrYaZ^A{{d2sk1hZJ

delta 617
zcmWN^TTG8(0Knnj`+e{Ge(&cd)6lXpk#jkvgHs59W6ml<N~0o&N=~J}Lpe<mDyI}m
zMd%<_8OE3m7q-j=U0IBcW^L%grswYI_H=vdzxj&6P2YXfUGGo~0rX`U{Rza65xpBl
z5Mu~uEGdj5vv)ZJlh1exnLsHMsbCVdOs0_#+L*!zLis_MfN(K@2r-(eB9duh1=B?e
zGekBsMG=vrl3Aja+2Sp8#Al+!Z!dF25A(!7=35evWmsVOu+Z{nkrl{dE14x$5lgK$
zmRX%Fw|!V)N3haPVwGJ$v|U1sT~4fB!)m*MHFhg;_H)+SZ&+u4Wxf4}c<Hb~4kSU2
zBvFR3QF=&{v22nFY?j_sl4S-dGMiMH#}-+@R#`%tY-F2!#di6T9r71Dl_XvHlc9ph
zR8j0wF=VMUb}KJ?R55#14g1t%_N#Yft9Ei!2M5#_a#a^z^_PQMa7g#zu=eGM4kk~}
zBwsJ#s8`2xOmFA7&gFzI<fOjJDP2v0uBTA9a9Tg(jDAg#Zs)A-;GFK^yyHW$6F`X*
zPN}nq3r->zon2gVPIB2P<BHQnne&pX&L_&9E-H-Tn(^bh8N>}UoJtc!l?mmhi6pw(
zETG0Lr`E)A%Vcre<WpygxnruhYnr)dUQln|(_lJjGC#R*dT4e94_udrZa-RFe_GuD
U+T5``azl9HM)0($Ziq+z2cdnGbN~PV