updated branch

2021-11-29 07:52:04 +01:00
22 changed files with 98 additions and 226 deletions
--- a/client/app/src/main/java/main/CreateEventController.java
+++ b/client/app/src/main/java/main/CreateEventController.java
@@ -1,77 +0,0 @@
-package main;
-
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.scene.Node;
-import javafx.scene.control.*;
-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;
-    @FXML
-    public Label labelError;
-
-
-
-    public CreateEventController() {
-    }
-
-    @FXML
-    public void initialize() {
-    }
-
-
-    @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(),
-                    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();
-        } catch (RuntimeException e) {
-            labelError.setText(e.getMessage());
-        }
-    }
-
-    @FXML
-    protected void abortBtnClick(ActionEvent event) {
-        Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
-        stage.close();
-    }
-}
--- a/client/app/src/main/java/users/LoginControler.java
+++ b/client/app/src/main/java/users/LoginControler.java
@@ -1,4 +0,0 @@
-package users;
-
-public class LoginControler {
-}
--- a/client/app/src/main/resources/users/login.css
+++ b/client/app/src/main/resources/users/login.css
--- a/client/app/src/main/resources/users/login.fxml
+++ b/client/app/src/main/resources/users/login.fxml
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import java.lang.*?>
-<?import java.util.*?>
-<?import javafx.scene.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-
-<GridPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"  fx:controller="users.LoginControler">
-
-    <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"></TextField>
-    <Label GridPane.columnIndex="2" GridPane.rowIndex="1" fx:id="userErrLabel">Error</Label>
-
-    <Label GridPane.rowIndex="2">Paswort</Label>
-    <PasswordField GridPane.columnIndex="1" GridPane.rowIndex="2" fx:id="passField"></PasswordField>
-    <Label GridPane.columnIndex="2" GridPane.rowIndex="2" fx:id="passErrLabel">Error</Label>
-
-    <Button GridPane.columnIndex="1" GridPane.rowIndex="3">Beenden</Button>
-    <Button GridPane.columnIndex="2" GridPane.rowIndex="3">Anmelden</Button>
-
-</GridPane>
--- a/hellofx/app/build.gradle.kts
+++ b/hellofx/app/build.gradle.kts
--- a/hellofx/app/src/main/java/client/CreateEventController.java
+++ b/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();
+    }
+}
--- a/hellofx/app/src/main/java/client/Launcher.java
+++ b/hellofx/app/src/main/java/client/Launcher.java
@@ -1,4 +1,4 @@
-package main;
+package client;

 public class Launcher {
    
--- a/hellofx/app/src/main/java/client/MainApplication.java
+++ b/hellofx/app/src/main/java/client/MainApplication.java
@@ -1,7 +1,8 @@
-package main;
+package client;

 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
+import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.stage.Stage;

@@ -15,18 +16,10 @@ public class MainApplication extends Application {

        Scene scene = new Scene(fxmlLoader.load(), 1200, 700);
        scene.getStylesheets().add(Objects.requireNonNull(MainApplication.class.getResource("main-view.css")).toExternalForm());
-        stage.setTitle("SharePlaner");
+        stage.setTitle("Hello!");
        stage.setScene(scene);
        stage.show();

-        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.show();
-
    }

    public static void main(String[] args) {
--- a/hellofx/app/src/main/java/client/MainController.java
+++ b/hellofx/app/src/main/java/client/MainController.java
@@ -1,4 +1,4 @@
-package main;
+package client;

 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
@@ -45,7 +45,7 @@ public class MainController {
    }

    @FXML
-    public void initialize() {
+    public void initialize(){
        createWeek();
        setDates();

@@ -53,44 +53,23 @@ 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 {
+    protected void onAddBtnClick(){
+        try{
            FXMLLoader fxmlLoader = new FXMLLoader(MainApplication.class.getResource("create-event.fxml"));
-            Scene scene = new Scene(fxmlLoader.load(), 650, 650);
+            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");
@@ -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);
@@ -155,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);
-            vBox.getChildren().add(timeLabel);
-        }
+        Label timeLabel = new Label(event.getStart() + "-" + event.getEnd());
+        vBox.getChildren().add(timeLabel);

        Label typeLabel = new Label("Wer: " + event.getOwnerName());
        vBox.getChildren().add(typeLabel);
@@ -174,30 +150,22 @@ 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);
        }
-
+        

        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");
@@ -205,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)));
--- a/hellofx/app/src/main/resources/client/create-event.css
+++ b/hellofx/app/src/main/resources/client/create-event.css
@@ -32,15 +32,4 @@ 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;
 }
--- a/hellofx/app/src/main/resources/client/create-event.fxml
+++ b/hellofx/app/src/main/resources/client/create-event.fxml
@@ -5,7 +5,7 @@

 <?import javafx.collections.FXCollections?>
 <?import java.lang.String?>
-<GridPane 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/>
@@ -22,7 +22,6 @@
        <RowConstraints vgrow="ALWAYS" />
        <RowConstraints vgrow="ALWAYS" />
        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
    </rowConstraints>

    <Label styleClass="mainLabel">Termin anlegen</Label>
@@ -52,9 +51,8 @@
    </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">
+    <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>
--- a/hellofx/app/src/main/resources/client/main-view.css
+++ b/hellofx/app/src/main/resources/client/main-view.css
--- a/hellofx/app/src/main/resources/client/main-view.fxml
+++ b/hellofx/app/src/main/resources/client/main-view.fxml
@@ -5,7 +5,7 @@
 <?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" />
@@ -30,10 +30,7 @@
    <GridPane prefHeight="200.0" prefWidth="222.0" GridPane.columnIndex="1" GridPane.rowIndex="0">
        <columnConstraints>
        <ColumnConstraints hgrow="ALWAYS" />
-            <ColumnConstraints />
-            <ColumnConstraints />
-            <ColumnConstraints />
-            <ColumnConstraints />
+         <ColumnConstraints />
        </columnConstraints>
        <rowConstraints>
            <RowConstraints />
@@ -45,11 +42,8 @@
                <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" />
--- a/hellofx/build.gradle.kts
+++ b/hellofx/build.gradle.kts
--- a/hellofx/data/build.gradle.kts
+++ b/hellofx/data/build.gradle.kts
--- a/hellofx/data/src/main/java/res/DataController.java
+++ b/hellofx/data/src/main/java/res/DataController.java
@@ -29,7 +29,7 @@ public class DataController {
        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();
        }
    }

--- a/hellofx/data/src/main/java/res/Event.java
+++ b/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;
--- a/hellofx/data/src/main/java/res/HttpRequest.java
+++ b/hellofx/data/src/main/java/res/HttpRequest.java
--- a/hellofx/gradle/wrapper/gradle-wrapper.properties
+++ b/hellofx/gradle/wrapper/gradle-wrapper.properties
--- a/hellofx/gradlew
+++ b/hellofx/gradlew
--- a/hellofx/gradlew.bat
+++ b/hellofx/gradlew.bat
--- a/hellofx/settings.gradle.kts
+++ b/hellofx/settings.gradle.kts