Refactored code and added tooltips to the buttons

client/app/src/main/java/customUI/Tooltip.java

@@ -0,0 +1,9 @@
+package customUI;
+
+public class Tooltip extends javafx.scene.control.Tooltip {
+
+    public Tooltip(String tollTipText){
+        super(Converter.CONVERT_STR(tollTipText));
+    }
+
+}

client/app/src/main/java/helper/SvgBtnCreator.java

@@ -0,0 +1,68 @@
+package helper;
+
+import javafx.geometry.Bounds;
+import javafx.scene.Group;
+import customUI.Button;
+import javafx.scene.control.ContentDisplay;
+import customUI.Tooltip;
+import javafx.scene.shape.SVGPath;
+
+public class SvgBtnCreator {
+
+    public static Button createBtn(Group group, int svgSize) {
+        Button btn = new Button();
+
+        Bounds boundsDel = group.getBoundsInParent();
+        double scaleDel = Math.min(svgSize / boundsDel.getWidth(), svgSize / boundsDel.getHeight());
+        group.setScaleX(scaleDel);
+        group.setScaleY(scaleDel);
+        btn.setGraphic(group);
+        btn.setMaxSize(svgSize, svgSize);
+        btn.setMinSize(svgSize, svgSize);
+        btn.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+
+        return btn;
+    }
+
+    public static Button createBtn(Group group, int svgSize, String styleClass) {
+        Button btn = new Button();
+
+        Bounds boundsDel = group.getBoundsInParent();
+        double scaleDel = Math.min(svgSize / boundsDel.getWidth(), svgSize / boundsDel.getHeight());
+        group.setScaleX(scaleDel);
+        group.setScaleY(scaleDel);
+        btn.setGraphic(group);
+        btn.setMaxSize(svgSize, svgSize);
+        btn.setMinSize(svgSize, svgSize);
+        btn.getStyleClass().add(styleClass);
+
+        return btn;
+    }
+
+    public static Button createBtn(Group group, int svgSize, String styleClass, String toolTip) {
+        Button btn = new Button();
+
+        Bounds boundsDel = group.getBoundsInParent();
+        double scaleDel = Math.min(svgSize / boundsDel.getWidth(), svgSize / boundsDel.getHeight());
+        group.setScaleX(scaleDel);
+        group.setScaleY(scaleDel);
+        btn.setGraphic(group);
+        btn.setMaxSize(svgSize, svgSize);
+        btn.setMinSize(svgSize, svgSize);
+        btn.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        btn.getStyleClass().add(styleClass);
+        Tooltip tooltip = new Tooltip(toolTip);
+        btn.setTooltip(tooltip);
+
+        return btn;
+    }
+
+    public static SVGPath createPath(String d, String fill, String hoverFill) {
+        SVGPath path = new SVGPath();
+        path.getStyleClass().add("svg");
+        path.setContent(d);
+        path.setStyle("-fill:" + fill + ";-hover-fill:"+hoverFill+';');
+        return path;
+    }
+
+}

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

@@ -1,7 +1,6 @@
 package main;
 
 import com.jfoenix.controls.*;
-import helper.HttpRequestException;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.Node;
@@ -13,7 +12,6 @@ import javafx.util.converter.LocalTimeStringConverter;
 import res.DataController;
 import res.Event;
 
-import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.format.FormatStyle;
 import java.util.Locale;
@@ -75,20 +73,16 @@ public class CreateEventController {
 
             System.out.println(event.getAsUrlParam());
 
-            sendHttpRequest(event);
+            DataController dataController = new DataController();
+            dataController.createEvent(event);
 
             Stage stage = (Stage) ((Node) actionEvent.getSource()).getScene().getWindow();
             stage.close();
-        } catch (HttpRequestException e) {
+        } catch (RuntimeException e) {
             labelError.setText(e.getMessage());
         }
     }
 
