fixed time format

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

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

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

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

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

@@ -1,8 +1,7 @@
-package client;
+package main;
 
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
-import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 

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

@@ -1,4 +1,4 @@
-package client;
+package main;
 
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
@@ -78,8 +78,7 @@ public class MainController {
             stage.setResizable(false);
             //stage.initStyle(StageStyle.UNDECORATED);
             stage.showAndWait();
-        }
-        catch (IOException e){
+        } catch (IOException e) {
             e.printStackTrace();
         }
         updateEvents();
@@ -135,8 +134,12 @@ public class MainController {
         Label nameLabel = new Label(event.getName());
         vBox.getChildren().add(nameLabel);
 
-        Label timeLabel = new Label(event.getStart() + "-" + event.getEnd());
+        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);
@@ -165,6 +168,14 @@ 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");
@@ -173,7 +184,7 @@ public class MainController {
         LocalDateTime now = LocalDateTime.now();
         int dayOfWeek = Integer.parseInt(dayOfWeekFormatter.format(now));
 
-        weekStartDateTime = now.minusDays(weekOffset * 7L + dayOfWeek - 1);
+        weekStartDateTime = now.plusDays(weekOffset * 7L - dayOfWeek + 1);
 
         for (int i = 0; i < 7; i++) {
             dayLabel[i].setText(dayFormatter.format(weekStartDateTime.plusDays(i)));

client/app/src/main/resources/main/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="client.CreateEventController">
+<GridPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1" fx:controller="main.CreateEventController">
 
     <columnConstraints>
         <ColumnConstraints/>

client/app/src/main/resources/main/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="client.MainController">
+<GridPane style="-fx-background-color: #424242;" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1" fx:controller="main.MainController">
     <columnConstraints>
         <ColumnConstraints hgrow="NEVER" maxWidth="60.0" minWidth="60.0" />
         <ColumnConstraints hgrow="ALWAYS" />

hellofx/data/src/main/java/kaka/Dings.java

@@ -1,8 +0,0 @@
-package kaka;
-
-public class Dings {
-
-    public static int a() {
-        return 5;
-    }
-}