NOTICKET: Bugfix for Treatment locking

Signed-off-by: Dominik Säume <Dominik.Saeume@hmmh.de>

.idea/sqlDataSources.xml

@@ -27,12 +27,9 @@
               <option value="file://$PROJECT_DIR$/src/main/resources/de/hitec/nhplus/nurse/database/Nurse.sql" />
               <option value="file://$PROJECT_DIR$/src/main/resources/de/hitec/nhplus/medication/database/Medication.sql" />
               <option value="file://$PROJECT_DIR$/src/main/resources/de/hitec/nhplus/medication/database/Medication_Ingredient.sql" />
-              <option value="file://$PROJECT_DIR$/src/main/resources/de/hitec/nhplus/login/database/User.sql" />
-              <option value="file://$PROJECT_DIR$/src/main/resources/de/hitec/nhplus/login/database/UserPermission.sql" />
-              <option value="file://$PROJECT_DIR$/src/main/resources/de/hitec/nhplus/login/database/UserToNurse.sql" />
             </array>
           </option>
-          <option name="outLayout" value="File per object.groovy" />
+          <option name="outLayout" value="File per object by schema.groovy" />
         </State>
       </list>
     </option>

README.md

@@ -1,6 +1,3 @@
 [![Static Badge](https://img.shields.io/badge/Wiki-Wiki?style=for-the-badge&logo=wikipedia&color=slategray)](https://git.euph.dev/SZUT/nhplus/wiki)
 [![Static Badge](https://img.shields.io/badge/Tests-Tests?style=for-the-badge&logo=textpattern&logoColor=cyan&color=blue)](https://git.euph.dev/SZUT/nhplus/wiki/Tests)
 [![Static Badge](https://img.shields.io/badge/Javadoc-Javadoc?style=for-the-badge&logo=readthedocs&logoColor=orange&color=beige)](https://nhplus.euph.dev)
-[![Static Badge](https://img.shields.io/badge/Credentails-Credentails?style=for-the-badge&logo=keepassxc&logoColor=lime&color=darkgreen)](https://git.euph.dev/SZUT/nhplus/wiki/Test-Anmelde-Daten)
-
-

src/main/java/de/hitec/nhplus/Main.java

@@ -1,15 +1,11 @@
 package de.hitec.nhplus;
 
 import de.hitec.nhplus.datastorage.ConnectionBuilder;
-import de.hitec.nhplus.login.LoginController;
-import de.hitec.nhplus.login.User;
-import de.hitec.nhplus.main.MainWindowController;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
 import javafx.scene.control.TabPane;
-import javafx.scene.layout.BorderPane;
 import javafx.stage.Stage;
 
 import java.io.IOException;
@@ -37,43 +33,13 @@ public class Main extends Application {
     @Override
     public void start(Stage primaryStage) {
         this.primaryStage = primaryStage;
-        User user = executeLogin();
+        executeMainApplication();
-        if(user != null){
-            executeMainApplication(user);
-        }
-    }
-
-    /**
-     * Executes the login.
-     * @return User The {@link User} object for the logged-in {@link User}.
-     * Is {@code null}, if the login was not successful,
-     */
-    private User executeLogin() {
-        try {
-
-            FXMLLoader loader = new FXMLLoader(Main.class.getResource("/de/hitec/nhplus/login/LoginView.fxml"));
-            BorderPane pane = loader.load();
-            Scene scene = new Scene(pane);
-            Stage loginStage = new Stage();
-            loginStage.setTitle("NHPlus");
-            loginStage.setScene(scene);
-            loginStage.setResizable(false);
-
-            LoginController controller = loader.getController();
-            controller.initialize(loginStage);
-
-            loginStage.showAndWait();
-            return controller.user;
-        } catch (IOException exception) {
-            exception.printStackTrace();
-            return null;
-        }
     }
 
     /**
      * Executes the main application.
      */
-    private void executeMainApplication(User user) {
+    private void executeMainApplication() {
         try {
             FXMLLoader loader = new FXMLLoader(Main.class.getResource("/de/hitec/nhplus/main/MainWindowView.fxml"));
             TabPane pane = loader.load();
@@ -82,10 +48,6 @@ public class Main extends Application {
             this.primaryStage.setTitle("NHPlus");
             this.primaryStage.setScene(scene);
             this.primaryStage.setResizable(true);
-
-            MainWindowController controller = loader.getController();
-            controller.initialize(user);
-
             this.primaryStage.show();
 
             this.primaryStage.setOnCloseRequest(event -> {

src/main/java/de/hitec/nhplus/datastorage/DaoFactory.java

@@ -1,6 +1,5 @@
 package de.hitec.nhplus.datastorage;
 
-import de.hitec.nhplus.login.database.UserDao;
 import de.hitec.nhplus.medication.database.MedicationDao;
 import de.hitec.nhplus.nurse.database.NurseDao;
 import de.hitec.nhplus.patient.database.PatientDao;
@@ -64,12 +63,4 @@ public class DaoFactory {
     public MedicationDao createMedicationDAO() {
         return new MedicationDao(ConnectionBuilder.getConnection());
     }
-
-    /**
-     * @return A new {@link UserDao} instance with a database connection.
-     * @see de.hitec.nhplus.login.User User
-     */
-    public UserDao createUserDAO() {
-        return new UserDao(ConnectionBuilder.getConnection());
-    }
 }

src/main/java/de/hitec/nhplus/fixtures/Fixtures.java

@@ -46,11 +46,6 @@ public class Fixtures {
             medicationFixture.setupTable(connection);
             medicationFixture.load();
 
-            UserFixture userFixture = new UserFixture(nursesByName);
-            userFixture.dropTable(connection);
-            userFixture.setupTable(connection);
-            userFixture.load();
-
         } catch (Exception exception) {
             System.out.println(exception.getMessage());
         }

src/main/java/de/hitec/nhplus/fixtures/MedicationFixture.java

@@ -117,7 +117,7 @@ public class MedicationFixture implements Fixture<Medication> {
                 "Unterhautinjektion",
                 120
         ));
-        Medication deprecatedMedication = new Medication(
+        medications.add(new Medication(
                 "Levothyroxin",
                 "Sandoz",
                 List.of(
@@ -129,9 +129,7 @@ public class MedicationFixture implements Fixture<Medication> {
                 "Herzrasen, Gewichtsverlust",
                 "Oral",
                 90
-        );
+        ));
-        deprecatedMedication.setIsDeprecated(true);
-        medications.add(deprecatedMedication);
         medications.add(new Medication(
                 "Warfarin",
                 "Apotex Inc.",

src/main/java/de/hitec/nhplus/fixtures/NurseFixture.java

@@ -54,12 +54,6 @@ public class NurseFixture implements Fixture<Nurse> {
                 true
         ));
 
-        nurses.add(new Nurse(
-                "Maria",
-                "Höller",
-                "666"
-        ));
-
         NurseDao dao = DaoFactory.getInstance().createNurseDAO();
         for (Nurse nurse : nurses) {
             dao.create(nurse);

src/main/java/de/hitec/nhplus/fixtures/UserFixture.java

@@ -1,108 +0,0 @@
-package de.hitec.nhplus.fixtures;
-
-import de.hitec.nhplus.Main;
-import de.hitec.nhplus.datastorage.DaoFactory;
-import de.hitec.nhplus.login.Permissions;
-import de.hitec.nhplus.login.User;
-import de.hitec.nhplus.login.database.UserDao;
-import de.hitec.nhplus.nurse.Nurse;
-
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.*;
-
-/**
- * {@link Fixture} for {@link User}.
- *
- * @author Dominik Säume
- */
-public class UserFixture implements Fixture<User> {
-    private static final String SCHEMA = "/de/hitec/nhplus/login/database/User.sql";
-    private static final String PERMISSION_SCHEMA = "/de/hitec/nhplus/login/database/UserPermission.sql";
-    private static final String TO_NURSE_SCHEMA = "/de/hitec/nhplus/login/database/UserToNurse.sql";
-
-    private final Map<String, Nurse> nursesByName;
-
-    public UserFixture(Map<String, Nurse> nursesByName) {
-        this.nursesByName = nursesByName;
-    }
-
-    @Override
-    public void dropTable(Connection connection) throws SQLException {
-        connection.createStatement().execute("DROP TABLE IF EXISTS user");
-        connection.createStatement().execute("DROP TABLE IF EXISTS user__permissions");
-        connection.createStatement().execute("DROP TABLE IF EXISTS user__nurse");
-    }
-
-    @Override
-    public void setupTable(Connection connection) throws SQLException {
-        final InputStream schema = Main.class.getResourceAsStream(SCHEMA);
-        final InputStream permissionSchema = Main.class.getResourceAsStream(PERMISSION_SCHEMA);
-        final InputStream toNurseSchema = Main.class.getResourceAsStream(TO_NURSE_SCHEMA);
-
-        assert schema != null;
-        assert permissionSchema != null;
-        assert toNurseSchema != null;
-
-        String SQL = new Scanner(schema, StandardCharsets.UTF_8)
-                .useDelimiter("\\A")
-                .next();
-        String permissionSQL = new Scanner(permissionSchema, StandardCharsets.UTF_8)
-                .useDelimiter("\\A")
-                .next();
-        String toNurseSQL = new Scanner(toNurseSchema, StandardCharsets.UTF_8)
-                .useDelimiter("\\A")
-                .next();
-
-        connection.createStatement().execute(SQL);
-        connection.createStatement().execute(permissionSQL);
-        connection.createStatement().execute(toNurseSQL);
-    }
-
-    @Override
-    public Map<String, User> load() throws SQLException {
-        List<User> users = new ArrayList<>();
-
-        User udo = new User(
-                "udo",
-                Permissions.OWNER,
-                null
-        );
-        udo.setPassword("uD0_187!");
-        users.add(udo);
-
-        User maria = new User(
-                "maria",
-                Permissions.NURSE,
-                nursesByName.get("Maria")
-        );
-        maria.setPassword("H!mm3lf4hrt");
-        users.add(maria);
-
-        User werner = new User(
-                "werner",
-                Permissions.MANAGEMENT,
-                null
-        );
-        werner.setPassword("TurboSchraube42!");
-        users.add(werner);
-
-        User fullPermissionsTestUser = new User(
-                "test",
-                -1,
-                null
-        );
-        fullPermissionsTestUser.setPassword("");
-        users.add(fullPermissionsTestUser);
-
-        UserDao dao = DaoFactory.getInstance().createUserDAO();
-        Map<String, User> usersByUsername = new HashMap<>();
-        for (User user : users) {
-            dao.create(user);
-            usersByUsername.put(user.getUsername(), user);
-        }
-        return usersByUsername;
-    }
-}

src/main/java/de/hitec/nhplus/login/LoginController.java

@@ -1,104 +0,0 @@
-package de.hitec.nhplus.login;
-
-import de.hitec.nhplus.datastorage.DaoFactory;
-import de.hitec.nhplus.login.database.UserDao;
-import javafx.animation.PauseTransition;
-import javafx.animation.TranslateTransition;
-import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.control.PasswordField;
-import javafx.scene.control.TextField;
-import javafx.stage.Stage;
-import javafx.util.Duration;
-
-import java.nio.charset.StandardCharsets;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.sql.SQLException;
-import java.util.Arrays;
-
-/**
- * Controller for handling the login of {@link User}s.
- *
- * @author Dominik Säume
- */
-public class LoginController {
-
-    public User user;
-    @FXML
-    public TextField textFieldUsername;
-    @FXML
-    public PasswordField passwordField;
-    @FXML
-    public Button buttonSubmit;
-    private Stage stage;
-    private int loginTries = 0;
-
-    /**
-     * JavaFX Initialization method that is called after the binding of all the fields.
-     *
-     * @param stage The {@link Stage}, so the modal can close itself, when finished.
-     */
-    public void initialize(Stage stage) {
-        this.stage = stage;
-    }
-
-    /**
-     * Internal method to handle actions on wrong logins, like a shake, timout and total tries.
-     */
-    private void handleWrongPasswordOrUsername() {
-        loginTries++;
-
-        // Shake
-        TranslateTransition ttUsername = new TranslateTransition(Duration.millis(50), textFieldUsername);
-        ttUsername.setByX(10);
-        ttUsername.setAutoReverse(true);
-        ttUsername.setCycleCount(6);
-
-        TranslateTransition ttPassword = new TranslateTransition(Duration.millis(50), passwordField);
-        ttPassword.setByX(10);
-        ttPassword.setAutoReverse(true);
-        ttPassword.setCycleCount(6);
-
-        ttUsername.play();
-        ttPassword.play();
-
-        // Timout
-        PauseTransition pause = new PauseTransition(Duration.seconds(3));
-        pause.setOnFinished(event -> {
-            if (loginTries == 3) {
-                stage.close();
-            }
-            buttonSubmit.setDisable(false);
-        });
-        pause.play();
-
-    }
-
-    @FXML
-    public void handleSubmit() {
-        buttonSubmit.setDisable(true);
-
-        UserDao dao = DaoFactory.getInstance().createUserDAO();
-        try {
-            int id = dao.readUserId(textFieldUsername.getText());
-            if (id == 0) {
-                handleWrongPasswordOrUsername();
-                return;
-            }
-            byte[] salt = dao.readPasswordSalt(id);
-            MessageDigest md = MessageDigest.getInstance("SHA-512");
-            md.update(salt);
-            byte[] hash = md.digest(passwordField.getText().getBytes(StandardCharsets.UTF_8));
-            byte[] requiredHash = dao.readPasswordHash(id);
-            if (!Arrays.equals(hash, requiredHash)) {
-                handleWrongPasswordOrUsername();
-                return;
-            }
-            user = dao.read(id);
-            stage.close();
-        } catch (SQLException | NoSuchAlgorithmException exception) {
-            exception.printStackTrace();
-        }
-    }
-}

src/main/java/de/hitec/nhplus/login/Permissions.java

@@ -1,14 +0,0 @@
-package de.hitec.nhplus.login;
-
-/**
- * A simple class holding the bitmasks for all permissions.
- * This is a class instead of an enum, for ease of use.
- *
- * @author Dominiok Säume
- */
-public class Permissions {
-    public final static int EVERYBODY = 0b0;
-    public final static int NURSE = 0b1;
-    public final static int MANAGEMENT = 0b10;
-    public final static int OWNER = 0b100;
-}

src/main/java/de/hitec/nhplus/login/User.java

@@ -1,120 +0,0 @@
-package de.hitec.nhplus.login;
-
-import de.hitec.nhplus.nurse.Nurse;
-
-import java.nio.charset.StandardCharsets;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-
-
-/**
- * The model for a {@link User}.
- *
- * @author Dominik Säume
- */
-public class User {
-
-    private int id;
-    private String username;
-    private byte[] passwordSalt;
-    private byte[] passwordHash;
-    private int permissions = 0;
-    private Nurse nurse;
-
-
-    /**
-     * This constructor allows instantiating a {@link User} object with all existing fields.
-     */
-    public User(
-            int id,
-            String username,
-            byte[] passwordSalt,
-            byte[] passwordHash,
-            int permissions,
-            Nurse nurse
-    ) {
-        this.id = id;
-        this.username = username;
-        this.passwordSalt = passwordSalt;
-        this.passwordHash = passwordHash;
-        this.permissions = permissions;
-        this.nurse = nurse;
-    }
-
-    /**
-     * This constructor allows instantiating a {@link User} object.
-     */
-    public User(
-            String username,
-            int permissions,
-            Nurse nurse
-    ) {
-        this.username = username;
-        this.permissions = permissions;
-        this.nurse = nurse;
-    }
-
-    /**
-     * Sets the {@link User} password. The {@link User} will need to be manually stored with the
-     * {@link de.hitec.nhplus.login.database.UserDao UserDao}, for changes to persists.
-     * @param password The new Password
-     */
-    public void setPassword(String password) {
-        try {
-            SecureRandom random = new SecureRandom();
-            byte[] salt = new byte[32];
-            random.nextBytes(salt);
-            this.passwordSalt = salt;
-            MessageDigest md = MessageDigest.getInstance("SHA-512");
-            md.update(salt);
-            this.passwordHash = md.digest(password.getBytes(StandardCharsets.UTF_8));
-        }catch (NoSuchAlgorithmException exception){
-            exception.printStackTrace();
-        }
-    }
-
-    public boolean hasNursePermissions(){
-        return (permissions & Permissions.NURSE) != 0;
-    }
-
-    public boolean hasAdminPermissions(){
-        return (permissions & Permissions.MANAGEMENT) != 0;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public byte[] getPasswordSalt() {
-        return passwordSalt;
-    }
-
-    public byte[] getPasswordHash() {
-        return passwordHash;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public int getPermissions() {
-        return permissions;
-    }
-
-    public void setPermissions(int permissions) {
-        this.permissions = permissions;
-    }
-
-    public Nurse getNurse() {
-        return nurse;
-    }
-
-    public void setNurse(Nurse nurse) {
-        this.nurse = nurse;
-    }
-}

src/main/java/de/hitec/nhplus/login/database/UserDao.java

@@ -1,232 +0,0 @@
-package de.hitec.nhplus.login.database;
-
-import de.hitec.nhplus.datastorage.Dao;
-import de.hitec.nhplus.datastorage.DaoFactory;
-import de.hitec.nhplus.login.User;
-import de.hitec.nhplus.nurse.Nurse;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * The {@link UserDao} is an implementation of the{@link de.hitec.nhplus.datastorage.Dao Dao}
- * for the {@link User} model.
- *
- * @author Dominik Säume
- */
-public class UserDao implements Dao<User> {
-    protected final Connection connection;
-
-    public UserDao(Connection connection) {
-        this.connection = connection;
-    }
-
-    /**
-     * Try reading a {@link User#id} by its {@link User#username}.
-     * @param username The {@link User#username username} to try reading the {@link User#id id} of.
-     * @return The {@link User#id}. {@code 0} if the {@link User} doesn't exist.
-     */
-    public int readUserId(String username) throws SQLException {
-        final String SQL = "SELECT id FROM user WHERE username = ?";
-        PreparedStatement statement = this.connection.prepareStatement(SQL);
-        statement.setString(1, username);
-        return statement.executeQuery().getInt(1);
-    }
-
-    /**
-     * Read a {@link User}s {@link User#passwordSalt password salt}.
-     * @param id The {@link User#id} of which the {@link User#passwordSalt password salt} should be read.
-     * @return The {@link User#passwordSalt password salt} as a{@code byte[]}.
-     */
-    public byte[] readPasswordSalt(int id) throws SQLException {
-        final String SQL = "SELECT passwordSalt FROM user WHERE id = ?";
-        PreparedStatement statement = this.connection.prepareStatement(SQL);
-        statement.setInt(1, id);
-        return statement.executeQuery().getBytes(1);
-    }
-
-    /**
-     * Read a {@link User}s {@link User#passwordHash password hash} for authentication purposes.
-     * @param id The {@link User#id} of which the {@link User#passwordHash password hash} should be read.
-     * @return The {@link User#passwordHash password hash} as a{@code byte[]}.
-     */
-    public byte[] readPasswordHash(int id) throws SQLException {
-        final String SQL = "SELECT passwordHash FROM user WHERE id = ?";
-        PreparedStatement statement = this.connection.prepareStatement(SQL);
-        statement.setInt(1, id);
-        return statement.executeQuery().getBytes(1);
-    }
-
-    @Override
-    public User read(int id) throws SQLException {
-        final String SQL = """
-                        SELECT
-                        user.username,
-                        user.passwordSalt,
-                        user.passwordHash,
-                        user__permissions.permissions,
-                        user__nurse.nurseId
-                        FROM user
-                        LEFT JOIN user__permissions ON user.id = user__permissions.userId
-                        LEFT JOIN user__nurse ON user.id = user__nurse.userId
-                        WHERE user.id = ?;
-                """;
-        PreparedStatement statement = this.connection.prepareStatement(SQL);
-        statement.setInt(1, id);
-        ResultSet result = statement.executeQuery();
-        int nurseId = result.getInt(5);
-        Nurse nurse = null;
-        if (!result.wasNull()) {
-            nurse = DaoFactory.getInstance().createNurseDAO().read(nurseId);
-        }
-        return new User(
-                id,
-                result.getString(1),
-                result.getBytes(2),
-                result.getBytes(3),
-                result.getInt(4),
-                nurse
-        );
-    }
-
-    @Override
-    public void create(User user) throws SQLException {
-        connection.setAutoCommit(false); //Switch to Manual Commit, to do an SQL Transaction
-        final String userSQL = """
-                    INSERT INTO user
-                    (username, passwordSalt, passwordHash)
-                    VALUES (?, ?, ?);
-                """;
-        PreparedStatement statement = this.connection.prepareStatement(userSQL);
-        statement.setString(1, user.getUsername());
-        statement.setBytes(2, user.getPasswordSalt());
-        statement.setBytes(3, user.getPasswordHash());
-        statement.execute();
-
-        ResultSet generatedKeys = connection.createStatement().executeQuery("SELECT last_insert_rowid()");
-        connection.commit(); //Finish SQL Transaction
-        connection.setAutoCommit(true); //Switch back Mode
-
-        if (!generatedKeys.next()) {
-            return;
-        }
-        int newId = generatedKeys.getInt(1);
-
-        final String permissionSQL = """
-                    INSERT INTO user__permissions
-                    (userId, permissions)
-                    VALUES (?, ?);
-                """;
-        PreparedStatement permissionStatement = this.connection.prepareStatement(permissionSQL);
-        permissionStatement.setInt(1, newId);
-        permissionStatement.setInt(2, user.getPermissions());
-        permissionStatement.execute();
-
-        if (user.getNurse() == null) {
-            return;
-        }
-        final String nurseSQL = """
-                    INSERT INTO user__nurse
-                    (userId, nurseId)
-                    VALUES (?, ?);
-                """;
-        PreparedStatement nurseStatement = this.connection.prepareStatement(nurseSQL);
-        nurseStatement.setInt(1, newId);
-        nurseStatement.setInt(2, user.getNurse().getId());
-        nurseStatement.execute();
-    }
-
-    @Override
-    public void update(User user) throws SQLException {
-        final String userSQL = """
-                    UPDATE user SET
-                    username = ?,
-                    passwordSalt = ?,
-                    passwordHash = ?
-                    WHERE id = ?
-                """;
-        PreparedStatement statement = this.connection.prepareStatement(userSQL);
-        statement.setString(1, user.getUsername());
-        statement.setBytes(2, user.getPasswordSalt());
-        statement.setBytes(3, user.getPasswordHash());
-        statement.setInt(3, user.getId());
-        statement.executeUpdate();
-
-        final String permissionSQL = """
-                    UPDATE user__permissions SET
-                    permissions = ?
-                    WHERE userId = ?
-                """;
-        PreparedStatement permissionStatement = this.connection.prepareStatement(permissionSQL);
-        permissionStatement.setInt(1, user.getPermissions());
-        permissionStatement.setInt(2, user.getId());
-        permissionStatement.executeUpdate();
-
-        if (user.getNurse() == null) {
-            final String nurseSQL = """
-                        DELETE FROM user__nurse WHERE userId = ?
-                    """;
-            this.connection.prepareStatement(nurseSQL).executeUpdate();
-            return;
-        }
-
-        final String nurseSQL = """
-                    UPDATE user__nurse set
-                    nurseId = ?
-                    WHERE userId = ?
-                """;
-        PreparedStatement nurseStatement = this.connection.prepareStatement(nurseSQL);
-        nurseStatement.setInt(1, user.getNurse().getId());
-        nurseStatement.setInt(2, user.getId());
-        permissionStatement.executeUpdate();
-    }
-
-    @Override
-    public void delete(int id) throws SQLException {
-        final String SQL = """
-                    DELETE FROM user WHERE user.id = ?;
-                """;
-        PreparedStatement preparedStatement = this.connection.prepareStatement(SQL);
-        preparedStatement.setInt(1, id);
-        preparedStatement.executeUpdate();
-    }
-
-    @Override
-    public List<User> readAll() throws SQLException {
-        final String SQL = """
-                        SELECT
-                        user.id,
-                        user.username,
-                        user.passwordSalt,
-                        user.passwordHash,
-                        user__permissions.permissions,
-                        user__nurse.nurseId
-                        FROM user
-                        LEFT JOIN user__permissions ON user.id = user__permissions.userId
-                        LEFT JOIN user__nurse ON user.id = user__nurse.userId
-                """;
-        ResultSet result = connection.prepareStatement(SQL).executeQuery();
-
-        List<User> users = new ArrayList<>();
-        while (result.next()) {
-            int nurseId = result.getInt(6);
-            Nurse nurse = null;
-            if (!result.wasNull()) {
-                nurse = DaoFactory.getInstance().createNurseDAO().read(nurseId);
-            }
-            users.add(new User(
-                    result.getInt(1),
-                    result.getString(2),
-                    result.getBytes(3),
-                    result.getBytes(4),
-                    result.getInt(5),
-                    nurse
-            ));
-        }
-        return users;
-    }
-}

src/main/java/de/hitec/nhplus/main/MainWindowController.java

@@ -1,104 +1,224 @@
 package de.hitec.nhplus.main;
 
-import de.hitec.nhplus.login.Permissions;
+import de.hitec.nhplus.Main;
-import de.hitec.nhplus.login.User;
+import de.hitec.nhplus.nurse.Nurse;
-import de.hitec.nhplus.utils.tab.TabManager;
-import de.hitec.nhplus.utils.tab.TabStruct;
-import javafx.event.Event;
 import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.control.SelectionModel;
 import javafx.scene.control.Tab;
 import javafx.scene.control.TabPane;
+import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.BorderPane;
+import de.hitec.nhplus.treatment.Treatment;
+import de.hitec.nhplus.medication.Medication;
+import de.hitec.nhplus.patient.Patient;
 
-import java.util.List;
+import java.io.IOException;
+import java.util.Objects;
 
 /**
  * Controller for the main window of the application, which holds all tabs.
  *
+ * @author Bernd Heidemann
  * @author Dominik Säume
+ * @author Armin Ribic
+ * @author Dorian Nemec
  */
 public class MainWindowController {
-    private static MainWindowController instace;
     @FXML
-    public TabPane mainTabPane;
+    private TabPane mainTabPane;
-    private User user;
+    @FXML
-    private TabManager tabManager;
+    private AnchorPane patientPage;
-
+    @FXML
-    public MainWindowController() {
+    private Tab patientTab;
-        instace = this;
+    @FXML
-    }
+    private AnchorPane activeTreatmentPage;
+    @FXML
+    private Tab treatmentTab;
+    @FXML
+    private TabPane treatmentTabPane;
+    @FXML
+    private Tab activeTreatmentTab;
+    @FXML
+    private AnchorPane lockedTreatmentPage;
+    @FXML
+    private Tab lockedTreatmentTab;
+    @FXML
+    private Tab nurseTab;
+    @FXML
+    private TabPane nurseTabPane;
+    @FXML
+    private AnchorPane activeNursePage;
+    @FXML
+    private Tab activeNurseTab;
+    @FXML
+    private AnchorPane lockedNursePage;
+    @FXML
+    private Tab lockedNurseTab;
+    @FXML
+    private AnchorPane medicationPage;
+    @FXML
+    private Tab medicationTab;
 
     /**
-     * Method copying the idea of a singleton, to allow getting the current {@link User}.
+     * Initialization method that is called after the binding of all the fields.
-     */
-    public static MainWindowController getInstance() {
-        return instace;
-    }
-
-    /**
-     * JavaFX Initialization method that is called after the binding of all the fields.
-     *
-     * @param user The logged in {@link User}.
      */
     @FXML
-    public void initialize(User user) {
+    public void initialize() {
-        instace = this;
+        loadPatientPage();
-        this.user = user;
+        mainTabPane.getSelectionModel().select(patientTab);
-        this.tabManager = new TabManager(user);
+
-        setupTabs();
+        patientTab.setOnSelectionChanged(event -> loadPatientPage());
+        medicationTab.setOnSelectionChanged(event -> loadMedicationPage());
+
+
+        nurseTab.setOnSelectionChanged(event -> loadNursePage());
+        nurseTabPane.getSelectionModel().select(activeNurseTab);
+
+        activeNurseTab.setOnSelectionChanged(event -> loadActiveNursePage());
+        lockedNurseTab.setOnSelectionChanged(event -> loadLockedNursePage());
+
+        treatmentTab.setOnSelectionChanged(event -> loadTreatmentPage());
+        treatmentTabPane.getSelectionModel().select(activeTreatmentTab);
+
+        activeTreatmentTab.setOnSelectionChanged(event -> loadActiveTreatmentPage());
+        lockedTreatmentTab.setOnSelectionChanged(event -> loadLockedTreatmentPage());
+
     }
 
     /**
-     * Sets up all Tabs Accessible, with help of the {@link TabManager}.
+     * Loads the {@link Patient} page into its tab.
      */
-    private void setupTabs() {
+    private void loadPatientPage() {
-        tabManager.setupTab(mainTabPane, new TabStruct(
+        try {
-                "Patienten",
+            BorderPane patientsPane = FXMLLoader.load(
-                "/de/hitec/nhplus/patient/AllPatientView.fxml",
+                    Objects.requireNonNull(Main.class.getResource("/de/hitec/nhplus/patient/AllPatientView.fxml"))
-                Permissions.NURSE
+            );
-        ));
+            patientPage.getChildren().setAll(patientsPane);
-        tabManager.setupSubTabPane(mainTabPane, "Behandlungen", Permissions.NURSE, List.of(
+            AnchorPane.setTopAnchor(patientsPane, 0d);
-                new TabStruct(
+            AnchorPane.setBottomAnchor(patientsPane, 0d);
-                        "Behandlungen",
+            AnchorPane.setLeftAnchor(patientsPane, 0d);
-                        "/de/hitec/nhplus/treatment/AllTreatmentView.fxml",
+            AnchorPane.setRightAnchor(patientsPane, 0d);
-                        Permissions.NURSE
+        } catch (IOException exception) {
-                ),
+            exception.printStackTrace();
-                new TabStruct(
+        }
-                        "Gesperrte Behandlungen",
+    }
-                        "/de/hitec/nhplus/treatment/LockedTreatmentView.fxml",
+
-                        Permissions.NURSE
+    /**
-                )
+     * Loads the {@link Treatment } tab.
-        ));
+     */
-        tabManager.setupSubTabPane(mainTabPane, "Pfleger", Permissions.EVERYBODY, List.of(
+    private void loadTreatmentPage() {
-                new TabStruct(
+        SelectionModel<Tab> selectionModel = treatmentTabPane.getSelectionModel();
-                        "Pfleger",
+        Tab selectedTab = selectionModel.getSelectedItem();
-                        "/de/hitec/nhplus/nurse/AllNurseView.fxml",
+        if (selectedTab == activeTreatmentTab) {
-                        Permissions.NURSE | Permissions.MANAGEMENT | Permissions.OWNER
+            loadActiveTreatmentPage();
-                ),
+        }
-                new TabStruct(
+        if (selectedTab == lockedTreatmentTab) {
-                        "Gesperrte Pfleger",
+            loadLockedTreatmentPage();
-                        "/de/hitec/nhplus/nurse/LockedNurseView.fxml",
+        }
-                        Permissions.MANAGEMENT | Permissions.OWNER
+    }
-                )
+
-        ));
+    /**
-        tabManager.setupSubTabPane(mainTabPane, "Medikamente", Permissions.MANAGEMENT, List.of(
+     * Loads the active {@link Treatment} page into its tab.
-                new TabStruct(
+     */
-                        "Medikamente",
+    private void loadActiveTreatmentPage() {
-                        "/de/hitec/nhplus/medication/AllMedicationView.fxml",
+        try {
-                        Permissions.MANAGEMENT
+            BorderPane activeTreatmentPane = FXMLLoader.load(
-                ), new TabStruct(
+                    Objects.requireNonNull(Main.class.getResource("/de/hitec/nhplus/treatment/AllTreatmentView.fxml"))
-                        "Veraltete Medikamente",
+            );
-                        "/de/hitec/nhplus/medication/DeprecatedMedicationView.fxml",
+            activeTreatmentPage.getChildren().setAll(activeTreatmentPane);
-                        Permissions.MANAGEMENT
+            AnchorPane.setTopAnchor(activeTreatmentPane, 0d);
-                )
+            AnchorPane.setBottomAnchor(activeTreatmentPane, 0d);
-        ));
+            AnchorPane.setLeftAnchor(activeTreatmentPane, 0d);
-
+            AnchorPane.setRightAnchor(activeTreatmentPane, 0d);
-
+        } catch (IOException exception) {
-        Tab defaultTab = mainTabPane.getTabs().get(0);
+            exception.printStackTrace();
-        mainTabPane.getSelectionModel().select(defaultTab);
+        }
-        defaultTab.getOnSelectionChanged().handle(new Event(Event.ANY));
+    }
-    }
+
-
+    /**
-    public User getUser() {
+     * Loads the locked {@link Treatment} page into its tab.
-        return user;
+     */
+    private void loadLockedTreatmentPage() {
+        try {
+            BorderPane treatmentsPane = FXMLLoader.load(
+                  Objects.requireNonNull(Main.class.getResource("/de/hitec/nhplus/treatment/LockedTreatmentView.fxml"))
+            );
+            lockedTreatmentPage.getChildren().setAll(treatmentsPane);
+            AnchorPane.setTopAnchor(treatmentsPane, 0d);
+            AnchorPane.setBottomAnchor(treatmentsPane, 0d);
+            AnchorPane.setLeftAnchor(treatmentsPane, 0d);
+            AnchorPane.setRightAnchor(treatmentsPane, 0d);
+        } catch (IOException exception) {
+            exception.printStackTrace();
+        }
+    }
+
+    /**
+     * Loads the {@link Nurse} page into its tab.
+     */
+    private void loadNursePage() {
+        SelectionModel<Tab> selectionModel = nurseTabPane.getSelectionModel();
+        Tab selectedTab = selectionModel.getSelectedItem();
+        if (selectedTab == activeNurseTab) {
+            loadActiveNursePage();
+        }
+        if (selectedTab == lockedNurseTab) {
+            loadLockedNursePage();
+        }
+    }
+
+    /**
+     * Loads the active {@link Nurse} page into its tab.
+     */
+    private void loadActiveNursePage() {
+        try {
+            BorderPane activeNursePane = FXMLLoader.load(
+                    Objects.requireNonNull(Main.class.getResource("/de/hitec/nhplus/nurse/AllNurseView.fxml"))
+            );
+            activeNursePage.getChildren().setAll(activeNursePane);
+            AnchorPane.setTopAnchor(activeNursePane, 0d);
+            AnchorPane.setBottomAnchor(activeNursePane, 0d);
+            AnchorPane.setLeftAnchor(activeNursePane, 0d);
+            AnchorPane.setRightAnchor(activeNursePane, 0d);
+        } catch (IOException exception) {
+            exception.printStackTrace();
+        }
+    }
+
+    /**
+     * Loads the locked {@link Nurse} page into its tab.
+     */
+    private void loadLockedNursePage() {
+        try {
+            BorderPane lockedNursePane = FXMLLoader.load(
+                    Objects.requireNonNull(Main.class.getResource("/de/hitec/nhplus/nurse/LockedNurseView.fxml"))
+            );
+            lockedNursePage.getChildren().setAll(lockedNursePane);
+            AnchorPane.setTopAnchor(lockedNursePane, 0d);
+            AnchorPane.setBottomAnchor(lockedNursePane, 0d);
+            AnchorPane.setLeftAnchor(lockedNursePane, 0d);
+            AnchorPane.setRightAnchor(lockedNursePane, 0d);
+        } catch (IOException exception) {
+            exception.printStackTrace();
+        }
+    }
+
+    /**
+     * Loads the {@link Medication} page into its tab.
+     */
+    private void loadMedicationPage() {
+        try {
+            BorderPane medicationPane = FXMLLoader.load(
+                    Objects.requireNonNull(Main.class.getResource("/de/hitec/nhplus/medication/AllMedicationView.fxml"))
+            );
+            medicationPage.getChildren().setAll(medicationPane);
+            AnchorPane.setTopAnchor(medicationPane, 0d);
+            AnchorPane.setBottomAnchor(medicationPane, 0d);
+            AnchorPane.setLeftAnchor(medicationPane, 0d);
+            AnchorPane.setRightAnchor(medicationPane, 0d);
+        } catch (IOException exception) {
+            exception.printStackTrace();
+        }
     }
 }

src/main/java/de/hitec/nhplus/medication/AllMedicationController.java

@@ -7,8 +7,6 @@ import java.util.stream.Collectors;
 
 import de.hitec.nhplus.Main;
 import de.hitec.nhplus.datastorage.DaoFactory;
-import de.hitec.nhplus.login.Permissions;
-import de.hitec.nhplus.main.MainWindowController;
 import de.hitec.nhplus.medication.database.MedicationDao;
 import de.hitec.nhplus.nurse.Nurse;
 import de.hitec.nhplus.patient.Patient;
@@ -17,11 +15,9 @@ import de.hitec.nhplus.treatment.TreatmentModalController;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
-import javafx.scene.control.Button;
 import javafx.scene.control.SelectionModel;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
@@ -52,26 +48,16 @@ public class AllMedicationController {
     private TableColumn<Medication, String> columnAdministrationMethod;
     @FXML
     private TableColumn<Medication, Integer> columnCurrentStock;
-    @FXML
-    public Button buttonChangeAvailable;
-    @FXML
-    public Button buttonAdd;
-    @FXML
-    public Button buttonDelete;
 
     private final ObservableList<Medication> medications = FXCollections.observableArrayList();
     private MedicationDao dao;
-    private boolean hasEditPermissions;
 
     /**
      * Initialization method that is called after the binding of all the fields.
      */
     @FXML
     public void initialize() {
-        int editPermissions = Permissions.MANAGEMENT | Permissions.OWNER;
+        readAllAndShowInTableView();
-        int userPermissions = MainWindowController.getInstance().getUser().getPermissions();
-        hasEditPermissions = (userPermissions & editPermissions) != 0;
-        this.readAllAndShowInTableView();
 
         this.columnId.setCellValueFactory(new PropertyValueFactory<>("id"));
         this.columnName.setCellValueFactory(new PropertyValueFactory<>("name"));
@@ -96,13 +82,6 @@ public class AllMedicationController {
         this.columnCurrentStock.setCellValueFactory(new PropertyValueFactory<>("currentStock"));
 
         this.tableView.setItems(this.medications);
-
-        if (!hasEditPermissions) {
-            this.buttonAdd.setDisable(true);
-            this.buttonDelete.setDisable(true);
-            this.buttonChangeAvailable.setDisable(true);
-        }
-
     }
 
     /**
@@ -111,7 +90,7 @@ public class AllMedicationController {
     public void readAllAndShowInTableView() {
         this.dao = DaoFactory.getInstance().createMedicationDAO();
         try {
-            this.medications.setAll(dao.readAllAvailable());
+            this.medications.setAll(dao.readAll());
         } catch (SQLException exception) {
             exception.printStackTrace();
         }
@@ -141,38 +120,6 @@ public class AllMedicationController {
         }
     }
 
-    @FXML
-    public void handleChangeAvailable() {
-        Medication selectedItem = this.tableView.getSelectionModel().getSelectedItem();
-        if (selectedItem == null) {
-            return;
-        }
-
-        try {
-            selectedItem.setIsDeprecated(true);
-            this.dao.update(selectedItem);
-        } catch (SQLException exception) {
-            exception.printStackTrace();
-        }
-        this.readAllAndShowInTableView();
-    }
-
-
-    @FXML
-    public void handleDelete() {
-        Medication selectedItem = this.tableView.getSelectionModel().getSelectedItem();
-        if (selectedItem == null) {
-            return;
-        }
-
-        try {
-            this.dao.delete(selectedItem.getId());
-        } catch (SQLException exception) {
-            exception.printStackTrace();
-        }
-        this.readAllAndShowInTableView();
-    }
-
     /**
      * Internal method to create a {@link MedicationModalController MedicationModal}.
      *
@@ -217,5 +164,4 @@ public class AllMedicationController {
             }
         });
     }
-
 }

src/main/java/de/hitec/nhplus/medication/DeprecatedMedicationController.java

@@ -1,108 +0,0 @@
-package de.hitec.nhplus.medication;
-
-import de.hitec.nhplus.datastorage.DaoFactory;
-import de.hitec.nhplus.medication.database.MedicationDao;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.control.TableColumn;
-import javafx.scene.control.TableView;
-import javafx.scene.control.cell.PropertyValueFactory;
-
-import java.sql.SQLException;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * The controller for viewing all deprecated {@link Medication}s.
- *
- * @author Armin Ribic
- * @author Dorian Nemec
- */
-public class DeprecatedMedicationController {
-    @FXML
-    private TableView<Medication> tableView;
-    @FXML
-    private TableColumn<Medication, Integer> columnId;
-    @FXML
-    private TableColumn<Medication, String> columnName;
-    @FXML
-    private TableColumn<Medication, String> columnManufacturer;
-    @FXML
-    private TableColumn<Medication, String> columnIngredient;
-    @FXML
-    private TableColumn<Medication, String> columnPossibleSideEffects;
-    @FXML
-    private TableColumn<Medication, String> columnAdministrationMethod;
-    @FXML
-    private TableColumn<Medication, Integer> columnCurrentStock;
-    @FXML
-    public Button buttonChangeAvailable;
-
-    private final ObservableList<Medication> medications = FXCollections.observableArrayList();
-    private MedicationDao dao;
-
-    /**
-     * Initialization method that is called after the binding of all the fields.
-     */
-    public void initialize() {
-        this.readAllAndShowInTableView();
-
-        this.columnId.setCellValueFactory(new PropertyValueFactory<>("id"));
-        this.columnName.setCellValueFactory(new PropertyValueFactory<>("name"));
-        this.columnManufacturer.setCellValueFactory(new PropertyValueFactory<>("manufacturer"));
-        this.columnIngredient.setCellValueFactory(
-                cellData -> {
-                    Medication medication = cellData.getValue();
-                    List<Ingredient> ingredients = medication.getIngredients();
-                    if (ingredients.isEmpty()) {
-                        return new SimpleStringProperty("");
-                    }
-
-                    return new SimpleStringProperty(
-                            ingredients
-                                    .stream()
-                                    .map(ingredient -> ingredient.getName())
-                                    .collect(Collectors.joining("\n"))
-                    );
-                });
-        this.columnPossibleSideEffects.setCellValueFactory(new PropertyValueFactory<>("possibleSideEffects"));
-        this.columnAdministrationMethod.setCellValueFactory(new PropertyValueFactory<>("administrationMethod"));
-        this.columnCurrentStock.setCellValueFactory(new PropertyValueFactory<>("currentStock"));
-
-        this.tableView.setItems(this.medications);
-
-    }
-
-    /**
-     * Internal method to read all data and set it to the table view.
-     */
-    public void readAllAndShowInTableView() {
-        this.medications.clear();
-        this.dao = DaoFactory.getInstance().createMedicationDAO();
-        try {
-            this.medications.setAll(this.dao.readAllDeprecated());
-        } catch (SQLException exception) {
-            exception.printStackTrace();
-        }
-    }
-
-    @FXML
-    public void handleChangeAvailable() {
-        Medication selectedItem = tableView.getSelectionModel().getSelectedItem();
-        if (selectedItem == null) {
-            return;
-        }
-
-        try {
-            selectedItem.setIsDeprecated(false);
-            this.dao.update(selectedItem);
-        } catch (SQLException exception) {
-            exception.printStackTrace();
-        }
-        this.readAllAndShowInTableView();
-    }
-
-}

src/main/java/de/hitec/nhplus/medication/Medication.java

@@ -1,6 +1,5 @@
 package de.hitec.nhplus.medication;
 
-import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleListProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -24,7 +23,6 @@ public class Medication {
     private final SimpleStringProperty possibleSideEffects;
     private final SimpleStringProperty administrationMethod;
     private final SimpleIntegerProperty currentStock;
-    private final SimpleBooleanProperty isDeprecated;
 
     /**
      * This constructor allows instantiating a {@link Medication} object,
@@ -47,7 +45,6 @@ public class Medication {
         this.possibleSideEffects = new SimpleStringProperty(possibleSideEffects);
         this.administrationMethod = new SimpleStringProperty(administrationMethod);
         this.currentStock = new SimpleIntegerProperty(currentStock);
-        this.isDeprecated = new SimpleBooleanProperty(false);
     }
 
     /**
@@ -60,8 +57,7 @@ public class Medication {
             List<Ingredient> ingredients,
             String possibleSideEffects,
             String administrationMethod,
-            int currentStock,
+            int currentStock
-            boolean isDeprecated
     ) {
         this.id = new SimpleIntegerProperty(id);
         this.name = new SimpleStringProperty(name);
@@ -70,7 +66,6 @@ public class Medication {
         this.possibleSideEffects = new SimpleStringProperty(possibleSideEffects);
         this.administrationMethod = new SimpleStringProperty(administrationMethod);
         this.currentStock = new SimpleIntegerProperty(currentStock);
-        this.isDeprecated = new SimpleBooleanProperty(isDeprecated);
     }
 
     public int getId() {
@@ -89,18 +84,6 @@ public class Medication {
         return name;
     }
 
-    public boolean isDeprecated() {
-        return isDeprecated.get();
-    }
-
-    public SimpleBooleanProperty isDeprecatedProperty() {
-        return isDeprecated;
-    }
-
-    public void setIsDeprecated(boolean isDeprecated) {
-        this.isDeprecated.set(isDeprecated);
-    }
-
     public void setName(String name) {
         this.name.set(name);
     }

src/main/java/de/hitec/nhplus/medication/MedicationModalController.java

@@ -39,7 +39,6 @@ public class MedicationModalController {
     @FXML
     public Button buttonSave;
 
-
     private Stage stage;
     private Medication medication;
     private final ObservableList<Ingredient> ingredients = FXCollections.observableArrayList();

src/main/java/de/hitec/nhplus/medication/database/MedicationDao.java

@@ -32,8 +32,8 @@ public class MedicationDao implements Dao<Medication> {
         connection.setAutoCommit(false); //Switch to Manual Commit, to do an SQL Transaction
         final String medicationSQL = """
                     INSERT INTO medication
-                    (name, manufacturer, possibleSideEffects, administrationMethod, currentStock, isDeprecated)
+                    (name, manufacturer, possibleSideEffects, administrationMethod, currentStock)
-                    VALUES (?, ?, ?, ?, ?, ?);
+                    VALUES (?, ?, ?, ?, ?);
                 """;
         PreparedStatement medicationStatement = this.connection.prepareStatement(medicationSQL);
         medicationStatement.setString(1, medication.getName());
@@ -41,7 +41,6 @@ public class MedicationDao implements Dao<Medication> {
         medicationStatement.setString(3, medication.getPossibleSideEffects());
         medicationStatement.setString(4, medication.getAdministrationMethod());
         medicationStatement.setInt(5, medication.getCurrentStock());
-        medicationStatement.setBoolean(6, medication.isDeprecated());
         medicationStatement.execute();
 
         ResultSet generatedKeys = connection.createStatement().executeQuery("SELECT last_insert_rowid()");
@@ -104,111 +103,12 @@ public class MedicationDao implements Dao<Medication> {
                         new ArrayList<>(),
                         result.getString(4),
                         result.getString(5),
-                        result.getInt(6),
+                        result.getInt(6)
-                        result.getBoolean(7)
                 );
                 medications.add(medication);
             }
             List<Ingredient> ingredients = ingredientMap.computeIfAbsent(currentMedicationId, k -> new ArrayList<>());
-            String ingredientName = result.getString(8);
+            String ingredientName = result.getString(7);
-            if(ingredientName == null){
-                continue;
-            }
-            ingredients.add(new Ingredient(ingredientName));
-            lastMedicationId = currentMedicationId;
-        }
-        for (Medication medication : medications) {
-            List<Ingredient> ingredients = ingredientMap.get(medication.getId());
-            if(ingredients.isEmpty()){
-                continue;
-            }
-            medication.setIngredients(ingredientMap.get(medication.getId()));
-        }
-
-        return medications;
-    }
-
-    public List<Medication> readAllDeprecated() throws SQLException {
-        final String SQL = """
-                    SELECT medication.*, medication_ingredient.name
-                    FROM medication LEFT JOIN
-                    medication_ingredient
-                    ON medication.id = medication_ingredient.id
-                    WHERE medication.isDeprecated = true
-                """;
-        ResultSet result = connection.prepareStatement(SQL).executeQuery();
-
-        List<Medication> medications = new ArrayList<>();
-        Map<Integer, List<Ingredient>> ingredientMap = new HashMap<>();
-
-        int currentMedicationId;
-        int lastMedicationId = -1;
-        while (result.next()) {
-            currentMedicationId = result.getInt(1);
-            if (currentMedicationId != lastMedicationId) {
-                Medication medication = new Medication(
-                        result.getInt(1),
-                        result.getString(2),
-                        result.getString(3),
-                        new ArrayList<>(),
-                        result.getString(4),
-                        result.getString(5),
-                        result.getInt(6),
-                        result.getBoolean(7)
-                );
-                medications.add(medication);
-            }
-            List<Ingredient> ingredients = ingredientMap.computeIfAbsent(currentMedicationId, k -> new ArrayList<>());
-            String ingredientName = result.getString(8);
-            if(ingredientName == null){
-                continue;
-            }
-            ingredients.add(new Ingredient(ingredientName));
-            lastMedicationId = currentMedicationId;
-        }
-        for (Medication medication : medications) {
-            List<Ingredient> ingredients = ingredientMap.get(medication.getId());
-            if(ingredients.isEmpty()){
-                continue;
-            }
-            medication.setIngredients(ingredientMap.get(medication.getId()));
-        }
-
-        return medications;
-    }
-
-    public List<Medication> readAllAvailable() throws SQLException {
-        final String SQL = """
-                    SELECT medication.*, medication_ingredient.name
-                    FROM medication LEFT JOIN
-                    medication_ingredient
-                    ON medication.id = medication_ingredient.id
-                    WHERE medication.isDeprecated = false
-                """;
-        ResultSet result = connection.prepareStatement(SQL).executeQuery();
-
-        List<Medication> medications = new ArrayList<>();
-        Map<Integer, List<Ingredient>> ingredientMap = new HashMap<>();
-
-        int currentMedicationId;
-        int lastMedicationId = -1;
-        while (result.next()) {
-            currentMedicationId = result.getInt(1);
-            if (currentMedicationId != lastMedicationId) {
-                Medication medication = new Medication(
-                        result.getInt(1),
-                        result.getString(2),
-                        result.getString(3),
-                        new ArrayList<>(),
-                        result.getString(4),
-                        result.getString(5),
-                        result.getInt(6),
-                        result.getBoolean(7)
-                );
-                medications.add(medication);
-            }
-            List<Ingredient> ingredients = ingredientMap.computeIfAbsent(currentMedicationId, k -> new ArrayList<>());
-            String ingredientName = result.getString(8);
             if(ingredientName == null){
                 continue;
             }
@@ -234,8 +134,7 @@ public class MedicationDao implements Dao<Medication> {
                     manufacturer = ?,
                     possibleSideEffects = ?,
                     administrationMethod = ?,
-                    currentStock = ?,
+                    currentStock = ?
-                    isDeprecated = ?
                     WHERE id = ?
                 """;
         PreparedStatement preparedStatement = this.connection.prepareStatement(SQL);
@@ -244,8 +143,7 @@ public class MedicationDao implements Dao<Medication> {
         preparedStatement.setString(3, medication.getPossibleSideEffects());
         preparedStatement.setString(4, medication.getAdministrationMethod());
         preparedStatement.setInt(5, medication.getCurrentStock());
-        preparedStatement.setBoolean(6, medication.isDeprecated());
+        preparedStatement.setInt(6, medication.getId());
-        preparedStatement.setInt(7, medication.getId());
         preparedStatement.executeUpdate();
 
         final String ingredientDeleteSQL = """
@@ -293,8 +191,7 @@ public class MedicationDao implements Dao<Medication> {
                 List.of(),
                 result.getString(4),
                 result.getString(5),
-                result.getInt(6),
+                result.getInt(6)
-                result.getBoolean(7)
         );
 
         List<Ingredient> ingredients = new ArrayList<>();

src/main/java/de/hitec/nhplus/nurse/AllNurseController.java

@@ -1,8 +1,8 @@
 package de.hitec.nhplus.nurse;
 
+import static de.hitec.nhplus.utils.Validator.*;
+
 import de.hitec.nhplus.datastorage.DaoFactory;
-import de.hitec.nhplus.login.Permissions;
-import de.hitec.nhplus.main.MainWindowController;
 import de.hitec.nhplus.nurse.database.NurseDao;
 import javafx.beans.value.ChangeListener;
 import javafx.collections.FXCollections;
@@ -17,8 +17,6 @@ import javafx.scene.control.cell.TextFieldTableCell;
 
 import java.sql.SQLException;
 
-import static de.hitec.nhplus.utils.Validator.*;
-
 /**
  * The controller for viewing all {@link Nurse}s.
  *
@@ -51,17 +49,12 @@ public class AllNurseController {
 
     private final ObservableList<Nurse> nurses = FXCollections.observableArrayList();
     private NurseDao dao;
-    private boolean hasEditPermissions;
 
     /**
      * Initialization method that is called after the binding of all the fields.
      */
     @FXML
     public void initialize() {
-        int editPermissions = Permissions.MANAGEMENT | Permissions.OWNER;
-        int userPermissions = MainWindowController.getInstance().getUser().getPermissions();
-        hasEditPermissions = (userPermissions & editPermissions) != 0;
-
         this.readAllAndShowInTableView();
 
         this.columnId.setCellValueFactory(new PropertyValueFactory<>("id"));
@@ -78,13 +71,7 @@ public class AllNurseController {
 
         this.tableView.setItems(this.nurses);
 
-
         this.buttonAdd.setDisable(true);
-        if (!hasEditPermissions) {
-            this.buttonLock.setDisable(true);
-            return;
-        }
-
         ChangeListener<String> inputNewNurseValidationListener = (observableValue, oldText, newText)->
         {
             boolean isValid = isValidFirstName(this.textFieldFirstName.getText())
@@ -139,7 +126,8 @@ public class AllNurseController {
         String phoneNumber=this.textFieldPhoneNumber.getText();
         try {
             this.dao.create(new Nurse(firstName, surname, phoneNumber));
-        } catch (SQLException exception) {
+        }
+        catch (SQLException exception){
             exception.printStackTrace();
         }
         readAllAndShowInTableView();
@@ -164,10 +152,6 @@ public class AllNurseController {
 
     @FXML
     public void handleOnEditSurname(TableColumn.CellEditEvent<Nurse, String> event) {
-        if(!hasEditPermissions){
-            event.getTableView().refresh();
-            return;
-        }
         String newSurName = event.getNewValue();
         if (!isValidSurName(newSurName)) {
             showValidationError("Nachname");
@@ -180,10 +164,6 @@ public class AllNurseController {
 
     @FXML
     public void handleOnEditFirstname(TableColumn.CellEditEvent<Nurse, String> event) {
-        if(!hasEditPermissions){
-            event.getTableView().refresh();
-            return;
-        }
         String newFirstName = event.getNewValue();
         if (!isValidFirstName(newFirstName)) {
             showValidationError("Vorname");
@@ -196,10 +176,6 @@ public class AllNurseController {
 
     @FXML
     public void handleOnEditPhoneNumber(TableColumn.CellEditEvent<Nurse, String> event) {
-        if(!hasEditPermissions){
-            event.getTableView().refresh();
-            return;
-        }
         String newPhoneNumber = event.getNewValue();
         if (!isValidPhoneNumber(newPhoneNumber)) {
             showValidationError("Telefonnummer");

src/main/java/de/hitec/nhplus/nurse/Nurse.java

@@ -44,7 +44,7 @@ public class Nurse extends Person {
 
     /**
      * This constructor allows instantiating a {@link Nurse} object with
-     * specifying whether the {@link Nurse} is locked or not.
+     * specifying if the nurse is locked or not.
      */
     public Nurse(
             String firstName,

src/main/java/de/hitec/nhplus/nurse/database/NurseDao.java

@@ -112,4 +112,6 @@ public class NurseDao extends DaoImp<Nurse> {
         statement.setInt(1, id);
         return statement;
     }
+
+
 }

src/main/java/de/hitec/nhplus/treatment/AllTreatmentController.java

@@ -78,7 +78,7 @@ public class AllTreatmentController {
      */
     @FXML
     public void initialize() {
-
+        readAllAndShowInTableView();
         comboBoxPatientSelection.setItems(patientSelection);
         comboBoxPatientSelection.getSelectionModel().select("alle");
 
@@ -112,7 +112,7 @@ public class AllTreatmentController {
                 );
 
         this.createComboBoxData();
-        readAllAndShowInTableView();
+
     }
 
     /**

src/main/java/de/hitec/nhplus/utils/tab/TabManager.java

@@ -1,114 +0,0 @@
-package de.hitec.nhplus.utils.tab;
-
-import de.hitec.nhplus.Main;
-import de.hitec.nhplus.login.Permissions;
-import de.hitec.nhplus.login.User;
-import javafx.event.Event;
-import javafx.event.EventHandler;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.control.Tab;
-import javafx.scene.control.TabPane;
-import javafx.scene.layout.AnchorPane;
-import javafx.scene.layout.BorderPane;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * A utility class to construct {@link Tab}s from views. This also supports sub {@link Tab}s.
- *
- * @author Dominiok Säume
- * @see TabManager
- */
-public class TabManager {
-    private final User user;
-
-    public TabManager(User user) {
-        this.user = user;
-    }
-
-    /**
-     * Internal method to check permissions
-     * @param requiredPermissions The permissions the {@link User} requires.
-     * @param permissions The permissions the {@link User} has.
-     */
-    private boolean hasPermissions(int requiredPermissions, int permissions) {
-        return requiredPermissions == Permissions.EVERYBODY
-               || (permissions & requiredPermissions) != 0;
-    }
-
-    /**
-     * Method to set up a single tab and register it to its {@link TabPane}.
-     * @param tabPane The {@link TabPane} to register to.
-     * @param tabStruct The data needed to construct the new tab.
-     */
-    public void setupTab(TabPane tabPane, TabStruct tabStruct) {
-        if (!hasPermissions(tabStruct.requiredPermissions, user.getPermissions())) {
-            return;
-        }
-        Tab tab = new Tab();
-        tab.setText(tabStruct.title);
-        AnchorPane pane = new AnchorPane();
-        tab.setContent(pane);
-        tab.setOnSelectionChanged(loadTabEventHandler(tabStruct, pane));
-        tabPane.getTabs().add(tab);
-    }
-
-    /**
-     * {@link EventHandler} to handle the loading of a {@link Tab}.
-     * @param tabStruct The {@link TabStruct} holding the path of the view.
-     * @param pane The main pane of the {@link Tab}.
-     */
-    private EventHandler<Event> loadTabEventHandler(TabStruct tabStruct, AnchorPane pane) {
-        return event -> {
-            try {
-                BorderPane patientsPane = FXMLLoader.load(
-                        Objects.requireNonNull(Main.class.getResource(tabStruct.view))
-                );
-                pane.getChildren().setAll(patientsPane);
-                AnchorPane.setTopAnchor(patientsPane, 0d);
-                AnchorPane.setBottomAnchor(patientsPane, 0d);
-                AnchorPane.setLeftAnchor(patientsPane, 0d);
-                AnchorPane.setRightAnchor(patientsPane, 0d);
-            } catch (IOException exception) {
-                exception.printStackTrace();
-            }
-        };
-    }
-
-    /**
-     * Method to set up a sub tab and register it to its parent {@link TabPane}.
-     * @param parentTabPane The {@link TabPane} to register to.
-     * @param title The title of the {@link Tab}.
-     * @param requiredPermissions The permissions required to see the sub {@link Tab}.
-     * @param subTabs A {@link List} of {@link TabStruct}s to create in the sub {@link Tab}.
-     */
-    public void setupSubTabPane(TabPane parentTabPane, String title, int requiredPermissions, List<TabStruct> subTabs) {
-        if (!hasPermissions(requiredPermissions, user.getPermissions())) {
-            return;
-        }
-        Tab tab = new Tab();
-        tab.setText(title);
-        TabPane subTabPane = new TabPane();
-        subTabPane.setTabClosingPolicy(TabPane.TabClosingPolicy.UNAVAILABLE);
-        tab.setContent(subTabPane);
-        subTabs.forEach(tabStruct -> setupTab(subTabPane, tabStruct));
-        if (subTabPane.getTabs().isEmpty()) {
-            return;
-        }
-        tab.setOnSelectionChanged(loadSubTabPaneEventHandler(subTabPane));
-        parentTabPane.getTabs().add(tab);
-    }
-
-    /**
-     * {@link EventHandler} to handle the loading of a sub {@link TabPane}.
-     * @param tabPane The {@link TabPane} of the sub {@link Tab} to handle loading.
-     */
-    private EventHandler<Event> loadSubTabPaneEventHandler(TabPane tabPane) {
-        return event -> {
-            Tab tab = tabPane.getSelectionModel().getSelectedItem();
-            tab.getOnSelectionChanged().handle(new Event(Event.ANY));
-        };
-    }
-}

src/main/java/de/hitec/nhplus/utils/tab/TabStruct.java

@@ -1,19 +0,0 @@
-package de.hitec.nhplus.utils.tab;
-
-/**
- * A simple class holding the data needed for constructing a {@link javafx.scene.control.Tab Tab}.
- *
- * @author Dominiok Säume
- * @see TabManager
- */
-public class TabStruct {
-    public String title;
-    public String view;
-    public int requiredPermissions;
-
-    public TabStruct(String title, String view, int requiredPermissions) {
-        this.title = title;
-        this.view = view;
-        this.requiredPermissions = requiredPermissions;
-    }
-}

src/main/java/module-info.java

@@ -10,9 +10,6 @@ module de.hitec.nhplus {
     exports de.hitec.nhplus.main;
     opens de.hitec.nhplus.main to javafx.base, javafx.fxml;
 
-    exports de.hitec.nhplus.login;
-    opens de.hitec.nhplus.login to javafx.base, javafx.fxml;
-
     exports de.hitec.nhplus.patient;
     exports de.hitec.nhplus.patient.database;
     opens de.hitec.nhplus.patient.database to javafx.base, javafx.fxml;

src/main/resources/de/hitec/nhplus/login/LoginView.fxml

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.PasswordField?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.*?>
-<BorderPane
-        xmlns="http://javafx.com/javafx/17.0.2-ea"
-        xmlns:fx="http://javafx.com/fxml/1"
-        fx:controller="de.hitec.nhplus.login.LoginController"
-        minWidth="240"
-        maxWidth="240"
->
-    <padding>
-        <Insets bottom="8" left="8" right="8" top="8"/>
-    </padding>
-    <top>
-        <Label text="Anmeldung" BorderPane.alignment="CENTER"/>
-    </top>
-    <center>
-        <VBox spacing="8">
-            <BorderPane.margin>
-                <Insets bottom="8.0" top="8.0"/>
-            </BorderPane.margin>
-            <TextField
-                    fx:id="textFieldUsername"
-                    promptText="nutzername"
-                    VBox.vgrow="ALWAYS"
-            />
-            <PasswordField
-                    fx:id="passwordField"
-                    promptText="password"
-                    VBox.vgrow="ALWAYS"
-            />
-        </VBox>
-    </center>
-    <bottom>
-        <Button
-                fx:id="buttonSubmit"
-                text="Bestätigen"
-                BorderPane.alignment="CENTER"
-                onAction="#handleSubmit"
-        />
-    </bottom>
-</BorderPane>

src/main/resources/de/hitec/nhplus/login/database/User.sql

@@ -1,7 +0,0 @@
-CREATE TABLE user
-(
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    username TEXT NOT NULL UNIQUE,
-    passwordSalt BLOB NOT NULL,
-    passwordHash BLOB NOT NULL
-)

src/main/resources/de/hitec/nhplus/login/database/UserPermission.sql

@@ -1,6 +0,0 @@
-CREATE TABLE user__permissions
-(
-    userId  INTEGER NOT NULL UNIQUE,
-    permissions INTEGER NOT NULL, -- Binary Bitmask for Permissions
-    FOREIGN KEY (userId) REFERENCES user (id) ON DELETE CASCADE
-)

src/main/resources/de/hitec/nhplus/login/database/UserToNurse.sql

@@ -1,7 +0,0 @@
-CREATE TABLE user__nurse
-(
-    userId  INTEGER NOT NULL UNIQUE,
-    nurseId INTEGER NOT NULL UNIQUE,
-    FOREIGN KEY (userId) REFERENCES user (id) ON DELETE CASCADE,
-    FOREIGN KEY (nurseId) REFERENCES nurse (id) ON DELETE CASCADE
-)

src/main/resources/de/hitec/nhplus/main/MainWindowView.fxml

@@ -1,10 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.scene.control.*?>
+<?import javafx.scene.layout.AnchorPane?>
 <TabPane
         fx:id="mainTabPane"
         tabClosingPolicy="UNAVAILABLE"
         xmlns="http://javafx.com/javafx/17.0.2-ea"
         xmlns:fx="http://javafx.com/fxml/1"
         fx:controller="de.hitec.nhplus.main.MainWindowController"
-/>
+>
+    <Tab fx:id="patientTab" text="Patienten">
+        <AnchorPane fx:id="patientPage"/>
+    </Tab>
+    <Tab fx:id="treatmentTab"  text="Behandlungen">
+        <TabPane fx:id="treatmentTabPane" tabClosingPolicy="UNAVAILABLE">
+            <Tab fx:id="activeTreatmentTab" text="Behandlungen">
+                <AnchorPane fx:id="activeTreatmentPage"/>
+            </Tab>
+            <Tab fx:id="lockedTreatmentTab" text="Gesperrte Behandlungen">
+                <AnchorPane fx:id="lockedTreatmentPage" />
+            </Tab>
+        </TabPane>
+    </Tab>
+    <Tab fx:id="nurseTab" text="Pfleger">
+        <TabPane fx:id="nurseTabPane" tabClosingPolicy="UNAVAILABLE">
+            <Tab fx:id="activeNurseTab" text="Pfleger">
+                <AnchorPane fx:id="activeNursePage"/>
+            </Tab>
+            <Tab fx:id="lockedNurseTab" text="Gesperrte Pfleger">
+                <AnchorPane fx:id="lockedNursePage"/>
+            </Tab>
+        </TabPane>
+    </Tab>
+    <Tab fx:id="medicationTab" text="Medikamente">
+        <AnchorPane fx:id="medicationPage"/>
+    </Tab>
+</TabPane>

src/main/resources/de/hitec/nhplus/medication/AllMedicationView.fxml

@@ -73,16 +73,8 @@
                             fx:id="buttonDelete"
                             mnemonicParsing="false"
                             prefWidth="90.0"
-                            onAction="#handleDelete"
                             text="Löschen"
                     />
-                    <Button
-                            fx:id="buttonChangeAvailable"
-                            mnemonicParsing="false"
-                            onAction="#handleChangeAvailable"
-                            prefWidth="155.0"
-                            text="Veraltet-Status ändern"
-                    />
                 </HBox>
             </right>
         </BorderPane>

src/main/resources/de/hitec/nhplus/medication/DeprecatedMedicationView.fxml

@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.BorderPane?>
-<?import javafx.scene.layout.HBox?>
-<BorderPane xmlns="http://javafx.com/javafx"
-            xmlns:fx="http://javafx.com/fxml"
-            fx:controller="de.hitec.nhplus.medication.DeprecatedMedicationController"
->
-    <padding>
-        <Insets top="8" left="8" right="8" bottom="8"/>
-    </padding>
-    <center>
-        <TableView fx:id="tableView">
-            <columns>
-                <TableColumn
-                        fx:id="columnId"
-                        minWidth="40.0"
-                        text="ID"
-                />
-                <TableColumn
-                        fx:id="columnName"
-                        minWidth="140.0"
-                        text="Name"
-                />
-                <TableColumn
-                        fx:id="columnManufacturer"
-                        minWidth="140.0"
-                        text="Hersteller"
-                />
-                <TableColumn
-                        fx:id="columnIngredient"
-                        minWidth="140.0"
-                        text="Inhaltsstoffe"
-                />
-                <TableColumn
-                        fx:id="columnPossibleSideEffects"
-                        minWidth="200.0"
-                        text="Mögliche Nebenwirkungen"
-                />
-                <TableColumn
-                        fx:id="columnAdministrationMethod"
-                        minWidth="180.0"
-                        text="Verabreichungsmethode"
-                />
-                <TableColumn
-                        fx:id="columnCurrentStock"
-                        minWidth="100.0"
-                        text="Lagerbestand"
-                />
-            </columns>
-            <columnResizePolicy>
-                <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
-            </columnResizePolicy>
-        </TableView>
-    </center>
-    <bottom>
-        <BorderPane>
-            <BorderPane.margin>
-                <Insets top="8.0"/>
-            </BorderPane.margin>
-            <right>
-                <HBox spacing="8.0">
-                    <Button
-                            fx:id="buttonChangeAvailable"
-                            mnemonicParsing="false"
-                            prefWidth="155.0"
-                            onAction="#handleChangeAvailable"
-                            text="Veraltet-Status ändern"
-                    />
-                </HBox>
-            </right>
-        </BorderPane>
-    </bottom>
-</BorderPane>

src/main/resources/de/hitec/nhplus/medication/database/Medication.sql

@@ -5,6 +5,5 @@ CREATE TABLE medication
     manufacturer         TEXT    NOT NULL,
     possibleSideEffects  TEXT    NOT NULL,
     administrationMethod TEXT    NOT NULL,
-    currentStock         INTEGER NOT NULL,
+    currentStock         INTEGER NOT NULL
-    isDeprecated         BOOLEAN NOT NULL DEFAULT false
 )

src/main/resources/de/hitec/nhplus/nurse/LockedNurseView.fxml

@@ -78,6 +78,7 @@
                             onAction="#handleDelete"
                             prefWidth="90.0"
                             text="Löschen"
+
                     />
                 </HBox>
             </right>