-    protected void sendHttpRequest(Event event) throws HttpRequestException {
-        DataController dataController = new DataController();
-        dataController.createEvent(event);
-    }
-
     @FXML
     protected void abortBtnClick(ActionEvent event) {
         Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();

client/app/src/main/java/main/EditEventController.java

@@ -1,25 +0,0 @@
-package main;
-
-import helper.HttpRequestException;
-import res.DataController;
-import res.Event;
-
-public class EditEventController extends CreateEventController{
-
-    private Event currentEvent;
-
-    public Event getCurrentEvent() {
-        return currentEvent;
-    }
-
-    public void setCurrentEvent(Event currentEvent) {
-        this.currentEvent = currentEvent;
-    }
-
-    @Override
-    protected void sendHttpRequest(Event event) throws HttpRequestException {
-        DataController dataController = new DataController();
-        dataController.deleteEvent(currentEvent.getOwnerId(), currentEvent.getId(), currentEvent.getDate());
-        dataController.createEvent(event);
-    }
-}

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

@@ -1,12 +1,13 @@
 package main;
 
-import helper.HttpRequestException;
+import customUI.Button;
+import customUI.Label;
+import helper.SvgBtnCreator;
 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;
@@ -25,6 +26,12 @@ import java.util.Objects;
 
 public class MainController {
 
+    @FXML
+    public VBox leftNav;
+    @FXML
+    public GridPane mainGridPane;
+    @FXML
+    public HBox buttonBox;
     @FXML
     private GridPane calendarGrid;
 
@@ -47,8 +54,9 @@ public class MainController {
     public void initialize() {
         createWeek();
         setDates();
-
         updateEvents();
+        createBtns();
+        leftNav.setSpacing(40);
     }
 
     private void updateEvents() {
@@ -57,17 +65,11 @@ public class MainController {
         }
 
         DataController dataController = new DataController();
-        try {
-            ArrayList<Event> eventList = dataController.getAllVisibleEvents(weekStartDateTime, weekStartDateTime.plusDays(7));
+        ArrayList<Event> eventList = dataController.getAllVisibleEvents(weekStartDateTime, weekStartDateTime.plusDays(7));
 
-            for (Event event : eventList) {
-                addEvent(event);
-            }
-        } catch (HttpRequestException e) {
-            e.printStackTrace();
+        for (Event event : eventList) {
+            addEvent(event);
         }
-
-
     }
 
     @FXML
@@ -104,7 +106,6 @@ public class MainController {
             stage.setScene(scene);
             stage.initModality(Modality.APPLICATION_MODAL);
             stage.setResizable(false);
-            //stage.initStyle(StageStyle.UNDECORATED);
             stage.showAndWait();
         } catch (IOException e) {
             e.printStackTrace();
@@ -112,6 +113,14 @@ public class MainController {
         updateEvents();
     }
 
+    protected void onSettingBtnClick(){
+
+    }
+
+    protected void onLogoutBtnClick(){
+
+    }
+
     private void createWeek() {
         for (int i = 0; i < 7; i++) {
             Label label = new Label();
@@ -146,19 +155,28 @@ public class MainController {
 
         HBox btnHBox = new HBox();
         btnHBox.setAlignment(Pos.BOTTOM_RIGHT);
-        Button deleteBtn = new Button();
-        deleteBtn.setTextValue(" X ");
+
+        Group svgDel = new Group(
+                SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
+                SvgBtnCreator.createPath("M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z",
+                        "white", "gray")
+        );
+        Button deleteBtn = SvgBtnCreator.createBtn(svgDel, 24, "", "Löschen des Termins");
+
+        deleteBtn.getStyleClass().add("deleteEventBtn");
         deleteBtn.setOnAction(e -> {
             DataController dataController = new DataController();
-            try {
-                dataController.deleteEvent(event.getOwnerId(), event.getId(), event.getDate());
-            } catch (HttpRequestException ex) {
-                ex.printStackTrace();
-            }
+            dataController.deleteEvent(event.getOwnerId(), event.getId(), event.getDate());
             updateEvents();
         });
-        Button editBtn = new Button();
-        editBtn.setTextValue("edit");
+
+        Group svgEdit = new Group(
+                SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
+                SvgBtnCreator.createPath("M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25zM20.71 7.04c.39-.39.39-1.02 0-1.41l-2.34-2.34c-.39-.39-1.02-.39-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z",
+                        "white", "gray")
+        );
+        Button editBtn = SvgBtnCreator.createBtn(svgEdit, 24, "", "Bearbeiten des Termins");
+        editBtn.getStyleClass().add("editEventBtn");
         editBtn.setOnAction(event1 -> {
             try {
                 FXMLLoader fxmlLoader = new FXMLLoader(
@@ -171,10 +189,7 @@ public class MainController {
                 stage.setScene(scene);
                 stage.initModality(Modality.APPLICATION_MODAL);
                 stage.setResizable(false);
-                EditEventController editEventController = fxmlLoader.getController();
-                editEventController.setCurrentEvent(event);
                 stage.showAndWait();
-                updateEvents();
             } catch (IOException e) {
                 e.printStackTrace();
             }
@@ -240,4 +255,71 @@ public class MainController {
         LabelMonth.setText(dateFormatter.format(weekStartDateTime));
 
     }
+
+    private void createBtns(){
+        Group svgAdd = new Group(
+                SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
+                SvgBtnCreator.createPath("M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z",
+                        "white", "gray")
+        );
+        Button addBtn = SvgBtnCreator.createBtn(svgAdd, 40, "main-btn", "Erstellt einen neuen Termin");
+        addBtn.setOnAction(e -> onAddBtnClick());
+        addBtn.getStyleClass().add("main-btn");
+        leftNav.getChildren().add(addBtn);
+
+        Group svgSettings = new Group(
+                SvgBtnCreator.createPath("M0 0h24v24H0V0z", "transparent", "transparent"),
+                SvgBtnCreator.createPath("M19.14,12.94c0.04-0.3,0.06-0.61,0.06-0.94c0-0.32-0.02-0.64-0.07-0.94l2.03-1.58c0.18-0.14,0.23-0.41,0.12-0.61 l-1.92-3.32c-0.12-0.22-0.37-0.29-0.59-0.22l-2.39,0.96c-0.5-0.38-1.03-0.7-1.62-0.94L14.4,2.81c-0.04-0.24-0.24-0.41-0.48-0.41 h-3.84c-0.24,0-0.43,0.17-0.47,0.41L9.25,5.35C8.66,5.59,8.12,5.92,7.63,6.29L5.24,5.33c-0.22-0.08-0.47,0-0.59,0.22L2.74,8.87 C2.62,9.08,2.66,9.34,2.86,9.48l2.03,1.58C4.84,11.36,4.8,11.69,4.8,12s0.02,0.64,0.07,0.94l-2.03,1.58 c-0.18,0.14-0.23,0.41-0.12,0.61l1.92,3.32c0.12,0.22,0.37,0.29,0.59,0.22l2.39-0.96c0.5,0.38,1.03,0.7,1.62,0.94l0.36,2.54 c0.05,0.24,0.24,0.41,0.48,0.41h3.84c0.24,0,0.44-0.17,0.47-0.41l0.36-2.54c0.59-0.24,1.13-0.56,1.62-0.94l2.39,0.96 c0.22,0.08,0.47,0,0.59-0.22l1.92-3.32c0.12-0.22,0.07-0.47-0.12-0.61L19.14,12.94z M12,15.6c-1.98,0-3.6-1.62-3.6-3.6 s1.62-3.6,3.6-3.6s3.6,1.62,3.6,3.6S13.98,15.6,12,15.6z",
+                        "white", "gray")
+        );
+        Button settingsBtn = SvgBtnCreator.createBtn(svgSettings, 40, "main-btn", "Öffnet die Einstellungen");
+        settingsBtn.setOnAction(e -> onSettingBtnClick());
+        settingsBtn.getStyleClass().add("main-btn");
+        leftNav.getChildren().add(settingsBtn);
+
+        Group svgLogout = new Group(
+                SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
+                SvgBtnCreator.createPath("M17 7l-1.41 1.41L18.17 11H8v2h10.17l-2.58 2.58L17 17l5-5zM4 5h8V3H4c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h8v-2H4V5z",
+                        "white", "gray")
+        );
+        Button logoutBtn = SvgBtnCreator.createBtn(svgLogout, 40, "main-btn", "Abmelden");
+        logoutBtn.setOnAction(e -> onLogoutBtnClick());
+        logoutBtn.getStyleClass().add("main-btn");
+        leftNav.getChildren().add(logoutBtn);
+
+        Group svgBack = new Group(
+                SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
+                SvgBtnCreator.createPath("M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z",
+                        "white", "lightgray")
+        );
+        Button backBtn = SvgBtnCreator.createBtn(svgBack, 40, "navBtn", "Zeigt die vorherige Woche");
+        backBtn.setOnAction(e -> onBackClick());
+        backBtn.getStyleClass().add("navBtn");
+        GridPane.setColumnIndex(backBtn, 1);
+        buttonBox.getChildren().add(backBtn);
+
+        Group svgToday = new Group(
+                SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
+                SvgBtnCreator.createPath("M20 3h-1V1h-2v2H7V1H5v2H4c-1.1 0-2 .9-2 2v16c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 18H4V8h16v13z",
+                        "white", "lightgray")
+        );
+        Button todayBtn = SvgBtnCreator.createBtn(svgToday, 40, "navBtn", "Zeigt die aktuelle Woche");
+        todayBtn.setOnAction(e -> onTodayClick());
+        todayBtn.getStyleClass().add("navBtn");
+        GridPane.setColumnIndex(todayBtn, 2);
+        buttonBox.getChildren().add(todayBtn);
+
+        Group svgNext = new Group(
+                SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
+                SvgBtnCreator.createPath("M12 4l-1.41 1.41L16.17 11H4v2h12.17l-5.58 5.59L12 20l8-8z",
+                        "white", "lightgray")
+        );
+        Button nextBtn = SvgBtnCreator.createBtn(svgNext, 40, "navBtn", "Zeigt die nächste Woche");
+        nextBtn.setOnAction(e -> onNextClick());
+        nextBtn.getStyleClass().add("navBtn");
+        GridPane.setColumnIndex(nextBtn, 3);
+        buttonBox.getChildren().add(nextBtn);
+    }
+
+
 }

client/app/src/main/resources/main/edit-event.fxml

@@ -8,7 +8,7 @@
 <?import com.jfoenix.controls.*?>
 
 <GridPane fx:id="mainGrid" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1"
-          fx:controller="main.EditEventController">
+          fx:controller="main.CreateEventController">
 
     <columnConstraints>
         <ColumnConstraints/>

client/app/src/main/resources/main/main-view.css

@@ -63,16 +63,58 @@ Label{
 }
 
 .main-btn{
-    -fx-background-color: #ffffff;
-    -fx-text-fill: -fx-main-text-color;
-    -fx-background-radius: 5em;
-    -fx-min-width: 40px;
-    -fx-min-height: 40px;
-    -fx-max-width: 40px;
-    -fx-max-height: 40px;
+    -fx-background-color: transparent;
+    -fx-border-color: transparent;
+}
+
+.main-btn .svg {
+    -fx-fill: -fill;
+}
+
+.main-btn:hover .svg {
+    -fx-fill: -hover-fill;
+}
+
+.buttonBox{
+    -fx-background-color: #77859E;
 }
 
 .navBtn{
-    -fx-background-color: white;
+    -fx-background-color: transparent;
+    -fx-border-color: transparent;
+}
+
+.navBtn .svg {
+    -fx-fill: -fill;
+}
+
+.navBtn:hover .svg {
+    -fx-fill: -hover-fill;
+}
+
+.editEventBtn{
+    -fx-background-color: transparent;
+    -fx-border-color: transparent;
+}
+
+.editEventBtn .svg {
+    -fx-fill: -fill;
+}
+
+.editEventBtn:hover .svg {
+    -fx-fill: -hover-fill;
+}
+
+.deleteEventBtn{
+    -fx-background-color: transparent;
+    -fx-border-color: transparent;
+}
+
+.deleteEventBtn .svg {
+    -fx-fill: -fill;
+}
+
+.deleteEventBtn:hover .svg {
+    -fx-fill: -hover-fill;
 }
 

client/app/src/main/resources/main/main-view.fxml

@@ -4,7 +4,6 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.image.*?>
 <?import javafx.scene.layout.*?>
-<?import com.jfoenix.controls.*?>
 
 <GridPane style="-fx-background-color: #424242;" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1"
           fx:controller="main.MainController">
@@ -15,22 +14,13 @@
     <rowConstraints>
         <RowConstraints vgrow="SOMETIMES"/>
     </rowConstraints>
-    <VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0" spacing="5.0"
+    <VBox fx:id="leftNav" alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0" spacing="5.0"
           style="-fx-background-color: #525E74;">
         <ImageView fitHeight="50.0" fitWidth="50.0" pickOnBounds="true" preserveRatio="true">
 
         </ImageView>
-        <JFXButton onAction="#onAddBtnClick" styleClass="main-btn">
-            ADD
-        </JFXButton>
-        <JFXButton onAction="#onAddBtnClick" styleClass="main-btn">
-            ADD
-        </JFXButton>
-        <JFXButton onAction="#onAddBtnClick" styleClass="main-btn">
-            ADD
-        </JFXButton>
     </VBox>
-    <GridPane prefHeight="200.0" prefWidth="222.0" GridPane.columnIndex="1" GridPane.rowIndex="0">
+    <GridPane fx:id="mainGridPane" prefHeight="200.0" prefWidth="222.0" GridPane.columnIndex="1" GridPane.rowIndex="0">
         <columnConstraints>
             <ColumnConstraints hgrow="ALWAYS"/>
             <ColumnConstraints/>
@@ -49,9 +39,8 @@
                 <Insets left="5"/>
             </padding>
         </Label>
-        <JFXButton styleClass="navBtn" onAction="#onBackClick" GridPane.columnIndex="1" maxHeight="1.7976931348623157E308">zurück</JFXButton>
-        <JFXButton styleClass="navBtn" onAction="#onTodayClick" GridPane.columnIndex="2" maxHeight="1.7976931348623157E308">heute</JFXButton>
-        <JFXButton styleClass="navBtn" onAction="#onNextClick" GridPane.columnIndex="3" maxHeight="1.7976931348623157E308">weiter</JFXButton>
+
+        <HBox fx:id="buttonBox" styleClass="buttonBox" GridPane.columnIndex="1" alignment="CENTER"/>
 
         <GridPane fx:id="calendarGrid" gridLinesVisible="true" styleClass="gridCalendar" GridPane.columnSpan="4"
                   GridPane.columnIndex="0" GridPane.rowIndex="1">

client/data/src/main/java/helper/HttpRequestException.java

@@ -1,23 +0,0 @@
-package helper;
-
-public class HttpRequestException extends Exception{
-    private int status;
-
-    public HttpRequestException(String message, int status) {
-        super(message);
-        this.status = status;
-    }
-
-    public HttpRequestException(Tuple<Integer, String> response) {
-        super(response.getValue());
-        this.status = response.getKey();
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-    public void setStatus(int status) {
-        this.status = status;
-    }
-}

client/data/src/main/java/res/DataController.java

@@ -3,7 +3,6 @@ package res;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import helper.HttpRequestException;
 import helper.Tuple;
 
 import java.io.BufferedReader;
@@ -25,7 +24,6 @@ public class DataController {
     private static final String DELETE_EVENT_ENDPOINT = "http://localhost:8080/event/del";
 
     private static final String LOGIN_ENDPOINT = "http://localhost:8080/user/login";
-    private static final String LOGIN_WITH_TOKEN_ENDPOINT = "http://localhost:8080/user/login-with-token";
     private static final String ALL_USERS_ENDPOINT = "http://localhost:8080/user/all";
     private static final String HEADER_TEST_ENDPOINT = "http://localhost:8080/vpr/header-test";
 
@@ -62,52 +60,28 @@ public class DataController {
         return USER_ID >= 0;
     }
 
-    public boolean loginWIthToken(String username, String password) {
+    public void createEvent(Event event) {
         try {
-            Tuple<Integer, String> response = httpRequest.sendPostRequest(
-                    LOGIN_WITH_TOKEN_ENDPOINT,
-                    "userId=" + USER_ID,
-                    true
-            );
+            System.out.println(httpRequest.sendPostRequest(ADD_EVENT_ENDPOINT, event.getAsUrlParam(), true));
         } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-        return USER_ID >= 0;
-    }
-
-    public void createEvent(Event event) throws HttpRequestException {
-        try {
-            Tuple<Integer, String> response = httpRequest.sendPostRequest(ADD_EVENT_ENDPOINT, event.getAsUrlParam(), true);
-            if(response.getKey() != 200){
-                throw new HttpRequestException(response);
-            }
-        }catch (HttpRequestException e){
-            throw e;
-        }catch (Exception e) {
-            throw new HttpRequestException("Es konnte keine Verbindung mit dem Server hergestellt werden.", 600);
+            throw new RuntimeException("Es konnte keine Verbindung mit dem Server hergestellt werden.");
         }
     }
 
-    public void deleteEvent(int userId, int eventId, LocalDateTime date) throws HttpRequestException {
+    public void deleteEvent(int userId, int eventId, LocalDateTime date) {
         try {
             System.out.println("DELETE: userId=" + userId + "&eventId=" + eventId + "&date=" + date.toLocalDate());
-            Tuple<Integer, String> response = httpRequest.sendPostRequest(
+            System.out.println(httpRequest.sendPostRequest(
                     DELETE_EVENT_ENDPOINT,
                     "userId=" + userId + "&eventId=" + eventId + "&date=" + date.toLocalDate(),
                     true
-            );
-            if(response.getKey() != 200){
-                throw new HttpRequestException(response);
-            }
-        }catch (HttpRequestException e){
-            throw e;
-        }catch (Exception e) {
-            throw new HttpRequestException("Es konnte keine Verbindung mit dem Server hergestellt werden.", 600);
+            ));
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 
-    public ArrayList<Event> getAllVisibleEvents(LocalDateTime startDate, LocalDateTime endDate) throws HttpRequestException {
+    public ArrayList<Event> getAllVisibleEvents(LocalDateTime startDate, LocalDateTime endDate) {
         ArrayList<Event> eventList = new ArrayList<>();
         try {
             Tuple<Integer, String> response = httpRequest.sendPostRequest(
@@ -115,9 +89,6 @@ public class DataController {
                     "userId=" + USER_ID + "&startDate=" + startDate.toLocalDate() + "&endDate=" + endDate.toLocalDate(),
                     true
             );
-            if(response.getKey() != 200){
-                throw new HttpRequestException(response);
-            }
             String jsonResponse = response.getValue();
             System.out.println(jsonResponse);
 
@@ -126,14 +97,35 @@ public class DataController {
             eventList = (ArrayList<Event>) objectMapper.readValue(jsonResponse, new TypeReference<List<Event>>(){});
 
 
-        }catch (HttpRequestException e){
-            throw e;
-        }catch (Exception e) {
-            throw new HttpRequestException("Es konnte keine Verbindung mit dem Server hergestellt werden.", 600);
+        } catch (Exception e) {
+            e.printStackTrace();
         }
 
         return eventList;
     }
 
+    public Event[] getAllEvents() {
+        Event[] eventList = null;
 
+        try {
+            String jsonResponse = httpRequest.sendGetRequest("http://localhost:8080/vpr/all-events-test");
+            eventList = parseJsonToEventList(jsonResponse);
+            for (Event e : eventList) {
+                System.out.println(e);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return eventList;
+    }
+
+    private Event[] parseJsonToEventList(String jsonString) throws JsonProcessingException {
+        ArrayList<Event> eventList;
+
+        // Parse JSON
+        ObjectMapper objectMapper = new ObjectMapper();
+
+        return objectMapper.readValue(jsonString, Event[].class);
+    }
 }