From da8e4e764c4aa51a8439afac926ff37ea512bdd0 Mon Sep 17 00:00:00 2001
From: Hassan <s1136140@student.hsleiden.nl>
Date: Thu, 3 Nov 2022 19:59:52 +0100
Subject: [PATCH 01/11] Added: admin space views, controllers and necessary
 entities

---
 .../com/example/werkplekkenfrontend/Main.java |  3 +-
 .../AdminEditMeetingroomViewController.java   | 28 ++++++++
 .../AdminEditWorkspaceViewController.java     | 27 ++++++++
 .../controllers/AdminViewSpaceController.java | 41 +++++++++++
 .../werkplekkenfrontend/models/Facility.java  | 35 ++++++++++
 .../werkplekkenfrontend/models/Floor.java     | 37 ++++++++++
 .../werkplekkenfrontend/models/Space.java     | 37 ++++++++++
 .../werkplekkenfrontend/admin-space-view.fxml | 64 +++++++++++++++++
 .../space-view-edit-meetingroom.fxml          | 68 +++++++++++++++++++
 .../space-view-edit-workspace.fxml            | 48 +++++++++++++
 10 files changed, 386 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/com/example/werkplekkenfrontend/controllers/AdminEditMeetingroomViewController.java
 create mode 100644 src/main/java/com/example/werkplekkenfrontend/controllers/AdminEditWorkspaceViewController.java
 create mode 100644 src/main/java/com/example/werkplekkenfrontend/controllers/AdminViewSpaceController.java
 create mode 100644 src/main/java/com/example/werkplekkenfrontend/models/Facility.java
 create mode 100644 src/main/java/com/example/werkplekkenfrontend/models/Floor.java
 create mode 100644 src/main/java/com/example/werkplekkenfrontend/models/Space.java
 create mode 100644 src/main/resources/com/example/werkplekkenfrontend/admin-space-view.fxml
 create mode 100644 src/main/resources/com/example/werkplekkenfrontend/space-view-edit-meetingroom.fxml
 create mode 100644 src/main/resources/com/example/werkplekkenfrontend/space-view-edit-workspace.fxml

diff --git a/src/main/java/com/example/werkplekkenfrontend/Main.java b/src/main/java/com/example/werkplekkenfrontend/Main.java
index 5286aa5..218a132 100644
--- a/src/main/java/com/example/werkplekkenfrontend/Main.java
+++ b/src/main/java/com/example/werkplekkenfrontend/Main.java
@@ -2,7 +2,6 @@
 
 import com.example.werkplekkenfrontend.controllers.*;
 import javafx.application.Application;
