client/app/build.gradle.kts

@@ -5,19 +5,15 @@ plugins {
 }
 
 javafx {
-    version = "11.0.2"
+    version = "11"
     modules(
             "javafx.controls",
             "javafx.fxml"
     )
 }
 
-tasks.withType<JavaCompile> {
-    options.encoding = "UTF-8"
-}
-
 application {
-    mainClassName = "main.MainApplication"
+    mainClassName = "client.MainApplication"
 }
 
 repositories {
@@ -31,7 +27,7 @@ dependencies {
 
 val jar by tasks.getting(Jar::class) {
     manifest {
-        attributes["Main-Class"] = "main.Launcher"
+        attributes["Main-Class"] = "client.Launcher"
     }
     from({
         configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) }

client/app/src/main/java/customUI/Button.java

@@ -0,0 +1,9 @@
+//Marc Beyer//
+package customUI;
+
+public class Button extends javafx.scene.control.Button {
+
+    public void setTextValue(String text){
+        super.setText(Converter.convertString(text));
+    }
+}

client/app/src/main/java/customUI/Converter.java

@@ -0,0 +1,22 @@
+//Marc Beyer//
+package customUI;
+
+public class Converter {
+    /*
+    Ä, ä 		\u00c4, \u00e4
+    Ö, ö 		\u00d6, \u00f6
+    Ü, ü 		\u00dc, \u00fc
+    ß 		    \u00df
+     */
+    @SuppressWarnings("all")
+    public static String convertString(String str){
+        return str
+                .replace("ä", "\u00e4")
+                .replace("Ä", "\u00c4")
+                .replace("ö", "\u00f6")
+                .replace("Ö", "\u00d6")
+                .replace("ü", "\u00fc")
+                .replace("Ü", "\u00dc")
+                .replace("ß", "\u00df");
+    }
+}

client/app/src/main/java/customUI/Label.java

@@ -0,0 +1,16 @@
+//Marc Beyer//
+package customUI;
+
+public class Label extends javafx.scene.control.Label {
+    public Label(String content){
+        super(Converter.convertString(content));
+    }
+
+    public Label(){
+        super();
+    }
+
+    public void setTextValue(String text){
+        super.setText(Converter.convertString(text));
+    }
+}

client/app/src/main/java/customUI/Tooltip.java

@@ -0,0 +1,10 @@
+//Marco Kühn//
+package customUI;
+
+public class Tooltip extends javafx.scene.control.Tooltip {
+
+    public Tooltip(String tollTipText){
+        super(Converter.convertString(tollTipText));
+    }
+
+}

client/app/src/main/java/helper/SvgBtnCreator.java

@@ -0,0 +1,69 @@
+//Marco Kühn//
+package helper;
+
+import javafx.geometry.Bounds;
+import javafx.scene.Group;
+import customUI.Button;
+import javafx.scene.control.ContentDisplay;
+import customUI.Tooltip;
+import javafx.scene.shape.SVGPath;
+
+public class SvgBtnCreator {
+
+    public static Button createBtn(Group group, int svgSize) {
+        Button btn = new Button();
+
+        Bounds boundsDel = group.getBoundsInParent();
+        double scaleDel = Math.min(svgSize / boundsDel.getWidth(), svgSize / boundsDel.getHeight());
+        group.setScaleX(scaleDel);
+        group.setScaleY(scaleDel);
+        btn.setGraphic(group);
+        btn.setMaxSize(svgSize, svgSize);
+        btn.setMinSize(svgSize, svgSize);
+        btn.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+
+        return btn;
+    }
+
+    public static Button createBtn(Group group, int svgSize, String styleClass) {
+        Button btn = new Button();
+
+        Bounds boundsDel = group.getBoundsInParent();
+        double scaleDel = Math.min(svgSize / boundsDel.getWidth(), svgSize / boundsDel.getHeight());
+        group.setScaleX(scaleDel);
+        group.setScaleY(scaleDel);
+        btn.setGraphic(group);
+        btn.setMaxSize(svgSize, svgSize);
+        btn.setMinSize(svgSize, svgSize);
+        btn.getStyleClass().add(styleClass);
+
+        return btn;
+    }
+
+    public static Button createBtn(Group group, int svgSize, String styleClass, String toolTip) {
+        Button btn = new Button();
+
+        Bounds boundsDel = group.getBoundsInParent();
+        double scaleDel = Math.min(svgSize / boundsDel.getWidth(), svgSize / boundsDel.getHeight());
+        group.setScaleX(scaleDel);
+        group.setScaleY(scaleDel);
+        btn.setGraphic(group);
+        btn.setMaxSize(svgSize, svgSize);
+        btn.setMinSize(svgSize, svgSize);
+        btn.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        btn.getStyleClass().add(styleClass);
+        Tooltip tooltip = new Tooltip(toolTip);
+        btn.setTooltip(tooltip);
+
+        return btn;
+    }
+
+    public static SVGPath createPath(String d, String fill, String hoverFill) {
+        SVGPath path = new SVGPath();
+        path.getStyleClass().add("svg");
+        path.setContent(d);
+        path.setStyle("-fill:" + fill + ";-hover-fill:"+hoverFill+';');
+        return path;
+    }
+
+}

client/app/src/main/java/main/CreateEventController.java

@@ -1,4 +1,4 @@
-package events;
+package main;
 
 import com.jfoenix.controls.*;
 import helper.HttpRequestException;
@@ -10,8 +10,8 @@ import javafx.scene.layout.GridPane;
 import javafx.stage.Stage;
 import javafx.util.StringConverter;
 import javafx.util.converter.LocalTimeStringConverter;
-import container.DataController;
-import container.Event;
+import res.DataController;
+import res.Event;
 
 import java.time.LocalTime;
 import java.time.format.FormatStyle;
@@ -20,23 +20,23 @@ import java.util.Locale;
 public class CreateEventController {
 
     @FXML
-    private GridPane mainGrid;
+    public GridPane mainGrid;
     @FXML
-    protected JFXDatePicker datePickerDate;
+    public JFXDatePicker datePickerDate;
     @FXML
-    protected JFXTextField textName;
+    public JFXTextField textName;
     @FXML
-    protected JFXComboBox<String> comboBoxPriority;
+    public JFXComboBox<String> ComboBoxPriotity;
     @FXML
-    private JFXToggleButton toggleBtnIsFullDay;
+    public JFXToggleButton toggleBtnIsFullDay;
     @FXML
-    private JFXToggleButton toggleBtnIsPrivate;
+    public JFXToggleButton toggleBtnIsPrivate;
     @FXML
-    private Label labelError;
+    public Label labelError;
     @FXML
-    private JFXTimePicker timeStart;
+    public JFXTimePicker timeStart;
     @FXML
-    private JFXTimePicker timeEnd;
+    public JFXTimePicker timeEnd;
 
 
     public CreateEventController() {
@@ -45,6 +45,7 @@ public class CreateEventController {
     //Marco Kühn//
     @FXML
     public void initialize() {
+
         StringConverter<LocalTime> defaultConverter = new LocalTimeStringConverter(FormatStyle.SHORT, Locale.GERMANY);
         timeStart.set24HourView(true);
         timeStart.setConverter(defaultConverter);
@@ -65,7 +66,7 @@ public class CreateEventController {
 
             Event event = new Event(
                     textName.getText(),
-                    comboBoxPriority.getSelectionModel().getSelectedIndex(),
+                    ComboBoxPriotity.getSelectionModel().getSelectedIndex(),
                     toggleBtnIsFullDay.isSelected(),
                     toggleBtnIsPrivate.isSelected(),
                     timeStart.getValue(),

client/app/src/main/java/main/EditEventController.java

@@ -1,8 +1,17 @@
-package events;
+//Marc Beyer//
+package main;
 
+import customUI.Converter;
 import helper.HttpRequestException;
-import container.DataController;
-import container.Event;
+import javafx.fxml.FXML;
+import javafx.util.StringConverter;
+import javafx.util.converter.LocalTimeStringConverter;
+import res.DataController;
+import res.Event;
+
+import java.time.LocalTime;
+import java.time.format.FormatStyle;
+import java.util.Locale;
 
 public class EditEventController extends CreateEventController{
 
@@ -15,16 +24,20 @@ public class EditEventController extends CreateEventController{
     public void setCurrentEvent(Event currentEvent) {
         this.currentEvent = currentEvent;
 
-        textName.setText(currentEvent.getName());
+        textName.setText(Converter.convertString(currentEvent.getName()));
         datePickerDate.setValue(currentEvent.getDate().toLocalDate());
-        comboBoxPriority.getSelectionModel().select(currentEvent.getPriority());
+        ComboBoxPriotity.getSelectionModel().select(currentEvent.getPriority());
 
         //timeEnd.setValue(currentEvent.getEnd());
     }
 
+
+
+
     @Override
     protected void sendHttpRequest(Event event) throws HttpRequestException {
         DataController dataController = new DataController();
-        dataController.editEvent(currentEvent, event);
+        dataController.deleteEvent(currentEvent.getOwnerId(), currentEvent.getId(), currentEvent.getDate());
+        dataController.createEvent(event);
     }
 }

client/app/src/main/java/main/MainApplication.java

@@ -3,17 +3,15 @@ package main;
 
 import config.Config;
 import config.ConfigLoader;
-import container.DataController;
-import container.HttpRequest;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
-import javafx.stage.Modality;
 import javafx.stage.Stage;
+import res.DataController;
+import res.HttpRequest;
 
 import java.io.IOException;
 import java.util.Objects;
-import java.util.function.Consumer;
 
 
 public class MainApplication extends Application {
@@ -24,8 +22,6 @@ public class MainApplication extends Application {
             config = new Config(false, -1, "");
         }
 
-        DataController.SERVER_URL = config.toServerUrl();
-
         System.out.println("Ignore 'Illegal reflective access operation'-Warning. See https://github.com/sshahine/JFoenix/issues/1170");
 
         if(
@@ -42,7 +38,6 @@ public class MainApplication extends Application {
                 config.setToken(HttpRequest.TOKEN);
                 ConfigLoader.save(config);
             }
-
             // Load main-scene
             loadMainScene(stage);
 
@@ -62,55 +57,19 @@ public class MainApplication extends Application {
         stage.show();
     }
 
-    private void loadLoginScene() {
-        loadScene(
-                "Anmelden",
-                "../users/login.fxml",
-                "../users/login.css",
-                650,
-                500
+    private void loadLoginScene() throws IOException {
+        FXMLLoader fxmlLoaderLogin = new FXMLLoader(MainApplication.class.getResource("../users/login.fxml"));
+        Scene sceneLogin = new Scene(fxmlLoaderLogin.load(), 650, 500);
+        sceneLogin.getStylesheets().add(Objects.requireNonNull(
+                MainApplication.class.getResource("../users/login.css")).toExternalForm()
         );
+        Stage stageLogin = new Stage();
+        stageLogin.setTitle("Anmelden");
+        stageLogin.setScene(sceneLogin);
+        stageLogin.showAndWait();
     }
 
     public static void main(String[] args) {
         launch();
     }
-
-    public static void loadScene(
-            String title,
-            String fxml,
-            String css,
-            int width,
-            int height
-    ) {
-        loadScene(title, fxml, css, width, height, null);
-    }
-
-    public static void loadScene(
-            String title,
-            String fxml,
-            String css,
-            int width,
-            int height,
-            Consumer<FXMLLoader> method
-    ) {
-        FXMLLoader fxmlLoader = new FXMLLoader(
-                MainApplication.class.getResource(fxml));
-        try {
-            Scene scene = new Scene(fxmlLoader.load(), width, height);
-            scene.getStylesheets().add(Objects.requireNonNull(
-                    MainApplication.class.getResource(css)).toExternalForm());
-            Stage stage = new Stage();
-            stage.setTitle(title);
-            stage.setScene(scene);
-            stage.initModality(Modality.APPLICATION_MODAL);
-            stage.setResizable(false);
-
-            if(method != null)method.accept(fxmlLoader);
-
-            stage.showAndWait();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
 }

client/app/src/main/java/main/MainController.java

@@ -1,42 +1,47 @@
-/* Marco Kühn, Marc Beyer */
 package main;
 
 import config.Config;
 import config.ConfigLoader;
-import container.DataController;
-import container.Event;
-import container.HttpRequest;
-import events.EditEventController;
+import customUI.Button;
+import customUI.Label;
+import helper.SvgBtnCreator;
 import helper.HttpRequestException;
-import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.geometry.Pos;
+import javafx.scene.Group;
 import javafx.scene.Node;
-import javafx.scene.control.Alert;
-import javafx.scene.control.Button;
-import javafx.scene.control.Label;
+import javafx.scene.Scene;
+import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
+import javafx.stage.Modality;
 import javafx.stage.Stage;
-import ui.DayPane;
-import ui.EventPane;
-import ui.SvgBtnCreator;
+import res.DataController;
+import res.Event;
 
+import javafx.event.ActionEvent;
+import res.HttpRequest;
+
+import java.io.IOException;
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.Objects;
 
 public class MainController {
 
     @FXML
-    private VBox leftNav;
+    public VBox leftNav;
     @FXML
-    private GridPane mainGridPane;
+    public GridPane mainGridPane;
     @FXML
-    private HBox buttonBox;
+    public HBox buttonBox;
     @FXML
     private GridPane calendarGrid;
+
     @FXML
     private javafx.scene.control.Label LabelMonth;
 
@@ -53,6 +58,7 @@ public class MainController {
     }
 
     @FXML
+    //Marco Kühn,Marc Beyer//
     public void initialize() {
         createWeek();
         setDates();
@@ -61,6 +67,7 @@ public class MainController {
         leftNav.setSpacing(40);
     }
 
+    //Marc Beyer//
     private void updateEvents() {
         for (VBox vBox : dayVBoxes) {
             vBox.getChildren().clear();
@@ -78,6 +85,7 @@ public class MainController {
         }
     }
 
+    //Marc Beyer//
     @FXML
     protected void onBackClick() {
         weekOffset--;
@@ -85,6 +93,7 @@ public class MainController {
         updateEvents();
     }
 
+    //Marc Beyer//
     @FXML
     protected void onTodayClick() {
         weekOffset = 0;
@@ -92,6 +101,7 @@ public class MainController {
         updateEvents();
     }
 
+    //Marc Beyer//
     @FXML
     protected void onNextClick() {
         weekOffset++;
@@ -99,28 +109,35 @@ public class MainController {
         updateEvents();
     }
 
+
+    //Marco Kühn,Marc Beyer//
     @FXML
     protected void onAddBtnClick() {
-        MainApplication.loadScene(
-                "Termin erstellen",
-                "create-event.fxml",
-                "create-event.css",
-                650,
-                650
-        );
+        try {
+            FXMLLoader fxmlLoader = new FXMLLoader(
+                    MainApplication.class.getResource("create-event.fxml"));
+            Scene scene = new Scene(fxmlLoader.load(), 650, 650);
+            scene.getStylesheets().add(Objects.requireNonNull(
+                    MainApplication.class.getResource("create-event.css")).toExternalForm());
+            Stage stage = new Stage();
+            stage.setTitle("Termin erstellen");
+            stage.setScene(scene);
+            stage.initModality(Modality.APPLICATION_MODAL);
+            stage.setResizable(false);
+            //stage.initStyle(StageStyle.UNDECORATED);
+            stage.showAndWait();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
         updateEvents();
     }
 
+    //Marco Kühn//
     protected void onSettingBtnClick(){
-        MainApplication.loadScene(
-                "Einstellungen",
-                "option-view.fxml",
-                "option-view.css",
-                650,
-                600
-                );
+
     }
 
+    //Marc Beyer//
     protected void onLogoutBtnClick(ActionEvent event){
         ConfigLoader.save(new Config());
         DataController.USER_ID = -1;
@@ -129,52 +146,134 @@ public class MainController {
         stage.close();
     }
 
+    //Marc Beyer//
     private void createWeek() {
         for (int i = 0; i < 7; i++) {
-            DayPane dayPane = new DayPane();
-            this.dayLabel[i] = dayPane.getDayLabel();
-            calendarGrid.add(dayPane.getDayLabel(), i, 0);
-            dayVBoxes[i] = dayPane.getDayVBox();
-            calendarGrid.add(dayPane, i, 1);
+            Label label = new Label();
+            label.setTextValue(dayNames[i]);
+            label.setMaxHeight(Double.MAX_VALUE);
+            label.setMaxWidth(Double.MAX_VALUE);
+            label.getStyleClass().add("labelDays");
+            dayLabel[i] = label;
+            calendarGrid.add(label, i, 0);
+
+            ScrollPane scrollPane = new ScrollPane();
+
+            VBox vBox = new VBox();
+            vBox.getStyleClass().add("vBoxDays");
+            vBox.setSpacing(10);
+            dayVBoxes[i] = vBox;
+            scrollPane.setContent(vBox);
+
+            scrollPane.setFitToWidth(true);
+            scrollPane.setFitToHeight(true);
+            scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
+            scrollPane.getStyleClass().add("scrollDays");
+
+            calendarGrid.add(scrollPane, i, 1);
         }
     }
 
+    //Marco Kühn ,Marc Beyer//
     private void addEvent(Event event) {
-        EventPane eventPane = new EventPane(event);
-        eventPane.getEditBtn().setOnAction(event1 -> {
-            MainApplication.loadScene(
-                    "Termin bearbeiten",
-                    "edit-event.fxml",
-                    "create-event.css",
-                    650,
-                    650,
-                    fxmlLoader -> {
-                        EditEventController editEventController = fxmlLoader.getController();
-                        editEventController.setCurrentEvent(event);
-                    }
-            );
-            updateEvents();
-        });
+        VBox vBox = new VBox();
+        vBox.getStyleClass().add("event");
+        vBox.setSpacing(5);
 
-        eventPane.getDeleteBtn().setOnAction(e -> {
+        HBox btnHBox = new HBox();
+        btnHBox.setAlignment(Pos.BOTTOM_RIGHT);
+
+        Group svgDel = new Group(
+                SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
+                SvgBtnCreator.createPath("M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z",
+                        "white", "gray")
+        );
+        Button deleteBtn = SvgBtnCreator.createBtn(svgDel, 24, "", "Löschen des Termins");
+
+        deleteBtn.getStyleClass().add("deleteEventBtn");
+        deleteBtn.setOnAction(e -> {
             DataController dataController = new DataController();
             try {
                 dataController.deleteEvent(event.getOwnerId(), event.getId(), event.getDate());
             } catch (HttpRequestException ex) {
-                new Alert(Alert.AlertType.ERROR, ex.getMessage()).showAndWait();
+                ex.printStackTrace();
             }
             updateEvents();
         });
 
+        Group svgEdit = new Group(
+                SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
+                SvgBtnCreator.createPath("M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25zM20.71 7.04c.39-.39.39-1.02 0-1.41l-2.34-2.34c-.39-.39-1.02-.39-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z",
+                        "white", "gray")
+        );
+        Button editBtn = SvgBtnCreator.createBtn(svgEdit, 24, "", "Bearbeiten des Termins");
+        editBtn.getStyleClass().add("editEventBtn");
+        editBtn.setOnAction(event1 -> {
+            try {
+                FXMLLoader fxmlLoader = new FXMLLoader(
+                        MainApplication.class.getResource("edit-event.fxml"));
+                Scene scene = new Scene(fxmlLoader.load(), 650, 650);
+                scene.getStylesheets().add(Objects.requireNonNull(
+                        MainApplication.class.getResource("create-event.css")).toExternalForm());
+                Stage stage = new Stage();
+                stage.setTitle("Termin bearbeiten");
+                stage.setScene(scene);
+                stage.initModality(Modality.APPLICATION_MODAL);
+                stage.setResizable(false);
+                EditEventController editEventController = fxmlLoader.getController();
+                editEventController.setCurrentEvent(event);
+                stage.showAndWait();
+                updateEvents();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        });
+        btnHBox.getChildren().add(editBtn);
+        btnHBox.getChildren().add(deleteBtn);
+        vBox.getChildren().add(btnHBox);
+
+        Label nameLabel = new Label(event.getName());
+        vBox.getChildren().add(nameLabel);
+
+        if (event.getStart() != null || event.getEnd() != null) {
+            String timeStr = (event.getStart() != null ? formatTime(event.getStart()) : "")
+                    + (event.getEnd() != null ? " - " + formatTime(event.getEnd()) : "");
+            Label timeLabel = new Label(timeStr);
+            vBox.getChildren().add(timeLabel);
+        }
+
+        Label typeLabel = new Label("Wer: " + event.getOwnerName());
+        vBox.getChildren().add(typeLabel);
+
+        Label prioLabel = new Label("Priorit\u00e4t: " + event.getPriority());
+        vBox.getChildren().add(prioLabel);
+
+        if (event.isFullDay()) {
+            Label fullDayLabel = new Label("Dieser Termin bockiert den ganzen Tag!");
+            vBox.getChildren().add(fullDayLabel);
+        }
+
+
         LocalDateTime eventDate = event.getDate();
+
         int day = (int) Duration.between(
                 weekStartDateTime.toLocalDate().atStartOfDay(), eventDate.toLocalDate().atStartOfDay()).toDays();
 
         if (day >= 0 && day < 7) {
-            dayVBoxes[day].getChildren().add(eventPane);
+            dayVBoxes[day].getChildren().add(vBox);
         }
     }
 
+    //Marc Beyer//
+    private String formatTime(String time) {
+        String[] timeArr = time.split(":");
+        if (timeArr.length > 2) {
+            return timeArr[0] + ":" + timeArr[1];
+        }
+        return time;
+    }
+
+    //Marc Beyer//
     private void setDates() {
         DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("LLLL yyyy");
         DateTimeFormatter dayFormatter = DateTimeFormatter.ofPattern("E dd.MM");
@@ -186,42 +285,73 @@ public class MainController {
         weekStartDateTime = now.plusDays(weekOffset * 7L - dayOfWeek + 1);
 
         for (int i = 0; i < 7; i++) {
-            dayLabel[i].setText(dayFormatter.format(weekStartDateTime.plusDays(i)));
+            dayLabel[i].setTextValue(dayFormatter.format(weekStartDateTime.plusDays(i)));
         }
 
         LabelMonth.setText(dateFormatter.format(weekStartDateTime));
 
     }
 
+    //Marco Kühn//
     private void createBtns(){
-        Button addBtn = SvgBtnCreator.createAddBtn();
+        Group svgAdd = new Group(
+                SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
+                SvgBtnCreator.createPath("M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z",
+                        "white", "gray")
+        );
+        Button addBtn = SvgBtnCreator.createBtn(svgAdd, 40, "main-btn", "Erstellt einen neuen Termin");
         addBtn.setOnAction(e -> onAddBtnClick());
         addBtn.getStyleClass().add("main-btn");
         leftNav.getChildren().add(addBtn);
 
-        Button settingsBtn = SvgBtnCreator.createSettingBtn();
+        Group svgSettings = new Group(
+                SvgBtnCreator.createPath("M0 0h24v24H0V0z", "transparent", "transparent"),
+                SvgBtnCreator.createPath("M19.14,12.94c0.04-0.3,0.06-0.61,0.06-0.94c0-0.32-0.02-0.64-0.07-0.94l2.03-1.58c0.18-0.14,0.23-0.41,0.12-0.61 l-1.92-3.32c-0.12-0.22-0.37-0.29-0.59-0.22l-2.39,0.96c-0.5-0.38-1.03-0.7-1.62-0.94L14.4,2.81c-0.04-0.24-0.24-0.41-0.48-0.41 h-3.84c-0.24,0-0.43,0.17-0.47,0.41L9.25,5.35C8.66,5.59,8.12,5.92,7.63,6.29L5.24,5.33c-0.22-0.08-0.47,0-0.59,0.22L2.74,8.87 C2.62,9.08,2.66,9.34,2.86,9.48l2.03,1.58C4.84,11.36,4.8,11.69,4.8,12s0.02,0.64,0.07,0.94l-2.03,1.58 c-0.18,0.14-0.23,0.41-0.12,0.61l1.92,3.32c0.12,0.22,0.37,0.29,0.59,0.22l2.39-0.96c0.5,0.38,1.03,0.7,1.62,0.94l0.36,2.54 c0.05,0.24,0.24,0.41,0.48,0.41h3.84c0.24,0,0.44-0.17,0.47-0.41l0.36-2.54c0.59-0.24,1.13-0.56,1.62-0.94l2.39,0.96 c0.22,0.08,0.47,0,0.59-0.22l1.92-3.32c0.12-0.22,0.07-0.47-0.12-0.61L19.14,12.94z M12,15.6c-1.98,0-3.6-1.62-3.6-3.6 s1.62-3.6,3.6-3.6s3.6,1.62,3.6,3.6S13.98,15.6,12,15.6z",
+                        "white", "gray")
+        );
+        Button settingsBtn = SvgBtnCreator.createBtn(svgSettings, 40, "main-btn", "Öffnet die Einstellungen");
         settingsBtn.setOnAction(e -> onSettingBtnClick());
         settingsBtn.getStyleClass().add("main-btn");
         leftNav.getChildren().add(settingsBtn);
 
-        Button logoutBtn = SvgBtnCreator.createLogoutBtn();
+        Group svgLogout = new Group(
+                SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
+                SvgBtnCreator.createPath("M17 7l-1.41 1.41L18.17 11H8v2h10.17l-2.58 2.58L17 17l5-5zM4 5h8V3H4c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h8v-2H4V5z",
+                        "white", "gray")
+        );
+        Button logoutBtn = SvgBtnCreator.createBtn(svgLogout, 40, "main-btn", "Abmelden");
         logoutBtn.setOnAction(this::onLogoutBtnClick);
         logoutBtn.getStyleClass().add("main-btn");
         leftNav.getChildren().add(logoutBtn);
 
-        Button backBtn = SvgBtnCreator.createBackBtn();
+        Group svgBack = new Group(
+                SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
+                SvgBtnCreator.createPath("M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z",
+                        "white", "lightgray")
+        );
+        Button backBtn = SvgBtnCreator.createBtn(svgBack, 40, "navBtn", "Zeigt die vorherige Woche");
         backBtn.setOnAction(e -> onBackClick());
         backBtn.getStyleClass().add("navBtn");
         GridPane.setColumnIndex(backBtn, 1);
         buttonBox.getChildren().add(backBtn);
 
-        Button todayBtn = SvgBtnCreator.createTodayBtn();
+        Group svgToday = new Group(
+                SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
+                SvgBtnCreator.createPath("M20 3h-1V1h-2v2H7V1H5v2H4c-1.1 0-2 .9-2 2v16c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 18H4V8h16v13z",
+                        "white", "lightgray")
+        );
+        Button todayBtn = SvgBtnCreator.createBtn(svgToday, 40, "navBtn", "Zeigt die aktuelle Woche");
         todayBtn.setOnAction(e -> onTodayClick());
         todayBtn.getStyleClass().add("navBtn");
         GridPane.setColumnIndex(todayBtn, 2);
         buttonBox.getChildren().add(todayBtn);
 
-        Button nextBtn = SvgBtnCreator.createNextBtn();
+        Group svgNext = new Group(
+                SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
+                SvgBtnCreator.createPath("M12 4l-1.41 1.41L16.17 11H4v2h12.17l-5.58 5.59L12 20l8-8z",
+                        "white", "lightgray")
+        );
+        Button nextBtn = SvgBtnCreator.createBtn(svgNext, 40, "navBtn", "Zeigt die nächste Woche");
         nextBtn.setOnAction(e -> onNextClick());
         nextBtn.getStyleClass().add("navBtn");
         GridPane.setColumnIndex(nextBtn, 3);

client/app/src/main/java/main/OptionController.java

@@ -1,139 +0,0 @@
-/* Marco Kühn */
-package main;
-
-import com.jfoenix.controls.*;
-import config.Config;
-import config.ConfigLoader;
-import container.HttpRequest;
-import helper.HttpRequestException;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.Node;
-import javafx.scene.control.Alert;
-import javafx.scene.control.ButtonType;
-import javafx.scene.control.Label;
-import javafx.scene.layout.GridPane;
-import javafx.stage.Stage;
-import container.DataController;
-import container.User;
-import users.EditUserController;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-public class OptionController {
-
-    @FXML
-    private JFXButton updateUserBtn;
-    @FXML
-    private JFXButton deleteUserBtn;
-    @FXML
-    private JFXButton createUserBtn;
-    @FXML
-    private JFXToggleButton saveLoginTBtn;
-    @FXML
-    private Label labelError;
-    @FXML
-    private GridPane mainGrid;
-
-    private JFXComboBox<String> comboBox;
-    private DataController dataController;
-    private List<User> users;
-    private Config config;
-
-    @FXML
-    public void initialize(){
-        dataController = new DataController();
-        try{
-           users = dataController.getAllUser();
-        } catch (HttpRequestException e){
-           users = new ArrayList<>();
-        }
-
-        ObservableList<String> observableUserList = FXCollections.observableArrayList();
-        for (User user: users) {
-            observableUserList.add(user.getLogin());
-        }
-        comboBox = new JFXComboBox<>(observableUserList);
-        comboBox.getStyleClass().add("comboBox");
-        mainGrid.add(comboBox, 2,2);
-
-        config = ConfigLoader.load();
-        if(config == null){
-            config = new Config(false, -1, "");
-        }
-        saveLoginTBtn.setSelected(config.isSaveLogin());
-    }
-
-    public void onBackBtnClick(ActionEvent actionEvent) {
-        Stage stage = (Stage) ((Node) actionEvent.getSource()).getScene().getWindow();
-        stage.close();
-    }
-
-    public void onCreateBtnClick(ActionEvent actionEvent) {
-        MainApplication.loadScene(
-                "User erstellen",
-                "../users/create-user.fxml",
-                "../users/create-user.css",
-                800,
-                650
-        );
-    }
-
-    public void onUpdateBtnClick(ActionEvent actionEvent) {
-        int editIndex = comboBox.getSelectionModel().getSelectedIndex();
-
-        if(editIndex < 0 || editIndex >= users.size()) return;
-
-        MainApplication.loadScene(
-                "User bearbeiten",
-                "../users/edit-user.fxml",
-                "../users/create-user.css",
-                800,
-                650,
-                fxmlLoader -> {
-                    EditUserController editUserController = fxmlLoader.getController();
-                    editUserController.setCurrentUser(users.get(editIndex));
-                }
-        );
-    }
-
-    public void onDeleteBtnClick(ActionEvent actionEvent) {
-        Alert alert = new Alert(Alert.AlertType.CONFIRMATION, "Wirklich löschen?");
-        Optional<ButtonType> result = alert.showAndWait();
-        if(result.isPresent() && result.get() == ButtonType.OK){
-            int removeIndex = comboBox.getSelectionModel().getSelectedIndex();
-            try {
-                dataController.deleteUser(users.get(removeIndex));
-            } catch (HttpRequestException e) {
-                Alert alert1 = new Alert(Alert.AlertType.ERROR, e.getMessage());
-                alert1.showAndWait();
-                return;
-            }
-            comboBox.getItems().remove(removeIndex);
-            users.remove(removeIndex);
-        }
-    }
-
-    private void setUserAtController(FXMLLoader fxmlLoader){
-        int editIndex = comboBox.getSelectionModel().getSelectedIndex();
-        EditUserController editUserController = fxmlLoader.getController();
-        editUserController.setCurrentUser(users.get(editIndex));
-    }
-
-    public void toggledBtn(ActionEvent actionEvent) {
-        config.setSaveLogin(saveLoginTBtn.isSelected());
-        if(config.isSaveLogin()){
-            config.setId(DataController.USER_ID);
-            config.setToken(HttpRequest.TOKEN);
-        } else {
-            config.setId(-1);
-            config.setToken("");
-        }
-        ConfigLoader.save(config);
-    }
-}

client/app/src/main/java/ui/DayPane.java

@@ -1,38 +0,0 @@
-package ui;
-
-import javafx.scene.control.Label;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.layout.VBox;
-
-public class DayPane extends ScrollPane {
-
-    private final Label dayLabel;
-    private final VBox dayVBox;
-
-    public DayPane() {
-        dayLabel = new Label();
-        dayLabel.setMaxHeight(Double.MAX_VALUE);
-        dayLabel.setMaxWidth(Double.MAX_VALUE);
-        dayLabel.getStyleClass().add("labelDays");
-
-        dayVBox = new VBox();
-
-        dayVBox.getStyleClass().add("vBoxDays");
-        dayVBox.setSpacing(10);
-
-        setContent(dayVBox);
-        setFitToWidth(true);
-        setFitToHeight(true);
-        setHbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
-        getStyleClass().add("scrollDays");
-        getStyleClass().add("scrollDays");
-    }
-
-    public Label getDayLabel() {
-        return dayLabel;
-    }
-
-    public VBox getDayVBox() {
-        return dayVBox;
-    }
-}

client/app/src/main/java/ui/EventPane.java

@@ -1,83 +0,0 @@
-package ui;
-
-import container.Event;
-import javafx.geometry.Pos;
-import javafx.scene.Group;
-import javafx.scene.control.Button;
-import javafx.scene.control.Label;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.VBox;
-
-public class EventPane extends VBox {
-
-    private Button deleteBtn;
-    private Button editBtn;
-
-    public EventPane(Event event) {
-        this.getStyleClass().add("event");
-        this.setSpacing(5);
-
-        HBox btnHBox = new HBox();
-        btnHBox.setAlignment(Pos.BOTTOM_RIGHT);
-
-        Group svgDel = new Group(
-                SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
-                SvgBtnCreator.createPath("M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z",
-                        "white", "gray")
-        );
-        deleteBtn = SvgBtnCreator.createBtn(svgDel, 24, "", "Löschen des Termins");
-        deleteBtn.getStyleClass().add("deleteEventBtn");
-
-        Group svgEdit = new Group(
-                SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
-                SvgBtnCreator.createPath("M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25zM20.71 7.04c.39-.39.39-1.02 0-1.41l-2.34-2.34c-.39-.39-1.02-.39-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z",
-                        "white", "gray")
-        );
-        editBtn = SvgBtnCreator.createBtn(svgEdit, 24, "", "Bearbeiten des Termins");
-        editBtn.getStyleClass().add("editEventBtn");
-
-        btnHBox.getChildren().add(editBtn);
-        btnHBox.getChildren().add(deleteBtn);
-        this.getChildren().add(btnHBox);
-
-        Label nameLabel = new Label(event.getName());
-        nameLabel.setWrapText(true);
-        this.getChildren().add(nameLabel);
-
-        if (event.getStart() != null || event.getEnd() != null) {
-            String timeStr = (event.getStart() != null ? formatTime(event.getStart()) : "")
-                    + (event.getEnd() != null ? " - " + formatTime(event.getEnd()) : "");
-            Label timeLabel = new Label(timeStr);
-            this.getChildren().add(timeLabel);
-        }
-
-        Label typeLabel = new Label("Wer: " + event.getOwnerName());
-        this.getChildren().add(typeLabel);
-
-        Label prioLabel = new Label("Priorität: " + event.getPriority());
-        this.getChildren().add(prioLabel);
-
-        if (event.isFullDay()) {
-            Label fullDayLabel = new Label("Dieser Termin bockiert den ganzen Tag!");
-            fullDayLabel.setWrapText(true);
-            this.getChildren().add(fullDayLabel);
-        }
-    }
-
-    public Button getDeleteBtn() {
-        return deleteBtn;
-    }
-
-    public Button getEditBtn() {
-        return editBtn;
-    }
-
-
-    private String formatTime(String time) {
-        String[] timeArr = time.split(":");
-        if (timeArr.length > 2) {
-            return timeArr[0] + ":" + timeArr[1];
-        }
-        return time;
-    }
-}

client/app/src/main/java/ui/SvgBtnCreator.java

@@ -1,91 +0,0 @@
-package ui;
-
-import javafx.geometry.Bounds;
-import javafx.scene.Group;
-import javafx.scene.control.*;
-import javafx.scene.shape.SVGPath;
-
-public class SvgBtnCreator {
-
-
-    public static Button createBtn(Group group, int svgSize, String styleClass, String toolTip) {
-        Button btn = new Button();
-
-        Bounds boundsDel = group.getBoundsInParent();
-        double scaleDel = Math.min(svgSize / boundsDel.getWidth(), svgSize / boundsDel.getHeight());
-        group.setScaleX(scaleDel);
-        group.setScaleY(scaleDel);
-        btn.setGraphic(group);
-        btn.setMaxSize(svgSize, svgSize);
-        btn.setMinSize(svgSize, svgSize);
-        btn.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-        btn.getStyleClass().add(styleClass);
-        Tooltip tooltip = new Tooltip(toolTip);
-        btn.setTooltip(tooltip);
-
-        return btn;
-    }
-
-    public static SVGPath createPath(String d, String fill, String hoverFill) {
-        SVGPath path = new SVGPath();
-        path.getStyleClass().add("svg");
-        path.setContent(d);
-        path.setStyle("-fill:" + fill + ";-hover-fill:"+hoverFill+';');
-        return path;
-    }
-
-    public static Button createAddBtn(){
-        Group svgAdd = new Group(
-                createPath("M0 0h24v24H0z", "transparent", "transparent"),
-                createPath("M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z",
-                        "white", "gray")
-        );
-        return createBtn(svgAdd, 40, "main-btn", "Erstellt einen neuen Termin");
-    }
-
-    public static Button createSettingBtn(){
-        Group svgSettings = new Group(
-                createPath("M0 0h24v24H0V0z", "transparent", "transparent"),
-                createPath("M19.14,12.94c0.04-0.3,0.06-0.61,0.06-0.94c0-0.32-0.02-0.64-0.07-0.94l2.03-1.58c0.18-0.14,0.23-0.41,0.12-0.61 l-1.92-3.32c-0.12-0.22-0.37-0.29-0.59-0.22l-2.39,0.96c-0.5-0.38-1.03-0.7-1.62-0.94L14.4,2.81c-0.04-0.24-0.24-0.41-0.48-0.41 h-3.84c-0.24,0-0.43,0.17-0.47,0.41L9.25,5.35C8.66,5.59,8.12,5.92,7.63,6.29L5.24,5.33c-0.22-0.08-0.47,0-0.59,0.22L2.74,8.87 C2.62,9.08,2.66,9.34,2.86,9.48l2.03,1.58C4.84,11.36,4.8,11.69,4.8,12s0.02,0.64,0.07,0.94l-2.03,1.58 c-0.18,0.14-0.23,0.41-0.12,0.61l1.92,3.32c0.12,0.22,0.37,0.29,0.59,0.22l2.39-0.96c0.5,0.38,1.03,0.7,1.62,0.94l0.36,2.54 c0.05,0.24,0.24,0.41,0.48,0.41h3.84c0.24,0,0.44-0.17,0.47-0.41l0.36-2.54c0.59-0.24,1.13-0.56,1.62-0.94l2.39,0.96 c0.22,0.08,0.47,0,0.59-0.22l1.92-3.32c0.12-0.22,0.07-0.47-0.12-0.61L19.14,12.94z M12,15.6c-1.98,0-3.6-1.62-3.6-3.6 s1.62-3.6,3.6-3.6s3.6,1.62,3.6,3.6S13.98,15.6,12,15.6z",
-                        "white", "gray")
-        );
-        return createBtn(svgSettings, 40, "main-btn", "Öffnet die Einstellungen");
-    }
-
-    public static Button createLogoutBtn(){
-        Group svgLogout = new Group(
-                createPath("M0 0h24v24H0z", "transparent", "transparent"),
-                createPath("M17 7l-1.41 1.41L18.17 11H8v2h10.17l-2.58 2.58L17 17l5-5zM4 5h8V3H4c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h8v-2H4V5z",
-                        "white", "gray")
-        );
-        return createBtn(svgLogout, 40, "main-btn", "Abmelden");
-    }
-
-    public static Button createBackBtn(){
-        Group svgBack = new Group(
-                createPath("M0 0h24v24H0z", "transparent", "transparent"),
-                createPath("M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z",
-                        "white", "lightgray")
-        );
-        return createBtn(svgBack, 40, "navBtn", "Zeigt die vorherige Woche");
-    }
-
-    public static Button createTodayBtn(){
-        Group svgToday = new Group(
-                createPath("M0 0h24v24H0z", "transparent", "transparent"),
-                createPath("M20 3h-1V1h-2v2H7V1H5v2H4c-1.1 0-2 .9-2 2v16c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 18H4V8h16v13z",
-                        "white", "lightgray")
-        );
-        return createBtn(svgToday, 40, "navBtn", "Zeigt die aktuelle Woche");
-    }
-
-    public static Button createNextBtn(){
-        Group svgNext = new Group(
-                createPath("M0 0h24v24H0z", "transparent", "transparent"),
-                createPath("M12 4l-1.41 1.41L16.17 11H4v2h12.17l-5.58 5.59L12 20l8-8z",
-                        "white", "lightgray")
-        );
-        return createBtn(svgNext, 40, "navBtn", "Zeigt die nächste Woche");
-    }
-
-}

client/app/src/main/java/users/CreateUserController.java

@@ -1,7 +1,6 @@
 //Alex Rechtin//
 package users;
 
-import helper.HttpRequestException;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.Node;
@@ -10,43 +9,39 @@ import javafx.scene.control.PasswordField;
 import javafx.scene.control.TextField;
 import javafx.scene.control.ToggleButton;
 import javafx.stage.Stage;
-import container.DataController;
-import container.User;
 
 import java.util.Objects;
 
 public class CreateUserController {
 
-    @FXML
-    protected TextField textName;
-    @FXML
-    protected PasswordField textPassword;
-    @FXML
-    protected PasswordField textPasswordSecond;
-    @FXML
-    protected ToggleButton checkButtonIsAdmin;
-    @FXML
-    protected TextField textLogin;
-    @FXML
-    protected TextField textForename;
-    @FXML
-    protected Label labelError;
+    public TextField textName;
+    public PasswordField textPassword;
+    public PasswordField textPasswordSecond;
+    public ToggleButton checkButtonIsAdmin;
+    public TextField textLogin;
+    public TextField textForename;
+    public Label labelError;
 
     @FXML
     protected void createUser(ActionEvent event) {
-        if (validateNameAndLogin() || validatePassword()) return;
-
-        User user = new User();
-        user.setLogin(textLogin.getText().trim());
-        user.setForename(textForename.getText().trim());
-        user.setName(textName.getText().trim());
-        user.setPassword(textPassword.getText().trim());
-        user.setAdmin(checkButtonIsAdmin.isSelected());
-
-        try {
-            sendHttpRequest(user);
-        } catch (HttpRequestException e) {
-            labelError.setText(e.getMessage());
+        if (textLogin.getText().trim().isEmpty()){
+            labelError.setText("Bitte Login Namen angeben");
+            return;
+        }
+        if (textForename.getText().trim().isEmpty()) {
+            labelError.setText("Bitte Vornamen eingeben!");
+            return;
+        }
+        if (textName.getText().trim().isEmpty()) {
+            labelError.setText("Bitte Nachnamen eingeben!");
+            return;
+        }
+        if (textPassword.getText().trim().isEmpty()) {
+            labelError.setText("Bitte Passwort eingeben!");
+            return;
+        }
+        if (!Objects.equals(textPassword.getText(), textPasswordSecond.getText())){
+            labelError.setText("Passwörter stimmen nicht überein!");
             return;
         }
 
@@ -54,43 +49,6 @@ public class CreateUserController {
         stage.close();
     }
 
-    protected boolean validatePassword() {
-        if (textPassword.getText().trim().isEmpty()) {
-            labelError.setText("Bitte Passwort eingeben!");
-            return true;
-        }
-        if (textPassword.getText().trim().length() < 8) {
-            labelError.setText("Das Passwort muss mindestens 8 Zeichen lang sein!");
-            return true;
-        }
-        if (!Objects.equals(textPassword.getText(), textPasswordSecond.getText())){
-            labelError.setText("Passwörter stimmen nicht überein!");
-            return true;
-        }
-        return false;
-    }
-
-    protected boolean validateNameAndLogin() {
-        if (textLogin.getText().trim().isEmpty()){
-            labelError.setText("Bitte Login Namen angeben");
-            return true;
-        }
-        if (textForename.getText().trim().isEmpty()) {
-            labelError.setText("Bitte Vornamen eingeben!");
-            return true;
-        }
-        if (textName.getText().trim().isEmpty()) {
-            labelError.setText("Bitte Nachnamen eingeben!");
-            return true;
-        }
-        return false;
-    }
-
-    protected void sendHttpRequest(User user) throws HttpRequestException {
-        DataController dataController = new DataController();
-        dataController.createUser(user);
-    }
-
     @FXML
     protected void abortBtnClick(ActionEvent event) {
         Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();

client/app/src/main/java/users/EditUserController.java

@@ -1,69 +0,0 @@
-/* Marc Beyer */
-package users;
-
-import container.DataController;
-import container.User;
-import helper.HttpRequestException;
-import javafx.event.ActionEvent;
-import javafx.scene.Node;
-import javafx.scene.control.Alert;
-import javafx.stage.Stage;
-
-public class EditUserController extends CreateUserController{
-    private User currentUser;
-
-    public User getCurrentUser() {
-        return currentUser;
-    }
-
-    public void setCurrentUser(User currentUser) {
-        this.currentUser = currentUser;
-
-        textForename.setText(currentUser.getForename());
-        textName.setText(currentUser.getName());
-        textLogin.setText(currentUser.getLogin());
-        checkButtonIsAdmin.setSelected(currentUser.isAdmin());
-    }
-
-    @Override
-    protected void createUser(ActionEvent event){
-        if (validateNameAndLogin()) return;
-
-        User user = new User();
-
-        if(!textPassword.getText().trim().isEmpty() || !textPasswordSecond.getText().trim().isEmpty()){
-            if (validatePassword()) return;
-            user.setPassword(textPassword.getText().trim());
-        }
-
-        user.setUserId(currentUser.getUserId());
-        user.setLogin(textLogin.getText().trim());
-        user.setForename(textForename.getText().trim());
-        user.setName(textName.getText().trim());
-        user.setAdmin(checkButtonIsAdmin.isSelected());
-
-        try {
-            sendHttpRequest(user);
-        } catch (HttpRequestException e) {
-            labelError.setText(e.getMessage());
-            return;
-        }
-
-        if(currentUser.getUserId() == DataController.USER_ID){
-            Alert alert = new Alert(
-                    Alert.AlertType.WARNING,
-                    "Bitte starte das Programm neu um die Änderungen anzuwenden."
-            );
-            alert.showAndWait();
-        }
-
-        Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
-        stage.close();
-    }
-
-    @Override
-    protected void sendHttpRequest(User user) throws HttpRequestException {
-        DataController dataController = new DataController();
-        dataController.editUser(user);
-    }
-}

client/app/src/main/java/users/LoginController.java

@@ -7,17 +7,17 @@ import javafx.fxml.FXML;
 import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.stage.Stage;
-import container.DataController;
+import res.DataController;
 
 public class LoginController {
     @FXML
-    private JFXTextField userField;
+    public JFXTextField userField;
     @FXML
-    private JFXPasswordField passField;
+    public JFXPasswordField passField;
     @FXML
-    private Label userErrLabel;
+    public Label userErrLabel;
     @FXML
-    private Label passErrLabel;
+    public Label passErrLabel;
 
     @FXML
     protected void login(ActionEvent event) {

client/app/src/main/resources/main/create-event.css

@@ -62,19 +62,4 @@ JFXButton{
 
 .timePicker{
     -fx-background-color: white;
-}
-
-.jfx-time-picker .date-picker-popup{
-    -fx-max-width: 230px;
-    -fx-min-width: 230px;
-}
-
-.jfx-time-picker .date-picker-popup > * > .spinner > .label {
-    -fx-max-width: 55px;
-    -fx-min-width: 55px;
-}
-
-.jfx-date-picker .date-picker-popup > * > .spinner > .label {
-     -fx-max-width: 300px;
-     -fx-min-width: 300px;
- }
+}

client/app/src/main/resources/main/create-event.fxml

@@ -10,7 +10,7 @@
 <?import com.jfoenix.controls.*?>
 
 <GridPane fx:id="mainGrid" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1"
-          fx:controller="events.CreateEventController">
+          fx:controller="main.CreateEventController">
 
     <columnConstraints>
         <ColumnConstraints/>
@@ -45,7 +45,7 @@
     <JFXTimePicker styleClass="timePicker" fx:id="timeStart" GridPane.columnIndex="1" GridPane.rowIndex="3" maxWidth="200" minWidth="200"/>
     <JFXTimePicker styleClass="timePicker" fx:id="timeEnd" GridPane.columnIndex="1" GridPane.rowIndex="4" maxWidth="200" minWidth="200"/>
 
-    <JFXComboBox fx:id="comboBoxPriority" styleClass="comboBox" GridPane.columnIndex="1" GridPane.rowIndex="5" maxWidth="200" minWidth="200">
+    <JFXComboBox fx:id="ComboBoxPriotity" styleClass="comboBox" GridPane.columnIndex="1" GridPane.rowIndex="5" maxWidth="200" minWidth="200">
         <items>
             <FXCollections fx:factory="observableArrayList">
                 <String fx:value="gering"/>

client/app/src/main/resources/main/edit-event.fxml

@@ -10,7 +10,7 @@
 <?import com.jfoenix.controls.*?>
 
 <GridPane fx:id="mainGrid" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1"
-          fx:controller="events.EditEventController">
+          fx:controller="main.EditEventController">
 
     <columnConstraints>
         <ColumnConstraints/>
@@ -45,7 +45,7 @@
     <JFXTimePicker styleClass="timePicker" fx:id="timeStart" GridPane.columnIndex="1" GridPane.rowIndex="3" maxWidth="200" minWidth="200"/>
     <JFXTimePicker styleClass="timePicker" fx:id="timeEnd" GridPane.columnIndex="1" GridPane.rowIndex="4" maxWidth="200" minWidth="200"/>
 
-    <JFXComboBox fx:id="comboBoxPriority" styleClass="comboBox" GridPane.columnIndex="1" GridPane.rowIndex="5" maxWidth="200" minWidth="200">
+    <JFXComboBox fx:id="ComboBoxPriotity" styleClass="comboBox" GridPane.columnIndex="1" GridPane.rowIndex="5" maxWidth="200" minWidth="200">
         <items>
             <FXCollections fx:factory="observableArrayList">
                 <String fx:value="gering"/>

client/app/src/main/resources/main/option-view.css

@@ -1,59 +0,0 @@
-/* Marco Kühn */
-GridPane{
-    -fx-background-color: #3E415F;
-    -fx-padding: 20px;
-    -fx-font-size: 20px;
-    -fx-font-family: Segoe UI;
-
-    -fx-border-insets: 1;
-    -fx-border-color: #B0B0B0;
-    -fx-border-style: solid;
-    -fx-border-width: 2;
-    -fx-effect: dropshadow(three-pass-box, rgba(100, 100, 100, 1), 24, 0.5, 0, 0);
-}
-
-Label{
-    -fx-text-fill: white;
-    -fx-max-width: 200px;
-    -fx-min-width: 200px;
-}
-
-.mainLabel{
-    -fx-background-color: #8D99AE;
-    -fx-padding: 10px;
-    -fx-max-width: 200px;
-    -fx-min-width: 200px;
-    -fx-font-weight: bold;
-    -fx-alignment: center;
-}
-
-.mainButton{
-    -fx-font-weight: bold;
-    -fx-background-color: white;
-}
-
-JFXButton{
-    -fx-background-color: white;
-}
-
-#labelError{
-    -fx-font-weight: bold;
-    -fx-max-width: 1000px;
-    -fx-text-fill: #ff5555;
-    -fx-padding: 16px;
-    -fx-min-height: 140px;
-    -fx-max-height: 400px;
-    -fx-wrap-text: true;
-    -fx-font-size: 16px;
-}
-
-.comboBox{
-    -fx-background-color: white;
-    -fx-max-width: 200px;
-    -fx-min-width: 200px;
-}
-
-.userBtn{
-    -fx-max-width: 200px;
-    -fx-min-width: 200px;
-}

client/app/src/main/resources/main/option-view.fxml

@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Marco Kühn -->
-
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import com.jfoenix.controls.*?>
-
-<GridPane xmlns="http://javafx.com/javafx"
-          xmlns:fx="http://javafx.com/fxml"
-          fx:controller="main.OptionController"
-          prefHeight="400.0" prefWidth="600.0"
-fx:id="mainGrid">
-
-    <columnConstraints>
-        <ColumnConstraints minWidth="100"/>
-        <ColumnConstraints minWidth="100"/>
-        <ColumnConstraints minWidth="200"/>
-        <ColumnConstraints minWidth="100"/>
-        <ColumnConstraints minWidth="100"/>
-    </columnConstraints>
-    <rowConstraints>
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-    </rowConstraints>
-
-    <Label styleClass="mainLabel" GridPane.columnIndex="2" GridPane.halignment="CENTER" >Einstellungen</Label>
-
-    <Label GridPane.columnIndex="1" GridPane.rowIndex="2" GridPane.halignment="CENTER">User:</Label>
-
-    <JFXButton styleClass="userBtn" fx:id="updateUserBtn" GridPane.columnIndex="1" GridPane.columnSpan="3"
-               GridPane.rowIndex="4" GridPane.halignment="CENTER" onAction="#onUpdateBtnClick">User bearbeiten</JFXButton>
-    <JFXButton styleClass="userBtn" fx:id="deleteUserBtn" GridPane.columnIndex="1" GridPane.columnSpan="3"
-               GridPane.rowIndex="5" GridPane.halignment="CENTER" onAction="#onDeleteBtnClick">User löschen</JFXButton>
-    <JFXButton styleClass="userBtn" fx:id="createUserBtn" GridPane.columnIndex="1" GridPane.columnSpan="3"
-               GridPane.rowIndex="7" GridPane.halignment="CENTER" onAction="#onCreateBtnClick">User anlegen</JFXButton>
-
-    <Label styleClass="loginLbl" GridPane.columnIndex="1" GridPane.rowIndex="8"
-           GridPane.halignment="CENTER">Angemeldet bleiben:</Label>
-    <JFXToggleButton fx:id="saveLoginTBtn" GridPane.columnIndex="3" GridPane.rowIndex="8" onAction="#toggledBtn"/>
-
-    <Label fx:id="labelError" styleClass="errorMessage" GridPane.columnIndex="1" GridPane.rowIndex="9"/>
-    <JFXButton GridPane.columnIndex="4" GridPane.rowIndex="9" onAction="#onBackBtnClick">Zurück</JFXButton>
-
-</GridPane>

client/app/src/main/resources/users/create-user.fxml

@@ -5,7 +5,6 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.geometry.Insets?>
-<?import com.jfoenix.controls.JFXToggleButton?>
 <GridPane xmlns="http://javafx.com/javafx"
           xmlns:fx="http://javafx.com/fxml"
           fx:controller="users.CreateUserController">
@@ -43,16 +42,16 @@
     <PasswordField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" />
     <PasswordField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" />
 
-    <JFXToggleButton fx:id="checkButtonIsAdmin" GridPane.columnIndex="2" GridPane.rowIndex="6"/>
+    <ToggleButton fx:id="checkButtonIsAdmin" GridPane.columnIndex="2" GridPane.rowIndex="6"/>
 
-    <Label fx:id="labelError" wrapText="true" styleClass="errorMessage" GridPane.columnIndex="2" GridPane.rowIndex="7"/>
+    <Label fx:id="labelError" styleClass="errorMessage" GridPane.columnIndex="2" GridPane.rowIndex="7"/>
 
     <HBox GridPane.columnIndex="2" GridPane.rowIndex="8" alignment="CENTER_RIGHT">
         <HBox.margin>
             <Insets right="100" left="100"/>
         </HBox.margin>
         <Button onAction="#abortBtnClick">Abbrechen</Button>
-        <Button onAction="#createUser" styleClass="btnLogin" >Anlegen</Button>
+        <Button onAction="#createUser" styleClass="btnLogin" >Anmelden</Button>
 
     </HBox>
 </GridPane>

client/app/src/main/resources/users/edit-user.fxml

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.geometry.Insets?>
-<?import com.jfoenix.controls.JFXToggleButton?>
-<GridPane xmlns="http://javafx.com/javafx"
-          xmlns:fx="http://javafx.com/fxml"
-          fx:controller="users.EditUserController">
-    <columnConstraints>
-        <ColumnConstraints minWidth="100"/>
-        <ColumnConstraints minWidth="100"/>
-        <ColumnConstraints minWidth="100"/>
-    </columnConstraints>
-    <rowConstraints>
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-    </rowConstraints>
-
-    <Label styleClass="mainLabel" GridPane.columnIndex="2" >User bearbeiten</Label>
-
-    <Label styleClass="inputLabel" GridPane.rowIndex="1" GridPane.columnIndex="1">Login:</Label>
-    <Label styleClass="inputLabel" GridPane.rowIndex="2" GridPane.columnIndex="1">Vorname:</Label>
-    <Label styleClass="inputLabel" GridPane.rowIndex="3" GridPane.columnIndex="1">Nachname:</Label>
-    <Label styleClass="inputLabel" GridPane.rowIndex="4" GridPane.columnIndex="1">Passwort:</Label>
-    <Label styleClass="inputLabel" GridPane.rowIndex="5" GridPane.columnIndex="1">Passwort wiederholen:</Label>
-
-    <Label styleClass="inputLabelAdmin" GridPane.rowIndex="6" GridPane.columnIndex="1">Admin:</Label>
-
-    <TextField fx:id="textLogin" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="1" />
-    <TextField fx:id="textForename" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="2" />
-    <TextField fx:id="textName" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="3" />
-    <PasswordField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" />
-    <PasswordField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" />
-
-    <JFXToggleButton fx:id="checkButtonIsAdmin" GridPane.columnIndex="2" GridPane.rowIndex="6"/>
-
-    <Label fx:id="labelError" wrapText="true" styleClass="errorMessage" GridPane.columnIndex="2" GridPane.rowIndex="7"/>
-
-    <HBox GridPane.columnIndex="2" GridPane.rowIndex="8" alignment="CENTER_RIGHT">
-        <HBox.margin>
-            <Insets right="100" left="100"/>
-        </HBox.margin>
-        <Button onAction="#abortBtnClick">Abbrechen</Button>
-        <Button onAction="#createUser" styleClass="btnLogin" >Bearbeiten</Button>
-
-    </HBox>
-</GridPane>
-

client/data/build.gradle.kts

@@ -2,10 +2,6 @@ plugins {
     java
 }
 
-tasks.withType<JavaCompile> {
-    options.encoding = "UTF-8"
-}
-
 dependencies {
     val jacksonVersion = "2.13.0"
     implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")

client/data/src/main/java/config/Config.java

@@ -5,26 +5,15 @@ public class Config {
     private boolean saveLogin;
     private long id;
     private String token;
-    private String connectionMethod;
-    private String hostAddress;
-    private int port;
 
     public Config(){
-        saveLogin = false;
-        id = -1;
-        token = "";
-        connectionMethod = "http";
-        hostAddress = "localhost";
-        port = 8080;
+
     }
 
     public Config(boolean saveLogin, long id, String token) {
         this.saveLogin = saveLogin;
         this.id = id;
         this.token = token;
-        connectionMethod = "http";
-        hostAddress = "localhost";
-        port = 8080;
     }
 
     public boolean isSaveLogin() {
@@ -50,32 +39,4 @@ public class Config {
     public void setToken(String token) {
         this.token = token;
     }
-
-    public String getConnectionMethod() {
-        return connectionMethod;
-    }
-
-    public void setConnectionMethod(String connectionMethod) {
-        this.connectionMethod = connectionMethod;
-    }
-
-    public String getHostAddress() {
-        return hostAddress;
-    }
-
-    public void setHostAddress(String hostAddress) {
-        this.hostAddress = hostAddress;
-    }
-
-    public int getPort() {
-        return port;
-    }
-
-    public void setPort(int port) {
-        this.port = port;
-    }
-
-    public String toServerUrl(){
-        return getConnectionMethod() + "://" + getHostAddress() + ":" + getPort();
-    }
 }

client/data/src/main/java/config/ConfigLoader.java

@@ -2,6 +2,7 @@
 package config;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import res.DataController;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -17,11 +18,9 @@ public class ConfigLoader {
             objectMapper.findAndRegisterModules();
             return objectMapper.readValue(jsonString, Config.class);
         } catch (IOException e) {
-            System.out.println("config.json missing");
-            Config config = new Config(false, -1, "");
-            save(config);
-            return config;
+            e.printStackTrace();
         }
+        return null;
     }
 
     public static void save(Config config){
@@ -29,12 +28,9 @@ public class ConfigLoader {
         objectMapper.findAndRegisterModules();
 
         try {
-            Files.writeString(
-                    Paths.get("config.json"),
+            Files.writeString(Paths.get(
+                    "config.json"),
                     objectMapper.writeValueAsString(config)
-                            .replace(",", ",\n\t")
-                            .replace("{", "{\n\t")
-                            .replace("}", "\n}")
             );
         } catch (IOException e) {
             e.printStackTrace();

client/data/src/main/java/container/DataController.java

@@ -1,220 +0,0 @@
-package container;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import helper.HttpRequestException;
-import helper.Tuple;
-
-import java.time.LocalDateTime;
-import java.util.*;
-
-public class DataController {
-
-    public static long USER_ID = -1;
-    public static String SERVER_URL = "http://localhost:8080";
-
-    private static final String ALL_EVENTS_ENDPOINT =           "/event/all";
-    private static final String ADD_EVENT_ENDPOINT =            "/event/add";
-    private static final String DELETE_EVENT_ENDPOINT =         "/event/del";
-    private static final String EDIT_EVENT_ENDPOINT =           "/event/edit";
-
-    private static final String ALL_USER_ENDPOINT =             "/user/all";
-    private static final String ADD_USER_ENDPOINT =             "/user/add";
-    private static final String DELETE_USER_ENDPOINT =          "/user/del";
-    private static final String EDIT_USER_ENDPOINT =            "/user/edit";
-
-    private static final String LOGIN_ENDPOINT =                "/user/login";
-    private static final String LOGIN_WITH_TOKEN_ENDPOINT =     "/user/login-with-token";
-    private static final String HEADER_TEST_ENDPOINT =          "/vpr/header-test";
-
-    private final HttpRequest httpRequest;
-
-    public DataController() {
-        httpRequest = new HttpRequest();
-    }
-
-    public boolean login(String username, String password) {
-        try {
-            Tuple<Integer, String> response = httpRequest.sendPostRequest(
-                    SERVER_URL + LOGIN_ENDPOINT,
-                    "login=" + username
-                            + "&password=" + password,
-                    false
-            );
-            String[] data = response.getValue().split("\\s+");
-
-            USER_ID = Long.parseLong(data[1]);
-            HttpRequest.TOKEN = data[0];
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-
-        return USER_ID >= 0;
-    }
-
-    public boolean loginWithToken(long userId, String token) {
-        try {
-            HttpRequest.TOKEN = token;
-            Tuple<Integer, String> response = httpRequest.sendPostRequest(
-                    SERVER_URL + LOGIN_WITH_TOKEN_ENDPOINT,
-                    "userId=" + userId,
-                    true
-            );
-
-            System.out.println(response.getKey() + " " + response.getValue());
-
-            if (response.getKey() != 200) return false;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-        USER_ID = userId;
-        HttpRequest.TOKEN = token;
-        return USER_ID >= 0;
-    }
-
-    /*********
-     * Event *
-     *********/
-    public void createEvent(Event event) throws HttpRequestException {
-        sendBasicHttpRequest(
-                SERVER_URL + ADD_EVENT_ENDPOINT,
-                event.getAsUrlParam(),
-                true
-        );
-    }
-
-    public void deleteEvent(int userId, int eventId, LocalDateTime date) throws HttpRequestException {
-        sendBasicHttpRequest(
-                SERVER_URL + DELETE_EVENT_ENDPOINT,
-                "userId=" + userId + "&eventId=" + eventId + "&date=" + date.toLocalDate(),
-                true
-        );
-    }
-
-    public void editEvent(Event oldEvent, Event event) throws HttpRequestException {
-        sendBasicHttpRequest(
-                SERVER_URL + EDIT_EVENT_ENDPOINT,
-                "eventId=" + oldEvent.getId() +
-                        "&userId=" + oldEvent.getOwnerId() +
-                        "&date=" + oldEvent.getDate().toLocalDate() +
-                        "&newDate=" + event.getDate().toLocalDate() +
-                        "&newName=" + event.getName() +
-                        "&newStart=" + event.getStart() +
-                        "&newEnd=" + event.getEnd() +
-                        "&newPriority=" + event.getPriority() +
-                        "&newIsFullDay=" + event.isFullDay() +
-                        "&newIsPrivate=" + event.isPrivate(),
-                true
-        );
-    }
-
-    public ArrayList<Event> getAllVisibleEvents(LocalDateTime startDate, LocalDateTime endDate) throws HttpRequestException {
-        try {
-            Tuple<Integer, String> response = httpRequest.sendPostRequest(
-                    SERVER_URL + ALL_EVENTS_ENDPOINT,
-                    "userId=" + USER_ID + "&startDate=" + startDate.toLocalDate() + "&endDate=" + endDate.toLocalDate(),
-                    true
-            );
-            if (response.getKey() != 200) {
-                throw new HttpRequestException(response);
-            }
-            String jsonResponse = response.getValue();
-            System.out.println(jsonResponse);
-
-            ObjectMapper objectMapper = new ObjectMapper();
-            objectMapper.findAndRegisterModules();
-            return (ArrayList<Event>) objectMapper.readValue(jsonResponse, new TypeReference<List<Event>>() {
-            });
-
-        } catch (HttpRequestException e) {
-            throw e;
-        } catch (Exception e) {
-            throw new HttpRequestException("Es konnte keine Verbindung mit dem Server hergestellt werden.", 600);
-        }
-    }
-
-    /********
-     * User *
-     ********/
-
-    public List<User> getAllUser() throws HttpRequestException {
-        String userJSON = sendBasicHttpRequest(
-                SERVER_URL + ALL_USER_ENDPOINT,
-                "",
-                true
-        );
-
-        ObjectMapper objectMapper = new ObjectMapper();
-        objectMapper.findAndRegisterModules();
-        try {
-            List<User> list = objectMapper.readValue(userJSON, new TypeReference<>() {
-            });
-
-            for(User u : list){
-                System.out.println(u);
-            }
-            return list;
-        } catch (JsonProcessingException e) {
-            e.printStackTrace();
-        }
-        return new ArrayList<>();
-    }
-
-    public void createUser(User user) throws HttpRequestException {
-        sendBasicHttpRequest(
-                SERVER_URL + ADD_USER_ENDPOINT,
-                "name=" + user.getName() +
-                        "&forename=" + user.getForename() +
-                        "&login=" + user.getLogin() +
-                        "&password=" + user.getPassword() +
-                        "&isAdmin=" + user.isAdmin(),
-                true
-        );
-    }
-
-    public void deleteUser(User user) throws HttpRequestException {
-        sendBasicHttpRequest(
-                SERVER_URL + DELETE_USER_ENDPOINT,
-                "userId=" + user.getUserId(),
-                true
-        );
-    }
-
-    public void editUser(User user) throws HttpRequestException {
-        String urlParam = "userId=" + user.getUserId() +
-                "&name=" + user.getName() +
-                "&forename=" + user.getForename() +
-                "&login=" + user.getLogin() +
-                "&isAdmin=" + user.isAdmin() +
-                (user.getPassword() == null ? "" : "&password=" + user.getPassword());
-
-        System.out.println(urlParam);
-        sendBasicHttpRequest(
-                SERVER_URL + EDIT_USER_ENDPOINT,
-                urlParam,
-                true
-        );
-    }
-
-    private String sendBasicHttpRequest(String urlString, String urlParameters, boolean sendAuth) throws HttpRequestException {
-        try {
-            Tuple<Integer, String> response = httpRequest.sendPostRequest(
-                    urlString,
-                    urlParameters,
-                    sendAuth
-            );
-            if (response.getKey() != 200) {
-                throw new HttpRequestException(response);
-            }
-
-            return response.getValue();
-        } catch (HttpRequestException e) {
-            throw e;
-        } catch (Exception e) {
-            throw new HttpRequestException("Es konnte keine Verbindung mit dem Server hergestellt werden.", 600);
-        }
-    }
-}

client/data/src/main/java/container/HttpRequest.java

@@ -1,77 +0,0 @@
-package container;
-
-import helper.Tuple;
-
-import java.io.BufferedReader;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-
-public class HttpRequest {
-    public static String TOKEN = "";
-
-    public Tuple<Integer, String> sendPostRequest(String urlString, String urlParameters, boolean sendAuth) throws Exception {
-        byte[] postData = urlParameters.getBytes(StandardCharsets.UTF_8);
-        int postDataLength = postData.length;
-
-        URL url = new URL(urlString);
-        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-
-        connection.setDoOutput(true);
-        connection.setInstanceFollowRedirects(false);
-        connection.setRequestMethod("POST");
-        connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
-        connection.setRequestProperty("charset", "utf-8");
-        connection.setRequestProperty("Content-Length", Integer.toString(postDataLength));
-        connection.setUseCaches(false);
-
-        if(sendAuth){
-            connection.setRequestProperty("Accept", "application/json");
-            connection.setRequestProperty("Authorization", "Bearer " + TOKEN);
-        }
-
-        try (DataOutputStream writer = new DataOutputStream(connection.getOutputStream())) {
-            writer.write(postData);
-        }
-
-        return getHttpTuple(connection);
-    }
-
-    public Tuple<Integer, String> sendGetRequest(String urlString) throws Exception {
-        URL url = new URL(urlString);
-        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-        connection.setRequestMethod("GET");
-
-        connection.setConnectTimeout(5000);
-        connection.setReadTimeout(5000);
-
-        int status = connection.getResponseCode();
-
-        return getHttpTuple(connection);
-    }
-
-    private Tuple<Integer, String> getHttpTuple(HttpURLConnection connection) throws IOException {
-        int status = connection.getResponseCode();
-        String inputLine;
-        StringBuilder content = new StringBuilder();
-        BufferedReader in;
-
-        if (status == 200) {
-            in = new BufferedReader(new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8));
-        } else {
-            in = new BufferedReader(new InputStreamReader(connection.getErrorStream(), StandardCharsets.UTF_8));
-        }
-
-        while ((inputLine = in.readLine()) != null) {
-            content.append(inputLine);
-        }
-        in.close();
-
-        connection.disconnect();
-
-        return new Tuple<>(status, content.toString());
-    }
-}

client/data/src/main/java/container/User.java

@@ -1,75 +0,0 @@
-package container;
-
-public class User {
-
-    private int userId;
-    private String login;
-    private String forename;
-    private String name;
-    private String password;
-    private boolean isAdmin;
-
-    public User(){}
-
-
-
-    public int getUserId() {
-        return userId;
-    }
-
-    public void setUserId(int userId) {
-        this.userId = userId;
-    }
-
-    public String getLogin() {
-        return login;
-    }
-
-    public void setLogin(String login) {
-        this.login = login;
-    }
-
-    public String getForename() {
-        return forename;
-    }
-
-    public void setForename(String forename) {
-        this.forename = forename;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public boolean isAdmin() {
-        return isAdmin;
-    }
-
-    public void setAdmin(boolean admin) {
-        isAdmin = admin;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    @Override
-    public String toString() {
-        return "User{" +
-                "userId=" + userId +
-                ", login='" + login + '\'' +
-                ", forename='" + forename + '\'' +
-                ", name='" + name + '\'' +
-                ", password='" + password + '\'' +
-                ", isAdmin=" + isAdmin +
-                '}';
-    }
-}

client/data/src/main/java/res/DataController.java

@@ -0,0 +1,147 @@
+//Marc Beyer//
+package res;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import helper.HttpRequestException;
+import helper.Tuple;
+
+import java.io.BufferedReader;
+import java.io.DataOutputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.time.LocalDateTime;
+import java.util.*;
+
+public class DataController {
+
+    public static long USER_ID = -1;
+
+    private static final String ALL_EVENTS_ENDPOINT = "http://localhost:8080/event/all";
+    private static final String ADD_EVENT_ENDPOINT = "http://localhost:8080/event/add";
+    private static final String DELETE_EVENT_ENDPOINT = "http://localhost:8080/event/del";
+
+    private static final String LOGIN_ENDPOINT = "http://localhost:8080/user/login";
+    private static final String LOGIN_WITH_TOKEN_ENDPOINT = "http://localhost:8080/user/login-with-token";
+    private static final String ALL_USERS_ENDPOINT = "http://localhost:8080/user/all";
+    private static final String HEADER_TEST_ENDPOINT = "http://localhost:8080/vpr/header-test";
+
+    private final HttpRequest httpRequest;
+
+    public DataController() {
+        httpRequest = new HttpRequest();
+    }
+
+    public boolean login(String username, String password) {
+        try {
+            Tuple<Integer, String> response = httpRequest.sendPostRequest(
+                    LOGIN_ENDPOINT,
+                    "login=" + username
+                            + "&password=" + password,
+                    false
+            );
+            String[] data = response.getValue().split("\\s+");
+
+            USER_ID = Long.parseLong(data[1]);
+            HttpRequest.TOKEN = data[0];
+
+            Tuple<Integer, String> auth = httpRequest.sendPostRequest(
+                    HEADER_TEST_ENDPOINT,
+                    "",
+                    true
+            );
+            System.out.println("auth " + auth);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+
+        return USER_ID >= 0;
+    }
+
+    public boolean loginWithToken(long userId, String token) {
+        try {
+            HttpRequest.TOKEN = token;
+            Tuple<Integer, String> response = httpRequest.sendPostRequest(
+                    LOGIN_WITH_TOKEN_ENDPOINT,
+                    "userId=" + userId,
+                    true
+            );
+
+            System.out.println(response.getKey() + " " + response.getValue());
+
+            if(response.getKey() != 200) return false;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+        USER_ID = userId;
+        HttpRequest.TOKEN = token;
+        return USER_ID >= 0;
+    }
+
+    public void createEvent(Event event) throws HttpRequestException {
+        try {
+            Tuple<Integer, String> response = httpRequest.sendPostRequest(ADD_EVENT_ENDPOINT, event.getAsUrlParam(), true);
+            if(response.getKey() != 200){
+                throw new HttpRequestException(response);
+            }
+        }catch (HttpRequestException e){
+            throw e;
+        }catch (Exception e) {
+            throw new HttpRequestException("Es konnte keine Verbindung mit dem Server hergestellt werden.", 600);
+        }
+    }
+
+    public void deleteEvent(int userId, int eventId, LocalDateTime date) throws HttpRequestException {
+        try {
+            System.out.println("DELETE: userId=" + userId + "&eventId=" + eventId + "&date=" + date.toLocalDate());
+            Tuple<Integer, String> response = httpRequest.sendPostRequest(
+                    DELETE_EVENT_ENDPOINT,
+                    "userId=" + userId + "&eventId=" + eventId + "&date=" + date.toLocalDate(),
+                    true
+            );
+            if(response.getKey() != 200){
+                throw new HttpRequestException(response);
+            }
+        }catch (HttpRequestException e){
+            throw e;
+        }catch (Exception e) {
+            throw new HttpRequestException("Es konnte keine Verbindung mit dem Server hergestellt werden.", 600);
+        }
+    }
+
+    public ArrayList<Event> getAllVisibleEvents(LocalDateTime startDate, LocalDateTime endDate) throws HttpRequestException {
+        ArrayList<Event> eventList = new ArrayList<>();
+        try {
+            Tuple<Integer, String> response = httpRequest.sendPostRequest(
+                    ALL_EVENTS_ENDPOINT,
+                    "userId=" + USER_ID + "&startDate=" + startDate.toLocalDate() + "&endDate=" + endDate.toLocalDate(),
+                    true
+            );
+            if(response.getKey() != 200){
+                throw new HttpRequestException(response);
+            }
+            String jsonResponse = response.getValue();
+            System.out.println(jsonResponse);
+
+            ObjectMapper objectMapper = new ObjectMapper();
+            objectMapper.findAndRegisterModules();
+            eventList = (ArrayList<Event>) objectMapper.readValue(jsonResponse, new TypeReference<List<Event>>(){});
+
+
+        }catch (HttpRequestException e){
+            throw e;
+        }catch (Exception e) {
+            throw new HttpRequestException("Es konnte keine Verbindung mit dem Server hergestellt werden.", 600);
+        }
+
+        return eventList;
+    }
+
+
+}

client/data/src/main/java/res/Event.java

@@ -1,11 +1,20 @@
-package container;
+//Marc Beyer//
+package res;
 
+import com.sun.jdi.event.StepEvent;
+
+import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
+import java.sql.SQLOutput;
 import java.time.Duration;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
 
 public class Event {
 
@@ -22,7 +31,68 @@ public class Event {
     private int ownerId;
     private String ownerName;
 
-    public Event() {}
+    /*
+    Constructor for SELECT:
+    e.id AS eid,
+    e.name AS ename,
+    e.start,
+    e.end,
+    e.priority,
+    e.is_full_day,
+
+    ue.date,
+
+    u.id AS uid,
+    u.forename,
+    u.name AS uname
+     */
+
+    public Event() {
+
+    }
+
+    public Event(ArrayList<Object> arr) {
+        id = (int) arr.get(0);
+        name = (String) arr.get(1);
+        start = (String) arr.get(2);
+        end = (String) arr.get(3);
+        priority = (int) arr.get(4);
+        isFullDay = (Boolean) arr.get(5); //((String)arr.get(5)).equals("true");
+
+
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+        date = LocalDateTime.parse(arr.get(6) + " 00:00", formatter);
+
+        ownerId = (int) arr.get(7);
+        ownerName = arr.get(8) + " " + arr.get(9);
+    }
+
+    public Event(
+            int id,
+            String name,
+            int priority,
+            boolean isFullDay,
+            boolean isPrivate,
+            String start,
+            String end,
+            String date,
+            int ownerId,
+            String ownerName
+    ) {
+        this.ownerId = ownerId;
+        this.ownerName = ownerName;
+        this.id = id;
+        this.name = name;
+        this.start = start;
+        this.end = end;
+        this.priority = priority;
+        this.isFullDay = isFullDay;
+
+
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+        this.date = LocalDateTime.parse(date + " 00:00", formatter);
+
+    }
 
     public Event(String name,
                  int priority,
@@ -36,15 +106,15 @@ public class Event {
 
         System.out.println("Create Event");
         if (name.length() < 3) {
-            throw new IllegalArgumentException("Der Name muss eine Länge von 3 haben.");
+            throw new IllegalArgumentException("Der Name muss eine L\u00e4nge von 3 haben.");
         }
-        Pattern pattern = Pattern.compile("[A-Za-zäöüÄÖÜß0-9 =!?+*/$.:,;_<>()-]*");
+        Pattern pattern = Pattern.compile("[A-Za-z\u00e4\u00f6\u00fc\u00c4\u00d6\u00dc\u00df0-9 =!?+*/$.:,;_<>()-]*");
         Matcher matcher = pattern.matcher(name);
         if (!matcher.matches()) {
-            throw new IllegalArgumentException("Der Name darf nur aus Zahlen, Buchstaben und folgenden Sonderzeichen bestehen: äöü ÄÖÜ ß =!?+*/$.:,;_ <>()-");
+            throw new IllegalArgumentException("Der Name darf nur aus Zahlen, Buchstaben und folgenden Sonderzeichen bestehen: \u00e4\u00f6\u00fc \u00c4\u00d6\u00dc \u00df =!?+*/$.:,;_ <>()-");
         }
         if (priority < 0) {
-            throw new IllegalArgumentException("Bitte eine Priorität wählen.");
+            throw new IllegalArgumentException("Bitte eine Priorit\u00e4t w\u00e4hlen.");
         }
         LocalDateTime today = LocalDateTime.now().toLocalDate().atStartOfDay();
         if (Duration.between(today, date).isNegative()) {
@@ -56,7 +126,7 @@ public class Event {
         this.isFullDay = isFullDay;
         this.isPrivate = isPrivate;
         if (start != null) this.start = start.toString();
-        if (end != null) this.end = end.toString();
+        if (start != null) this.end = end.toString();
         this.date = date;
         this.ownerId = ownerId;
     }
@@ -74,7 +144,9 @@ public class Event {
     }
 
     public void setName(String name) {
+        System.out.println(name);
         this.name = name;
+        System.out.println(this.name);
     }
 
     public int getPriority() {

client/data/src/main/java/res/HttpRequest.java

@@ -0,0 +1,102 @@
+//Marc Beyer//
+package res;
+
+import helper.Tuple;
+
+import java.io.BufferedReader;
+import java.io.DataOutputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+
+public class HttpRequest {
+    public static String TOKEN = "";
+
+    public Tuple<Integer, String> sendPostRequest(String urlString, String urlParameters, boolean sendAuth) throws Exception {
+        byte[] postData = urlParameters.getBytes(StandardCharsets.UTF_8);
+        int postDataLength = postData.length;
+
+        /*
+        URL url = new URL("http://test.de:8080/event/add");
+        HttpURLConnection http = (HttpURLConnection)url.openConnection();
+        http.setRequestMethod("POST");
+        http.setDoOutput(true);
+        http.setRequestProperty("Accept", "application/json");
+        http.setRequestProperty("Authorization", "Bearer {token}");
+        http.setRequestProperty("Content-Type", "");
+        http.setRequestProperty("Content-Length", "0");
+
+        System.out.println(http.getResponseCode() + " " + http.getResponseMessage());
+        http.disconnect();
+         */
+        URL url = new URL(urlString);
+        HttpURLConnection con = (HttpURLConnection) url.openConnection();
+
+        con.setDoOutput(true);
+        con.setInstanceFollowRedirects(false);
+        con.setRequestMethod("POST");
+        con.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+        con.setRequestProperty("charset", "utf-8");
+        con.setRequestProperty("Content-Length", Integer.toString(postDataLength));
+        con.setUseCaches(false);
+
+        if(sendAuth){
+            con.setRequestProperty("Accept", "application/json");
+            con.setRequestProperty("Authorization", "Bearer " + TOKEN);
+        }
+
+        try (DataOutputStream wr = new DataOutputStream(con.getOutputStream())) {
+            wr.write(postData);
+        }
+
+        int status = con.getResponseCode();
+        String inputLine;
+        StringBuilder content = new StringBuilder();
+        BufferedReader in;
+
+        if (status == 200) {
+             in = new BufferedReader(new InputStreamReader(con.getInputStream()));
+        } else {
+             in = new BufferedReader(new InputStreamReader(con.getErrorStream()));
+        }
+
+        while ((inputLine = in.readLine()) != null) {
+            content.append(inputLine);
+        }
+        in.close();
+
+        con.disconnect();
+
+        return new Tuple<>(status, content.toString());
+    }
+
+    public String sendGetRequest(String urlString) throws Exception {
+        URL url = new URL(urlString);
+        HttpURLConnection con = (HttpURLConnection) url.openConnection();
+        con.setRequestMethod("GET");
+
+        con.setConnectTimeout(5000);
+        con.setReadTimeout(5000);
+
+        int status = con.getResponseCode();
+        if (status == 200) {
+            BufferedReader in = new BufferedReader(
+                    new InputStreamReader(con.getInputStream()));
+            String inputLine;
+            StringBuilder content = new StringBuilder();
+            while ((inputLine = in.readLine()) != null) {
+                content.append(inputLine);
+            }
+            in.close();
+
+            con.disconnect();
+            return content.toString();
+
+        } else {
+            con.disconnect();
+            throw new Exception("Status: " + status);
+        }
+    }
+}