From 3fe16186e29dab34a9bece5fac0ac72afd99b084 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20K=C3=BChn?= <marco.kuehn@edu.bib.de>
Date: Fri, 14 Jan 2022 11:11:05 +0100
Subject: [PATCH] Improved layout, removed typ

---
 .../main/java/main/CreateEventController.java |  2 --
 .../src/main/resources/main/create-event.css  |  2 +-
 .../src/main/resources/main/create-event.fxml | 29 +++++++++----------
 .../src/main/resources/main/edit-event.fxml   | 29 +++++++++----------
 4 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/client/app/src/main/java/main/CreateEventController.java b/client/app/src/main/java/main/CreateEventController.java
index f3359c8..645c4e9 100644
--- a/client/app/src/main/java/main/CreateEventController.java
+++ b/client/app/src/main/java/main/CreateEventController.java
@@ -25,8 +25,6 @@ public class CreateEventController {
     @FXML
     public TextField textName;
     @FXML
-    public ComboBox<String> ComboBoxTyp;
-    @FXML
     public ComboBox<String> ComboBoxPriotity;
     @FXML
     public CheckBox checkBoxIsFullDay;
diff --git a/client/app/src/main/resources/main/create-event.css b/client/app/src/main/resources/main/create-event.css
index 0b7b085..323051a 100644
--- a/client/app/src/main/resources/main/create-event.css
+++ b/client/app/src/main/resources/main/create-event.css
@@ -47,5 +47,5 @@ Label{
 
 .timePicker{
     -fx-background-color: white;
-    -fx-max-width: 150px;
+    -fx-max-width: 200px;
 }
\ No newline at end of file
diff --git a/client/app/src/main/resources/main/create-event.fxml b/client/app/src/main/resources/main/create-event.fxml
index e25fcdd..d60b89c 100644
--- a/client/app/src/main/resources/main/create-event.fxml
+++ b/client/app/src/main/resources/main/create-event.fxml
@@ -23,24 +23,23 @@
         <RowConstraints vgrow="ALWAYS"/>
         <RowConstraints vgrow="ALWAYS"/>
         <RowConstraints vgrow="ALWAYS"/>
-        <RowConstraints vgrow="ALWAYS"/>
     </rowConstraints>
 
     <Label styleClass="mainLabel">Termin anlegen</Label>
 
-    <Label styleClass="inputLabel" GridPane.rowIndex="1">Datum:</Label>
-    <Label styleClass="inputLabel" GridPane.rowIndex="2">Titel:</Label>
+    <Label styleClass="inputLabel" GridPane.rowIndex="1">Titel:</Label>
+    <Label styleClass="inputLabel" GridPane.rowIndex="2">Datum:</Label>
     <Label styleClass="inputLabel" GridPane.rowIndex="3">Von:</Label>
     <Label styleClass="inputLabel" GridPane.rowIndex="4">Bis:</Label>
-    <Label styleClass="inputLabel" GridPane.rowIndex="5">Typ:</Label>
-    <Label styleClass="inputLabel" GridPane.rowIndex="6">Priorität:</Label>
-    <Label styleClass="inputLabel" GridPane.rowIndex="7">Ganztägig:</Label>
-    <Label styleClass="inputLabel" GridPane.rowIndex="8">Privat:</Label>
 
-    <DatePicker fx:id="datePickerDate" GridPane.columnIndex="1" GridPane.rowIndex="1" maxWidth="400" minWidth="400"/>
-    <TextField fx:id="textName" GridPane.columnIndex="1" GridPane.rowIndex="2" maxWidth="400" minWidth="400"/>
-    <ComboBox fx:id="ComboBoxTyp" GridPane.columnIndex="1" GridPane.rowIndex="5" maxWidth="400" minWidth="400"/>
-    <ComboBox fx:id="ComboBoxPriotity" GridPane.columnIndex="1" GridPane.rowIndex="6" maxWidth="200" minWidth="200">
+    <Label styleClass="inputLabel" GridPane.rowIndex="5">Priorität:</Label>
+    <Label styleClass="inputLabel" GridPane.rowIndex="6">Ganztägig:</Label>
+    <Label styleClass="inputLabel" GridPane.rowIndex="7">Privat:</Label>
+
+    <TextField fx:id="textName" GridPane.columnIndex="1" GridPane.rowIndex="1" maxWidth="400" minWidth="400"/>
+    <DatePicker fx:id="datePickerDate" GridPane.columnIndex="1" GridPane.rowIndex="2" maxWidth="200" minWidth="200"/>
+
+    <ComboBox fx:id="ComboBoxPriotity" GridPane.columnIndex="1" GridPane.rowIndex="5" maxWidth="200" minWidth="200">
         <items>
             <FXCollections fx:factory="observableArrayList">
                 <String fx:value="gering"/>
@@ -49,11 +48,11 @@
             </FXCollections>
         </items>
     </ComboBox>
-    <CheckBox fx:id="checkBoxIsFullDay" GridPane.columnIndex="1" GridPane.rowIndex="7"/>
-    <CheckBox fx:id="checkBoxIsPrivate" GridPane.columnIndex="1" GridPane.rowIndex="8"/>
-    <Label fx:id="labelError" GridPane.columnIndex="1" GridPane.rowIndex="9"/>
+    <CheckBox fx:id="checkBoxIsFullDay" GridPane.columnIndex="1" GridPane.rowIndex="6"/>
+    <CheckBox fx:id="checkBoxIsPrivate" GridPane.columnIndex="1" GridPane.rowIndex="7"/>
+    <Label fx:id="labelError" GridPane.columnIndex="1" GridPane.rowIndex="8"/>
 
-    <HBox GridPane.columnIndex="1" GridPane.rowIndex="10" GridPane.columnSpan="2" alignment="CENTER_RIGHT">
+    <HBox GridPane.columnIndex="1" GridPane.rowIndex="9" GridPane.columnSpan="2" alignment="CENTER_RIGHT">
         <Button onAction="#abortBtnClick" maxWidth="150" minWidth="150">Abbrechen</Button>
         <Button styleClass="mainButton" onAction="#createBtnClick" maxWidth="150" minWidth="150">Anlegen</Button>
     </HBox>
diff --git a/client/app/src/main/resources/main/edit-event.fxml b/client/app/src/main/resources/main/edit-event.fxml
index 1d56f3d..21aa5d0 100644
--- a/client/app/src/main/resources/main/edit-event.fxml
+++ b/client/app/src/main/resources/main/edit-event.fxml
@@ -23,24 +23,23 @@
         <RowConstraints vgrow="ALWAYS"/>
         <RowConstraints vgrow="ALWAYS"/>
         <RowConstraints vgrow="ALWAYS"/>
-        <RowConstraints vgrow="ALWAYS"/>
     </rowConstraints>
 
     <Label styleClass="mainLabel">Termin bearbeiten</Label>
 
-    <Label styleClass="inputLabel" GridPane.rowIndex="1">Datum:</Label>
-    <Label styleClass="inputLabel" GridPane.rowIndex="2">Titel:</Label>
+    <Label styleClass="inputLabel" GridPane.rowIndex="1">Titel:</Label>
+    <Label styleClass="inputLabel" GridPane.rowIndex="2">Datum:</Label>
     <Label styleClass="inputLabel" GridPane.rowIndex="3">Von:</Label>
     <Label styleClass="inputLabel" GridPane.rowIndex="4">Bis:</Label>
-    <Label styleClass="inputLabel" GridPane.rowIndex="5">Typ:</Label>
-    <Label styleClass="inputLabel" GridPane.rowIndex="6">Priorität:</Label>
-    <Label styleClass="inputLabel" GridPane.rowIndex="7">Ganztägig:</Label>
-    <Label styleClass="inputLabel" GridPane.rowIndex="8">Privat:</Label>
 
-    <DatePicker fx:id="datePickerDate" GridPane.columnIndex="1" GridPane.rowIndex="1" maxWidth="400" minWidth="400"/>
-    <TextField fx:id="textName" GridPane.columnIndex="1" GridPane.rowIndex="2" maxWidth="400" minWidth="400"/>
-    <ComboBox fx:id="ComboBoxTyp" GridPane.columnIndex="1" GridPane.rowIndex="5" maxWidth="400" minWidth="400"/>
-    <ComboBox fx:id="ComboBoxPriotity" GridPane.columnIndex="1" GridPane.rowIndex="6" maxWidth="200" minWidth="200">
+    <Label styleClass="inputLabel" GridPane.rowIndex="5">Priorität:</Label>
+    <Label styleClass="inputLabel" GridPane.rowIndex="6">Ganztägig:</Label>
+    <Label styleClass="inputLabel" GridPane.rowIndex="7">Privat:</Label>
+
+    <TextField fx:id="textName" GridPane.columnIndex="1" GridPane.rowIndex="1" maxWidth="400" minWidth="400"/>
+    <DatePicker fx:id="datePickerDate" GridPane.columnIndex="1" GridPane.rowIndex="2" maxWidth="200" minWidth="200"/>
+
+    <ComboBox fx:id="ComboBoxPriotity" GridPane.columnIndex="1" GridPane.rowIndex="5" maxWidth="200" minWidth="200">
         <items>
             <FXCollections fx:factory="observableArrayList">
                 <String fx:value="gering"/>
@@ -49,11 +48,11 @@
             </FXCollections>
         </items>
     </ComboBox>
-    <CheckBox fx:id="checkBoxIsFullDay" GridPane.columnIndex="1" GridPane.rowIndex="7"/>
-    <CheckBox fx:id="checkBoxIsPrivate" GridPane.columnIndex="1" GridPane.rowIndex="8"/>
-    <Label fx:id="labelError" GridPane.columnIndex="1" GridPane.rowIndex="9"/>
+    <CheckBox fx:id="checkBoxIsFullDay" GridPane.columnIndex="1" GridPane.rowIndex="6"/>
+    <CheckBox fx:id="checkBoxIsPrivate" GridPane.columnIndex="1" GridPane.rowIndex="7"/>
+    <Label fx:id="labelError" GridPane.columnIndex="1" GridPane.rowIndex="8"/>
 
-    <HBox GridPane.columnIndex="1" GridPane.rowIndex="10" GridPane.columnSpan="2" alignment="CENTER_RIGHT">
+    <HBox GridPane.columnIndex="1" GridPane.rowIndex="9" GridPane.columnSpan="2" alignment="CENTER_RIGHT">
         <Button onAction="#abortBtnClick" maxWidth="150" minWidth="150">Abbrechen</Button>
         <Button styleClass="mainButton" onAction="#createBtnClick" maxWidth="150" minWidth="150">Speichern</Button>
     </HBox>