-import javafx.scene.Scene;
 import javafx.stage.Stage;
 
 public class Main extends Application {
@@ -11,7 +10,7 @@ public class Main extends Application {
     @Override
     public void start(Stage stage) {
         Main.sceneController.setStage(stage);
-        ViewController controller = sceneController.showView("admin-view.fxml");
+        ViewController controller = sceneController.showView("admin-buildings-view.fxml");
         controller.updateView();
         // testAdminBuildingsViewController();
         // testAdminEditBuildingViewController();
diff --git a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminEditMeetingroomViewController.java b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminEditMeetingroomViewController.java
new file mode 100644
index 0000000..73941cf
--- /dev/null
+++ b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminEditMeetingroomViewController.java
@@ -0,0 +1,28 @@
+package com.example.werkplekkenfrontend.controllers;
+
+import com.example.werkplekkenfrontend.Main;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+
+public class AdminEditMeetingroomViewController implements ViewController{
+
+    @FXML
+    void onApplyClick(ActionEvent event) {
+        ViewController controller = Main.sceneController.showView("admin-space-view.fxml");
+        controller.updateView();
+
+    }
+
+    @FXML
+    void onCancelClick(ActionEvent event) {
+        ViewController controller = Main.sceneController.showView("admin-space-view.fxml");
+        controller.updateView();
+
+    }
+
+    @Override
+    public void updateView() {
+
+    }
+
+}
diff --git a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminEditWorkspaceViewController.java b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminEditWorkspaceViewController.java
new file mode 100644
index 0000000..6f0f0a8
--- /dev/null
+++ b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminEditWorkspaceViewController.java
@@ -0,0 +1,27 @@
+package com.example.werkplekkenfrontend.controllers;
+
+import com.example.werkplekkenfrontend.Main;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+
+public class AdminEditWorkspaceViewController implements ViewController{
+
+
+    @FXML
+    void onApplyClick(ActionEvent event) {
+        ViewController controller = Main.sceneController.showView("admin-space-view.fxml");
+        controller.updateView();
+
+    }
+
+    @FXML
+    void onCancelClick(ActionEvent event) {
+        ViewController controller = Main.sceneController.showView("admin-space-view.fxml");
+        controller.updateView();
+    }
+
+    @Override
+    public void updateView() {
+
+    }
+}
diff --git a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminViewSpaceController.java b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminViewSpaceController.java
new file mode 100644
index 0000000..edf555c
--- /dev/null
+++ b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminViewSpaceController.java
@@ -0,0 +1,41 @@
+package com.example.werkplekkenfrontend.controllers;
+
+import com.example.werkplekkenfrontend.Main;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+
+public class AdminViewSpaceController implements ViewController {
+
+    @FXML
+    void OnNewMeetingroomButtonClick(ActionEvent event) {
+        ViewController controller = Main.sceneController.showView("space-view-edit-meetingroom.fxml");
+        controller.updateView();
+
+    }
+
+    @FXML
+    void OnNewWorkspaceButtonClick(ActionEvent event) {
+        ViewController controller = Main.sceneController.showView("space-view-edit-workspace.fxml");
+        controller.updateView();
+
+
+    }
+
+    @FXML
+    void onEditMeetingRoomButtonClick(ActionEvent event) {
+        ViewController controller = Main.sceneController.showView("space-view-edit-meetingroom.fxml");
+        controller.updateView();
+
+    }
+
+    @FXML
+    void onEditWorkspaceButtonClick(ActionEvent event) {
+        ViewController controller = Main.sceneController.showView("space-view-edit-workspace.fxml");
+        controller.updateView();
+
+    }
+    @Override
+    public void updateView() {
+
+    }
+}
diff --git a/src/main/java/com/example/werkplekkenfrontend/models/Facility.java b/src/main/java/com/example/werkplekkenfrontend/models/Facility.java
new file mode 100644
index 0000000..fa1080c
--- /dev/null
+++ b/src/main/java/com/example/werkplekkenfrontend/models/Facility.java
@@ -0,0 +1,35 @@
+package com.example.werkplekkenfrontend.models;
+
+public class Facility {
+
+    String id;
+
+    String name;
+
+    int quantity;
+
+    Building building;
+
+    public Facility(String id, String name, int quantity, Building building) {
+        this.id = id;
+        this.name = name;
+        this.quantity = quantity;
+        this.building = building;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getQuantity() {
+        return quantity;
+    }
+
+    public Building getBuilding() {
+        return building;
+    }
+}
diff --git a/src/main/java/com/example/werkplekkenfrontend/models/Floor.java b/src/main/java/com/example/werkplekkenfrontend/models/Floor.java
new file mode 100644
index 0000000..81bccd3
--- /dev/null
+++ b/src/main/java/com/example/werkplekkenfrontend/models/Floor.java
@@ -0,0 +1,37 @@
+package com.example.werkplekkenfrontend.models;
+
+import java.util.Set;
+
+public class Floor {
+
+    String id;
+
+    String Designation;
+
+    Building building;
+
+    Set<Space> spaces;
+
+    public Floor(String id, String designation, Building building, Set<Space> spaces) {
+        this.id = id;
+        Designation = designation;
+        this.building = building;
+        this.spaces = spaces;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public String getDesignation() {
+        return Designation;
+    }
+
+    public Building getBuilding() {
+        return building;
+    }
+
+    public Set<Space> getSpaces() {
+        return spaces;
+    }
+}
diff --git a/src/main/java/com/example/werkplekkenfrontend/models/Space.java b/src/main/java/com/example/werkplekkenfrontend/models/Space.java
new file mode 100644
index 0000000..5ba84b0
--- /dev/null
+++ b/src/main/java/com/example/werkplekkenfrontend/models/Space.java
@@ -0,0 +1,37 @@
+package com.example.werkplekkenfrontend.models;
+
+import java.util.Set;
+import java.util.UUID;
+
+public class Space {
+    UUID id;
+
+    int capacity;
+
+    Floor floor;
+
+    Set<Facility> Facilities;
+
+    public Space(UUID id, int capacity, Floor floor, Set<Facility> facilities) {
+        this.id = id;
+        this.capacity = capacity;
+        this.floor = floor;
+        Facilities = facilities;
+    }
+
+    public UUID getId() {
+        return id;
+    }
+
+    public int getCapacity() {
+        return capacity;
+    }
+
+    public Floor getFloor() {
+        return floor;
+    }
+
+    public Set<Facility> getFacilities() {
+        return Facilities;
+    }
+}
diff --git a/src/main/resources/com/example/werkplekkenfrontend/admin-space-view.fxml b/src/main/resources/com/example/werkplekkenfrontend/admin-space-view.fxml
new file mode 100644
index 0000000..1040f4a
--- /dev/null
+++ b/src/main/resources/com/example/werkplekkenfrontend/admin-space-view.fxml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.MenuItem?>
+<?import javafx.scene.control.SplitMenuButton?>
+<?import javafx.scene.layout.FlowPane?>
+<?import javafx.scene.layout.VBox?>
+
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="800.0" minWidth="1080.0" xmlns="http://javafx.com/javafx/19"
+      xmlns:fx="http://javafx.com/fxml/1"
+      fx:controller="com.example.werkplekkenfrontend.controllers.AdminViewSpaceController">
+   <VBox prefHeight="56.0" prefWidth="600.0">
+      <Button mnemonicParsing="false" onAction="#OnNewWorkspaceButtonClick" prefHeight="25.0" prefWidth="152.0"
+              text="New Werkplek">
+         <VBox.margin>
+            <Insets bottom="10.0" left="500.0"/>
+         </VBox.margin>
+      </Button>
+      <Button mnemonicParsing="false" onAction="#OnNewMeetingroomButtonClick" prefHeight="25.0" prefWidth="152.0"
+              text="New Vergaderruimte">
+         <VBox.margin>
+            <Insets left="500.0"/>
+         </VBox.margin>
+      </Button>
+   </VBox>
+   <FlowPane prefHeight="130.0" prefWidth="600.0">
+      <padding>
+         <Insets left="110.0"/>
+      </padding>
+      <Label alignment="TOP_LEFT" prefHeight="100.0" prefWidth="298.0" style="-fx-background-color: fffafa;"
+             text="Werkplek">
+         <FlowPane.margin>
+            <Insets left="310.0"/>
+         </FlowPane.margin>
+      </Label>
+      <SplitMenuButton mnemonicParsing="false" text="options">
+         <items>
+            <MenuItem mnemonicParsing="false" text="Delete"/>
+            <MenuItem mnemonicParsing="false" onAction="#onEditWorkspaceButtonClick" text="Edit"/>
+            <MenuItem mnemonicParsing="false" text="Cancel"/>
+         </items>
+      </SplitMenuButton>
+   </FlowPane>
+   <FlowPane prefHeight="125.0" prefWidth="600.0">
+      <VBox.margin>
+         <Insets/>
+      </VBox.margin>
+      <Label alignment="TOP_LEFT" contentDisplay="TOP" prefHeight="100.0" prefWidth="296.0"
+             style="-fx-background-color: fffafa;" text="Vergaderruimte">
+         <FlowPane.margin>
+            <Insets left="420.0"/>
+         </FlowPane.margin>
+      </Label>
+      <SplitMenuButton mnemonicParsing="false" text="options">
+         <items>
+            <MenuItem mnemonicParsing="false" text="Delete"/>
+            <MenuItem mnemonicParsing="false" onAction="#onEditMeetingRoomButtonClick" text="Edit"/>
+            <MenuItem mnemonicParsing="false" text="Cancel"/>
+         </items>
+      </SplitMenuButton>
+   </FlowPane>
+</VBox>
diff --git a/src/main/resources/com/example/werkplekkenfrontend/space-view-edit-meetingroom.fxml b/src/main/resources/com/example/werkplekkenfrontend/space-view-edit-meetingroom.fxml
new file mode 100644
index 0000000..5c5dc4e
--- /dev/null
+++ b/src/main/resources/com/example/werkplekkenfrontend/space-view-edit-meetingroom.fxml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.layout.FlowPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Text?>
+
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="800.0" minWidth="1080.0" xmlns="http://javafx.com/javafx/19"
+      xmlns:fx="http://javafx.com/fxml/1"
+      fx:controller="com.example.werkplekkenfrontend.controllers.AdminEditMeetingroomViewController">
+   <HBox alignment="CENTER" prefHeight="73.0" prefWidth="600.0" spacing="200">
+      <padding>
+         <Insets bottom="20.0" left="20.0" right="20.0" top="20.0"/>
+      </padding>
+      <Button cancelButton="true" onAction="#onCancelClick" prefHeight="50" prefWidth="200" text="Cancel"/>
+      <Button defaultButton="true" onAction="#onApplyClick" prefHeight="80" prefWidth="80" text="Apply"/>
+   </HBox>
+   <FlowPane prefHeight="34.0" prefWidth="600.0">
+      <Text strokeType="OUTSIDE" strokeWidth="0.0" text="vergaderruimte">
+         <FlowPane.margin>
+            <Insets left="550.0"/>
+         </FlowPane.margin>
+      </Text>
+   </FlowPane>
+   <FlowPane prefHeight="53.0" prefWidth="600.0">
+      <padding>
+         <Insets left="110.0"/>
+      </padding>
+      <TextArea prefHeight="46.0" prefWidth="342.0" promptText="naam">
+         <FlowPane.margin>
+            <Insets left="300.0"/>
+         </FlowPane.margin>
+      </TextArea>
+   </FlowPane>
+   <FlowPane prefHeight="55.0" prefWidth="600.0">
+      <padding>
+         <Insets left="110.0"/>
+      </padding>
+      <TextArea prefHeight="45.0" prefWidth="342.0" promptText="capaciteit">
+         <FlowPane.margin>
+            <Insets left="300.0"/>
+         </FlowPane.margin>
+      </TextArea>
+   </FlowPane>
+   <FlowPane prefHeight="74.0" prefWidth="600.0">
+      <padding>
+         <Insets left="110.0"/>
+      </padding>
+      <TextArea prefHeight="38.0" prefWidth="134.0" promptText="faciliteit">
+         <FlowPane.margin>
+            <Insets left="300.0"/>
+         </FlowPane.margin>
+      </TextArea>
+      <Button mnemonicParsing="false" text="Add">
+         <FlowPane.margin>
+            <Insets left="10.0"/>
+         </FlowPane.margin>
+      </Button>
+      <Button mnemonicParsing="false" text="Delete">
+         <FlowPane.margin>
+            <Insets left="10.0"/>
+         </FlowPane.margin>
+      </Button>
+   </FlowPane>
+</VBox>
diff --git a/src/main/resources/com/example/werkplekkenfrontend/space-view-edit-workspace.fxml b/src/main/resources/com/example/werkplekkenfrontend/space-view-edit-workspace.fxml
new file mode 100644
index 0000000..349890a
--- /dev/null
+++ b/src/main/resources/com/example/werkplekkenfrontend/space-view-edit-workspace.fxml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.layout.FlowPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Text?>
+
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0"
+      prefWidth="1080.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1"
+      fx:controller="com.example.werkplekkenfrontend.controllers.AdminEditWorkspaceViewController">
+   <HBox alignment="CENTER" prefHeight="73.0" prefWidth="600.0" spacing="200">
+      <padding>
+         <Insets bottom="20.0" left="20.0" right="20.0" top="20.0"/>
+      </padding>
+      <Button cancelButton="true" onAction="#onCancelClick" prefHeight="50" prefWidth="200" text="Cancel"/>
+      <Button defaultButton="true" onAction="#onApplyClick" prefHeight="80" prefWidth="80" text="Apply"/>
+   </HBox>
+   <FlowPane prefHeight="39.0" prefWidth="600.0">
+      <Text strokeType="OUTSIDE" strokeWidth="0.0" text="werkplek">
+         <FlowPane.margin>
+            <Insets left="550.0"/>
+         </FlowPane.margin>
+      </Text>
+   </FlowPane>
+   <FlowPane prefHeight="53.0" prefWidth="600.0">
+      <padding>
+         <Insets left="110.0"/>
+      </padding>
+      <TextArea prefHeight="34.0" prefWidth="338.0" promptText="naam">
+         <FlowPane.margin>
+            <Insets left="300.0"/>
+         </FlowPane.margin>
+      </TextArea>
+   </FlowPane>
+   <FlowPane prefHeight="90.0" prefWidth="600.0">
+      <padding>
+         <Insets left="110.0"/>
+      </padding>
+      <TextArea prefHeight="39.0" prefWidth="342.0" promptText="capaciteit">
+         <FlowPane.margin>
+            <Insets left="300.0"/>
+         </FlowPane.margin>
+      </TextArea>
+   </FlowPane>
+</VBox>

From 162a1f765d9966bc33890d15a1b0effa87391826 Mon Sep 17 00:00:00 2001
From: Hassan <s1136140@student.hsleiden.nl>
Date: Fri, 4 Nov 2022 03:36:08 +0100
Subject: [PATCH 02/11] Added: controllers for both meetingroom and workspace
 when editing existing entries. New fxml views and elements for workspace and
 meeting, you can see a list of them with a not yet functioning edit button.
 Change: Space variables Deleted: recently made Facility and Floor models

---
 .../AdminEditMeetingroomViewController.java   | 28 ++++++-
 .../AdminEditWorkspaceViewController.java     | 19 +++++
 .../AdminMeetingroomViewController.java       | 78 +++++++++++++++++++
 .../AdminNewMeetingroomViewController.java    | 26 +++++++
 .../AdminNewWorkspaceViewController.java      | 28 +++++++
 .../controllers/AdminViewSpaceController.java | 28 +++----
 .../AdminWorkspaceViewController.java         | 70 +++++++++++++++++
 .../elements/AdminMeetingroomElement.java     | 29 +++++++
 .../elements/AdminWorkspaceElement.java       | 28 +++++++
 .../models/DaoReplicator.java                 | 17 ++++
 .../werkplekkenfrontend/models/Facility.java  | 35 ---------
 .../werkplekkenfrontend/models/Floor.java     | 37 ---------
 .../werkplekkenfrontend/models/Space.java     | 33 ++++----
 .../admin-meetingroom-view.fxml               | 38 +++++++++
 .../werkplekkenfrontend/admin-space-view.fxml | 56 ++++---------
 .../admin-workspace-view.fxml                 | 33 ++++++++
 .../space-edit-meetingroom.fxml               | 30 +++++++
 .../space-edit-workspace.fxml                 | 29 +++++++
 ...m.fxml => space-view-new-meetingroom.fxml} |  2 +-
 ...ace.fxml => space-view-new-workspace.fxml} |  2 +-
 20 files changed, 498 insertions(+), 148 deletions(-)
 create mode 100644 src/main/java/com/example/werkplekkenfrontend/controllers/AdminMeetingroomViewController.java
 create mode 100644 src/main/java/com/example/werkplekkenfrontend/controllers/AdminNewMeetingroomViewController.java
 create mode 100644 src/main/java/com/example/werkplekkenfrontend/controllers/AdminNewWorkspaceViewController.java
 create mode 100644 src/main/java/com/example/werkplekkenfrontend/controllers/AdminWorkspaceViewController.java
 create mode 100644 src/main/java/com/example/werkplekkenfrontend/elements/AdminMeetingroomElement.java
 create mode 100644 src/main/java/com/example/werkplekkenfrontend/elements/AdminWorkspaceElement.java
 delete mode 100644 src/main/java/com/example/werkplekkenfrontend/models/Facility.java
 delete mode 100644 src/main/java/com/example/werkplekkenfrontend/models/Floor.java
 create mode 100644 src/main/resources/com/example/werkplekkenfrontend/admin-meetingroom-view.fxml
 create mode 100644 src/main/resources/com/example/werkplekkenfrontend/admin-workspace-view.fxml
 create mode 100644 src/main/resources/com/example/werkplekkenfrontend/space-edit-meetingroom.fxml
 create mode 100644 src/main/resources/com/example/werkplekkenfrontend/space-edit-workspace.fxml
 rename src/main/resources/com/example/werkplekkenfrontend/{space-view-edit-meetingroom.fxml => space-view-new-meetingroom.fxml} (98%)
 rename src/main/resources/com/example/werkplekkenfrontend/{space-view-edit-workspace.fxml => space-view-new-workspace.fxml} (98%)

diff --git a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminEditMeetingroomViewController.java b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminEditMeetingroomViewController.java
index 73941cf..1096987 100644
--- a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminEditMeetingroomViewController.java
+++ b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminEditMeetingroomViewController.java
@@ -1,11 +1,36 @@
 package com.example.werkplekkenfrontend.controllers;
 
 import com.example.werkplekkenfrontend.Main;
+import com.example.werkplekkenfrontend.models.DaoReplicator;
+import com.example.werkplekkenfrontend.models.Space;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
+import javafx.scene.control.TextArea;
+
+import java.util.UUID;
 
 public class AdminEditMeetingroomViewController implements ViewController{
 
+    public UUID spaceID = null;
+
+
+    @FXML
+    public TextArea facility;
+
+    @FXML
+    public  TextArea capacity;
+
+    @FXML
+    public  TextArea name;
+
+    private void updateMeetingroomDetails(Space space){
+        name.setText(space.getName());
+        capacity.setText(String.valueOf(space.getCapacity()));
+        facility.setText(space.getFacilities());
+
+    }
+
+
     @FXML
     void onApplyClick(ActionEvent event) {
         ViewController controller = Main.sceneController.showView("admin-space-view.fxml");
@@ -22,7 +47,8 @@ void onCancelClick(ActionEvent event) {
 
     @Override
     public void updateView() {
-
+            Space spaceFromDao = DaoReplicator.getMeetingroomFromID(UUID.randomUUID());
+            updateMeetingroomDetails(spaceFromDao);
     }
 
 }
diff --git a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminEditWorkspaceViewController.java b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminEditWorkspaceViewController.java
index 6f0f0a8..37cfe88 100644
--- a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminEditWorkspaceViewController.java
+++ b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminEditWorkspaceViewController.java
@@ -1,12 +1,29 @@
 package com.example.werkplekkenfrontend.controllers;
 
 import com.example.werkplekkenfrontend.Main;
+import com.example.werkplekkenfrontend.models.DaoReplicator;
+import com.example.werkplekkenfrontend.models.Space;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
+import javafx.scene.control.TextArea;
+
+import java.util.UUID;
 
 public class AdminEditWorkspaceViewController implements ViewController{
 
+    @FXML
+    private TextArea capacity;
+
+    @FXML
+    private TextArea name;
+
+
 
+    private void updateWorkspaceDetails(Space space){
+        name.setText(space.getName());
+        capacity.setText(String.valueOf(space.getCapacity()));
+
+    }
     @FXML
     void onApplyClick(ActionEvent event) {
         ViewController controller = Main.sceneController.showView("admin-space-view.fxml");
@@ -22,6 +39,8 @@ void onCancelClick(ActionEvent event) {
 
     @Override
     public void updateView() {
+        Space spaceFromDao = DaoReplicator.getWorkSpaceFromID(UUID.randomUUID());
+        updateWorkspaceDetails(spaceFromDao);
 
     }
 }
diff --git a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminMeetingroomViewController.java b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminMeetingroomViewController.java
new file mode 100644
index 0000000..cd54c5c
--- /dev/null
+++ b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminMeetingroomViewController.java
@@ -0,0 +1,78 @@
+package com.example.werkplekkenfrontend.controllers;
+
+import com.example.werkplekkenfrontend.Main;
+import com.example.werkplekkenfrontend.elements.AdminMeetingroomElement;
+import com.example.werkplekkenfrontend.models.Space;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.layout.VBox;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+public class AdminMeetingroomViewController implements ViewController{
+
+    @FXML
+    public VBox meetingrooms_container;
+
+    @FXML
+    void OnNewMeetingroomButtonClick(ActionEvent event) {
+        ViewController controller = Main.sceneController.showView("space-view-new-meetingroom.fxml");
+        controller.updateView();
+    }
+
+
+
+    private void showSpacesOnView(List<Space> spaces){
+        for(Space space : spaces){
+            AdminMeetingroomElement element = new AdminMeetingroomElement(this, space);
+            meetingrooms_container.getChildren().add(element.getMeetingroomBox());
+        }
+    }
+
+    @FXML
+    public void onEditMeetingRoomButtonClick(Space space) {
+        AdminEditMeetingroomViewController controller = (AdminEditMeetingroomViewController)Main.sceneController.showView("space-edit-meetingroom.fxml");
+        controller.spaceID = space.getId();
+        controller.updateView();
+
+    }
+
+    private List<Space> setupTestData(){
+        List<Space> testSpaces = new ArrayList<>();
+        Space vergaderruimte_1 = new Space(UUID.randomUUID(),10,"sponge", "vergaderingruimte_1");
+        testSpaces.add(vergaderruimte_1);
+        return testSpaces;
+    }
+
+
+
+    @Override
+    public void updateView() {
+        List<Space> spacesFromDao = setupTestData();
+        showSpacesOnView(spacesFromDao);
+
+    }
+
+    public void onEditWorkspaceButtonClick(Space space) {
+        AdminEditMeetingroomViewController controller = (AdminEditMeetingroomViewController) Main.sceneController.showView("space-edit-meetingroom.fxml");
+        controller.spaceID = space.getId();
+        controller.updateView();
+    }
+
+    @FXML
+    void onApplyClick(ActionEvent event) {
+        ViewController controller = Main.sceneController.showView("admin-space-view.fxml");
+        controller.updateView();
+
+    }
+
+    @FXML
+    void onCancelClick(ActionEvent event) {
+        ViewController controller = Main.sceneController.showView("admin-space-view.fxml");
+        controller.updateView();
+
+    }
+
+}
diff --git a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminNewMeetingroomViewController.java b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminNewMeetingroomViewController.java
new file mode 100644
index 0000000..ebf7121
--- /dev/null
+++ b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminNewMeetingroomViewController.java
@@ -0,0 +1,26 @@
+package com.example.werkplekkenfrontend.controllers;
+
+import com.example.werkplekkenfrontend.Main;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+
+public class AdminNewMeetingroomViewController implements ViewController {
+
+    @Override
+    public void updateView() {
+    }
+
+    @FXML
+    void onApplyClick(ActionEvent event) {
+        ViewController controller = Main.sceneController.showView("admin-space-view.fxml");
+        controller.updateView();
+
+    }
+
+    @FXML
+    void onCancelClick(ActionEvent event) {
+        ViewController controller = Main.sceneController.showView("admin-space-view.fxml");
+        controller.updateView();
+
+    }
+}
diff --git a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminNewWorkspaceViewController.java b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminNewWorkspaceViewController.java
new file mode 100644
index 0000000..113a071
--- /dev/null
+++ b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminNewWorkspaceViewController.java
@@ -0,0 +1,28 @@
+package com.example.werkplekkenfrontend.controllers;
+
+import com.example.werkplekkenfrontend.Main;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+
+public class AdminNewWorkspaceViewController implements ViewController {
+
+    @Override
+    public void updateView() {
+
+    }
+
+    @FXML
+    void onApplyClick(ActionEvent event) {
+        ViewController controller = Main.sceneController.showView("admin-space-view.fxml");
+        controller.updateView();
+
+    }
+
+    @FXML
+    void onCancelClick(ActionEvent event) {
+        ViewController controller = Main.sceneController.showView("admin-space-view.fxml");
+        controller.updateView();
+
+    }
+
+}
diff --git a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminViewSpaceController.java b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminViewSpaceController.java
index edf555c..ef37e93 100644
--- a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminViewSpaceController.java
+++ b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminViewSpaceController.java
@@ -7,35 +7,31 @@
 public class AdminViewSpaceController implements ViewController {
 
     @FXML
-    void OnNewMeetingroomButtonClick(ActionEvent event) {
-        ViewController controller = Main.sceneController.showView("space-view-edit-meetingroom.fxml");
+    void OnMeetingroomButtonClick(ActionEvent event) {
+        ViewController controller = Main.sceneController.showView("admin-meetingroom-view.fxml");
         controller.updateView();
 
     }
 
     @FXML
-    void OnNewWorkspaceButtonClick(ActionEvent event) {
-        ViewController controller = Main.sceneController.showView("space-view-edit-workspace.fxml");
+    void OnWorkspaceButtonClick(ActionEvent event) {
+        ViewController controller = Main.sceneController.showView("admin-workspace-view.fxml");
         controller.updateView();
-
-
     }
 
-    @FXML
-    void onEditMeetingRoomButtonClick(ActionEvent event) {
-        ViewController controller = Main.sceneController.showView("space-view-edit-meetingroom.fxml");
-        controller.updateView();
+    @Override
+    public void updateView() {
 
     }
 
-    @FXML
-    void onEditWorkspaceButtonClick(ActionEvent event) {
-        ViewController controller = Main.sceneController.showView("space-view-edit-workspace.fxml");
-        controller.updateView();
 
+    public void OnNewWorkspaceButtonClick(ActionEvent actionEvent) {
+        ViewController controller = Main.sceneController.showView("space-view-new-workspace.fxml");
+        controller.updateView();
     }
-    @Override
-    public void updateView() {
 
+    public void OnNewMeetingroomButtonClick(ActionEvent actionEvent) {
+        ViewController controller = Main.sceneController.showView("space-view-new-meetingroom.fxml");
+        controller.updateView();
     }
 }
diff --git a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminWorkspaceViewController.java b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminWorkspaceViewController.java
new file mode 100644
index 0000000..fdc2ddf
--- /dev/null
+++ b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminWorkspaceViewController.java
@@ -0,0 +1,70 @@
+package com.example.werkplekkenfrontend.controllers;
+
+import com.example.werkplekkenfrontend.Main;
+import com.example.werkplekkenfrontend.elements.AdminWorkspaceElement;
+import com.example.werkplekkenfrontend.models.Space;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.layout.VBox;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+public class AdminWorkspaceViewController implements ViewController{
+
+    @FXML
+    public VBox workspaces_container;
+
+
+    @FXML
+    void OnNewWorkspaceButtonClick(ActionEvent event) {
+        ViewController controller = Main.sceneController.showView("space-view-new-workspace.fxml");
+        controller.updateView();
+    }
+
+    private void showSpacesOnView(List<Space> spaces){
+        for(Space space : spaces){
+            AdminWorkspaceElement element = new AdminWorkspaceElement(this,space);
+            workspaces_container.getChildren().add(element.getWorkspaceBox());
+        }
+    }
+
+    @FXML
+    public void onEditWorkspaceButtonClick(Space space) {
+        ViewController controller = Main.sceneController.showView("space-edit-workspace.fxml");
+        controller.updateView();
+
+    }
+
+
+    @Override
+    public void updateView() {
+        List<Space> spacesFromDao = setupTestData();
+        showSpacesOnView(spacesFromDao);
+
+    }
+
+    public List<Space> setupTestData(){
+        List<Space> testSpaces = new ArrayList<>();
+        Space werkplek_1 = new Space(UUID.randomUUID(), 1,"werkplek_1");
+        testSpaces.add(werkplek_1);
+        return testSpaces;
+    }
+
+
+    @FXML
+    void onApplyClick(ActionEvent event) {
+        ViewController controller = Main.sceneController.showView("admin-space-view.fxml");
+        controller.updateView();
+
+    }
+
+    @FXML
+    void onCancelClick(ActionEvent event) {
+        ViewController controller = Main.sceneController.showView("admin-space-view.fxml");
+        controller.updateView();
+
+    }
+
+}
diff --git a/src/main/java/com/example/werkplekkenfrontend/elements/AdminMeetingroomElement.java b/src/main/java/com/example/werkplekkenfrontend/elements/AdminMeetingroomElement.java
new file mode 100644
index 0000000..a9c4581
--- /dev/null
+++ b/src/main/java/com/example/werkplekkenfrontend/elements/AdminMeetingroomElement.java
@@ -0,0 +1,29 @@
+package com.example.werkplekkenfrontend.elements;
+
+import com.example.werkplekkenfrontend.controllers.AdminMeetingroomViewController;
+import com.example.werkplekkenfrontend.models.Space;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.layout.HBox;
+
+public class AdminMeetingroomElement {
+
+    AdminMeetingroomViewController parent;
+
+    Space space;
+    HBox meetingroomBox;
+
+    public AdminMeetingroomElement(AdminMeetingroomViewController parent, Space space) {
+        this.parent = parent;
+        this.space = space;
+        Label name = new Label(space.getName());
+        Button edit = new Button("edit");
+        edit.setOnAction(actionEvent -> parent.onEditMeetingRoomButtonClick(this.space));
+        meetingroomBox = new HBox(name,edit);
+    }
+
+
+    public HBox getMeetingroomBox() {
+        return meetingroomBox;
+    }
+}
diff --git a/src/main/java/com/example/werkplekkenfrontend/elements/AdminWorkspaceElement.java b/src/main/java/com/example/werkplekkenfrontend/elements/AdminWorkspaceElement.java
new file mode 100644
index 0000000..e92db19
--- /dev/null
+++ b/src/main/java/com/example/werkplekkenfrontend/elements/AdminWorkspaceElement.java
@@ -0,0 +1,28 @@
+package com.example.werkplekkenfrontend.elements;
+
+import com.example.werkplekkenfrontend.controllers.AdminWorkspaceViewController;
+import com.example.werkplekkenfrontend.models.Space;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.layout.HBox;
+
+public class AdminWorkspaceElement {
+
+    AdminWorkspaceViewController parent;
+
+    Space space;
+    HBox workspaceBox;
+
+    public AdminWorkspaceElement(AdminWorkspaceViewController parent, Space space) {
+        this.parent = parent;
+        this.space = space;
+        Label name = new Label(space.getName());
+        Button edit = new Button("edit");
+        edit.setOnAction(actionEvent -> parent.onEditWorkspaceButtonClick(this.space));
+        workspaceBox = new HBox(name, edit);
+    }
+
+    public HBox getWorkspaceBox() {
+        return workspaceBox;
+    }
+}
diff --git a/src/main/java/com/example/werkplekkenfrontend/models/DaoReplicator.java b/src/main/java/com/example/werkplekkenfrontend/models/DaoReplicator.java
index bc75c9c..5ca2a0c 100644
--- a/src/main/java/com/example/werkplekkenfrontend/models/DaoReplicator.java
+++ b/src/main/java/com/example/werkplekkenfrontend/models/DaoReplicator.java
@@ -14,6 +14,23 @@ public static List<Building> getBuildings(){
         return testBuildings;
     }
 
+    public static List<Space> getSpaces(){
+        List<Space> testSpaces = new ArrayList<>();
+        Space werkplek_1 = new Space(UUID.randomUUID(), 1,"werkplek_1");
+        Space vergaderruimte_1 = new Space(UUID.randomUUID(),10,"sponge", "vergaderingruimte_1");
+        testSpaces.add(werkplek_1);
+        testSpaces.add(vergaderruimte_1);
+        return testSpaces;
+    }
+
+    public static Space getWorkSpaceFromID(UUID id){
+        return new Space(id, 1,"workspace_1");
+    }
+    public static Space getMeetingroomFromID(UUID id){
+        return new Space(id, 1,"sponge","meetingroom_1");
+    }
+
+
     public static Building getBuildingFromID(UUID id){
         return new Building(id, "Cool Kids Club", "IL2016", "Leiden", "naast het station");
     }
diff --git a/src/main/java/com/example/werkplekkenfrontend/models/Facility.java b/src/main/java/com/example/werkplekkenfrontend/models/Facility.java
deleted file mode 100644
index fa1080c..0000000
--- a/src/main/java/com/example/werkplekkenfrontend/models/Facility.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.example.werkplekkenfrontend.models;
-
-public class Facility {
-
-    String id;
-
-    String name;
-
-    int quantity;
-
-    Building building;
-
-    public Facility(String id, String name, int quantity, Building building) {
-        this.id = id;
-        this.name = name;
-        this.quantity = quantity;
-        this.building = building;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public int getQuantity() {
-        return quantity;
-    }
-
-    public Building getBuilding() {
-        return building;
-    }
-}
diff --git a/src/main/java/com/example/werkplekkenfrontend/models/Floor.java b/src/main/java/com/example/werkplekkenfrontend/models/Floor.java
deleted file mode 100644
index 81bccd3..0000000
--- a/src/main/java/com/example/werkplekkenfrontend/models/Floor.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.example.werkplekkenfrontend.models;
-
-import java.util.Set;
-
-public class Floor {
-
-    String id;
-
-    String Designation;
-
-    Building building;
-
-    Set<Space> spaces;
-
-    public Floor(String id, String designation, Building building, Set<Space> spaces) {
-        this.id = id;
-        Designation = designation;
-        this.building = building;
-        this.spaces = spaces;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public String getDesignation() {
-        return Designation;
-    }
-
-    public Building getBuilding() {
-        return building;
-    }
-
-    public Set<Space> getSpaces() {
-        return spaces;
-    }
-}
diff --git a/src/main/java/com/example/werkplekkenfrontend/models/Space.java b/src/main/java/com/example/werkplekkenfrontend/models/Space.java
index 5ba84b0..0edbe9c 100644
--- a/src/main/java/com/example/werkplekkenfrontend/models/Space.java
+++ b/src/main/java/com/example/werkplekkenfrontend/models/Space.java
@@ -1,37 +1,42 @@
 package com.example.werkplekkenfrontend.models;
 
-import java.util.Set;
 import java.util.UUID;
 
 public class Space {
     UUID id;
 
+    String name;
+
     int capacity;
 
-    Floor floor;
+    String Facilities;
 
-    Set<Facility> Facilities;
+    public Space(UUID id, int capacity, String facilities, String name) {
+        this.id = id;
+        this.capacity = capacity;
+        this.Facilities = facilities;
+        this.name = name;
+    }
 
-    public Space(UUID id, int capacity, Floor floor, Set<Facility> facilities) {
+    public Space(UUID id, int capacity,String name) {
         this.id = id;
         this.capacity = capacity;
-        this.floor = floor;
-        Facilities = facilities;
+        this.name = name;
     }
 
-    public UUID getId() {
-        return id;
+    public String getName() {
+        return name;
     }
 
-    public int getCapacity() {
-        return capacity;
+    public String getFacilities() {
+        return Facilities;
     }
 
-    public Floor getFloor() {
-        return floor;
+    public UUID getId() {
+        return id;
     }
 
-    public Set<Facility> getFacilities() {
-        return Facilities;
+    public int getCapacity() {
+        return capacity;
     }
 }
diff --git a/src/main/resources/com/example/werkplekkenfrontend/admin-meetingroom-view.fxml b/src/main/resources/com/example/werkplekkenfrontend/admin-meetingroom-view.fxml
new file mode 100644
index 0000000..4523d6f
--- /dev/null
+++ b/src/main/resources/com/example/werkplekkenfrontend/admin-meetingroom-view.fxml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.FlowPane?>
+<?import javafx.scene.layout.VBox?>
+
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="800.0" minWidth="1080.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.werkplekkenfrontend.controllers.AdminMeetingroomViewController">
+   <children>
+      <VBox prefHeight="56.0" prefWidth="600.0">
+         <children>
+            <Button mnemonicParsing="false" onAction="#OnNewMeetingroomButtonClick" prefHeight="25.0" prefWidth="152.0" text="New Vergaderruimte">
+               <VBox.margin>
+                  <Insets left="500.0" />
+               </VBox.margin>
+            </Button>
+         </children></VBox>
+      <FlowPane prefHeight="130.0" prefWidth="600.0">
+         <children>
+            <Label alignment="TOP_LEFT" contentDisplay="TOP" prefHeight="100.0" prefWidth="296.0" style="-fx-background-color: fffafa;" text="Vergaderruimte">
+               <FlowPane.margin>
+                  <Insets left="300.0" />
+               </FlowPane.margin>
+            </Label>
+         </children>
+         <padding>
+            <Insets left="110.0" />
+         </padding>
+      </FlowPane>
+      <FlowPane prefHeight="125.0" prefWidth="600.0">
+         <VBox.margin>
+            <Insets />
+         </VBox.margin>
+      </FlowPane>
+   </children>
+   <VBox fx:id="meetingrooms_container" prefHeight="345.0" prefWidth="1080.0" />
+</VBox>
diff --git a/src/main/resources/com/example/werkplekkenfrontend/admin-space-view.fxml b/src/main/resources/com/example/werkplekkenfrontend/admin-space-view.fxml
index 1040f4a..c7e2021 100644
--- a/src/main/resources/com/example/werkplekkenfrontend/admin-space-view.fxml
+++ b/src/main/resources/com/example/werkplekkenfrontend/admin-space-view.fxml
@@ -2,63 +2,33 @@
 
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.MenuItem?>
-<?import javafx.scene.control.SplitMenuButton?>
 <?import javafx.scene.layout.FlowPane?>
 <?import javafx.scene.layout.VBox?>
 
 <VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="800.0" minWidth="1080.0" xmlns="http://javafx.com/javafx/19"
       xmlns:fx="http://javafx.com/fxml/1"
       fx:controller="com.example.werkplekkenfrontend.controllers.AdminViewSpaceController">
-   <VBox prefHeight="56.0" prefWidth="600.0">
-      <Button mnemonicParsing="false" onAction="#OnNewWorkspaceButtonClick" prefHeight="25.0" prefWidth="152.0"
-              text="New Werkplek">
-         <VBox.margin>
-            <Insets bottom="10.0" left="500.0"/>
-         </VBox.margin>
-      </Button>
-      <Button mnemonicParsing="false" onAction="#OnNewMeetingroomButtonClick" prefHeight="25.0" prefWidth="152.0"
-              text="New Vergaderruimte">
-         <VBox.margin>
-            <Insets left="500.0"/>
-         </VBox.margin>
-      </Button>
-   </VBox>
+   <VBox prefHeight="56.0" prefWidth="600.0"/>
    <FlowPane prefHeight="130.0" prefWidth="600.0">
+      <children>
+         <Button mnemonicParsing="false" onAction="#OnWorkspaceButtonClick" prefHeight="169.0" prefWidth="762.0"
+                 text="Werkplekken"/>
+      </children>
       <padding>
          <Insets left="110.0"/>
       </padding>
-      <Label alignment="TOP_LEFT" prefHeight="100.0" prefWidth="298.0" style="-fx-background-color: fffafa;"
-             text="Werkplek">
-         <FlowPane.margin>
-            <Insets left="310.0"/>
-         </FlowPane.margin>
-      </Label>
-      <SplitMenuButton mnemonicParsing="false" text="options">
-         <items>
-            <MenuItem mnemonicParsing="false" text="Delete"/>
-            <MenuItem mnemonicParsing="false" onAction="#onEditWorkspaceButtonClick" text="Edit"/>
-            <MenuItem mnemonicParsing="false" text="Cancel"/>
-         </items>
-      </SplitMenuButton>
    </FlowPane>
    <FlowPane prefHeight="125.0" prefWidth="600.0">
+      <children>
+         <Button mnemonicParsing="false" onAction="#OnMeetingroomButtonClick" prefHeight="165.0" prefWidth="762.0"
+                 text="Vergaderruimtes">
+            <FlowPane.margin>
+               <Insets left="110.0" top="10.0"/>
+            </FlowPane.margin>
+         </Button>
+      </children>
       <VBox.margin>
          <Insets/>
       </VBox.margin>
-      <Label alignment="TOP_LEFT" contentDisplay="TOP" prefHeight="100.0" prefWidth="296.0"
-             style="-fx-background-color: fffafa;" text="Vergaderruimte">
-         <FlowPane.margin>
-            <Insets left="420.0"/>
-         </FlowPane.margin>
-      </Label>
-      <SplitMenuButton mnemonicParsing="false" text="options">
-         <items>
-            <MenuItem mnemonicParsing="false" text="Delete"/>
-            <MenuItem mnemonicParsing="false" onAction="#onEditMeetingRoomButtonClick" text="Edit"/>
-            <MenuItem mnemonicParsing="false" text="Cancel"/>
-         </items>
-      </SplitMenuButton>
    </FlowPane>
 </VBox>
diff --git a/src/main/resources/com/example/werkplekkenfrontend/admin-workspace-view.fxml b/src/main/resources/com/example/werkplekkenfrontend/admin-workspace-view.fxml
new file mode 100644
index 0000000..47647e1
--- /dev/null
+++ b/src/main/resources/com/example/werkplekkenfrontend/admin-workspace-view.fxml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.FlowPane?>
+<?import javafx.scene.layout.VBox?>
+
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="800.0" minWidth="1080.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.werkplekkenfrontend.controllers.AdminWorkspaceViewController">
+   <VBox prefHeight="56.0" prefWidth="600.0">
+      <Button mnemonicParsing="false" onAction="#OnNewWorkspaceButtonClick" prefHeight="25.0" prefWidth="152.0" text="New Werkplek">
+         <VBox.margin>
+            <Insets bottom="10.0" left="500.0" />
+         </VBox.margin>
+      </Button>
+   </VBox>
+   <FlowPane prefHeight="130.0" prefWidth="600.0">
+      <padding>
+         <Insets left="110.0" />
+      </padding>
+      <Label alignment="TOP_LEFT" prefHeight="100.0" prefWidth="298.0" style="-fx-background-color: fffafa;" text="Werkplek">
+         <FlowPane.margin>
+            <Insets left="310.0" />
+         </FlowPane.margin>
+      </Label>
+   </FlowPane>
+   <FlowPane prefHeight="125.0" prefWidth="600.0">
+      <VBox.margin>
+         <Insets />
+      </VBox.margin>
+   </FlowPane>
+   <VBox fx:id="workspaces_container" prefHeight="345.0" prefWidth="1080.0" />
+</VBox>
diff --git a/src/main/resources/com/example/werkplekkenfrontend/space-edit-meetingroom.fxml b/src/main/resources/com/example/werkplekkenfrontend/space-edit-meetingroom.fxml
new file mode 100644
index 0000000..1dafd82
--- /dev/null
+++ b/src/main/resources/com/example/werkplekkenfrontend/space-edit-meetingroom.fxml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+
+<VBox alignment="TOP_CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" spacing="20.0" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/19" fx:controller="com.example.werkplekkenfrontend.controllers.AdminEditMeetingroomViewController">
+    <VBox>
+        <HBox alignment="CENTER" prefHeight="102.0" prefWidth="600.0" spacing="200" xmlns:fx="http://javafx.com/fxml">
+            <padding>
+                <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
+            </padding>
+            <Button cancelButton="true" onAction="#onCancelClick" prefHeight="50" prefWidth="200" text="Cancel" />
+            <Button defaultButton="true" onAction="#onApplyClick" prefHeight="80" prefWidth="80" text="Apply" />
+        </HBox>
+
+        <VBox>
+            <TextArea fx:id="name" prefHeight="23.0" prefWidth="600.0" />
+            <HBox />
+            <TextArea fx:id="capacity" prefHeight="23.0" prefWidth="600.0">
+            <VBox.margin>
+               <Insets top="20.0" />
+            </VBox.margin></TextArea>
+        </VBox>
+    </VBox>
+   <TextArea fx:id="facility" prefHeight="23.0" prefWidth="600.0" />
+
+</VBox>
diff --git a/src/main/resources/com/example/werkplekkenfrontend/space-edit-workspace.fxml b/src/main/resources/com/example/werkplekkenfrontend/space-edit-workspace.fxml
new file mode 100644
index 0000000..17de411
--- /dev/null
+++ b/src/main/resources/com/example/werkplekkenfrontend/space-edit-workspace.fxml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+
+<VBox alignment="TOP_CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" spacing="20.0" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/19" fx:controller="com.example.werkplekkenfrontend.controllers.AdminEditWorkspaceViewController">
+    <VBox>
+        <HBox alignment="CENTER" prefHeight="102.0" prefWidth="600.0" spacing="200" xmlns:fx="http://javafx.com/fxml">
+            <padding>
+                <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
+            </padding>
+            <Button cancelButton="true" onAction="#onCancelClick" prefHeight="50" prefWidth="200" text="Cancel" />
+            <Button defaultButton="true" onAction="#onApplyClick" prefHeight="80" prefWidth="80" text="Apply" />
+        </HBox>
+
+        <VBox>
+            <TextArea fx:id="name" prefHeight="23.0" prefWidth="600.0" />
+            <HBox />
+            <TextArea fx:id="capacity" prefHeight="23.0" prefWidth="600.0">
+            <VBox.margin>
+               <Insets top="20.0" />
+            </VBox.margin></TextArea>
+        </VBox>
+    </VBox>
+
+</VBox>
diff --git a/src/main/resources/com/example/werkplekkenfrontend/space-view-edit-meetingroom.fxml b/src/main/resources/com/example/werkplekkenfrontend/space-view-new-meetingroom.fxml
similarity index 98%
rename from src/main/resources/com/example/werkplekkenfrontend/space-view-edit-meetingroom.fxml
rename to src/main/resources/com/example/werkplekkenfrontend/space-view-new-meetingroom.fxml
index 5c5dc4e..be7ef7b 100644
--- a/src/main/resources/com/example/werkplekkenfrontend/space-view-edit-meetingroom.fxml
+++ b/src/main/resources/com/example/werkplekkenfrontend/space-view-new-meetingroom.fxml
@@ -10,7 +10,7 @@
 
 <VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="800.0" minWidth="1080.0" xmlns="http://javafx.com/javafx/19"
       xmlns:fx="http://javafx.com/fxml/1"
-      fx:controller="com.example.werkplekkenfrontend.controllers.AdminEditMeetingroomViewController">
+      fx:controller="com.example.werkplekkenfrontend.controllers.AdminNewMeetingroomViewController">
    <HBox alignment="CENTER" prefHeight="73.0" prefWidth="600.0" spacing="200">
       <padding>
          <Insets bottom="20.0" left="20.0" right="20.0" top="20.0"/>
diff --git a/src/main/resources/com/example/werkplekkenfrontend/space-view-edit-workspace.fxml b/src/main/resources/com/example/werkplekkenfrontend/space-view-new-workspace.fxml
similarity index 98%
rename from src/main/resources/com/example/werkplekkenfrontend/space-view-edit-workspace.fxml
rename to src/main/resources/com/example/werkplekkenfrontend/space-view-new-workspace.fxml
index 349890a..ca761da 100644
--- a/src/main/resources/com/example/werkplekkenfrontend/space-view-edit-workspace.fxml
+++ b/src/main/resources/com/example/werkplekkenfrontend/space-view-new-workspace.fxml
@@ -10,7 +10,7 @@
 
 <VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0"
       prefWidth="1080.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1"
-      fx:controller="com.example.werkplekkenfrontend.controllers.AdminEditWorkspaceViewController">
+      fx:controller="com.example.werkplekkenfrontend.controllers.AdminNewWorkspaceViewController">
    <HBox alignment="CENTER" prefHeight="73.0" prefWidth="600.0" spacing="200">
       <padding>
          <Insets bottom="20.0" left="20.0" right="20.0" top="20.0"/>

From 3fe6e3170c4072758fa04c1199fe9c80e189fbe7 Mon Sep 17 00:00:00 2001
From: Hassan <s1136140@student.hsleiden.nl>
Date: Sat, 5 Nov 2022 18:04:53 +0100
Subject: [PATCH 03/11] Added: nav bar in spaces, styling fix: return button

---
 .../controllers/AdminEditMeetingroomViewController.java     | 4 ++--
 .../controllers/AdminEditWorkspaceViewController.java       | 4 ++--
 .../controllers/AdminMeetingroomViewController.java         | 4 ++++
 .../controllers/AdminNewMeetingroomViewController.java      | 4 ++--
 .../controllers/AdminNewWorkspaceViewController.java        | 4 ++--
 .../controllers/AdminViewSpaceController.java               | 5 +++++
 .../controllers/AdminWorkspaceViewController.java           | 4 ++++
 .../elements/AdminMeetingroomElement.java                   | 6 ++++++
 .../werkplekkenfrontend/elements/AdminWorkspaceElement.java | 6 ++++++
 .../example/werkplekkenfrontend/admin-meetingroom-view.fxml | 2 +-
 .../com/example/werkplekkenfrontend/admin-space-view.fxml   | 2 +-
 .../example/werkplekkenfrontend/admin-workspace-view.fxml   | 2 +-
 12 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminEditMeetingroomViewController.java b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminEditMeetingroomViewController.java
index 1096987..20666b5 100644
--- a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminEditMeetingroomViewController.java
+++ b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminEditMeetingroomViewController.java
@@ -33,14 +33,14 @@ private void updateMeetingroomDetails(Space space){
 
     @FXML
     void onApplyClick(ActionEvent event) {
-        ViewController controller = Main.sceneController.showView("admin-space-view.fxml");
+        ViewController controller = Main.sceneController.showView("admin-meetingroom-view.fxml");
         controller.updateView();
 
     }
 
     @FXML
     void onCancelClick(ActionEvent event) {
-        ViewController controller = Main.sceneController.showView("admin-space-view.fxml");
+        ViewController controller = Main.sceneController.showView("admin-meetingroom-view.fxml");
         controller.updateView();
 
     }
diff --git a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminEditWorkspaceViewController.java b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminEditWorkspaceViewController.java
index 37cfe88..5bff4b7 100644
--- a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminEditWorkspaceViewController.java
+++ b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminEditWorkspaceViewController.java
@@ -26,14 +26,14 @@ private void updateWorkspaceDetails(Space space){
     }
     @FXML
     void onApplyClick(ActionEvent event) {
-        ViewController controller = Main.sceneController.showView("admin-space-view.fxml");
+        ViewController controller = Main.sceneController.showView("admin-workspace-view.fxml");
         controller.updateView();
 
     }
 
     @FXML
     void onCancelClick(ActionEvent event) {
-        ViewController controller = Main.sceneController.showView("admin-space-view.fxml");
+        ViewController controller = Main.sceneController.showView("admin-workspace-view.fxml");
         controller.updateView();
     }
 
diff --git a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminMeetingroomViewController.java b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminMeetingroomViewController.java
index cd54c5c..88b6b41 100644
--- a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminMeetingroomViewController.java
+++ b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminMeetingroomViewController.java
@@ -2,6 +2,7 @@
 
 import com.example.werkplekkenfrontend.Main;
 import com.example.werkplekkenfrontend.elements.AdminMeetingroomElement;
+import com.example.werkplekkenfrontend.elements.NavBarElement;
 import com.example.werkplekkenfrontend.models.Space;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
@@ -13,6 +14,8 @@
 
 public class AdminMeetingroomViewController implements ViewController{
 
+    @FXML
+    public VBox main_container;
     @FXML
     public VBox meetingrooms_container;
 
@@ -52,6 +55,7 @@ private List<Space> setupTestData(){
     public void updateView() {
         List<Space> spacesFromDao = setupTestData();
         showSpacesOnView(spacesFromDao);
+        main_container.getChildren().add(new NavBarElement().getBuildingBox());
 
     }
 
diff --git a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminNewMeetingroomViewController.java b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminNewMeetingroomViewController.java
index ebf7121..1111e39 100644
--- a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminNewMeetingroomViewController.java
+++ b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminNewMeetingroomViewController.java
@@ -12,14 +12,14 @@ public void updateView() {
 
     @FXML
     void onApplyClick(ActionEvent event) {
-        ViewController controller = Main.sceneController.showView("admin-space-view.fxml");
+        ViewController controller = Main.sceneController.showView("admin-meetingroom-view.fxml");
         controller.updateView();
 
     }
 
     @FXML
     void onCancelClick(ActionEvent event) {
-        ViewController controller = Main.sceneController.showView("admin-space-view.fxml");
+        ViewController controller = Main.sceneController.showView("admin-meetingroom-view.fxml");
         controller.updateView();
 
     }
diff --git a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminNewWorkspaceViewController.java b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminNewWorkspaceViewController.java
index 113a071..fb91ae8 100644
--- a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminNewWorkspaceViewController.java
+++ b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminNewWorkspaceViewController.java
@@ -13,14 +13,14 @@ public void updateView() {
 
     @FXML
     void onApplyClick(ActionEvent event) {
-        ViewController controller = Main.sceneController.showView("admin-space-view.fxml");
+        ViewController controller = Main.sceneController.showView("admin-workspace-view.fxml");
         controller.updateView();
 
     }
 
     @FXML
     void onCancelClick(ActionEvent event) {
-        ViewController controller = Main.sceneController.showView("admin-space-view.fxml");
+        ViewController controller = Main.sceneController.showView("admin-workspace-view.fxml");
         controller.updateView();
 
     }
diff --git a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminViewSpaceController.java b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminViewSpaceController.java
index ef37e93..798f037 100644
--- a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminViewSpaceController.java
+++ b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminViewSpaceController.java
@@ -1,11 +1,15 @@
 package com.example.werkplekkenfrontend.controllers;
 
 import com.example.werkplekkenfrontend.Main;
+import com.example.werkplekkenfrontend.elements.NavBarElement;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
+import javafx.scene.layout.VBox;
 
 public class AdminViewSpaceController implements ViewController {
 
+    @FXML
+    public VBox main_container;
     @FXML
     void OnMeetingroomButtonClick(ActionEvent event) {
         ViewController controller = Main.sceneController.showView("admin-meetingroom-view.fxml");
@@ -21,6 +25,7 @@ void OnWorkspaceButtonClick(ActionEvent event) {
 
     @Override
     public void updateView() {
+        main_container.getChildren().add(new NavBarElement().getBuildingBox());
 
     }
 
diff --git a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminWorkspaceViewController.java b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminWorkspaceViewController.java
index fdc2ddf..7fe4363 100644
--- a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminWorkspaceViewController.java
+++ b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminWorkspaceViewController.java
@@ -2,6 +2,7 @@
 
 import com.example.werkplekkenfrontend.Main;
 import com.example.werkplekkenfrontend.elements.AdminWorkspaceElement;
+import com.example.werkplekkenfrontend.elements.NavBarElement;
 import com.example.werkplekkenfrontend.models.Space;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
@@ -16,6 +17,8 @@ public class AdminWorkspaceViewController implements ViewController{
     @FXML
     public VBox workspaces_container;
 
+    @FXML
+    public VBox main_container;
 
     @FXML
     void OnNewWorkspaceButtonClick(ActionEvent event) {
@@ -42,6 +45,7 @@ public void onEditWorkspaceButtonClick(Space space) {
     public void updateView() {
         List<Space> spacesFromDao = setupTestData();
         showSpacesOnView(spacesFromDao);
+        main_container.getChildren().add(new NavBarElement().getBuildingBox());
 
     }
 
diff --git a/src/main/java/com/example/werkplekkenfrontend/elements/AdminMeetingroomElement.java b/src/main/java/com/example/werkplekkenfrontend/elements/AdminMeetingroomElement.java
index a9c4581..f994068 100644
--- a/src/main/java/com/example/werkplekkenfrontend/elements/AdminMeetingroomElement.java
+++ b/src/main/java/com/example/werkplekkenfrontend/elements/AdminMeetingroomElement.java
@@ -17,9 +17,15 @@ public AdminMeetingroomElement(AdminMeetingroomViewController parent, Space spac
         this.parent = parent;
         this.space = space;
         Label name = new Label(space.getName());
+        name.setPrefHeight(50);
+        name.setPrefWidth(650);
         Button edit = new Button("edit");
+        edit.setPrefWidth(50);
+        edit.setPrefHeight(50);
         edit.setOnAction(actionEvent -> parent.onEditMeetingRoomButtonClick(this.space));
         meetingroomBox = new HBox(name,edit);
+        meetingroomBox.setMaxWidth(800);
+        meetingroomBox.setStyle("-fx-padding: 50; -fx-border-color: black");
     }
 
 
diff --git a/src/main/java/com/example/werkplekkenfrontend/elements/AdminWorkspaceElement.java b/src/main/java/com/example/werkplekkenfrontend/elements/AdminWorkspaceElement.java
index e92db19..7835cec 100644
--- a/src/main/java/com/example/werkplekkenfrontend/elements/AdminWorkspaceElement.java
+++ b/src/main/java/com/example/werkplekkenfrontend/elements/AdminWorkspaceElement.java
@@ -17,9 +17,15 @@ public AdminWorkspaceElement(AdminWorkspaceViewController parent, Space space) {
         this.parent = parent;
         this.space = space;
         Label name = new Label(space.getName());
+        name.setPrefHeight(50);
+        name.setPrefWidth(650);
         Button edit = new Button("edit");
+        edit.setPrefWidth(50);
+        edit.setPrefHeight(50);
         edit.setOnAction(actionEvent -> parent.onEditWorkspaceButtonClick(this.space));
         workspaceBox = new HBox(name, edit);
+        workspaceBox.setMaxWidth(800);
+        workspaceBox.setStyle("-fx-padding: 50; -fx-border-color: black");
     }
 
     public HBox getWorkspaceBox() {
diff --git a/src/main/resources/com/example/werkplekkenfrontend/admin-meetingroom-view.fxml b/src/main/resources/com/example/werkplekkenfrontend/admin-meetingroom-view.fxml
index 4523d6f..bebf233 100644
--- a/src/main/resources/com/example/werkplekkenfrontend/admin-meetingroom-view.fxml
+++ b/src/main/resources/com/example/werkplekkenfrontend/admin-meetingroom-view.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.layout.FlowPane?>
 <?import javafx.scene.layout.VBox?>
 
-<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="800.0" minWidth="1080.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.werkplekkenfrontend.controllers.AdminMeetingroomViewController">
+<VBox fx:id="main_container" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="800.0" minWidth="1080.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.werkplekkenfrontend.controllers.AdminMeetingroomViewController">
    <children>
       <VBox prefHeight="56.0" prefWidth="600.0">
          <children>
diff --git a/src/main/resources/com/example/werkplekkenfrontend/admin-space-view.fxml b/src/main/resources/com/example/werkplekkenfrontend/admin-space-view.fxml
index c7e2021..e510885 100644
--- a/src/main/resources/com/example/werkplekkenfrontend/admin-space-view.fxml
+++ b/src/main/resources/com/example/werkplekkenfrontend/admin-space-view.fxml
@@ -5,7 +5,7 @@
 <?import javafx.scene.layout.FlowPane?>
 <?import javafx.scene.layout.VBox?>
 
-<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="800.0" minWidth="1080.0" xmlns="http://javafx.com/javafx/19"
+<VBox fx:id="main_container" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="800.0" minWidth="1080.0" xmlns="http://javafx.com/javafx/19"
       xmlns:fx="http://javafx.com/fxml/1"
       fx:controller="com.example.werkplekkenfrontend.controllers.AdminViewSpaceController">
    <VBox prefHeight="56.0" prefWidth="600.0"/>
diff --git a/src/main/resources/com/example/werkplekkenfrontend/admin-workspace-view.fxml b/src/main/resources/com/example/werkplekkenfrontend/admin-workspace-view.fxml
index 47647e1..0e3cc21 100644
--- a/src/main/resources/com/example/werkplekkenfrontend/admin-workspace-view.fxml
+++ b/src/main/resources/com/example/werkplekkenfrontend/admin-workspace-view.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.layout.FlowPane?>
 <?import javafx.scene.layout.VBox?>
 
-<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="800.0" minWidth="1080.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.werkplekkenfrontend.controllers.AdminWorkspaceViewController">
+<VBox fx:id="main_container" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="800.0" minWidth="1080.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.werkplekkenfrontend.controllers.AdminWorkspaceViewController">
    <VBox prefHeight="56.0" prefWidth="600.0">
       <Button mnemonicParsing="false" onAction="#OnNewWorkspaceButtonClick" prefHeight="25.0" prefWidth="152.0" text="New Werkplek">
          <VBox.margin>

From d8df6858197de5ae5f3ccda3896eaa8de55559ef Mon Sep 17 00:00:00 2001
From: Hassan <s1136140@student.hsleiden.nl>
Date: Sat, 5 Nov 2022 18:30:44 +0100
Subject: [PATCH 04/11] Added: cancel button

---
 .../admin-meetingroom-view.fxml               | 58 +++++++++----------
 .../werkplekkenfrontend/admin-space-view.fxml |  4 --
 .../admin-workspace-view.fxml                 |  1 +
 3 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/src/main/resources/com/example/werkplekkenfrontend/admin-meetingroom-view.fxml b/src/main/resources/com/example/werkplekkenfrontend/admin-meetingroom-view.fxml
index bebf233..88bd947 100644
--- a/src/main/resources/com/example/werkplekkenfrontend/admin-meetingroom-view.fxml
+++ b/src/main/resources/com/example/werkplekkenfrontend/admin-meetingroom-view.fxml
@@ -6,33 +6,33 @@
 <?import javafx.scene.layout.FlowPane?>
 <?import javafx.scene.layout.VBox?>
 
-<VBox fx:id="main_container" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="800.0" minWidth="1080.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.werkplekkenfrontend.controllers.AdminMeetingroomViewController">
-   <children>
-      <VBox prefHeight="56.0" prefWidth="600.0">
-         <children>
-            <Button mnemonicParsing="false" onAction="#OnNewMeetingroomButtonClick" prefHeight="25.0" prefWidth="152.0" text="New Vergaderruimte">
-               <VBox.margin>
-                  <Insets left="500.0" />
-               </VBox.margin>
-            </Button>
-         </children></VBox>
-      <FlowPane prefHeight="130.0" prefWidth="600.0">
-         <children>
-            <Label alignment="TOP_LEFT" contentDisplay="TOP" prefHeight="100.0" prefWidth="296.0" style="-fx-background-color: fffafa;" text="Vergaderruimte">
-               <FlowPane.margin>
-                  <Insets left="300.0" />
-               </FlowPane.margin>
-            </Label>
-         </children>
-         <padding>
-            <Insets left="110.0" />
-         </padding>
-      </FlowPane>
-      <FlowPane prefHeight="125.0" prefWidth="600.0">
-         <VBox.margin>
-            <Insets />
-         </VBox.margin>
-      </FlowPane>
-   </children>
-   <VBox fx:id="meetingrooms_container" prefHeight="345.0" prefWidth="1080.0" />
+<VBox fx:id="main_container" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="800.0" minWidth="1080.0"
+      xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1"
+      fx:controller="com.example.werkplekkenfrontend.controllers.AdminMeetingroomViewController">
+   <VBox prefHeight="56.0" prefWidth="600.0">
+      <Button text="Cancel" onAction="#onCancelClick" cancelButton="true" prefHeight="50" prefWidth="200"/>
+         <Button mnemonicParsing="false" onAction="#OnNewMeetingroomButtonClick" prefHeight="25.0" prefWidth="152.0"
+                 text="New Vergaderruimte">
+            <VBox.margin>
+               <Insets left="500.0"/>
+            </VBox.margin>
+         </Button>
+   </VBox>
+   <FlowPane prefHeight="130.0" prefWidth="600.0">
+         <Label alignment="TOP_LEFT" contentDisplay="TOP" prefHeight="100.0" prefWidth="296.0"
+                style="-fx-background-color: fffafa;" text="Vergaderruimte">
+            <FlowPane.margin>
+               <Insets left="300.0"/>
+            </FlowPane.margin>
+         </Label>
+      <padding>
+         <Insets left="110.0"/>
+      </padding>
+   </FlowPane>
+   <FlowPane prefHeight="125.0" prefWidth="600.0">
+      <VBox.margin>
+         <Insets/>
+      </VBox.margin>
+   </FlowPane>
+   <VBox fx:id="meetingrooms_container" prefHeight="345.0" prefWidth="1080.0"/>
 </VBox>
diff --git a/src/main/resources/com/example/werkplekkenfrontend/admin-space-view.fxml b/src/main/resources/com/example/werkplekkenfrontend/admin-space-view.fxml
index e510885..acdba52 100644
--- a/src/main/resources/com/example/werkplekkenfrontend/admin-space-view.fxml
+++ b/src/main/resources/com/example/werkplekkenfrontend/admin-space-view.fxml
@@ -10,23 +10,19 @@
       fx:controller="com.example.werkplekkenfrontend.controllers.AdminViewSpaceController">
    <VBox prefHeight="56.0" prefWidth="600.0"/>
    <FlowPane prefHeight="130.0" prefWidth="600.0">
-      <children>
          <Button mnemonicParsing="false" onAction="#OnWorkspaceButtonClick" prefHeight="169.0" prefWidth="762.0"
                  text="Werkplekken"/>
-      </children>
       <padding>
          <Insets left="110.0"/>
       </padding>
    </FlowPane>
    <FlowPane prefHeight="125.0" prefWidth="600.0">
-      <children>
          <Button mnemonicParsing="false" onAction="#OnMeetingroomButtonClick" prefHeight="165.0" prefWidth="762.0"
                  text="Vergaderruimtes">
             <FlowPane.margin>
                <Insets left="110.0" top="10.0"/>
             </FlowPane.margin>
          </Button>
-      </children>
       <VBox.margin>
          <Insets/>
       </VBox.margin>
diff --git a/src/main/resources/com/example/werkplekkenfrontend/admin-workspace-view.fxml b/src/main/resources/com/example/werkplekkenfrontend/admin-workspace-view.fxml
index 0e3cc21..6f73411 100644
--- a/src/main/resources/com/example/werkplekkenfrontend/admin-workspace-view.fxml
+++ b/src/main/resources/com/example/werkplekkenfrontend/admin-workspace-view.fxml
@@ -8,6 +8,7 @@
 
 <VBox fx:id="main_container" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="800.0" minWidth="1080.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.werkplekkenfrontend.controllers.AdminWorkspaceViewController">
    <VBox prefHeight="56.0" prefWidth="600.0">
+      <Button text="Cancel" onAction="#onCancelClick" cancelButton="true" prefHeight="50" prefWidth="200"/>
       <Button mnemonicParsing="false" onAction="#OnNewWorkspaceButtonClick" prefHeight="25.0" prefWidth="152.0" text="New Werkplek">
          <VBox.margin>
             <Insets bottom="10.0" left="500.0" />

From ec63ed36eb57dcf0dab845ba3862434270efa865 Mon Sep 17 00:00:00 2001
From: Anisha2002 <45850205+Anisha2002@users.noreply.github.com>
Date: Sun, 6 Nov 2022 15:55:48 +0100
Subject: [PATCH 05/11] Change: getcurrentuser for the AccountViewController

---
 .../controllers/AccountViewController.java      | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/example/werkplekkenfrontend/controllers/AccountViewController.java b/src/main/java/com/example/werkplekkenfrontend/controllers/AccountViewController.java
index 914291e..a56eb74 100644
--- a/src/main/java/com/example/werkplekkenfrontend/controllers/AccountViewController.java
+++ b/src/main/java/com/example/werkplekkenfrontend/controllers/AccountViewController.java
@@ -1,5 +1,6 @@
 package com.example.werkplekkenfrontend.controllers;
 
+import com.example.werkplekkenfrontend.daos.UserDao;
 import com.example.werkplekkenfrontend.elements.NavBarElement;
 import com.example.werkplekkenfrontend.models.DaoReplicator;
 import com.example.werkplekkenfrontend.models.User;
@@ -17,12 +18,20 @@ public class AccountViewController implements ViewController{
     public Label firstName;
     public Label lastName;
     public Label email;
+    private User currentUser = null;
 
     private void displayUserInfo(String id){
-        User user = DaoReplicator.getUserInfoFromID(id);
-        firstName.setText(user.getName());
-        lastName.setText(user.getLastName());
-        email.setText(user.getEmail());
+        UserDao dao = new UserDao();
+        currentUser = dao.getCurrent();
+
+        firstName.setText(currentUser.getName());
+        lastName.setText(currentUser.getLastName());
+        email.setText(currentUser.getEmail());
+
+        System.out.println(currentUser);
+        System.out.println("current mf: " + currentUser.getName());
+        System.out.println("mail: " + currentUser.email);
+
     }
 
     public void onLogOutClick() {

From 144c51ef995b1bc558478e3dbeab5c6879df3ad0 Mon Sep 17 00:00:00 2001
From: Hassan <s1136140@student.hsleiden.nl>
Date: Sun, 6 Nov 2022 17:39:34 +0100
Subject: [PATCH 06/11] Added: SpaceDao.java

---
 .../werkplekkenfrontend/daos/SpaceDao.java    | 95 +++++++++++++++++++
 1 file changed, 95 insertions(+)
 create mode 100644 src/main/java/com/example/werkplekkenfrontend/daos/SpaceDao.java

diff --git a/src/main/java/com/example/werkplekkenfrontend/daos/SpaceDao.java b/src/main/java/com/example/werkplekkenfrontend/daos/SpaceDao.java
new file mode 100644
index 0000000..0aa4863
--- /dev/null
+++ b/src/main/java/com/example/werkplekkenfrontend/daos/SpaceDao.java
@@ -0,0 +1,95 @@
+package com.example.werkplekkenfrontend.daos;
+
+import com.example.werkplekkenfrontend.models.Space;
+import com.example.werkplekkenfrontend.models.User;
+import com.example.werkplekkenfrontend.project_settings;
+import com.example.werkplekkenfrontend.services.HttpService;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.util.ArrayList;
+import java.util.UUID;
+
+public class SpaceDao implements Dao<Space> {
+
+        public Space getCurrent() {
+            HttpService http = new HttpService();
+            String url = project_settings.baseURL + "/api/user";
+            String response = http.getWithURL(url);
+            ObjectMapper mapper = new ObjectMapper();
+            Space space = null;
+            try {
+                space = mapper.readValue(response, Space.class);
+            } catch (Exception e) {
+                e.printStackTrace();
+            };
+            return space;
+        }
+
+        @Override
+        public ArrayList<Space> getAll() {
+            HttpService http = new HttpService();
+            String url = project_settings.baseURL + "/api/space";
+            String response = http.getWithURL(url);
+            ObjectMapper mapper = new ObjectMapper();
+            ArrayList<Space> spaces = null;
+            try {
+                spaces = mapper.readValue(response, new TypeReference<ArrayList<Space>>(){});
+            } catch (Exception e) {
+                e.printStackTrace();
+            };
+            return spaces;
+        }
+
+        @Override
+        public Space get(UUID id) {
+            HttpService http = new HttpService();
+            String url = project_settings.baseURL + "/api/space/" + id;
+            String response = http.getWithURL(url);
+            ObjectMapper mapper = new ObjectMapper();
+            Space space = null;
+            try {
+                space = mapper.readValue(response, Space.class);
+            } catch (Exception e) {
+                e.printStackTrace();
+            };
+            return space;
+        }
+
+        @Override
+        public int post(Space object) {
+            HttpService http = new HttpService();
+            String url = project_settings.baseURL + "/api/space";
+            ObjectMapper mapper = new ObjectMapper();
+            String json = null;
+            try {
+                json = mapper.writeValueAsString(object);
+            } catch (Exception e) {
+                e.printStackTrace();
+                return 400;
+            }
+            return http.postWithURLandJSONreturnsCode(url, json);
+        }
+
+        @Override
+        public int patch(Space object) {
+            HttpService http = new HttpService();
+            String url = project_settings.baseURL + "/api/space/" + object.getId();
+            ObjectMapper mapper = new ObjectMapper();
+            String json = null;
+            try {
+                json = mapper.writeValueAsString(object);
+            } catch (Exception e) {
+                e.printStackTrace();
+                return 400;
+            }
+            return http.patchWithURL(url, json);
+        }
+
+        @Override
+        public int delete(Space object) {
+            HttpService http = new HttpService();
+            String url = project_settings.baseURL + "/api/space/" + object.getId();
+            return http.deleteWithURL(url);
+        }
+    }

From d122640b7402e3a1b8c52fe23fca2ad71fa884d2 Mon Sep 17 00:00:00 2001
From: Hassan <s1136140@student.hsleiden.nl>
Date: Sun, 6 Nov 2022 21:12:23 +0100
Subject: [PATCH 07/11] added: facility model

---
 .../werkplekkenfrontend/models/Facility.java  | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 src/main/java/com/example/werkplekkenfrontend/models/Facility.java

diff --git a/src/main/java/com/example/werkplekkenfrontend/models/Facility.java b/src/main/java/com/example/werkplekkenfrontend/models/Facility.java
new file mode 100644
index 0000000..df636e0
--- /dev/null
+++ b/src/main/java/com/example/werkplekkenfrontend/models/Facility.java
@@ -0,0 +1,34 @@
+package com.example.werkplekkenfrontend.models;
+
+public class Facility {
+    private String id;
+
+    private String name;
+
+    private int quantity;
+
+    private Building building;
+
+    public Facility(String id, String name, int quantity, Building building) {
+        this.id = id;
+        this.name = name;
+        this.quantity = quantity;
+        this.building = building;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getQuantity() {
+        return quantity;
+    }
+
+    public Building getBuilding() {
+        return building;
+    }
+}

From 215a0076ead467a3dd9f8be2650872bc7a5ca520 Mon Sep 17 00:00:00 2001
From: Hassan <s1136140@student.hsleiden.nl>
Date: Sun, 6 Nov 2022 21:45:25 +0100
Subject: [PATCH 08/11] added: spacedao updated

---
 .../com/example/werkplekkenfrontend/Main.java |  20 ++-
 .../AdminEditMeetingroomViewController.java   |  42 +++++-
 .../AdminEditWorkspaceViewController.java     |  49 ++++++-
 .../AdminMeetingroomViewController.java       |  25 ++--
 .../AdminNewMeetingroomViewController.java    |  19 +++
 .../AdminNewWorkspaceViewController.java      |  18 +++
 .../AdminWorkspaceViewController.java         |  23 ++--
 .../werkplekkenfrontend/daos/SpaceDao.java    | 129 ++++++++----------
 .../elements/AdminMeetingroomElement.java     |   8 +-
 .../elements/AdminWorkspaceElement.java       |   2 +-
 .../werkplekkenfrontend/models/Space.java     |  29 ++--
 .../space-edit-meetingroom.fxml               |   1 +
 12 files changed, 230 insertions(+), 135 deletions(-)

diff --git a/src/main/java/com/example/werkplekkenfrontend/Main.java b/src/main/java/com/example/werkplekkenfrontend/Main.java
index 4365dd0..c3b0c76 100644
--- a/src/main/java/com/example/werkplekkenfrontend/Main.java
+++ b/src/main/java/com/example/werkplekkenfrontend/Main.java
@@ -2,38 +2,48 @@
 
 import com.example.werkplekkenfrontend.controllers.*;
 import com.example.werkplekkenfrontend.daos.LoginDao;
+import com.example.werkplekkenfrontend.daos.SpaceDao;
 import com.example.werkplekkenfrontend.daos.UserDao;
+import com.example.werkplekkenfrontend.models.Space;
+import com.example.werkplekkenfrontend.models.User;
 import com.example.werkplekkenfrontend.services.HttpService;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import javafx.application.Application;
 import javafx.stage.Stage;
 
+import java.util.UUID;
+
 public class Main extends Application {
     public static SceneController sceneController = new SceneController();
     public static Stage publicStage;
-
     public static LoginController loginController = new LoginController(new LoginDao(new HttpService(), new ObjectMapper()), new UserDao(new HttpService(), new ObjectMapper()));
 
+
     @Override
     public void start(Stage stage) {
-        loginController.register("day", "meijroos", "daymeijroos@gmail.com", "DumbShit");
+        SpaceDao spaceDao = new SpaceDao(new HttpService(), new ObjectMapper());
+        loginController.register("day", "meijroos", "daymeijroos4@gmail.com", "DumbShit");
+        spaceDao.post(new Space(2));
         publicStage = stage;
         Main.sceneController.setStage(stage);
-        ViewController controller = sceneController.showView("admin-buildings-view.fxml");
+        ViewController controller = sceneController.showView("admin-workspace-view.fxml");
         controller.updateView();
         // testAdminBuildingsViewController();
         // testAdminEditBuildingViewController();
     }
 
-    private void testAdminBuildingsViewController(){
+    /*private void testAdminBuildingsViewController(){
         AdminBuildingsViewController controller = (AdminBuildingsViewController)Main.sceneController.showView("admin-buildings-view.fxml");
         controller.updateView();
     }
 
-    private void testAdminEditBuildingViewController(){
+     */
+
+    /*private void testAdminEditBuildingViewController(){
         AdminEditBuildingViewController controller = (AdminEditBuildingViewController)Main.sceneController.showView("admin-edit-building-view.fxml");
         controller.updateView();
     }
+     */
 
     public static void main(String[] args) {
         Main.sceneController = new SceneController();
diff --git a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminEditMeetingroomViewController.java b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminEditMeetingroomViewController.java
index 20666b5..0c4cc88 100644
--- a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminEditMeetingroomViewController.java
+++ b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminEditMeetingroomViewController.java
@@ -1,43 +1,73 @@
 package com.example.werkplekkenfrontend.controllers;
 
 import com.example.werkplekkenfrontend.Main;
-import com.example.werkplekkenfrontend.models.DaoReplicator;
+import com.example.werkplekkenfrontend.daos.SpaceDao;
 import com.example.werkplekkenfrontend.models.Space;
+import com.example.werkplekkenfrontend.services.HttpService;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.TextArea;
 
+import java.util.List;
+import java.util.Objects;
 import java.util.UUID;
 
 public class AdminEditMeetingroomViewController implements ViewController{
 
+    private SpaceDao spaceDao = new SpaceDao(new HttpService(), new ObjectMapper());
     public UUID spaceID = null;
 
 
     @FXML
     public TextArea facility;
 
+    @FXML
+    public TextArea floor;
     @FXML
     public  TextArea capacity;
 
     @FXML
     public  TextArea name;
 
+
     private void updateMeetingroomDetails(Space space){
-        name.setText(space.getName());
         capacity.setText(String.valueOf(space.getCapacity()));
-        facility.setText(space.getFacilities());
-
+        facility.setText(space.getFloorId());
     }
 
 
     @FXML
     void onApplyClick(ActionEvent event) {
+
+        if(spaceID != null){
+            Space updatedSpace = new Space(Integer.valueOf(capacity.getText()));
+            System.out.println("Patch request response: " + spaceDao.patch(updatedSpace));
+        }
+        else{
+            Space newSpace = new Space(Integer.valueOf(capacity.getText())); // the
+            if (!uniqueCheckFromDao()) return;
+            System.out.println("Post request response: " + spaceDao.post(newSpace));
+
+        }
         ViewController controller = Main.sceneController.showView("admin-meetingroom-view.fxml");
         controller.updateView();
+    }
 
+    private boolean uniqueCheckFromDao(){
+        List<Space> spaceList = spaceDao.getAll();
+        for(Space space : spaceList){
+            if (space.getId() == spaceID) continue;
+            if (Objects.equals(space.getCapacity(), capacity.getText())) return false;
+            if (Objects.equals(space.getCapacity(), capacity.getText())) return false;
+        }
+        return true;
     }
 
+    private boolean validityCheck(){
+        if (name.getText() == null || capacity.getText() == null) return false;
+        return true;
+    }
     @FXML
     void onCancelClick(ActionEvent event) {
         ViewController controller = Main.sceneController.showView("admin-meetingroom-view.fxml");
@@ -47,8 +77,10 @@ void onCancelClick(ActionEvent event) {
 
     @Override
     public void updateView() {
-            Space spaceFromDao = DaoReplicator.getMeetingroomFromID(UUID.randomUUID());
+        if(spaceID != null)  {
+            Space spaceFromDao = spaceDao.get(spaceID);
             updateMeetingroomDetails(spaceFromDao);
+        }
     }
 
 }
diff --git a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminEditWorkspaceViewController.java b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminEditWorkspaceViewController.java
index 5bff4b7..c83cf43 100644
--- a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminEditWorkspaceViewController.java
+++ b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminEditWorkspaceViewController.java
@@ -1,12 +1,16 @@
 package com.example.werkplekkenfrontend.controllers;
 
 import com.example.werkplekkenfrontend.Main;
-import com.example.werkplekkenfrontend.models.DaoReplicator;
+import com.example.werkplekkenfrontend.daos.SpaceDao;
 import com.example.werkplekkenfrontend.models.Space;
+import com.example.werkplekkenfrontend.services.HttpService;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.TextArea;
 
+import java.util.List;
+import java.util.Objects;
 import java.util.UUID;
 
 public class AdminEditWorkspaceViewController implements ViewController{
@@ -18,19 +22,51 @@ public class AdminEditWorkspaceViewController implements ViewController{
     private TextArea name;
 
 
+    public UUID spaceID = null;
+
+    private SpaceDao spaceDao = new SpaceDao(new HttpService(), new ObjectMapper());
 
     private void updateWorkspaceDetails(Space space){
-        name.setText(space.getName());
         capacity.setText(String.valueOf(space.getCapacity()));
 
     }
     @FXML
     void onApplyClick(ActionEvent event) {
+        if(spaceID != null){
+            Space updatedSpace = new Space(Integer.valueOf(capacity.getText()));
+            System.out.println("Patch request response: " + spaceDao.patch(updatedSpace));
+        }
+        else{
+            if (!uniqueCheckFromDao()) return;
+            Space newSpace = new Space(Integer.valueOf(capacity.getText())); // there is a chance this generates a duplicate UUID
+            System.out.println("Post request response: " + spaceDao.post(newSpace));
+
+        }
         ViewController controller = Main.sceneController.showView("admin-workspace-view.fxml");
         controller.updateView();
 
+        if (spaceID == null){
+            Space newSpace = new Space((Integer.valueOf(capacity.getText()))); // there is a chance this generates a duplicate UUID
+            System.out.println("Post request response: " + spaceDao);
+        }
+
+    }
+
+    private boolean uniqueCheckFromDao(){
+        List<Space> spaceList = spaceDao.getAll();
+        for(Space space : spaceList){
+            if (space.getId() == spaceID) continue;
+            if (Objects.equals(space.getCapacity(), capacity.getText())) return false;
+            if (Objects.equals(space.getCapacity(), capacity.getText())) return false;
+        }
+        return true;
+    }
+    private boolean validityCheck(){
+        if (capacity.getText() == null) return false;
+        return true;
     }
 
+
     @FXML
     void onCancelClick(ActionEvent event) {
         ViewController controller = Main.sceneController.showView("admin-workspace-view.fxml");
@@ -39,8 +75,11 @@ void onCancelClick(ActionEvent event) {
 
     @Override
     public void updateView() {
-        Space spaceFromDao = DaoReplicator.getWorkSpaceFromID(UUID.randomUUID());
-        updateWorkspaceDetails(spaceFromDao);
-
+        //Space spaceFromDao = DaoReplicator.getWorkSpaceFromID(UUID.randomUUID());
+        //updateWorkspaceDetails(spaceFromDao);
+        if(spaceID != null)  {
+            Space spaceFromDao = spaceDao.get(spaceID);
+            updateWorkspaceDetails(spaceFromDao);
+        }
     }
 }
diff --git a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminMeetingroomViewController.java b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminMeetingroomViewController.java
index 88b6b41..f481281 100644
--- a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminMeetingroomViewController.java
+++ b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminMeetingroomViewController.java
@@ -1,9 +1,14 @@
 package com.example.werkplekkenfrontend.controllers;
 
 import com.example.werkplekkenfrontend.Main;
+import com.example.werkplekkenfrontend.daos.BuildingDao;
+import com.example.werkplekkenfrontend.daos.SpaceDao;
 import com.example.werkplekkenfrontend.elements.AdminMeetingroomElement;
 import com.example.werkplekkenfrontend.elements.NavBarElement;
+import com.example.werkplekkenfrontend.models.Building;
 import com.example.werkplekkenfrontend.models.Space;
+import com.example.werkplekkenfrontend.services.HttpService;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.layout.VBox;
@@ -19,6 +24,9 @@ public class AdminMeetingroomViewController implements ViewController{
     @FXML
     public VBox meetingrooms_container;
 
+
+    private SpaceDao spaceDao = new SpaceDao(new HttpService(), new ObjectMapper());
+
     @FXML
     void OnNewMeetingroomButtonClick(ActionEvent event) {
         ViewController controller = Main.sceneController.showView("space-view-new-meetingroom.fxml");
@@ -27,13 +35,13 @@ void OnNewMeetingroomButtonClick(ActionEvent event) {
 
 
 
-    private void showSpacesOnView(List<Space> spaces){
-        for(Space space : spaces){
+    private void showSpacesOnView(){
+        List<Space> spacesFromDao = spaceDao.getAll();
+        for(Space space : spacesFromDao){
             AdminMeetingroomElement element = new AdminMeetingroomElement(this, space);
             meetingrooms_container.getChildren().add(element.getMeetingroomBox());
         }
     }
-
     @FXML
     public void onEditMeetingRoomButtonClick(Space space) {
         AdminEditMeetingroomViewController controller = (AdminEditMeetingroomViewController)Main.sceneController.showView("space-edit-meetingroom.fxml");
@@ -42,20 +50,11 @@ public void onEditMeetingRoomButtonClick(Space space) {
 
     }
 
-    private List<Space> setupTestData(){
-        List<Space> testSpaces = new ArrayList<>();
-        Space vergaderruimte_1 = new Space(UUID.randomUUID(),10,"sponge", "vergaderingruimte_1");
-        testSpaces.add(vergaderruimte_1);
-        return testSpaces;
-    }
-
-
 
     @Override
     public void updateView() {
-        List<Space> spacesFromDao = setupTestData();
-        showSpacesOnView(spacesFromDao);
         main_container.getChildren().add(new NavBarElement().getBuildingBox());
+        showSpacesOnView();
 
     }
 
diff --git a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminNewMeetingroomViewController.java b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminNewMeetingroomViewController.java
index 1111e39..d835d67 100644
--- a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminNewMeetingroomViewController.java
+++ b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminNewMeetingroomViewController.java
@@ -1,20 +1,39 @@
 package com.example.werkplekkenfrontend.controllers;
 
 import com.example.werkplekkenfrontend.Main;
+import com.example.werkplekkenfrontend.daos.SpaceDao;
+import com.example.werkplekkenfrontend.models.Space;
+import com.example.werkplekkenfrontend.services.HttpService;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 
+import java.util.UUID;
+
 public class AdminNewMeetingroomViewController implements ViewController {
 
+    private SpaceDao spaceDao = new SpaceDao(new HttpService(), new ObjectMapper());
+
+    public UUID spaceID = null;
+
     @Override
     public void updateView() {
     }
 
+
+
     @FXML
     void onApplyClick(ActionEvent event) {
         ViewController controller = Main.sceneController.showView("admin-meetingroom-view.fxml");
         controller.updateView();
 
+        /*if (spaceID == null){
+            Space newSpace = new Space(UUID.randomUUID(),Integer.valueOf(capacity.getText())); // there is a chance this generates a duplicate UUID
+            System.out.println("Post request response: " + spaceDao);
+        }
+
+         */
+
     }
 
     @FXML
diff --git a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminNewWorkspaceViewController.java b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminNewWorkspaceViewController.java
index fb91ae8..9415a38 100644
--- a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminNewWorkspaceViewController.java
+++ b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminNewWorkspaceViewController.java
@@ -1,14 +1,32 @@
 package com.example.werkplekkenfrontend.controllers;
 
 import com.example.werkplekkenfrontend.Main;
+import com.example.werkplekkenfrontend.daos.SpaceDao;
+import com.example.werkplekkenfrontend.models.Space;
+import com.example.werkplekkenfrontend.services.HttpService;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 
+import java.util.UUID;
+
 public class AdminNewWorkspaceViewController implements ViewController {
 
+    private SpaceDao spaceDao = new SpaceDao(new HttpService(), new ObjectMapper());
+
+    public UUID spaceID = null;
+
+
     @Override
     public void updateView() {
 
+        /*if (spaceID == null){
+            Space newSpace = new Space(UUID.randomUUID(), Integer.valueOf(capacity.getText())); // there is a chance this generates a duplicate UUID
+            System.out.println("Post request response: " + spaceDao);
+        }
+
+         */
+
     }
 
     @FXML
diff --git a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminWorkspaceViewController.java b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminWorkspaceViewController.java
index 7fe4363..00092d4 100644
--- a/src/main/java/com/example/werkplekkenfrontend/controllers/AdminWorkspaceViewController.java
+++ b/src/main/java/com/example/werkplekkenfrontend/controllers/AdminWorkspaceViewController.java
@@ -1,19 +1,27 @@
 package com.example.werkplekkenfrontend.controllers;
 
 import com.example.werkplekkenfrontend.Main;
+import com.example.werkplekkenfrontend.daos.LoginDao;
+import com.example.werkplekkenfrontend.daos.SpaceDao;
 import com.example.werkplekkenfrontend.elements.AdminWorkspaceElement;
 import com.example.werkplekkenfrontend.elements.NavBarElement;
+import com.example.werkplekkenfrontend.models.Facility;
 import com.example.werkplekkenfrontend.models.Space;
+import com.example.werkplekkenfrontend.services.HttpService;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.layout.VBox;
+import org.json.JSONObject;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 import java.util.UUID;
 
 public class AdminWorkspaceViewController implements ViewController{
 
+    private SpaceDao spaceDao = new SpaceDao(new HttpService(), new ObjectMapper());
     @FXML
     public VBox workspaces_container;
 
@@ -26,8 +34,9 @@ void OnNewWorkspaceButtonClick(ActionEvent event) {
         controller.updateView();
     }
 
-    private void showSpacesOnView(List<Space> spaces){
-        for(Space space : spaces){
+    private void showSpacesOnView(){
+        List<Space> spacesFromDao = spaceDao.getAll();
+        for(Space space : spacesFromDao){
             AdminWorkspaceElement element = new AdminWorkspaceElement(this,space);
             workspaces_container.getChildren().add(element.getWorkspaceBox());
         }
@@ -43,19 +52,11 @@ public void onEditWorkspaceButtonClick(Space space) {
 
     @Override
     public void updateView() {
-        List<Space> spacesFromDao = setupTestData();
-        showSpacesOnView(spacesFromDao);
+        showSpacesOnView();
         main_container.getChildren().add(new NavBarElement().getBuildingBox());
 
     }
 
-    public List<Space> setupTestData(){
-        List<Space> testSpaces = new ArrayList<>();
-        Space werkplek_1 = new Space(UUID.randomUUID(), 1,"werkplek_1");
-        testSpaces.add(werkplek_1);
-        return testSpaces;
-    }
-
 
     @FXML
     void onApplyClick(ActionEvent event) {
diff --git a/src/main/java/com/example/werkplekkenfrontend/daos/SpaceDao.java b/src/main/java/com/example/werkplekkenfrontend/daos/SpaceDao.java
index 0aa4863..6e7e672 100644
--- a/src/main/java/com/example/werkplekkenfrontend/daos/SpaceDao.java
+++ b/src/main/java/com/example/werkplekkenfrontend/daos/SpaceDao.java
@@ -1,5 +1,6 @@
 package com.example.werkplekkenfrontend.daos;
 
+import com.example.werkplekkenfrontend.models.Building;
 import com.example.werkplekkenfrontend.models.Space;
 import com.example.werkplekkenfrontend.models.User;
 import com.example.werkplekkenfrontend.project_settings;
@@ -12,84 +13,72 @@
 
 public class SpaceDao implements Dao<Space> {
 
-        public Space getCurrent() {
-            HttpService http = new HttpService();
-            String url = project_settings.baseURL + "/api/user";
-            String response = http.getWithURL(url);
-            ObjectMapper mapper = new ObjectMapper();
-            Space space = null;
-            try {
-                space = mapper.readValue(response, Space.class);
-            } catch (Exception e) {
-                e.printStackTrace();
-            };
-            return space;
-        }
+    private final HttpService httpService;
+    private final ObjectMapper objectMapper;
+
+    public SpaceDao(HttpService httpService, ObjectMapper objectMapper) {
+        this.httpService = httpService;
+        this.objectMapper = objectMapper;
+    }
 
-        @Override
-        public ArrayList<Space> getAll() {
-            HttpService http = new HttpService();
-            String url = project_settings.baseURL + "/api/space";
-            String response = http.getWithURL(url);
-            ObjectMapper mapper = new ObjectMapper();
-            ArrayList<Space> spaces = null;
-            try {
-                spaces = mapper.readValue(response, new TypeReference<ArrayList<Space>>(){});
-            } catch (Exception e) {
-                e.printStackTrace();
-            };
+    @Override
+    public ArrayList<Space> getAll() {
+        String url = "/api/space";
+        String response = httpService.getWithURL(url);
+        ObjectMapper mapper = new ObjectMapper();
+        try {
+            ArrayList<Space> spaces = mapper.readValue(response, new TypeReference<>() {
+            });
             return spaces;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
         }
+    }
 
-        @Override
-        public Space get(UUID id) {
-            HttpService http = new HttpService();
-            String url = project_settings.baseURL + "/api/space/" + id;
-            String response = http.getWithURL(url);
-            ObjectMapper mapper = new ObjectMapper();
-            Space space = null;
-            try {
-                space = mapper.readValue(response, Space.class);
-            } catch (Exception e) {
-                e.printStackTrace();
-            };
-            return space;
+    @Override
+    public Space get(UUID id) {
+        String url = "/api/space/" + id;
+        String response = httpService.getWithURL(url);
+        ObjectMapper mapper = new ObjectMapper();
+        Space space = null;
+        try {
+            space = mapper.readValue(response, Space.class);
+        } catch (Exception e) {
+            e.printStackTrace();
         }
+        return space;
+    }
 
-        @Override
-        public int post(Space object) {
-            HttpService http = new HttpService();
-            String url = project_settings.baseURL + "/api/space";
-            ObjectMapper mapper = new ObjectMapper();
-            String json = null;
-            try {
-                json = mapper.writeValueAsString(object);
-            } catch (Exception e) {
-                e.printStackTrace();
-                return 400;
-            }
-            return http.postWithURLandJSONreturnsCode(url, json);
+    @Override
+    public int post(Space object) {
+        String url = "/api/space";
+        ObjectMapper mapper = new ObjectMapper();
+        try {
+            String json = mapper.writeValueAsString(object);
+            return httpService.postWithURLandJSONreturnsCode(url, json);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 400;
         }
+    }
 
-        @Override
-        public int patch(Space object) {
-            HttpService http = new HttpService();
-            String url = project_settings.baseURL + "/api/space/" + object.getId();
-            ObjectMapper mapper = new ObjectMapper();
-            String json = null;
-            try {
-                json = mapper.writeValueAsString(object);
-            } catch (Exception e) {
-                e.printStackTrace();
-                return 400;
-            }
-            return http.patchWithURL(url, json);
+    @Override
+    public int patch(Space object) {
+        String url = "/api/space/" + object.getId();
+        ObjectMapper mapper = new ObjectMapper();
+        try {
+            String json = mapper.writeValueAsString(object);
+            return httpService.patchWithURL(url, json);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 400;
         }
+    }
 
-        @Override
-        public int delete(Space object) {
-            HttpService http = new HttpService();
-            String url = project_settings.baseURL + "/api/space/" + object.getId();
-            return http.deleteWithURL(url);
-        }
+    @Override
+    public int delete(Space object) {
+        String url = "/api/space/" + object.getId();
+        return httpService.deleteWithURL(url);
     }
+}
diff --git a/src/main/java/com/example/werkplekkenfrontend/elements/AdminMeetingroomElement.java b/src/main/java/com/example/werkplekkenfrontend/elements/AdminMeetingroomElement.java
index f994068..1c60e27 100644
--- a/src/main/java/com/example/werkplekkenfrontend/elements/AdminMeetingroomElement.java
+++ b/src/main/java/com/example/werkplekkenfrontend/elements/AdminMeetingroomElement.java
@@ -16,14 +16,14 @@ public class AdminMeetingroomElement {
     public AdminMeetingroomElement(AdminMeetingroomViewController parent, Space space) {
         this.parent = parent;
         this.space = space;
-        Label name = new Label(space.getName());
-        name.setPrefHeight(50);
-        name.setPrefWidth(650);
+        Label capacity =new Label(Integer.toString(space.getCapacity()));
+        capacity.setPrefHeight(50);
+        capacity.setPrefWidth(650);
         Button edit = new Button("edit");
         edit.setPrefWidth(50);
         edit.setPrefHeight(50);
         edit.setOnAction(actionEvent -> parent.onEditMeetingRoomButtonClick(this.space));
-        meetingroomBox = new HBox(name,edit);
+        meetingroomBox = new HBox(capacity,edit);
         meetingroomBox.setMaxWidth(800);
         meetingroomBox.setStyle("-fx-padding: 50; -fx-border-color: black");
     }
diff --git a/src/main/java/com/example/werkplekkenfrontend/elements/AdminWorkspaceElement.java b/src/main/java/com/example/werkplekkenfrontend/elements/AdminWorkspaceElement.java
index 7835cec..6e290c1 100644
--- a/src/main/java/com/example/werkplekkenfrontend/elements/AdminWorkspaceElement.java
+++ b/src/main/java/com/example/werkplekkenfrontend/elements/AdminWorkspaceElement.java
@@ -16,7 +16,7 @@ public class AdminWorkspaceElement {
     public AdminWorkspaceElement(AdminWorkspaceViewController parent, Space space) {
         this.parent = parent;
         this.space = space;
-        Label name = new Label(space.getName());
+        Label name = new Label(Integer.toString(space.getCapacity()));
         name.setPrefHeight(50);
         name.setPrefWidth(650);
         Button edit = new Button("edit");
diff --git a/src/main/java/com/example/werkplekkenfrontend/models/Space.java b/src/main/java/com/example/werkplekkenfrontend/models/Space.java
index 0edbe9c..d45237f 100644
--- a/src/main/java/com/example/werkplekkenfrontend/models/Space.java
+++ b/src/main/java/com/example/werkplekkenfrontend/models/Space.java
@@ -1,35 +1,17 @@
 package com.example.werkplekkenfrontend.models;
 
+import java.util.Set;
 import java.util.UUID;
 
 public class Space {
     UUID id;
 
-    String name;
-
     int capacity;
 
-    String Facilities;
-
-    public Space(UUID id, int capacity, String facilities, String name) {
-        this.id = id;
-        this.capacity = capacity;
-        this.Facilities = facilities;
-        this.name = name;
-    }
+    String floorId;
 
-    public Space(UUID id, int capacity,String name) {
-        this.id = id;
+    public Space(int capacity) {
         this.capacity = capacity;
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getFacilities() {
-        return Facilities;
     }
 
     public UUID getId() {
@@ -39,4 +21,9 @@ public UUID getId() {
     public int getCapacity() {
         return capacity;
     }
+
+    public String getFloorId() {
+        return floorId;
+    }
+
 }
diff --git a/src/main/resources/com/example/werkplekkenfrontend/space-edit-meetingroom.fxml b/src/main/resources/com/example/werkplekkenfrontend/space-edit-meetingroom.fxml
index 1dafd82..a8554c3 100644
--- a/src/main/resources/com/example/werkplekkenfrontend/space-edit-meetingroom.fxml
+++ b/src/main/resources/com/example/werkplekkenfrontend/space-edit-meetingroom.fxml
@@ -26,5 +26,6 @@
         </VBox>
     </VBox>
    <TextArea fx:id="facility" prefHeight="23.0" prefWidth="600.0" />
+    <TextArea fx:id="floor" prefHeight="23.0" prefWidth="600.0" />
 
 </VBox>

From 572658f2529bf1b4d816d8b569aca8aab94ffc26 Mon Sep 17 00:00:00 2001
From: Anisha2002 <45850205+Anisha2002@users.noreply.github.com>
Date: Sun, 6 Nov 2022 22:36:28 +0100
Subject: [PATCH 09/11] Change: updated the reservationdao to the current
 structure

---
 .../daos/ReservationDao.java                  | 138 ++++++------------
 .../models/Reservation.java                   |   4 +
 2 files changed, 47 insertions(+), 95 deletions(-)

diff --git a/src/main/java/com/example/werkplekkenfrontend/daos/ReservationDao.java b/src/main/java/com/example/werkplekkenfrontend/daos/ReservationDao.java
index c694567..c4350f8 100644
--- a/src/main/java/com/example/werkplekkenfrontend/daos/ReservationDao.java
+++ b/src/main/java/com/example/werkplekkenfrontend/daos/ReservationDao.java
@@ -1,8 +1,12 @@
 package com.example.werkplekkenfrontend.daos;
 
+import com.example.werkplekkenfrontend.models.Floor;
 import com.example.werkplekkenfrontend.models.Reservation;
 import com.example.werkplekkenfrontend.project_settings;
 
+import com.example.werkplekkenfrontend.services.HttpService;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
@@ -15,6 +19,15 @@
 import java.util.*;
 
 public class ReservationDao implements Dao<Reservation> {
+
+    private final HttpService httpService;
+    private final ObjectMapper objectMapper;
+
+    public ReservationDao(HttpService httpService, ObjectMapper objectMapper) {
+        this.httpService = httpService;
+        this.objectMapper = objectMapper;
+    }
+
     private Reservation ReservationFromJSON(JSONObject objectJSON) {
         Reservation reservation = new Reservation();
         reservation.id = objectJSON.getString("id");
@@ -47,128 +60,63 @@ private String fetchResponseBodyFromURL(String url) {
 
     @Override
     public ArrayList<Reservation> getAll() {
-        ArrayList<Reservation> reservations = new ArrayList<Reservation>();
-
-        String url = project_settings.baseURL + "/v1/api/reservation/";
-        String responseBody = fetchResponseBodyFromURL(url);
-        JSONArray responseJSON = new JSONArray(responseBody);
-
+        String url = "/api/reservation";
+        String response = httpService.getWithURL(url);
+        ObjectMapper mapper = new ObjectMapper();
         try {
-            for (int i = 0; i < responseJSON.length(); i++) {
-                JSONObject objectJSON = responseJSON.getJSONObject(i);
-                Reservation reservation = ReservationFromJSON(objectJSON);
-
-                reservations.add(reservation);
-            }
-        } catch(Exception e){
-            System.out.println(e);
+            ArrayList<Reservation> reservations = mapper.readValue(response, new TypeReference<>() {
+            });
+            return reservations;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
         }
-        return reservations;
     }
 
     @Override
     public Reservation get(UUID id) {
-        Reservation reservation = new Reservation();
-
-        String url = project_settings.baseURL + "/reservation/" + id;
-        String responseBody = fetchResponseBodyFromURL(url);
-        JSONArray responseJSON = new JSONArray(responseBody);
-
+        String url = "/api/reservation/" + id;
+        String response = httpService.getWithURL(url);
+        ObjectMapper mapper = new ObjectMapper();
+        Reservation reservation = null;
         try {
-            JSONObject objectJSON = responseJSON.getJSONObject(0);
-            reservation = ReservationFromJSON(objectJSON);
-        } catch(Exception e){
-            System.out.println(e);
+            reservation = mapper.readValue(response, Reservation.class);
+        } catch (Exception e) {
+            e.printStackTrace();
         }
         return reservation;
     }
 
     @Override
     public int post(Reservation object) {
-        int response = 0;
+        String url = "/api/reservation";
+        ObjectMapper mapper = new ObjectMapper();
         try {
-            URL url = new URL(project_settings.baseURL + "/reservation/" + object.id);
-            URLConnection con = url.openConnection();
-            HttpURLConnection http = (HttpURLConnection) con;
-            http.setRequestMethod("POST");
-            http.setDoOutput(true);
-
-            String format = """     
-                            {
-                                id: {0},
-                                userId: {1},
-                                dateIn: {2},
-                                dateOut: {3},
-                                amountOfPeople: {4}, 
-                                spaceId: {5}
-                            }""";
-            String json = String.format(format, object.id, object.userId, object.dateIn, object.dateOut, object.amountOfPeople, object.spaceId);
-
-            byte[] out = json.getBytes(StandardCharsets.UTF_8);
-            int length = out.length;
-
-            http.setFixedLengthStreamingMode(length);
-            http.setRequestProperty("Content-Type", "application/json; charset=UTF-8");
-            http.connect();
-            try(OutputStream os = http.getOutputStream()) {
-                os.write(out);
-            }
+            String json = mapper.writeValueAsString(object);
+            return httpService.postWithURLandJSONreturnsCode(url, json);
         } catch (Exception e) {
-            System.out.println(e);
+            e.printStackTrace();
+            return 400;
         }
-        return response;
     }
 
     //WE DO NOT CARE ABOUT PATCH
     @Override
     public int patch(Reservation object) {
-        int response = 0;
+        String url = "/api/reservation/" + object.getId();
+        ObjectMapper mapper = new ObjectMapper();
         try {
-            URL url = new URL(project_settings.baseURL + "/reservation/" + object.id);
-            URLConnection con = url.openConnection();
-            HttpURLConnection http = (HttpURLConnection) con;
-            http.setRequestMethod("PATCH");
-            http.setDoOutput(true);
-
-            String format = """
-                    [
-                        { "op": "replace", "path": "/dateIn", "value": "{0}" },
-                        { "op": "replace", "path": "/dateOut", "value": "{1}" },
-                        { "op": "replace", "path": "/user_id", "value": "{2}" },
-                        { "op": "replace", "path": "/space_id", "value": "{3}" }
-                        { "op": "replace", "path": "/amountOfPeople", "value": "{4}" }
-                    ]""";
-            String json = String.format(format,  object.dateIn, object.dateOut, object.userId, object.spaceId, object.amountOfPeople);
-
-            byte[] out = json.getBytes(StandardCharsets.UTF_8);
-            int length = out.length;
-
-            http.setFixedLengthStreamingMode(length);
-            http.setRequestProperty("Content-Type", "application/json; charset=UTF-8");
-            http.connect();
-            try(OutputStream os = http.getOutputStream()) {
-                os.write(out);
-            }
+            String json = mapper.writeValueAsString(object);
+            return httpService.patchWithURL(url, json);
         } catch (Exception e) {
-            System.out.println(e);
+            e.printStackTrace();
+            return 400;
         }
-        return response;
     }
 
     @Override
     public int delete(Reservation object) {
-        int response = 0;
-        try {
-            URL url = new URL(project_settings.baseURL + "/reservation/" + object.id);
-            HttpURLConnection httpCon = (HttpURLConnection) url.openConnection();
-            httpCon.setDoOutput(true);
-            httpCon.setRequestProperty(
-                    "Content-Type", "application/x-www-form-urlencoded");
-            httpCon.setRequestMethod("DELETE");
-            httpCon.connect();
-        } catch (Exception e) {
-            System.out.println(e);
-        }
-        return response;
+        String url = "/api/reservation/" + object.getId();
+        return httpService.deleteWithURL(url);
     }
 }
diff --git a/src/main/java/com/example/werkplekkenfrontend/models/Reservation.java b/src/main/java/com/example/werkplekkenfrontend/models/Reservation.java
index 12b4228..20008fe 100644
--- a/src/main/java/com/example/werkplekkenfrontend/models/Reservation.java
+++ b/src/main/java/com/example/werkplekkenfrontend/models/Reservation.java
@@ -15,6 +15,10 @@ public Reservation(String id, String userId, Long dateIn, Long dateOut, int amou
         this.spaceId = spaceId;
     }
 
+    public String getId() {
+        return id;
+    }
+
     public String id;
     public String userId;
     public Long dateIn;

From 0bb28adb61031ad10f5c47448d2e1242745f4b2d Mon Sep 17 00:00:00 2001
From: Anisha2002 <45850205+Anisha2002@users.noreply.github.com>
Date: Mon, 7 Nov 2022 00:20:36 +0100
Subject: [PATCH 10/11] Fix: fixed error messages

---
 .../controllers/AccountViewController.java    |  4 ++-
 .../models/DaoReplicator.java                 | 30 +++++++++----------
 .../werkplekkenfrontend/models/Space.java     |  2 ++
 src/main/java/module-info.java                |  1 +
 4 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/example/werkplekkenfrontend/controllers/AccountViewController.java b/src/main/java/com/example/werkplekkenfrontend/controllers/AccountViewController.java
index a56eb74..5aff4df 100644
--- a/src/main/java/com/example/werkplekkenfrontend/controllers/AccountViewController.java
+++ b/src/main/java/com/example/werkplekkenfrontend/controllers/AccountViewController.java
@@ -4,6 +4,8 @@
 import com.example.werkplekkenfrontend.elements.NavBarElement;
 import com.example.werkplekkenfrontend.models.DaoReplicator;
 import com.example.werkplekkenfrontend.models.User;
+import com.example.werkplekkenfrontend.services.HttpService;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
@@ -21,7 +23,7 @@ public class AccountViewController implements ViewController{
     private User currentUser = null;
 
     private void displayUserInfo(String id){
-        UserDao dao = new UserDao();
+        UserDao dao = new UserDao(new HttpService(), new ObjectMapper());
         currentUser = dao.getCurrent();
 
         firstName.setText(currentUser.getName());
diff --git a/src/main/java/com/example/werkplekkenfrontend/models/DaoReplicator.java b/src/main/java/com/example/werkplekkenfrontend/models/DaoReplicator.java
index fdcfd99..b058b61 100644
--- a/src/main/java/com/example/werkplekkenfrontend/models/DaoReplicator.java
+++ b/src/main/java/com/example/werkplekkenfrontend/models/DaoReplicator.java
@@ -14,21 +14,21 @@ public static List<Building> getBuildings(){
         return testBuildings;
     }
 
-    public static List<Space> getSpaces(){
-        List<Space> testSpaces = new ArrayList<>();
-        Space werkplek_1 = new Space(UUID.randomUUID(), 1,"werkplek_1");
-        Space vergaderruimte_1 = new Space(UUID.randomUUID(),10,"sponge", "vergaderingruimte_1");
-        testSpaces.add(werkplek_1);
-        testSpaces.add(vergaderruimte_1);
-        return testSpaces;
-    }
-
-    public static Space getWorkSpaceFromID(UUID id){
-        return new Space(id, 1,"workspace_1");
-    }
-    public static Space getMeetingroomFromID(UUID id){
-        return new Space(id, 1,"sponge","meetingroom_1");
-    }
+//    public static List<Space> getSpaces(){
+//        List<Space> testSpaces = new ArrayList<>();
+//        Space werkplek_1 = new Space(UUID.randomUUID(), 1,"werkplek_1");
+//        Space vergaderruimte_1 = new Space(UUID.randomUUID(),10,"sponge", "vergaderingruimte_1");
+//        testSpaces.add(werkplek_1);
+//        testSpaces.add(vergaderruimte_1);
+//        return testSpaces;
+//    }
+
+//    public static Space getWorkSpaceFromID(UUID id){
+//        return new Space(id, 1,"workspace_1");
+//    }
+//    public static Space getMeetingroomFromID(UUID id){
+//        return new Space(id, 1,"sponge","meetingroom_1");
+//    }
 
 
     public static Building getBuildingFromID(UUID id){
diff --git a/src/main/java/com/example/werkplekkenfrontend/models/Space.java b/src/main/java/com/example/werkplekkenfrontend/models/Space.java
index d45237f..e7658b1 100644
--- a/src/main/java/com/example/werkplekkenfrontend/models/Space.java
+++ b/src/main/java/com/example/werkplekkenfrontend/models/Space.java
@@ -14,6 +14,8 @@ public Space(int capacity) {
         this.capacity = capacity;
     }
 
+    public Space() {}
+
     public UUID getId() {
         return id;
     }
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index a11b7a9..f1a14bb 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -15,5 +15,6 @@
     exports com.example.werkplekkenfrontend.elements;
     exports com.example.werkplekkenfrontend.daos;
     exports com.example.werkplekkenfrontend.services;
+    opens com.example.werkplekkenfrontend.models to com.fasterxml.jackson.databind;
     opens com.example.werkplekkenfrontend.controllers to javafx.fxml;
 }

From b4580b81d88439b74560192ff7de48fc14790e6e Mon Sep 17 00:00:00 2001
From: VindicatorHQ <minecraftgamer725@gmail.com>
Date: Wed, 9 Nov 2022 22:58:35 +0100
Subject: [PATCH 11/11] Removed print statements, log out button functioning
 now

---
 .../controllers/AccountViewController.java                | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/example/werkplekkenfrontend/controllers/AccountViewController.java b/src/main/java/com/example/werkplekkenfrontend/controllers/AccountViewController.java
index 5aff4df..e62ad49 100644
--- a/src/main/java/com/example/werkplekkenfrontend/controllers/AccountViewController.java
+++ b/src/main/java/com/example/werkplekkenfrontend/controllers/AccountViewController.java
@@ -1,5 +1,6 @@
 package com.example.werkplekkenfrontend.controllers;
 
+import com.example.werkplekkenfrontend.Main;
 import com.example.werkplekkenfrontend.daos.UserDao;
 import com.example.werkplekkenfrontend.elements.NavBarElement;
 import com.example.werkplekkenfrontend.models.DaoReplicator;
@@ -29,15 +30,10 @@ private void displayUserInfo(String id){
         firstName.setText(currentUser.getName());
         lastName.setText(currentUser.getLastName());
         email.setText(currentUser.getEmail());
-
-        System.out.println(currentUser);
-        System.out.println("current mf: " + currentUser.getName());
-        System.out.println("mail: " + currentUser.email);
-
     }
 
     public void onLogOutClick() {
-
+        Main.sceneController.showView("login-view.fxml");
     }
 
     @Override