updated branch

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

@@ -1,102 +0,0 @@
-package main;
-
-import com.jfoenix.controls.JFXTimePicker;
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.scene.Node;
-import javafx.scene.control.*;
-import javafx.scene.layout.GridPane;
-import javafx.stage.Stage;
-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 CreateEventController {
-
-    @FXML
-    public GridPane mainGrid;
-    @FXML
-    public DatePicker datePickerDate;
-    @FXML
-    public TextField textName;
-    @FXML
-    public ComboBox<String> ComboBoxTyp;
-    @FXML
-    public ComboBox<String> ComboBoxPriotity;
-    @FXML
-    public CheckBox checkBoxIsFullDay;
-    @FXML
-    public CheckBox checkBoxIsPrivate;
-    @FXML
-    public Label labelError;
-    @FXML
-    public JFXTimePicker timeStart;
-    @FXML
-    public JFXTimePicker timeEnd;
-
-
-    public CreateEventController() {
-    }
-
-    @FXML
-    public void initialize() {
-
-        StringConverter<LocalTime> defaultConverter = new LocalTimeStringConverter(FormatStyle.SHORT, Locale.GERMANY);
-
-        JFXTimePicker timePickerStart = new JFXTimePicker();
-        timeStart = timePickerStart;
-        timePickerStart.set24HourView(true);
-        timePickerStart.setConverter(defaultConverter);
-        timePickerStart.getStyleClass().add("timePicker");
-        mainGrid.add(timePickerStart, 1 , 3);
-
-        JFXTimePicker timePickerEnd = new JFXTimePicker();
-        timeEnd = timePickerEnd;
-        timePickerEnd.set24HourView(true);
-        timePickerEnd.setConverter(defaultConverter);
-        timePickerEnd.getStyleClass().add("timePicker");
-        mainGrid.add(timePickerEnd, 1 , 4);
-    }
-
-
-    @FXML
-    protected void createBtnClick(ActionEvent actionEvent) {
-        try {
-            if (datePickerDate.getValue() == null) {
-                throw new IllegalArgumentException("Bitte w\u00e4hle ein Datum aus");
-            }
-
-            Event event = new Event(
-                    textName.getText(),
-                    ComboBoxPriotity.getSelectionModel().getSelectedIndex(),
-                    checkBoxIsFullDay.isSelected(),
-                    checkBoxIsPrivate.isSelected(),
-                    timeStart.getValue().toString(),
-                    timeEnd.getValue().toString(),
-                    datePickerDate.getValue().atStartOfDay(),
-                    (int) DataController.USER_ID
-            );
-
-            System.out.println(event.getAsUrlParam());
-
-            DataController dataController = new DataController();
-            dataController.createEvent(event);
-
-            Stage stage = (Stage) ((Node) actionEvent.getSource()).getScene().getWindow();
-            stage.close();
-        } catch (RuntimeException e) {
-            labelError.setText(e.getMessage());
-        }
-    }
-
-    @FXML
-    protected void abortBtnClick(ActionEvent event) {
-        Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
-        stage.close();
-    }
-}

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

@@ -1,40 +0,0 @@
-package main;
-
-import javafx.application.Application;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
-import res.DataController;
-
-import java.io.IOException;
-import java.util.Objects;
-
-public class MainApplication extends Application {
-    @Override
-    public void start(Stage stage) throws IOException {
-        FXMLLoader fxmlLoader = new FXMLLoader(MainApplication.class.getResource("main-view.fxml"));
-
-        Scene scene = new Scene(fxmlLoader.load(), 1200, 700);
-        scene.getStylesheets().add(Objects.requireNonNull(
-                MainApplication.class.getResource("main-view.css")).toExternalForm());
-        stage.setTitle("SharePlaner");
-        stage.setScene(scene);
-
-        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();
-
-        if (DataController.USER_ID >= 0) {
-            stage.show();
-        }
-    }
-
-    public static void main(String[] args) {
-        launch();
-    }
-}

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

