Get all user

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/OptionController.java

@@ -1,6 +1,7 @@
 package main;
 
 import com.jfoenix.controls.*;
+import helper.HttpRequestException;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
@@ -9,10 +10,15 @@ 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 {
@@ -28,10 +34,25 @@ public class OptionController {
     @FXML
     public Label labelError;
     @FXML
-    public JFXComboBox<String> userCmb;
+    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);
 
     }
 

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

@@ -3,12 +3,12 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import com.jfoenix.controls.*?>
-<?import javafx.collections.FXCollections?>
 
 <GridPane xmlns="http://javafx.com/javafx"
           xmlns:fx="http://javafx.com/fxml"
           fx:controller="main.OptionController"
-          prefHeight="400.0" prefWidth="600.0">
+          prefHeight="400.0" prefWidth="600.0"
+fx:id="mainGrid">
 
     <columnConstraints>
         <ColumnConstraints minWidth="100"/>
@@ -33,13 +33,6 @@
     <Label styleClass="mainLabel" GridPane.columnIndex="2" GridPane.halignment="CENTER" >Einstellungen</Label>
 
     <Label GridPane.columnIndex="1" GridPane.rowIndex="2" GridPane.halignment="CENTER">User:</Label>
-    <JFXComboBox styleClass="comboBox" fx:id="userCmb" GridPane.columnIndex="2" GridPane.rowIndex="2">
-        <items>
-            <FXCollections fx:factory="observableArrayList">
-
-            </FXCollections>
-        </items>
-    </JFXComboBox>
 
     <JFXButton styleClass="userBtn" fx:id="updateUserBtn" GridPane.columnIndex="1" GridPane.columnSpan="3"
                GridPane.rowIndex="4" GridPane.halignment="CENTER" onAction="#onUpdateBtnClick">User bearbeiten</JFXButton>

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

@@ -2,28 +2,29 @@ package res;
 
 public class User {
 
-    private int id;
+    private int userId;
-    private String loginName;
+    private String login;
     private String forename;
     private String name;
+    private String password;
+    private boolean isAdmin;
 
-    public User(){
+    public User(){}
+
+    public int getUserId() {
+        return userId;
     }
 
-    public int getId() {
+    public void setUserId(int userId) {
-        return id;
+        this.userId = userId;
     }
 
-    public void setId(int id) {
+    public String getLogin() {
-        this.id = id;
+        return login;
     }
 
-    public String getLoginName() {
+    public void setLogin(String login) {
-        return loginName;
+        this.login = login;
-    }
-
-    public void setLoginName(String loginName) {
-        this.loginName = loginName;
     }
 
     public String getForename() {
@@ -41,4 +42,20 @@ public class User {
     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;
+    }
 }