Get all user

# Conflicts:
#	client/data/src/main/java/res/DataController.java

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

@@ -44,7 +44,6 @@ public class CreateEventController {
 
     @FXML
     public void initialize() {
-
         StringConverter<LocalTime> defaultConverter = new LocalTimeStringConverter(FormatStyle.SHORT, Locale.GERMANY);
         timeStart.set24HourView(true);
         timeStart.setConverter(defaultConverter);

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

@@ -2,16 +2,9 @@ package main;
 
 import customUI.Converter;
 import helper.HttpRequestException;
-import javafx.fxml.FXML;
-import javafx.util.StringConverter;
-import javafx.util.converter.LocalTimeStringConverter;
 import res.DataController;
 import res.Event;
 
-import java.time.LocalTime;
-import java.time.format.FormatStyle;
-import java.util.Locale;
-
 public class EditEventController extends CreateEventController{
 
     private Event currentEvent;

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

@@ -126,7 +126,21 @@ public class MainController {
     }
 
     protected void onSettingBtnClick(){
-
+        try{
+            FXMLLoader fxmlLoader = new FXMLLoader(
+                    MainApplication.class.getResource("option-view.fxml"));
+            Scene scene = new Scene(fxmlLoader.load(), 650, 650);
+            scene.getStylesheets().add(Objects.requireNonNull(
+                    MainApplication.class.getResource("option-view.css")).toExternalForm());
+            Stage stage = new Stage();
+            stage.setTitle("Einstellungen");
+            stage.setScene(scene);
+            stage.initModality(Modality.APPLICATION_MODAL);
+            stage.setResizable(false);
+            stage.showAndWait();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
     }
 
     protected void onLogoutBtnClick(ActionEvent event){

client/app/src/main/java/main/OptionController.java

@@ -0,0 +1,89 @@
+package main;
+
+import com.jfoenix.controls.*;
+import helper.HttpRequestException;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Node;
+import javafx.scene.Scene;
+import javafx.scene.control.Label;
+import javafx.scene.layout.GridPane;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
+import res.DataController;
+import res.User;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+public class OptionController {
+
+    @FXML
+    public JFXButton updateUserBtn;
+    @FXML
+    public JFXButton deleteUserBtn;
+    @FXML
+    public JFXButton createUserBtn;
+    @FXML
+    public JFXToggleButton saveLoginTBtn;
+    @FXML
+    public Label labelError;
+    @FXML
+    public GridPane mainGrid;
+
+    @FXML
+    public void initialize(){
+        DataController dataController = new DataController();
+        List<User> users;
+        try{
+           users = dataController.getAllUser();
+        } catch (HttpRequestException e){
+           users = new ArrayList<>();
+        }
+
+        ObservableList<String> observableUserList = FXCollections.observableArrayList();
+        for (User user: users) {
+            observableUserList.add(user.getLogin());
+        }
+        JFXComboBox<String> comboBox = new JFXComboBox<>(observableUserList);
+        comboBox.getStyleClass().add("comboBox");
+        mainGrid.add(comboBox, 2,2);
+
+    }
+
+    public void onBackBtnClick(ActionEvent actionEvent) {
+        Stage stage = (Stage) ((Node) actionEvent.getSource()).getScene().getWindow();
+        stage.close();
+    }
+
+    public void onCreateBtnClick(ActionEvent actionEvent) {
+        try{
+            FXMLLoader fxmlLoader = new FXMLLoader(
+                    MainApplication.class.getResource("../users/create-user.fxml"));
+            Scene scene = new Scene(fxmlLoader.load(), 800, 650);
+            scene.getStylesheets().add(Objects.requireNonNull(
+                    MainApplication.class.getResource("../users/create-user.css")).toExternalForm());
+            Stage stage = new Stage();
+            stage.setTitle("User erstellen");
+            stage.setScene(scene);
+            stage.initModality(Modality.APPLICATION_MODAL);
+            stage.setResizable(false);
+            stage.showAndWait();
+            Stage stageOld = (Stage) ((Node) actionEvent.getSource()).getScene().getWindow();
+            stageOld.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void onUpdateBtnClick(ActionEvent actionEvent) {
+    }
+
+    public void onDeleteBtnClick(ActionEvent actionEvent) {
+    }
+}

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

@@ -0,0 +1,58 @@
+GridPane{
+    -fx-background-color: #3E415F;
+    -fx-padding: 20px;
+    -fx-font-size: 20px;
+    -fx-font-family: Segoe UI;
+
+    -fx-border-insets: 1;
+    -fx-border-color: #B0B0B0;
+    -fx-border-style: solid;
+    -fx-border-width: 2;
+    -fx-effect: dropshadow(three-pass-box, rgba(100, 100, 100, 1), 24, 0.5, 0, 0);
+}
+
+Label{
+    -fx-text-fill: white;
+    -fx-max-width: 200px;
+    -fx-min-width: 200px;
+}
+
+.mainLabel{
+    -fx-background-color: #8D99AE;
+    -fx-padding: 10px;
+    -fx-max-width: 200px;
+    -fx-min-width: 200px;
+    -fx-font-weight: bold;
+    -fx-alignment: center;
+}
+
+.mainButton{
+    -fx-font-weight: bold;
+    -fx-background-color: white;
+}
+
+JFXButton{
+    -fx-background-color: white;
+}
+
+#labelError{
+    -fx-font-weight: bold;
+    -fx-max-width: 1000px;
+    -fx-text-fill: #ff5555;
+    -fx-padding: 16px;
+    -fx-min-height: 140px;
+    -fx-max-height: 400px;
+    -fx-wrap-text: true;
+    -fx-font-size: 16px;
+}
+
+.comboBox{
+    -fx-background-color: white;
+    -fx-max-width: 200px;
+    -fx-min-width: 200px;
+}
+
+.userBtn{
+    -fx-max-width: 200px;
+    -fx-min-width: 200px;
+}

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

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import com.jfoenix.controls.*?>
+
+<GridPane xmlns="http://javafx.com/javafx"
+          xmlns:fx="http://javafx.com/fxml"
+          fx:controller="main.OptionController"
+          prefHeight="400.0" prefWidth="600.0"
+fx:id="mainGrid">
+
+    <columnConstraints>
+        <ColumnConstraints minWidth="100"/>
+        <ColumnConstraints minWidth="100"/>
+        <ColumnConstraints minWidth="200"/>
+        <ColumnConstraints minWidth="100"/>
+        <ColumnConstraints minWidth="100"/>
+    </columnConstraints>
+    <rowConstraints>
+        <RowConstraints vgrow="ALWAYS" />
+        <RowConstraints vgrow="ALWAYS" />
+        <RowConstraints vgrow="ALWAYS" />
+        <RowConstraints vgrow="ALWAYS" />
+        <RowConstraints vgrow="ALWAYS" />
+        <RowConstraints vgrow="ALWAYS" />
+        <RowConstraints vgrow="ALWAYS" />
+        <RowConstraints vgrow="ALWAYS" />
+        <RowConstraints vgrow="ALWAYS" />
+        <RowConstraints vgrow="ALWAYS" />
+    </rowConstraints>
+
+    <Label styleClass="mainLabel" GridPane.columnIndex="2" GridPane.halignment="CENTER" >Einstellungen</Label>
+
+    <Label GridPane.columnIndex="1" GridPane.rowIndex="2" GridPane.halignment="CENTER">User:</Label>
+
+    <JFXButton styleClass="userBtn" fx:id="updateUserBtn" GridPane.columnIndex="1" GridPane.columnSpan="3"
+               GridPane.rowIndex="4" GridPane.halignment="CENTER" onAction="#onUpdateBtnClick">User bearbeiten</JFXButton>
+    <JFXButton styleClass="userBtn" fx:id="deleteUserBtn" GridPane.columnIndex="1" GridPane.columnSpan="3"
+               GridPane.rowIndex="5" GridPane.halignment="CENTER" onAction="#onDeleteBtnClick">User löschen</JFXButton>
+    <JFXButton styleClass="userBtn" fx:id="createUserBtn" GridPane.columnIndex="1" GridPane.columnSpan="3"
+               GridPane.rowIndex="7" GridPane.halignment="CENTER" onAction="#onCreateBtnClick">User anlegen</JFXButton>
+
+    <Label styleClass="loginLbl" GridPane.columnIndex="1" GridPane.rowIndex="8"
+           GridPane.halignment="CENTER">Angemeldet bleiben:</Label>
+    <JFXToggleButton fx:id="saveLoginTBtn" GridPane.columnIndex="3" GridPane.rowIndex="8"/>
+
+    <Label fx:id="labelError" styleClass="errorMessage" GridPane.columnIndex="1" GridPane.rowIndex="9"/>
+    <JFXButton GridPane.columnIndex="4" GridPane.rowIndex="9" onAction="#onBackBtnClick">Zurück</JFXButton>
+
+</GridPane>

client/data/src/main/java/config/ConfigLoader.java

@@ -1,7 +1,6 @@
 package config;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import res.DataController;
 
 import java.io.IOException;
 import java.nio.file.Files;

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

@@ -6,13 +6,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import helper.HttpRequestException;
 import helper.Tuple;
 
-import java.io.BufferedReader;
-import java.io.DataOutputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
 import java.util.*;
 
@@ -118,7 +111,6 @@ public class DataController {
     }
 
     public ArrayList<Event> getAllVisibleEvents(LocalDateTime startDate, LocalDateTime endDate) throws HttpRequestException {
-        ArrayList<Event> eventList = new ArrayList<>();
         try {
             Tuple<Integer, String> response = httpRequest.sendPostRequest(
                     ALL_EVENTS_ENDPOINT,
@@ -133,28 +125,44 @@ public class DataController {
 
             ObjectMapper objectMapper = new ObjectMapper();
             objectMapper.findAndRegisterModules();
-            eventList = (ArrayList<Event>) objectMapper.readValue(jsonResponse, new TypeReference<List<Event>>() {
+            return (ArrayList<Event>) objectMapper.readValue(jsonResponse, new TypeReference<List<Event>>() {});
-            });
-
 
         } catch (HttpRequestException e) {
             throw e;
         } catch (Exception e) {
             throw new HttpRequestException("Es konnte keine Verbindung mit dem Server hergestellt werden.", 600);
         }
-
-        return eventList;
     }
 
     /********
      * User *
      ********/
 
-    /*
+    public List<User> getAllUser() throws HttpRequestException {
+        String userJSON = sendBasicHttpRequest(
+                ALL_USER_ENDPOINT,
+                "",
+                true
+        );
+
+        ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.findAndRegisterModules();
+        try {
+            return (List<User>)objectMapper.readValue(userJSON, new TypeReference<List<User>>() {});
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+        return new ArrayList<>();
+    }
+
     public void createUser(User user) throws HttpRequestException {
         sendBasicHttpRequest(
                 ADD_USER_ENDPOINT,
-                user.getAsUrlParam(),
+                "name=" + user.getName() +
+                        "&forename=" + user.getForename() +
+                        "&login=" + user.getLogin() +
+                        "&password=" + user.getPassword() +
+                        "&isAdmin=" + user.isAdmin(),
                 true
         );
     }
@@ -162,7 +170,7 @@ public class DataController {
     public void deleteUser(User user) throws HttpRequestException {
         sendBasicHttpRequest(
                 DELETE_USER_ENDPOINT,
-                user.getAsUrlParam(),
+                "userId=" + user.getUserId(),
                 true
         );
     }
@@ -170,13 +178,12 @@ public class DataController {
     public void editUser(User oldUser, User user) throws HttpRequestException {
         sendBasicHttpRequest(
                 EDIT_USER_ENDPOINT,
-                user.getAsUrlParam(),
+                "",
                 true
         );
     }
-     */
 
-    private void sendBasicHttpRequest(String urlString, String urlParameters, boolean sendAuth) throws HttpRequestException {
+    private String sendBasicHttpRequest(String urlString, String urlParameters, boolean sendAuth) throws HttpRequestException {
         try {
             Tuple<Integer, String> response = httpRequest.sendPostRequest(
                     urlString,
@@ -186,6 +193,8 @@ public class DataController {
             if (response.getKey() != 200) {
                 throw new HttpRequestException(response);
             }
+
+            return response.getValue();
         } catch (HttpRequestException e) {
             throw e;
         } catch (Exception e) {

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

@@ -0,0 +1,61 @@
+package res;
+
+public class User {
+
+    private int userId;
+    private String login;
+    private String forename;
+    private String name;
+    private String password;
+    private boolean isAdmin;
+
+    public User(){}
+
+    public int getUserId() {
+        return userId;
+    }
+
+    public void setUserId(int userId) {
+        this.userId = userId;
+    }
+
+    public String getLogin() {
+        return login;
+    }
+
+    public void setLogin(String login) {
+        this.login = login;
+    }
+
+    public String getForename() {
+        return forename;
+    }
+
+    public void setForename(String forename) {
+        this.forename = forename;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public boolean isAdmin() {
+        return isAdmin;
+    }
+
+    public void setAdmin(boolean admin) {
+        isAdmin = admin;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+}