@@ -1,50 +0,0 @@
-package users;
-
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.scene.Node;
-import javafx.scene.control.Label;
-import javafx.scene.control.TextField;
-import javafx.stage.Stage;
-import res.DataController;
-
-public class LoginController {
-    @FXML
-    public TextField userField;
-    @FXML
-    public TextField passField;
-    @FXML
-    public Label userErrLabel;
-    @FXML
-    public Label passErrLabel;
-
-    @FXML
-    protected void login(ActionEvent event) {
-        if (userField.getText().trim().isEmpty()) {
-            userErrLabel.setText("Bitte Usernamen eingeben!");
-            passErrLabel.setText("");
-            return;
-        }
-        if (passField.getText().trim().isEmpty()) {
-            userErrLabel.setText("");
-            passErrLabel.setText("Bitte Passwort eingeben!");
-            return;
-        }
-
-        DataController dataController = new DataController();
-        if (!dataController.login(userField.getText(), passField.getText())) {
-            userErrLabel.setText("Name und Passwort passen nicht zueinander!");
-            passErrLabel.setText("Name und Passwort passen nicht zueinander!");
-            return;
-        }
-
-        Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
-        stage.close();
-    }
-
-    @FXML
-    protected void abortBtnClick(ActionEvent event) {
-        Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
-        stage.close();
-    }
-}

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

@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.collections.FXCollections?>
-<?import java.lang.String?>
-
-<GridPane fx:id="mainGrid" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1"
-          fx:controller="main.CreateEventController">
-
-    <columnConstraints>
-        <ColumnConstraints/>
-        <ColumnConstraints/>
-        <ColumnConstraints/>
-    </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">Termin bearbeiten</Label>
-
-    <Label styleClass="inputLabel" GridPane.rowIndex="1">Datum:</Label>
-    <Label styleClass="inputLabel" GridPane.rowIndex="2">Titel:</Label>
-    <Label styleClass="inputLabel" GridPane.rowIndex="3">Von:</Label>
-    <Label styleClass="inputLabel" GridPane.rowIndex="4">Bis:</Label>
-    <Label styleClass="inputLabel" GridPane.rowIndex="5">Typ:</Label>
-    <Label styleClass="inputLabel" GridPane.rowIndex="6">Priorität:</Label>
-    <Label styleClass="inputLabel" GridPane.rowIndex="7">Ganztägig:</Label>
-    <Label styleClass="inputLabel" GridPane.rowIndex="8">Privat:</Label>
-
-    <DatePicker fx:id="datePickerDate" GridPane.columnIndex="1" GridPane.rowIndex="1" maxWidth="400" minWidth="400"/>
-    <TextField fx:id="textName" GridPane.columnIndex="1" GridPane.rowIndex="2" maxWidth="400" minWidth="400"/>
-    <ComboBox fx:id="ComboBoxTyp" GridPane.columnIndex="1" GridPane.rowIndex="5" maxWidth="400" minWidth="400"/>
-    <ComboBox fx:id="ComboBoxPriotity" GridPane.columnIndex="1" GridPane.rowIndex="6" maxWidth="200" minWidth="200">
-        <items>
-            <FXCollections fx:factory="observableArrayList">
-                <String fx:value="gering"/>
-                <String fx:value="mittel"/>
-                <String fx:value="hoch"/>
-            </FXCollections>
-        </items>
-    </ComboBox>
-    <CheckBox fx:id="checkBoxIsFullDay" GridPane.columnIndex="1" GridPane.rowIndex="7"/>
-    <CheckBox fx:id="checkBoxIsPrivate" GridPane.columnIndex="1" GridPane.rowIndex="8"/>
-    <Label fx:id="labelError" GridPane.columnIndex="1" GridPane.rowIndex="9"/>
-
-    <HBox GridPane.columnIndex="1" GridPane.rowIndex="10" GridPane.columnSpan="2" alignment="CENTER_RIGHT">
-        <Button onAction="#abortBtnClick" maxWidth="150" minWidth="150">Abbrechen</Button>
-        <Button styleClass="mainButton" onAction="#createBtnClick" maxWidth="150" minWidth="150">Speichern</Button>
-    </HBox>
-
-</GridPane>

client/app/src/main/resources/users/login.css

@@ -1,37 +0,0 @@
-* {
-   -fx-base-background-color: #2B2D42;
-   -fx-base1-background-color: #525E74;
-
-   -fx-main-border-color: #B0B0B0;
-   -fx-main-text-color: #ffffff;
-}
-
-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: 150px;
-    -fx-min-width: 150px;
-}
-
-.errorLbl{
-    -fx-font-weight: bold;
-        -fx-max-width: 200px;
-        -fx-text-fill: #ff5555;
-        -fx-padding: 16px;
-        -fx-min-height: 140px;
-        -fx-max-height: 400px;
-        -fx-wrap-text: true;
-        -fx-font-size: 16px;
-}

