updated branch

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;
 

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

@@ -1,4 +1,4 @@
-package main;
+package client;
 
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
@@ -78,7 +78,8 @@ public class MainController {
             stage.setResizable(false);
             //stage.initStyle(StageStyle.UNDECORATED);
             stage.showAndWait();
-        } catch (IOException e) {
+        }
+        catch (IOException e){
             e.printStackTrace();
         }
         updateEvents();
@@ -134,12 +135,8 @@ public class MainController {
         Label nameLabel = new Label(event.getName());
         vBox.getChildren().add(nameLabel);
 
-        if (event.getStart() != null || event.getEnd() != null) {
+        Label timeLabel = new Label(event.getStart() + "-" + event.getEnd());
-            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);
@@ -168,14 +165,6 @@ public class MainController {
         }
     }
 
-    private String formatTime(String time) {
-        String[] timeArr = time.split(":");
-        if (timeArr.length > 2) {
-            return timeArr[0] + ":" + timeArr[1];
-        }
-        return time;
-    }
-
     private void setDates(){
         DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("LLLL yyyy");
         DateTimeFormatter dayFormatter = DateTimeFormatter.ofPattern("E dd.MM");
@@ -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" />