From 4ce4445d50c8b10561d7ca446b65db86393d02fd Mon Sep 17 00:00:00 2001
From: Marc Beyer <marc.beyer@edu.bib.de>
Date: Sun, 23 Jan 2022 22:05:23 +0100
Subject: [PATCH] Merged

---
 client/app/src/main/java/customUI/Tooltip.java           | 2 +-
 client/app/src/main/java/main/CreateEventController.java | 4 +++-
 client/app/src/main/java/main/MainController.java        | 3 +--
 client/config.json                                       | 1 +
 4 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 client/config.json

diff --git a/client/app/src/main/java/customUI/Tooltip.java b/client/app/src/main/java/customUI/Tooltip.java
index 7407500..2a5324a 100644
--- a/client/app/src/main/java/customUI/Tooltip.java
+++ b/client/app/src/main/java/customUI/Tooltip.java
@@ -3,7 +3,7 @@ package customUI;
 public class Tooltip extends javafx.scene.control.Tooltip {
 
     public Tooltip(String tollTipText){
-        super(Converter.CONVERT_STR(tollTipText));
+        super(Converter.convertString(tollTipText));
     }
 
 }
diff --git a/client/app/src/main/java/main/CreateEventController.java b/client/app/src/main/java/main/CreateEventController.java
index 0511b96..e36cd4a 100644
--- a/client/app/src/main/java/main/CreateEventController.java
+++ b/client/app/src/main/java/main/CreateEventController.java
@@ -61,6 +61,8 @@ public class CreateEventController {
                 throw new IllegalArgumentException("Bitte w\u00e4hle ein Datum aus");
             }
 
+            System.out.println(datePickerDate.getValue());
+
             Event event = new Event(
                     textName.getText(),
                     ComboBoxPriotity.getSelectionModel().getSelectedIndex(),
@@ -78,7 +80,7 @@ public class CreateEventController {
 
             Stage stage = (Stage) ((Node) actionEvent.getSource()).getScene().getWindow();
             stage.close();
-        } catch (HttpRequestException e) {
+        } catch (Exception e) {
             labelError.setText(e.getMessage());
         }
     }
diff --git a/client/app/src/main/java/main/MainController.java b/client/app/src/main/java/main/MainController.java
index 150c4b8..2fb1398 100644
--- a/client/app/src/main/java/main/MainController.java
+++ b/client/app/src/main/java/main/MainController.java
@@ -7,9 +7,8 @@ import helper.HttpRequestException;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.geometry.Pos;
+import javafx.scene.Group;
 import javafx.scene.Scene;
-import customUI.Button;
-import customUI.Label;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.HBox;
diff --git a/client/config.json b/client/config.json
new file mode 100644
index 0000000..e80bf9d
--- /dev/null
+++ b/client/config.json
@@ -0,0 +1 @@
+{"saveLogin":true,"id":1,"token":"eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJtYXJjIn0.NdOMxKKgH4ZNZ84uA81L57vJtR9OhTVyKwtNsOuZhFQ"}
\ No newline at end of file