client/app/src/main/resources/users/login.fxml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<GridPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="users.LoginController">
-
-    <columnConstraints>
-        <ColumnConstraints/>
-        <ColumnConstraints/>
-        <ColumnConstraints/>
-    </columnConstraints>
-    <rowConstraints>
-        <RowConstraints vgrow="ALWAYS"/>
-        <RowConstraints vgrow="ALWAYS"/>
-        <RowConstraints vgrow="ALWAYS"/>
-        <RowConstraints vgrow="ALWAYS"/>
-    </rowConstraints>
-
-    <Label GridPane.columnIndex="1">Anmelden</Label>
-
-    <Label GridPane.rowIndex="1">Username</Label>
-    <TextField GridPane.columnIndex="1" GridPane.rowIndex="1" fx:id="userField"/>
-    <Label styleClass="errorLbl" GridPane.columnIndex="2" GridPane.rowIndex="1" fx:id="userErrLabel"/>
-
-    <Label GridPane.rowIndex="2">Paswort</Label>
-    <PasswordField GridPane.columnIndex="1" GridPane.rowIndex="2" fx:id="passField"/>
-    <Label styleClass="errorLbl" GridPane.columnIndex="2" GridPane.rowIndex="2" fx:id="passErrLabel"/>
-
-    <Button onAction="#abortBtnClick" GridPane.columnIndex="1" GridPane.rowIndex="3">Beenden</Button>
-    <Button onAction="#login" GridPane.columnIndex="2" GridPane.rowIndex="3">Anmelden</Button>
-
-</GridPane>

hellofx/app/build.gradle.kts

@@ -16,12 +16,7 @@ application {
     mainClassName = "client.MainApplication"
 }
 
-repositories {
-    mavenCentral()
-}
-
 dependencies {
-    implementation("com.jfoenix:jfoenix:9.0.10")
     implementation(project(":data"))
 }
 

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

@@ -0,0 +1,68 @@
+package client;
+
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.Node;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.DatePicker;
+import javafx.scene.control.TextField;
+import javafx.stage.Stage;
+import res.DataController;
+import res.Event;
+
+public class CreateEventController {
+
+    @FXML
+    public DatePicker datePickerDate;
+    @FXML
+    public TextField textName;
+    @FXML
+    public TextField textStart;
+    @FXML
+    public TextField textEnd;
+    @FXML
+    public ComboBox<String> ComboBoxTyp;
+    @FXML
+    public ComboBox<String> ComboBoxPriotity;
+    @FXML
+    public CheckBox checkBoxIsFullDay;
+    @FXML
+    public CheckBox checkBoxIsPrivate;
+
+
+    public CreateEventController(){}
+
+    @FXML
+    public void initialize(){}
+
+
+    @FXML
+    protected void createBtnClick(ActionEvent actionEvent){
+
+        Event event = new Event(
+                textName.getText(),
+                ComboBoxPriotity.getSelectionModel().getSelectedIndex(),
+                checkBoxIsFullDay.isSelected(),
+                checkBoxIsPrivate.isSelected(),
+                textStart.getText(),
+                textEnd.getText(),
+                datePickerDate.getValue().atStartOfDay(),
+                1
+        );
+
+        System.out.println(event.getAsUrlParam());
+
+        DataController dataController = new DataController();
+        dataController.createEvent(event);
+
+        Stage stage = (Stage) ((Node) actionEvent.getSource()).getScene().getWindow();
+        stage.close();
+    }
+
+    @FXML
+    protected void abortBtnClick(ActionEvent event){
+        Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
+        stage.close();
+    }
+}

hellofx/app/src/main/java/client/Launcher.java

