updated branch

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

@@ -1,4 +0,0 @@
-package users;
-
-public class LoginControler {
-}

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>

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

@@ -1,4 +1,4 @@
-package main;
+package client;
 
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;

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

@@ -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) {

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,21 +53,21 @@ 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 onAddBtnClick() {
-        try {
+    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());
@@ -78,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]);
@@ -111,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);
@@ -134,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);
@@ -153,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");
@@ -184,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.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/>

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" />