From a24addf6ec4d229fedcc16440cb814bcec17133b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20K=C3=BChn?= <marco.kuehn@edu.bib.de>
Date: Tue, 18 Jan 2022 09:46:36 +0100
Subject: [PATCH] Changed checkbox to toggleButton, refactored code

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

diff --git a/client/app/src/main/java/main/CreateEventController.java b/client/app/src/main/java/main/CreateEventController.java
index b194213..33772c5 100644
--- a/client/app/src/main/java/main/CreateEventController.java
+++ b/client/app/src/main/java/main/CreateEventController.java
@@ -1,7 +1,6 @@
 package main;
 
-import com.jfoenix.controls.JFXTextField;
-import com.jfoenix.controls.JFXTimePicker;
+import com.jfoenix.controls.*;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.Node;
@@ -28,9 +27,9 @@ public class CreateEventController {
     @FXML
     public ComboBox<String> ComboBoxPriotity;
     @FXML
-    public CheckBox checkBoxIsFullDay;
+    public JFXToggleButton toggleBtnIsFullDay;
     @FXML
-    public CheckBox checkBoxIsPrivate;
+    public JFXToggleButton toggleBtnIsPrivate;
     @FXML
     public Label labelError;
     @FXML
@@ -39,6 +38,7 @@ public class CreateEventController {
     public JFXTimePicker timeEnd;
 
 
+
     public CreateEventController() {
     }
 
@@ -46,20 +46,11 @@ public class CreateEventController {
     public void initialize() {
 
         StringConverter<LocalTime> defaultConverter = new LocalTimeStringConverter(FormatStyle.SHORT, Locale.GERMANY);
+        timeStart.set24HourView(true);
+        timeStart.setConverter(defaultConverter);
 
-        JFXTimePicker timePickerStart = new JFXTimePicker();
-        timeStart = timePickerStart;
-        timePickerStart.set24HourView(true);
-        timePickerStart.setConverter(defaultConverter);
-        timePickerStart.getStyleClass().add("timePicker");
-        mainGrid.add(timePickerStart, 1 , 3);
-
-        JFXTimePicker timePickerEnd = new JFXTimePicker();
-        timeEnd = timePickerEnd;
-        timePickerEnd.set24HourView(true);
-        timePickerEnd.setConverter(defaultConverter);
-        timePickerEnd.getStyleClass().add("timePicker");
-        mainGrid.add(timePickerEnd, 1 , 4);
+        timeEnd.set24HourView(true);
+        timeEnd.setConverter(defaultConverter);
     }
 
 
@@ -73,8 +64,8 @@ public class CreateEventController {
             Event event = new Event(
                     textName.getText(),
                     ComboBoxPriotity.getSelectionModel().getSelectedIndex(),
-                    checkBoxIsFullDay.isSelected(),
-                    checkBoxIsPrivate.isSelected(),
+                    toggleBtnIsFullDay.isSelected(),
+                    toggleBtnIsPrivate.isSelected(),
                     timeStart.getValue().toString(),
                     timeEnd.getValue().toString(),
                     datePickerDate.getValue().atStartOfDay(),
diff --git a/client/app/src/main/resources/main/create-event.css b/client/app/src/main/resources/main/create-event.css
index 1a49f33..be03557 100644
--- a/client/app/src/main/resources/main/create-event.css
+++ b/client/app/src/main/resources/main/create-event.css
@@ -61,5 +61,4 @@ JFXButton{
 
 .timePicker{
     -fx-background-color: white;
-    -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 f355352..e2798db 100644
--- a/client/app/src/main/resources/main/create-event.fxml
+++ b/client/app/src/main/resources/main/create-event.fxml
@@ -40,6 +40,8 @@
 
     <JFXTextField styleClass="inputField" fx:id="textName" GridPane.columnIndex="1" GridPane.rowIndex="1" maxWidth="400" minWidth="400"/>
     <JFXDatePicker styleClass="inputDate" fx:id="datePickerDate" GridPane.columnIndex="1" GridPane.rowIndex="2" maxWidth="200" minWidth="200"/>
+    <JFXTimePicker styleClass="timePicker" fx:id="timeStart" GridPane.columnIndex="1" GridPane.rowIndex="3" maxWidth="200" minWidth="200"/>
+    <JFXTimePicker styleClass="timePicker" fx:id="timeEnd" GridPane.columnIndex="1" GridPane.rowIndex="4" maxWidth="200" minWidth="200"/>
 
     <JFXComboBox fx:id="ComboBoxPriotity" styleClass="comboBox" GridPane.columnIndex="1" GridPane.rowIndex="5" maxWidth="200" minWidth="200">
         <items>
@@ -50,8 +52,8 @@
             </FXCollections>
         </items>
     </JFXComboBox>
-    <JFXCheckBox styleClass="checkbox" fx:id="checkBoxIsFullDay" GridPane.columnIndex="1" GridPane.rowIndex="6"/>
-    <JFXCheckBox styleClass="checkbox"  fx:id="checkBoxIsPrivate" GridPane.columnIndex="1" GridPane.rowIndex="7"/>
+    <JFXToggleButton styleClass="checkbox" fx:id="toggleBtnIsFullDay" GridPane.columnIndex="1" GridPane.rowIndex="6"/>
+    <JFXToggleButton styleClass="checkbox"  fx:id="toggleBtnIsPrivate" GridPane.columnIndex="1" GridPane.rowIndex="7"/>
     <Label fx:id="labelError" GridPane.columnIndex="1" GridPane.rowIndex="8"/>
 
     <HBox GridPane.columnIndex="1" GridPane.rowIndex="9" GridPane.columnSpan="2" alignment="CENTER_RIGHT">
diff --git a/client/app/src/main/resources/main/edit-event.fxml b/client/app/src/main/resources/main/edit-event.fxml
index 3863c52..9180344 100644
--- a/client/app/src/main/resources/main/edit-event.fxml
+++ b/client/app/src/main/resources/main/edit-event.fxml
@@ -40,6 +40,8 @@
 
     <JFXTextField styleClass="inputField" fx:id="textName" GridPane.columnIndex="1" GridPane.rowIndex="1" maxWidth="400" minWidth="400"/>
     <JFXDatePicker styleClass="inputDate" fx:id="datePickerDate" GridPane.columnIndex="1" GridPane.rowIndex="2" maxWidth="200" minWidth="200"/>
+    <JFXTimePicker styleClass="timePicker" fx:id="timeStart" GridPane.columnIndex="1" GridPane.rowIndex="3" maxWidth="200" minWidth="200"/>
+    <JFXTimePicker styleClass="timePicker" fx:id="timeEnd" GridPane.columnIndex="1" GridPane.rowIndex="4" maxWidth="200" minWidth="200"/>
 
     <JFXComboBox fx:id="ComboBoxPriotity" styleClass="comboBox" GridPane.columnIndex="1" GridPane.rowIndex="5" maxWidth="200" minWidth="200">
         <items>
@@ -50,8 +52,8 @@
             </FXCollections>
         </items>
     </JFXComboBox>
-    <JFXCheckBox styleClass="checkbox" fx:id="checkBoxIsFullDay" GridPane.columnIndex="1" GridPane.rowIndex="6"/>
-    <JFXCheckBox styleClass="checkbox"  fx:id="checkBoxIsPrivate" GridPane.columnIndex="1" GridPane.rowIndex="7"/>
+    <JFXToggleButton styleClass="checkbox" fx:id="toggleBtnIsFullDay" GridPane.columnIndex="1" GridPane.rowIndex="6"/>
+    <JFXToggleButton styleClass="checkbox"  fx:id="toggleBtnIsPrivate" GridPane.columnIndex="1" GridPane.rowIndex="7"/>
     <Label fx:id="labelError" GridPane.columnIndex="1" GridPane.rowIndex="8"/>
 
     <HBox GridPane.columnIndex="1" GridPane.rowIndex="9" GridPane.columnSpan="2" alignment="CENTER_RIGHT">