@@ -1,4 +1,4 @@
-package main;
+package client;
 
 public class Launcher {
     

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

@@ -0,0 +1,28 @@
+package client;
+
+import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Node;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
+import java.io.IOException;
+import java.util.Objects;
+
+public class MainApplication extends Application {
+    @Override
+    public void start(Stage stage) throws IOException {
+        FXMLLoader fxmlLoader = new FXMLLoader(MainApplication.class.getResource("main-view.fxml"));
+
+        Scene scene = new Scene(fxmlLoader.load(), 1200, 700);
+        scene.getStylesheets().add(Objects.requireNonNull(MainApplication.class.getResource("main-view.css")).toExternalForm());
+        stage.setTitle("Hello!");
+        stage.setScene(scene);
+        stage.show();
+
+    }
+
+    public static void main(String[] args) {
+        launch();
+    }
+}

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

@@ -1,5 +1,7 @@
-package main;
+package client;
 
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.geometry.Pos;
@@ -43,7 +45,7 @@ public class MainController {
     }
 
     @FXML
-    public void initialize() {
+    public void initialize(){
         createWeek();
         setDates();
 
@@ -51,47 +53,24 @@ public class MainController {
     }
 
     private void updateEvents() {
-        for (VBox vBox : dayVBoxes) {
+        for(VBox vBox : dayVBoxes){
             vBox.getChildren().clear();
         }
 
         DataController dataController = new DataController();
         ArrayList<Event> eventList = dataController.getAllVisibleEvents();
 
-        for (Event event : eventList) {
+        for(Event event : eventList){
             addEvent(event);
         }
     }
 
     @FXML
-    protected void onBackClick() {
-        weekOffset--;
-        setDates();
-        updateEvents();
-    }
-
-    @FXML
-    protected void onTodayClick() {
-        weekOffset = 0;
-        setDates();
-        updateEvents();
-    }
-
-    @FXML
-    protected void onNextClick() {
-        weekOffset++;
-        setDates();
-        updateEvents();
-    }
-
-    @FXML
-    protected void onAddBtnClick() {
-        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());
+    protected void onAddBtnClick(){
+        try{
+            FXMLLoader fxmlLoader = new FXMLLoader(MainApplication.class.getResource("create-event.fxml"));
+            Scene scene = new Scene(fxmlLoader.load(), 650, 500);
+            scene.getStylesheets().add(Objects.requireNonNull(MainApplication.class.getResource("create-event.css")).toExternalForm());
             Stage stage = new Stage();
             stage.setTitle("Termin erstellen");
             stage.setScene(scene);
@@ -99,13 +78,14 @@ public class MainController {
             stage.setResizable(false);
             //stage.initStyle(StageStyle.UNDECORATED);
             stage.showAndWait();
-        } catch (IOException e) {
+        }
+        catch (IOException e){
             e.printStackTrace();
         }
         updateEvents();
     }
 
-    private void createWeek() {
+    private void createWeek(){
         for (int i = 0; i < 7; i++) {
             Label label = new Label();
             label.setText(dayNames[i]);
@@ -132,7 +112,7 @@ public class MainController {
         }
     }
 
-    private void addEvent(Event event) {
+    private void addEvent(Event event){
         VBox vBox = new VBox();
         vBox.getStyleClass().add("event");
         vBox.setSpacing(5);
@@ -148,23 +128,6 @@ public class MainController {
         });
         Button editBtn = new Button();
         editBtn.setText("edit");
-        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);
-                stage.showAndWait();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        });
         btnHBox.getChildren().add(editBtn);
         btnHBox.getChildren().add(deleteBtn);
         vBox.getChildren().add(btnHBox);
@@ -172,12 +135,8 @@ public class MainController {
         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);
+        Label timeLabel = new Label(event.getStart() + "-" + event.getEnd());
         vBox.getChildren().add(timeLabel);
-        }
 
         Label typeLabel = new Label("Wer: " + event.getOwnerName());
         vBox.getChildren().add(typeLabel);
@@ -191,7 +150,7 @@ public class MainController {
         Label prioLabel = new Label("Priorit\u00e4t: " + event.getPriority());
         vBox.getChildren().add(prioLabel);
 
-        if (event.isFullDay()) {
+        if(event.isFullDay()){
             Label fullDayLabel = new Label("Dieser Termin bockiert den ganzen Tag!");
             vBox.getChildren().add(fullDayLabel);
         }
@@ -199,23 +158,14 @@ public class MainController {
 
         LocalDateTime eventDate = event.getDate();
 
-        int day = (int) Duration.between(
-                weekStartDateTime.toLocalDate().atStartOfDay(), eventDate.toLocalDate().atStartOfDay()).toDays();
+        int day = (int)Duration.between(weekStartDateTime.toLocalDate().atStartOfDay(), eventDate.toLocalDate().atStartOfDay()).toDays();
 
-        if (day >= 0 && day < 7) {
+        if(day >= 0 && day < 7){
             dayVBoxes[day].getChildren().add(vBox);
         }
     }
 
-    private String formatTime(String time) {
-        String[] timeArr = time.split(":");
-        if (timeArr.length > 2) {
-            return timeArr[0] + ":" + timeArr[1];
-        }
-        return time;
-    }
-
-    private void setDates() {
+    private void setDates(){
         DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("LLLL yyyy");
         DateTimeFormatter dayFormatter = DateTimeFormatter.ofPattern("E dd.MM");
         DateTimeFormatter dayOfWeekFormatter = DateTimeFormatter.ofPattern("e");
@@ -223,7 +173,7 @@ public class MainController {
         LocalDateTime now = LocalDateTime.now();
         int dayOfWeek = Integer.parseInt(dayOfWeekFormatter.format(now));
 
-        weekStartDateTime = now.plusDays(weekOffset * 7L - dayOfWeek + 1);
+        weekStartDateTime = now.minusDays(weekOffset * 7L + dayOfWeek - 1);
 
         for (int i = 0; i < 7; i++) {
             dayLabel[i].setText(dayFormatter.format(weekStartDateTime.plusDays(i)));

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

@@ -33,19 +33,3 @@ Label{
 .mainButton{
     -fx-font-weight: bold;
 }
-
-#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;
-}
-
-.timePicker{
-    -fx-background-color: white;
-    -fx-max-width: 150px;
-}

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

@@ -5,8 +5,7 @@
 
 <?import javafx.collections.FXCollections?>
 <?import java.lang.String?>
-<GridPane fx:id="mainGrid" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1"
-          fx:controller="main.CreateEventController">
+<GridPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1" fx:controller="client.CreateEventController">
 
     <columnConstraints>
         <ColumnConstraints/>
@@ -14,16 +13,15 @@
         <ColumnConstraints/>
     </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 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">Termin anlegen</Label>
@@ -39,22 +37,23 @@
 
     <DatePicker fx:id="datePickerDate" GridPane.columnIndex="1" GridPane.rowIndex="1" maxWidth="400" minWidth="400"/>
     <TextField fx:id="textName" GridPane.columnIndex="1" GridPane.rowIndex="2" maxWidth="400" minWidth="400"/>
+    <TextField fx:id="textStart" GridPane.columnIndex="1" GridPane.rowIndex="3" maxWidth="400" minWidth="400"/>
+    <TextField fx:id="textEnd" GridPane.columnIndex="1" GridPane.rowIndex="4" maxWidth="400" minWidth="400"/>
     <ComboBox fx:id="ComboBoxTyp" GridPane.columnIndex="1" GridPane.rowIndex="5" maxWidth="400" minWidth="400"/>
     <ComboBox fx:id="ComboBoxPriotity" GridPane.columnIndex="1" GridPane.rowIndex="6" maxWidth="200" minWidth="200">
         <items>
             <FXCollections fx:factory="observableArrayList">
-                <String fx:value="gering"/>
-                <String fx:value="mittel"/>
-                <String fx:value="hoch"/>
+                <String fx:value="gering" />
+                <String fx:value="mittel" />
+                <String fx:value="hoch" />
             </FXCollections>
         </items>
     </ComboBox>
     <CheckBox fx:id="checkBoxIsFullDay" GridPane.columnIndex="1" GridPane.rowIndex="7"/>
     <CheckBox fx:id="checkBoxIsPrivate" GridPane.columnIndex="1" GridPane.rowIndex="8"/>
-    <Label fx:id="labelError" GridPane.columnIndex="1" GridPane.rowIndex="9"/>
 
-    <HBox GridPane.columnIndex="1" GridPane.rowIndex="10" GridPane.columnSpan="2" alignment="CENTER_RIGHT">
-        <Button onAction="#abortBtnClick" maxWidth="150" minWidth="150">Abbrechen</Button>
+    <HBox GridPane.columnIndex="1" GridPane.rowIndex="9" GridPane.columnSpan="2"  alignment="CENTER_RIGHT">
+        <Button onAction="#abortBtnClick" maxWidth="150" minWidth="150" >Abbrechen</Button>
         <Button styleClass="mainButton" onAction="#createBtnClick" maxWidth="150" minWidth="150">Anlegen</Button>
     </HBox>
 

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

@@ -5,17 +5,15 @@
 <?import javafx.scene.image.*?>
 <?import javafx.scene.layout.*?>
 
-<GridPane style="-fx-background-color: #424242;" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1"
-          fx:controller="main.MainController">
+<GridPane style="-fx-background-color: #424242;" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1" fx:controller="client.MainController">
     <columnConstraints>
-        <ColumnConstraints hgrow="NEVER" maxWidth="60.0" minWidth="60.0"/>
-        <ColumnConstraints hgrow="ALWAYS"/>
+        <ColumnConstraints hgrow="NEVER" maxWidth="60.0" minWidth="60.0" />
+        <ColumnConstraints hgrow="ALWAYS" />
     </columnConstraints>
     <rowConstraints>
-        <RowConstraints vgrow="SOMETIMES"/>
+        <RowConstraints vgrow="SOMETIMES" />
     </rowConstraints>
-    <VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0" spacing="5.0"
-          style="-fx-background-color: #525E74;">
+    <VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0" spacing="5.0" style="-fx-background-color: #525E74;">
         <ImageView fitHeight="50.0" fitWidth="50.0" pickOnBounds="true" preserveRatio="true">
 
         </ImageView>
@@ -31,42 +29,33 @@
     </VBox>
     <GridPane prefHeight="200.0" prefWidth="222.0" GridPane.columnIndex="1" GridPane.rowIndex="0">
         <columnConstraints>
-            <ColumnConstraints hgrow="ALWAYS"/>
-            <ColumnConstraints/>
-            <ColumnConstraints/>
-            <ColumnConstraints/>
-            <ColumnConstraints/>
+        <ColumnConstraints hgrow="ALWAYS" />
+         <ColumnConstraints />
         </columnConstraints>
         <rowConstraints>
-            <RowConstraints/>
-            <RowConstraints vgrow="ALWAYS"/>
+            <RowConstraints />
+            <RowConstraints vgrow="ALWAYS" />
         </rowConstraints>
-        <Label fx:id="LabelMonth" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308"
-               styleClass="labelMonth" textFill="WHITE" GridPane.columnIndex="0" GridPane.rowIndex="0">
+        <Label fx:id="LabelMonth" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" styleClass="labelMonth" textFill="WHITE" GridPane.columnIndex="0" GridPane.rowIndex="0">
             Monat
             <padding>
-                <Insets left="5"/>
+                <Insets left="5" />
             </padding>
         </Label>
-        <Button onAction="#onBackClick" GridPane.columnIndex="1" maxHeight="1.7976931348623157E308">zurück</Button>
-        <Button onAction="#onTodayClick" GridPane.columnIndex="2" maxHeight="1.7976931348623157E308">heute</Button>
-        <Button onAction="#onNextClick" GridPane.columnIndex="3" maxHeight="1.7976931348623157E308">weiter</Button>
 
-        <GridPane fx:id="calendarGrid" gridLinesVisible="true" styleClass="gridCalendar" GridPane.columnSpan="4"
-                  GridPane.columnIndex="0" GridPane.rowIndex="1">
+        <GridPane fx:id="calendarGrid" gridLinesVisible="true"  styleClass="gridCalendar" GridPane.columnIndex="0" GridPane.rowIndex="1">
             <columnConstraints>
-                <ColumnConstraints hgrow="ALWAYS" maxWidth="14.2857142857" minWidth="14.2857142857"
-                                   percentWidth="14.2857142857"/>
-                <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
-                <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
-                <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
-                <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
-                <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
-                <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
+                <ColumnConstraints hgrow="ALWAYS" maxWidth="14.2857142857" minWidth="14.2857142857" percentWidth="14.2857142857" />
+                <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
+                <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
+                <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
+                <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
+                <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
+                <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
             </columnConstraints>
             <rowConstraints>
-                <RowConstraints maxHeight="55.0" minHeight="25.0" vgrow="NEVER"/>
-                <RowConstraints percentHeight="-Infinity" vgrow="ALWAYS"/>
+                <RowConstraints maxHeight="55.0" minHeight="25.0" vgrow="NEVER" />
+                <RowConstraints percentHeight="-Infinity" vgrow="ALWAYS" />
             </rowConstraints>
 
         </GridPane>

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

@@ -14,44 +14,26 @@ 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 ALL_USERS_ENDPOINT = "http://localhost:8080/user/all";
+    private static final String ALL_EVENTS_ENDPOINT = "http://localhost:8080/vpr/all-events";
+    private static final String ALL_USERS_ENDPOINT = "http://localhost:8080/vpr/all-users";
+    private static final String ADD_EVENT_ENDPOINT = "http://localhost:8080/vpr/add-event";
+    private static final String DELETE_EVENT_ENDPOINT = "http://localhost:8080/vpr/del-event";
 
     private final HttpRequest httpRequest;
 
-    public DataController() {
+    public DataController(){
         httpRequest = new HttpRequest();
     }
 
-    public boolean login(String username, String password) {
-        try {
-            USER_ID = Long.parseLong(httpRequest.sendPostRequest(
-                    LOGIN_ENDPOINT,
-                    "login=" + username
-                            + "&password=" + password
-            ));
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-        return USER_ID >= 0;
-    }
-
-    public void createEvent(Event event) {
+    public void createEvent(Event event){
         try {
             System.out.println(httpRequest.sendPostRequest(ADD_EVENT_ENDPOINT, event.getAsUrlParam()));
         } catch (Exception e) {
-            throw new RuntimeException("Es konnte keine Verbindung mit dem Server hergestellt werden.");
+            e.printStackTrace();
         }
     }
 
-    public void deleteEvent(int eventId) {
+    public void deleteEvent(int eventId){
         try {
             System.out.println(httpRequest.sendPostRequest(DELETE_EVENT_ENDPOINT, "eventId=" + eventId));
         } catch (Exception e) {
@@ -63,16 +45,16 @@ public class DataController {
         ArrayList<Event> eventList = new ArrayList<>();
 
         try {
-            String jsonResponse = httpRequest.sendPostRequest(ALL_EVENTS_ENDPOINT, "userId=" + USER_ID);
+            String jsonResponse = httpRequest.sendPostRequest(ALL_EVENTS_ENDPOINT, "userId=1");
             System.out.println(jsonResponse);
 
             ObjectMapper objectMapper = new ObjectMapper();
             //String json = "{ \"color\" : \"Black\", \"type\" : \"BMW\" }";
 
-            for (Object obj : objectMapper.readValue(jsonResponse, Object[].class)) {
+            for (Object obj : objectMapper.readValue(jsonResponse, Object[].class)){
                 ArrayList<Object> list = new ArrayList<>();
                 if (obj.getClass().isArray()) {
-                    list = (ArrayList<Object>) Arrays.asList((Object[]) obj);
+                    list = (ArrayList<Object>) Arrays.asList((Object[])obj);
                 } else if (obj instanceof Collection) {
                     list = new ArrayList<>((Collection<?>) obj);
                 }

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

@@ -2,14 +2,9 @@ package res;
 
 import com.sun.jdi.event.StepEvent;
 
-import java.time.Duration;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 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 {
 
@@ -66,23 +61,7 @@ public class Event {
                  String end,
                  LocalDateTime date,
                  int ownerId
-    ) throws IllegalArgumentException{
-        if(name.length() < 3){
-            throw new IllegalArgumentException("Der Name muss eine L\u00e4nge von 3 haben.");
-        }
-        Pattern pattern = Pattern.compile("[A-Za-zÄÖÜäöü0-9 =!?+*/$%€.:,;_<>()-]*");
-        Matcher matcher = pattern.matcher(name);
-        if(!matcher.matches()){
-            throw new IllegalArgumentException("Der Name darf nur aus Zahlen, Buchstaben und folgenden Sonderzeichen bestehen: =!?+*/$%€.:,;_ <>()-");
-        }
-        if(priority < 0){
-            throw new IllegalArgumentException("Bitte eine Priorit\u00e4t w\u00e4hlen.");
-        }
-        LocalDateTime today = LocalDateTime.now().toLocalDate().atStartOfDay();
-        if(Duration.between(today, date).isNegative()){
-            throw new IllegalArgumentException("Das Datum muss in der Zukunft liegen.");
-        }
-
+    ) {
         this.name = name;
         this.priority = priority;
         this.isFullDay = isFullDay;

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

@@ -9,7 +9,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 
 public class HttpRequest {
-    public String sendPostRequest(String urlString, String urlParameters) throws Exception {
+    public String sendPostRequest(String urlString, String urlParameters) throws Exception{
         byte[] postData = urlParameters.getBytes(StandardCharsets.UTF_8);
         int postDataLength = postData.length;
 
@@ -46,7 +46,7 @@ public class HttpRequest {
         }
     }
 
-    public String sendGetRequest(String urlString) throws Exception {
+    public String sendGetRequest(String urlString) throws Exception{
         URL url = new URL(urlString);
         HttpURLConnection con = (HttpURLConnection) url.openConnection();
         con.setRequestMethod("GET");