Compare commits
1 Commits
2c3d646c47
...
0120-UI-Te
| Author | SHA1 | Date | |
|---|---|---|---|
| 07ee10929a |
@@ -1,8 +0,0 @@
|
|||||||
package customUI;
|
|
||||||
|
|
||||||
public class Button extends javafx.scene.control.Button {
|
|
||||||
|
|
||||||
public void setTextValue(String text){
|
|
||||||
super.setText(Converter.convertString(text));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
package customUI;
|
|
||||||
|
|
||||||
public class Converter {
|
|
||||||
/*
|
|
||||||
Ä, ä \u00c4, \u00e4
|
|
||||||
Ö, ö \u00d6, \u00f6
|
|
||||||
Ü, ü \u00dc, \u00fc
|
|
||||||
ß \u00df
|
|
||||||
*/
|
|
||||||
@SuppressWarnings("all")
|
|
||||||
public static String convertString(String str){
|
|
||||||
return str
|
|
||||||
.replace("ä", "\u00e4")
|
|
||||||
.replace("Ä", "\u00c4")
|
|
||||||
.replace("ö", "\u00f6")
|
|
||||||
.replace("Ö", "\u00d6")
|
|
||||||
.replace("ü", "\u00fc")
|
|
||||||
.replace("Ü", "\u00dc")
|
|
||||||
.replace("ß", "\u00df");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
package customUI;
|
|
||||||
|
|
||||||
public class Label extends javafx.scene.control.Label {
|
|
||||||
public Label(String content){
|
|
||||||
super(Converter.convertString(content));
|
|
||||||
}
|
|
||||||
|
|
||||||
public Label(){
|
|
||||||
super();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setTextValue(String text){
|
|
||||||
super.setText(Converter.convertString(text));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,97 +0,0 @@
|
|||||||
package main;
|
|
||||||
|
|
||||||
import com.jfoenix.controls.*;
|
|
||||||
import helper.HttpRequestException;
|
|
||||||
import javafx.event.ActionEvent;
|
|
||||||
import javafx.fxml.FXML;
|
|
||||||
import javafx.scene.Node;
|
|
||||||
import javafx.scene.control.*;
|
|
||||||
import javafx.scene.layout.GridPane;
|
|
||||||
import javafx.stage.Stage;
|
|
||||||
import javafx.util.StringConverter;
|
|
||||||
import javafx.util.converter.LocalTimeStringConverter;
|
|
||||||
import res.DataController;
|
|
||||||
import res.Event;
|
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
|
||||||
import java.time.LocalTime;
|
|
||||||
import java.time.format.FormatStyle;
|
|
||||||
import java.util.Locale;
|
|
||||||
|
|
||||||
public class CreateEventController {
|
|
||||||
|
|
||||||
@FXML
|
|
||||||
public GridPane mainGrid;
|
|
||||||
@FXML
|
|
||||||
public JFXDatePicker datePickerDate;
|
|
||||||
@FXML
|
|
||||||
public JFXTextField textName;
|
|
||||||
@FXML
|
|
||||||
public JFXComboBox<String> ComboBoxPriotity;
|
|
||||||
@FXML
|
|
||||||
public JFXToggleButton toggleBtnIsFullDay;
|
|
||||||
@FXML
|
|
||||||
public JFXToggleButton toggleBtnIsPrivate;
|
|
||||||
@FXML
|
|
||||||
public Label labelError;
|
|
||||||
@FXML
|
|
||||||
public JFXTimePicker timeStart;
|
|
||||||
@FXML
|
|
||||||
public JFXTimePicker timeEnd;
|
|
||||||
|
|
||||||
|
|
||||||
public CreateEventController() {
|
|
||||||
}
|
|
||||||
|
|
||||||
@FXML
|
|
||||||
public void initialize() {
|
|
||||||
|
|
||||||
StringConverter<LocalTime> defaultConverter = new LocalTimeStringConverter(FormatStyle.SHORT, Locale.GERMANY);
|
|
||||||
timeStart.set24HourView(true);
|
|
||||||
timeStart.setConverter(defaultConverter);
|
|
||||||
|
|
||||||
timeEnd.set24HourView(true);
|
|
||||||
timeEnd.setConverter(defaultConverter);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@FXML
|
|
||||||
protected void createBtnClick(ActionEvent actionEvent) {
|
|
||||||
try {
|
|
||||||
if (datePickerDate.getValue() == null) {
|
|
||||||
throw new IllegalArgumentException("Bitte w\u00e4hle ein Datum aus");
|
|
||||||
}
|
|
||||||
|
|
||||||
Event event = new Event(
|
|
||||||
textName.getText(),
|
|
||||||
ComboBoxPriotity.getSelectionModel().getSelectedIndex(),
|
|
||||||
toggleBtnIsFullDay.isSelected(),
|
|
||||||
toggleBtnIsPrivate.isSelected(),
|
|
||||||
timeStart.getValue(),
|
|
||||||
timeEnd.getValue(),
|
|
||||||
datePickerDate.getValue().atStartOfDay(),
|
|
||||||
(int) DataController.USER_ID
|
|
||||||
);
|
|
||||||
|
|
||||||
System.out.println(event.getAsUrlParam());
|
|
||||||
|
|
||||||
sendHttpRequest(event);
|
|
||||||
|
|
||||||
Stage stage = (Stage) ((Node) actionEvent.getSource()).getScene().getWindow();
|
|
||||||
stage.close();
|
|
||||||
} catch (HttpRequestException e) {
|
|
||||||
labelError.setText(e.getMessage());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void sendHttpRequest(Event event) throws HttpRequestException {
|
|
||||||
DataController dataController = new DataController();
|
|
||||||
dataController.createEvent(event);
|
|
||||||
}
|
|
||||||
|
|
||||||
@FXML
|
|
||||||
protected void abortBtnClick(ActionEvent event) {
|
|
||||||
Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
|
|
||||||
stage.close();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
package main;
|
|
||||||
|
|
||||||
import helper.HttpRequestException;
|
|
||||||
import res.DataController;
|
|
||||||
import res.Event;
|
|
||||||
|
|
||||||
public class EditEventController extends CreateEventController{
|
|
||||||
|
|
||||||
private Event currentEvent;
|
|
||||||
|
|
||||||
public Event getCurrentEvent() {
|
|
||||||
return currentEvent;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setCurrentEvent(Event currentEvent) {
|
|
||||||
this.currentEvent = currentEvent;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void sendHttpRequest(Event event) throws HttpRequestException {
|
|
||||||
DataController dataController = new DataController();
|
|
||||||
dataController.deleteEvent(currentEvent.getOwnerId(), currentEvent.getId(), currentEvent.getDate());
|
|
||||||
dataController.createEvent(event);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,73 +0,0 @@
|
|||||||
package main;
|
|
||||||
|
|
||||||
import config.Config;
|
|
||||||
import config.ConfigLoader;
|
|
||||||
import javafx.application.Application;
|
|
||||||
import javafx.fxml.FXMLLoader;
|
|
||||||
import javafx.scene.Scene;
|
|
||||||
import javafx.stage.Stage;
|
|
||||||
import res.DataController;
|
|
||||||
import res.HttpRequest;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
public class MainApplication extends Application {
|
|
||||||
@Override
|
|
||||||
public void start(Stage stage) throws IOException {
|
|
||||||
Config config = ConfigLoader.load();
|
|
||||||
if(config == null){
|
|
||||||
config = new Config(false, -1, "");
|
|
||||||
}
|
|
||||||
|
|
||||||
System.out.println("Ignore 'Illegal reflective access operation'-Warning. See https://github.com/sshahine/JFoenix/issues/1170");
|
|
||||||
|
|
||||||
if(
|
|
||||||
!config.isSaveLogin()
|
|
||||||
|| !new DataController().loginWithToken(config.getId(), config.getToken())
|
|
||||||
){
|
|
||||||
// Load login-scene
|
|
||||||
loadLoginScene();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (DataController.USER_ID >= 0) {
|
|
||||||
if(config.isSaveLogin()){
|
|
||||||
config.setId(DataController.USER_ID);
|
|
||||||
config.setToken(HttpRequest.TOKEN);
|
|
||||||
ConfigLoader.save(config);
|
|
||||||
}
|
|
||||||
// Load main-scene
|
|
||||||
loadMainScene(stage);
|
|
||||||
|
|
||||||
System.out.println("Logged in...");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void loadMainScene(Stage stage) throws IOException {
|
|
||||||
FXMLLoader fxmlLoader = new FXMLLoader(MainApplication.class.getResource("main-view.fxml"));
|
|
||||||
|
|
||||||
Scene scene = new Scene(fxmlLoader.load(), 1200, 700);
|
|
||||||
scene.getStylesheets().add(Objects.requireNonNull(
|
|
||||||
MainApplication.class.getResource("main-view.css")).toExternalForm()
|
|
||||||
);
|
|
||||||
stage.setTitle("SharePlaner");
|
|
||||||
stage.setScene(scene);
|
|
||||||
stage.show();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void loadLoginScene() throws IOException {
|
|
||||||
FXMLLoader fxmlLoaderLogin = new FXMLLoader(MainApplication.class.getResource("../users/login.fxml"));
|
|
||||||
Scene sceneLogin = new Scene(fxmlLoaderLogin.load(), 650, 500);
|
|
||||||
sceneLogin.getStylesheets().add(Objects.requireNonNull(
|
|
||||||
MainApplication.class.getResource("../users/login.css")).toExternalForm()
|
|
||||||
);
|
|
||||||
Stage stageLogin = new Stage();
|
|
||||||
stageLogin.setTitle("Anmelden");
|
|
||||||
stageLogin.setScene(sceneLogin);
|
|
||||||
stageLogin.showAndWait();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void main(String[] args) {
|
|
||||||
launch();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,56 +0,0 @@
|
|||||||
package users;
|
|
||||||
|
|
||||||
import javafx.event.ActionEvent;
|
|
||||||
import javafx.fxml.FXML;
|
|
||||||
import javafx.scene.Node;
|
|
||||||
import javafx.scene.control.Label;
|
|
||||||
import javafx.scene.control.PasswordField;
|
|
||||||
import javafx.scene.control.TextField;
|
|
||||||
import javafx.scene.control.ToggleButton;
|
|
||||||
import javafx.stage.Stage;
|
|
||||||
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
public class CreateUserController {
|
|
||||||
|
|
||||||
public TextField textName;
|
|
||||||
public PasswordField textPassword;
|
|
||||||
public PasswordField textPasswordSecond;
|
|
||||||
public ToggleButton checkButtonIsAdmin;
|
|
||||||
public TextField textLogin;
|
|
||||||
public TextField textForename;
|
|
||||||
public Label labelError;
|
|
||||||
|
|
||||||
@FXML
|
|
||||||
protected void createUser(ActionEvent event) {
|
|
||||||
if (textLogin.getText().trim().isEmpty()){
|
|
||||||
labelError.setText("Bitte Login Namen angeben");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (textForename.getText().trim().isEmpty()) {
|
|
||||||
labelError.setText("Bitte Vornamen eingeben!");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (textName.getText().trim().isEmpty()) {
|
|
||||||
labelError.setText("Bitte Nachnamen eingeben!");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (textPassword.getText().trim().isEmpty()) {
|
|
||||||
labelError.setText("Bitte Passwort eingeben!");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (!Objects.equals(textPassword.getText(), textPasswordSecond.getText())){
|
|
||||||
labelError.setText("Passwörter stimmen nicht überein!");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
|
|
||||||
stage.close();
|
|
||||||
}
|
|
||||||
|
|
||||||
@FXML
|
|
||||||
protected void abortBtnClick(ActionEvent event) {
|
|
||||||
Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
|
|
||||||
stage.close();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
package users;
|
|
||||||
|
|
||||||
import com.jfoenix.controls.*;
|
|
||||||
import javafx.event.ActionEvent;
|
|
||||||
import javafx.fxml.FXML;
|
|
||||||
import javafx.scene.Node;
|
|
||||||
import javafx.scene.control.Label;
|
|
||||||
import javafx.stage.Stage;
|
|
||||||
import res.DataController;
|
|
||||||
|
|
||||||
public class LoginController {
|
|
||||||
@FXML
|
|
||||||
public JFXTextField userField;
|
|
||||||
@FXML
|
|
||||||
public JFXPasswordField passField;
|
|
||||||
@FXML
|
|
||||||
public Label userErrLabel;
|
|
||||||
@FXML
|
|
||||||
public Label passErrLabel;
|
|
||||||
|
|
||||||
@FXML
|
|
||||||
protected void login(ActionEvent event) {
|
|
||||||
if (userField.getText().trim().isEmpty()) {
|
|
||||||
userErrLabel.setText("Bitte Usernamen eingeben!");
|
|
||||||
passErrLabel.setText("");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (passField.getText().trim().isEmpty()) {
|
|
||||||
userErrLabel.setText("");
|
|
||||||
passErrLabel.setText("Bitte Passwort eingeben!");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
DataController dataController = new DataController();
|
|
||||||
if (!dataController.login(userField.getText(), passField.getText())) {
|
|
||||||
userErrLabel.setText("Name und Passwort passen nicht zueinander!");
|
|
||||||
passErrLabel.setText("Name und Passwort passen nicht zueinander!");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
|
|
||||||
stage.close();
|
|
||||||
}
|
|
||||||
|
|
||||||
@FXML
|
|
||||||
protected void abortBtnClick(ActionEvent event) {
|
|
||||||
Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
|
|
||||||
stage.close();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,64 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
|
|
||||||
<?import javafx.scene.control.*?>
|
|
||||||
<?import javafx.scene.layout.*?>
|
|
||||||
|
|
||||||
<?import javafx.collections.FXCollections?>
|
|
||||||
<?import java.lang.String?>
|
|
||||||
<?import com.jfoenix.controls.*?>
|
|
||||||
|
|
||||||
<GridPane fx:id="mainGrid" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1"
|
|
||||||
fx:controller="main.CreateEventController">
|
|
||||||
|
|
||||||
<columnConstraints>
|
|
||||||
<ColumnConstraints/>
|
|
||||||
<ColumnConstraints/>
|
|
||||||
<ColumnConstraints/>
|
|
||||||
</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>
|
|
||||||
|
|
||||||
<Label styleClass="mainLabel">Termin anlegen</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">Priorität:</Label>
|
|
||||||
<Label styleClass="inputLabel" GridPane.rowIndex="6">Ganztägig:</Label>
|
|
||||||
<Label styleClass="inputLabel" GridPane.rowIndex="7">Privat:</Label>
|
|
||||||
|
|
||||||
<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>
|
|
||||||
<FXCollections fx:factory="observableArrayList">
|
|
||||||
<String fx:value="gering"/>
|
|
||||||
<String fx:value="mittel"/>
|
|
||||||
<String fx:value="hoch"/>
|
|
||||||
</FXCollections>
|
|
||||||
</items>
|
|
||||||
</JFXComboBox>
|
|
||||||
<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">
|
|
||||||
<JFXButton onAction="#abortBtnClick" maxWidth="150" minWidth="150">Abbrechen</JFXButton>
|
|
||||||
<JFXButton styleClass="mainButton" onAction="#createBtnClick" maxWidth="150" minWidth="150">Anlegen</JFXButton>
|
|
||||||
</HBox>
|
|
||||||
|
|
||||||
</GridPane>
|
|
||||||
@@ -1,64 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
|
|
||||||
<?import javafx.scene.control.*?>
|
|
||||||
<?import javafx.scene.layout.*?>
|
|
||||||
|
|
||||||
<?import javafx.collections.FXCollections?>
|
|
||||||
<?import java.lang.String?>
|
|
||||||
<?import com.jfoenix.controls.*?>
|
|
||||||
|
|
||||||
<GridPane fx:id="mainGrid" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1"
|
|
||||||
fx:controller="main.EditEventController">
|
|
||||||
|
|
||||||
<columnConstraints>
|
|
||||||
<ColumnConstraints/>
|
|
||||||
<ColumnConstraints/>
|
|
||||||
<ColumnConstraints/>
|
|
||||||
</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>
|
|
||||||
|
|
||||||
<Label styleClass="mainLabel">Termin bearbeiten</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">Priorität:</Label>
|
|
||||||
<Label styleClass="inputLabel" GridPane.rowIndex="6">Ganztägig:</Label>
|
|
||||||
<Label styleClass="inputLabel" GridPane.rowIndex="7">Privat:</Label>
|
|
||||||
|
|
||||||
<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>
|
|
||||||
<FXCollections fx:factory="observableArrayList">
|
|
||||||
<String fx:value="gering"/>
|
|
||||||
<String fx:value="mittel"/>
|
|
||||||
<String fx:value="hoch"/>
|
|
||||||
</FXCollections>
|
|
||||||
</items>
|
|
||||||
</JFXComboBox>
|
|
||||||
<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">
|
|
||||||
<JFXButton onAction="#abortBtnClick" maxWidth="150" minWidth="150">Abbrechen</JFXButton>
|
|
||||||
<JFXButton styleClass="mainButton" onAction="#createBtnClick" maxWidth="150" minWidth="150">Speichern</JFXButton>
|
|
||||||
</HBox>
|
|
||||||
|
|
||||||
</GridPane>
|
|
||||||
@@ -1,75 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
|
|
||||||
<?import javafx.geometry.*?>
|
|
||||||
<?import javafx.scene.control.*?>
|
|
||||||
<?import javafx.scene.image.*?>
|
|
||||||
<?import javafx.scene.layout.*?>
|
|
||||||
<?import com.jfoenix.controls.*?>
|
|
||||||
|
|
||||||
<GridPane style="-fx-background-color: #424242;" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1"
|
|
||||||
fx:controller="main.MainController">
|
|
||||||
<columnConstraints>
|
|
||||||
<ColumnConstraints hgrow="NEVER" maxWidth="60.0" minWidth="60.0"/>
|
|
||||||
<ColumnConstraints hgrow="ALWAYS"/>
|
|
||||||
</columnConstraints>
|
|
||||||
<rowConstraints>
|
|
||||||
<RowConstraints vgrow="SOMETIMES"/>
|
|
||||||
</rowConstraints>
|
|
||||||
<VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0" spacing="5.0"
|
|
||||||
style="-fx-background-color: #525E74;">
|
|
||||||
<ImageView fitHeight="50.0" fitWidth="50.0" pickOnBounds="true" preserveRatio="true">
|
|
||||||
|
|
||||||
</ImageView>
|
|
||||||
<JFXButton onAction="#onAddBtnClick" styleClass="main-btn">
|
|
||||||
ADD
|
|
||||||
</JFXButton>
|
|
||||||
<JFXButton onAction="#onAddBtnClick" styleClass="main-btn">
|
|
||||||
ADD
|
|
||||||
</JFXButton>
|
|
||||||
<JFXButton onAction="#onAddBtnClick" styleClass="main-btn">
|
|
||||||
ADD
|
|
||||||
</JFXButton>
|
|
||||||
</VBox>
|
|
||||||
<GridPane prefHeight="200.0" prefWidth="222.0" GridPane.columnIndex="1" GridPane.rowIndex="0">
|
|
||||||
<columnConstraints>
|
|
||||||
<ColumnConstraints hgrow="ALWAYS"/>
|
|
||||||
<ColumnConstraints/>
|
|
||||||
<ColumnConstraints/>
|
|
||||||
<ColumnConstraints/>
|
|
||||||
<ColumnConstraints/>
|
|
||||||
</columnConstraints>
|
|
||||||
<rowConstraints>
|
|
||||||
<RowConstraints/>
|
|
||||||
<RowConstraints vgrow="ALWAYS"/>
|
|
||||||
</rowConstraints>
|
|
||||||
<Label fx:id="LabelMonth" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308"
|
|
||||||
styleClass="labelMonth" textFill="WHITE" GridPane.columnIndex="0" GridPane.rowIndex="0">
|
|
||||||
Monat
|
|
||||||
<padding>
|
|
||||||
<Insets left="5"/>
|
|
||||||
</padding>
|
|
||||||
</Label>
|
|
||||||
<JFXButton styleClass="navBtn" onAction="#onBackClick" GridPane.columnIndex="1" maxHeight="1.7976931348623157E308">zurück</JFXButton>
|
|
||||||
<JFXButton styleClass="navBtn" onAction="#onTodayClick" GridPane.columnIndex="2" maxHeight="1.7976931348623157E308">heute</JFXButton>
|
|
||||||
<JFXButton styleClass="navBtn" onAction="#onNextClick" GridPane.columnIndex="3" maxHeight="1.7976931348623157E308">weiter</JFXButton>
|
|
||||||
|
|
||||||
<GridPane fx:id="calendarGrid" gridLinesVisible="true" styleClass="gridCalendar" GridPane.columnSpan="4"
|
|
||||||
GridPane.columnIndex="0" GridPane.rowIndex="1">
|
|
||||||
<columnConstraints>
|
|
||||||
<ColumnConstraints hgrow="ALWAYS" maxWidth="14.2857142857" minWidth="14.2857142857"
|
|
||||||
percentWidth="14.2857142857"/>
|
|
||||||
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
|
|
||||||
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
|
|
||||||
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
|
|
||||||
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
|
|
||||||
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
|
|
||||||
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
|
|
||||||
</columnConstraints>
|
|
||||||
<rowConstraints>
|
|
||||||
<RowConstraints maxHeight="55.0" minHeight="25.0" vgrow="NEVER"/>
|
|
||||||
<RowConstraints percentHeight="-Infinity" vgrow="ALWAYS"/>
|
|
||||||
</rowConstraints>
|
|
||||||
|
|
||||||
</GridPane>
|
|
||||||
</GridPane>
|
|
||||||
</GridPane>
|
|
||||||
@@ -1,56 +0,0 @@
|
|||||||
* {
|
|
||||||
-fx-base-background-color: #2B2D42;
|
|
||||||
-fx-base1-background-color: #525E74;
|
|
||||||
|
|
||||||
-fx-main-border-color: #B0B0B0;
|
|
||||||
-fx-main-text-color: #ffffff;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
|
|
||||||
.mainLabel{
|
|
||||||
-fx-padding: 10px;
|
|
||||||
-fx-max-width: 400px;
|
|
||||||
-fx-min-width: 400px;
|
|
||||||
-fx-font-weight: bold;
|
|
||||||
-fx-alignment: top-center;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
Label{
|
|
||||||
-fx-text-fill: white;
|
|
||||||
-fx-max-width: 150px;
|
|
||||||
-fx-min-width: 150px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.textField{
|
|
||||||
-fx-max-width: 400px;
|
|
||||||
-fx-min-width: 400px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.errorMessage{
|
|
||||||
-fx-max-width: 400px;
|
|
||||||
-fx-min-width: 400px;
|
|
||||||
}
|
|
||||||
|
|
||||||
Button{
|
|
||||||
-fx-max-width: 150px;
|
|
||||||
-fx-min-width: 150px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.btnLogin{
|
|
||||||
-fx-font-weight: bold;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,56 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
|
|
||||||
<?import javafx.scene.control.*?>
|
|
||||||
<?import javafx.scene.layout.*?>
|
|
||||||
<?import javafx.geometry.Insets?>
|
|
||||||
<GridPane xmlns="http://javafx.com/javafx"
|
|
||||||
xmlns:fx="http://javafx.com/fxml"
|
|
||||||
fx:controller="users.CreateUserController">
|
|
||||||
<columnConstraints>
|
|
||||||
<ColumnConstraints minWidth="100"/>
|
|
||||||
<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" >User anlegen</Label>
|
|
||||||
|
|
||||||
<Label styleClass="inputLabel" GridPane.rowIndex="1" GridPane.columnIndex="1">Login:</Label>
|
|
||||||
<Label styleClass="inputLabel" GridPane.rowIndex="2" GridPane.columnIndex="1">Vorname:</Label>
|
|
||||||
<Label styleClass="inputLabel" GridPane.rowIndex="3" GridPane.columnIndex="1">Nachname:</Label>
|
|
||||||
<Label styleClass="inputLabel" GridPane.rowIndex="4" GridPane.columnIndex="1">Passwort:</Label>
|
|
||||||
<Label styleClass="inputLabel" GridPane.rowIndex="5" GridPane.columnIndex="1">Passwort wiederholen:</Label>
|
|
||||||
|
|
||||||
<Label styleClass="inputLabelAdmin" GridPane.rowIndex="6" GridPane.columnIndex="1">Admin:</Label>
|
|
||||||
|
|
||||||
<TextField fx:id="textLogin" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="1" />
|
|
||||||
<TextField fx:id="textForename" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="2" />
|
|
||||||
<TextField fx:id="textName" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="3" />
|
|
||||||
<PasswordField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" />
|
|
||||||
<PasswordField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" />
|
|
||||||
|
|
||||||
<ToggleButton fx:id="checkButtonIsAdmin" GridPane.columnIndex="2" GridPane.rowIndex="6"/>
|
|
||||||
|
|
||||||
<Label fx:id="labelError" styleClass="errorMessage" GridPane.columnIndex="2" GridPane.rowIndex="7"/>
|
|
||||||
|
|
||||||
<HBox GridPane.columnIndex="2" GridPane.rowIndex="8" alignment="CENTER_RIGHT">
|
|
||||||
<HBox.margin>
|
|
||||||
<Insets right="100" left="100"/>
|
|
||||||
</HBox.margin>
|
|
||||||
<Button onAction="#abortBtnClick">Abbrechen</Button>
|
|
||||||
<Button onAction="#createUser" styleClass="btnLogin" >Anmelden</Button>
|
|
||||||
|
|
||||||
</HBox>
|
|
||||||
</GridPane>
|
|
||||||
|
|
||||||
@@ -1,53 +0,0 @@
|
|||||||
* {
|
|
||||||
-fx-base-background-color: #2B2D42;
|
|
||||||
-fx-base1-background-color: #525E74;
|
|
||||||
|
|
||||||
-fx-main-border-color: #B0B0B0;
|
|
||||||
-fx-main-text-color: #ffffff;
|
|
||||||
}
|
|
||||||
|
|
||||||
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: 150px;
|
|
||||||
-fx-min-width: 150px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.errorLbl{
|
|
||||||
-fx-font-weight: bold;
|
|
||||||
-fx-max-width: 200px;
|
|
||||||
-fx-text-fill: #ff5555;
|
|
||||||
-fx-padding: 16px;
|
|
||||||
-fx-min-height: 140px;
|
|
||||||
-fx-max-height: 400px;
|
|
||||||
-fx-wrap-text: true;
|
|
||||||
-fx-font-size: 16px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.userField{
|
|
||||||
-fx-background-color: white;
|
|
||||||
}
|
|
||||||
|
|
||||||
.passField{
|
|
||||||
-fx-background-color: white;
|
|
||||||
}
|
|
||||||
|
|
||||||
.quitBtn{
|
|
||||||
-fx-background-color: white;
|
|
||||||
}
|
|
||||||
|
|
||||||
.loginBtn{
|
|
||||||
-fx-background-color: white;
|
|
||||||
}
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
<?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="users.LoginController">
|
|
||||||
|
|
||||||
<columnConstraints>
|
|
||||||
<ColumnConstraints/>
|
|
||||||
<ColumnConstraints/>
|
|
||||||
<ColumnConstraints/>
|
|
||||||
</columnConstraints>
|
|
||||||
<rowConstraints>
|
|
||||||
<RowConstraints vgrow="ALWAYS"/>
|
|
||||||
<RowConstraints vgrow="ALWAYS"/>
|
|
||||||
<RowConstraints vgrow="ALWAYS"/>
|
|
||||||
<RowConstraints vgrow="ALWAYS"/>
|
|
||||||
</rowConstraints>
|
|
||||||
|
|
||||||
<Label GridPane.columnIndex="1">Anmelden</Label>
|
|
||||||
|
|
||||||
<Label GridPane.rowIndex="1">Username</Label>
|
|
||||||
<JFXTextField styleClass="userField" GridPane.columnIndex="1" GridPane.rowIndex="1" fx:id="userField"/>
|
|
||||||
<Label styleClass="errorLbl" GridPane.columnIndex="2" GridPane.rowIndex="1" fx:id="userErrLabel"/>
|
|
||||||
|
|
||||||
<Label GridPane.rowIndex="2">Paswort</Label>
|
|
||||||
<JFXPasswordField styleClass="passField" GridPane.columnIndex="1" GridPane.rowIndex="2" fx:id="passField"/>
|
|
||||||
<Label styleClass="errorLbl" GridPane.columnIndex="2" GridPane.rowIndex="2" fx:id="passErrLabel"/>
|
|
||||||
|
|
||||||
<JFXButton styleClass="quitBtn" onAction="#abortBtnClick" GridPane.columnIndex="1" GridPane.rowIndex="3">Beenden</JFXButton>
|
|
||||||
<JFXButton styleClass="loginBtn" onAction="#login" GridPane.columnIndex="2" GridPane.rowIndex="3">Anmelden</JFXButton>
|
|
||||||
|
|
||||||
</GridPane>
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
package config;
|
|
||||||
|
|
||||||
public class Config {
|
|
||||||
private boolean saveLogin;
|
|
||||||
private long id;
|
|
||||||
private String token;
|
|
||||||
|
|
||||||
public Config(){
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public Config(boolean saveLogin, long id, String token) {
|
|
||||||
this.saveLogin = saveLogin;
|
|
||||||
this.id = id;
|
|
||||||
this.token = token;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isSaveLogin() {
|
|
||||||
return saveLogin;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setSaveLogin(boolean saveLogin) {
|
|
||||||
this.saveLogin = saveLogin;
|
|
||||||
}
|
|
||||||
|
|
||||||
public long getId() {
|
|
||||||
return id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setId(long id) {
|
|
||||||
this.id = id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getToken() {
|
|
||||||
return token;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setToken(String token) {
|
|
||||||
this.token = token;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
package config;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
||||||
import res.DataController;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.nio.file.Files;
|
|
||||||
import java.nio.file.Paths;
|
|
||||||
|
|
||||||
public class ConfigLoader {
|
|
||||||
|
|
||||||
public static Config load(){
|
|
||||||
try {
|
|
||||||
String jsonString = Files.readString(Paths.get("config.json"));
|
|
||||||
|
|
||||||
ObjectMapper objectMapper = new ObjectMapper();
|
|
||||||
objectMapper.findAndRegisterModules();
|
|
||||||
return objectMapper.readValue(jsonString, Config.class);
|
|
||||||
} catch (IOException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void save(Config config){
|
|
||||||
ObjectMapper objectMapper = new ObjectMapper();
|
|
||||||
objectMapper.findAndRegisterModules();
|
|
||||||
|
|
||||||
try {
|
|
||||||
Files.writeString(Paths.get(
|
|
||||||
"config.json"),
|
|
||||||
objectMapper.writeValueAsString(config)
|
|
||||||
);
|
|
||||||
} catch (IOException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
package helper;
|
|
||||||
|
|
||||||
public class HttpRequestException extends Exception{
|
|
||||||
private int status;
|
|
||||||
|
|
||||||
public HttpRequestException(String message, int status) {
|
|
||||||
super(message);
|
|
||||||
this.status = status;
|
|
||||||
}
|
|
||||||
|
|
||||||
public HttpRequestException(Tuple<Integer, String> response) {
|
|
||||||
super(response.getValue());
|
|
||||||
this.status = response.getKey();
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getStatus() {
|
|
||||||
return status;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setStatus(int status) {
|
|
||||||
this.status = status;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
package helper;
|
|
||||||
|
|
||||||
public class Tuple<X, Y> {
|
|
||||||
public final X key;
|
|
||||||
public final Y value;
|
|
||||||
|
|
||||||
public Tuple(X key, Y value) {
|
|
||||||
this.key = key;
|
|
||||||
this.value = value;
|
|
||||||
}
|
|
||||||
|
|
||||||
public X getKey() {
|
|
||||||
return key;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Y getValue() {
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return "Tuple{" +
|
|
||||||
"key=" + key +
|
|
||||||
", value=" + value +
|
|
||||||
'}';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,146 +0,0 @@
|
|||||||
package res;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
|
||||||
import com.fasterxml.jackson.core.type.TypeReference;
|
|
||||||
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.*;
|
|
||||||
|
|
||||||
public class DataController {
|
|
||||||
|
|
||||||
public static long USER_ID = -1;
|
|
||||||
|
|
||||||
private static final String ALL_EVENTS_ENDPOINT = "http://localhost:8080/event/all";
|
|
||||||
private static final String ADD_EVENT_ENDPOINT = "http://localhost:8080/event/add";
|
|
||||||
private static final String DELETE_EVENT_ENDPOINT = "http://localhost:8080/event/del";
|
|
||||||
|
|
||||||
private static final String LOGIN_ENDPOINT = "http://localhost:8080/user/login";
|
|
||||||
private static final String LOGIN_WITH_TOKEN_ENDPOINT = "http://localhost:8080/user/login-with-token";
|
|
||||||
private static final String ALL_USERS_ENDPOINT = "http://localhost:8080/user/all";
|
|
||||||
private static final String HEADER_TEST_ENDPOINT = "http://localhost:8080/vpr/header-test";
|
|
||||||
|
|
||||||
private final HttpRequest httpRequest;
|
|
||||||
|
|
||||||
public DataController() {
|
|
||||||
httpRequest = new HttpRequest();
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean login(String username, String password) {
|
|
||||||
try {
|
|
||||||
Tuple<Integer, String> response = httpRequest.sendPostRequest(
|
|
||||||
LOGIN_ENDPOINT,
|
|
||||||
"login=" + username
|
|
||||||
+ "&password=" + password,
|
|
||||||
false
|
|
||||||
);
|
|
||||||
String[] data = response.getValue().split("\\s+");
|
|
||||||
|
|
||||||
USER_ID = Long.parseLong(data[1]);
|
|
||||||
HttpRequest.TOKEN = data[0];
|
|
||||||
|
|
||||||
Tuple<Integer, String> auth = httpRequest.sendPostRequest(
|
|
||||||
HEADER_TEST_ENDPOINT,
|
|
||||||
"",
|
|
||||||
true
|
|
||||||
);
|
|
||||||
System.out.println("auth " + auth);
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return USER_ID >= 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean loginWithToken(long userId, String token) {
|
|
||||||
try {
|
|
||||||
HttpRequest.TOKEN = token;
|
|
||||||
Tuple<Integer, String> response = httpRequest.sendPostRequest(
|
|
||||||
LOGIN_WITH_TOKEN_ENDPOINT,
|
|
||||||
"userId=" + userId,
|
|
||||||
true
|
|
||||||
);
|
|
||||||
|
|
||||||
System.out.println(response.getKey() + " " + response.getValue());
|
|
||||||
|
|
||||||
if(response.getKey() != 200) return false;
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
USER_ID = userId;
|
|
||||||
HttpRequest.TOKEN = token;
|
|
||||||
return USER_ID >= 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void createEvent(Event event) throws HttpRequestException {
|
|
||||||
try {
|
|
||||||
Tuple<Integer, String> response = httpRequest.sendPostRequest(ADD_EVENT_ENDPOINT, event.getAsUrlParam(), true);
|
|
||||||
if(response.getKey() != 200){
|
|
||||||
throw new HttpRequestException(response);
|
|
||||||
}
|
|
||||||
}catch (HttpRequestException e){
|
|
||||||
throw e;
|
|
||||||
}catch (Exception e) {
|
|
||||||
throw new HttpRequestException("Es konnte keine Verbindung mit dem Server hergestellt werden.", 600);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void deleteEvent(int userId, int eventId, LocalDateTime date) throws HttpRequestException {
|
|
||||||
try {
|
|
||||||
System.out.println("DELETE: userId=" + userId + "&eventId=" + eventId + "&date=" + date.toLocalDate());
|
|
||||||
Tuple<Integer, String> response = httpRequest.sendPostRequest(
|
|
||||||
DELETE_EVENT_ENDPOINT,
|
|
||||||
"userId=" + userId + "&eventId=" + eventId + "&date=" + date.toLocalDate(),
|
|
||||||
true
|
|
||||||
);
|
|
||||||
if(response.getKey() != 200){
|
|
||||||
throw new HttpRequestException(response);
|
|
||||||
}
|
|
||||||
}catch (HttpRequestException e){
|
|
||||||
throw e;
|
|
||||||
}catch (Exception e) {
|
|
||||||
throw new HttpRequestException("Es konnte keine Verbindung mit dem Server hergestellt werden.", 600);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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,
|
|
||||||
"userId=" + USER_ID + "&startDate=" + startDate.toLocalDate() + "&endDate=" + endDate.toLocalDate(),
|
|
||||||
true
|
|
||||||
);
|
|
||||||
if(response.getKey() != 200){
|
|
||||||
throw new HttpRequestException(response);
|
|
||||||
}
|
|
||||||
String jsonResponse = response.getValue();
|
|
||||||
System.out.println(jsonResponse);
|
|
||||||
|
|
||||||
ObjectMapper objectMapper = new ObjectMapper();
|
|
||||||
objectMapper.findAndRegisterModules();
|
|
||||||
eventList = (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;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -16,12 +16,7 @@ application {
|
|||||||
mainClassName = "client.MainApplication"
|
mainClassName = "client.MainApplication"
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
|
||||||
mavenCentral()
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation("com.jfoenix:jfoenix:9.0.10")
|
|
||||||
implementation(project(":data"))
|
implementation(project(":data"))
|
||||||
}
|
}
|
||||||
|
|
||||||
68
hellofx/app/src/main/java/client/CreateEventController.java
Normal file
68
hellofx/app/src/main/java/client/CreateEventController.java
Normal file
@@ -0,0 +1,68 @@
|
|||||||
|
package client;
|
||||||
|
|
||||||
|
import javafx.event.ActionEvent;
|
||||||
|
import javafx.fxml.FXML;
|
||||||
|
import javafx.scene.Node;
|
||||||
|
import javafx.scene.control.CheckBox;
|
||||||
|
import javafx.scene.control.ComboBox;
|
||||||
|
import javafx.scene.control.DatePicker;
|
||||||
|
import javafx.scene.control.TextField;
|
||||||
|
import javafx.stage.Stage;
|
||||||
|
import res.DataController;
|
||||||
|
import res.Event;
|
||||||
|
|
||||||
|
public class CreateEventController {
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
public DatePicker datePickerDate;
|
||||||
|
@FXML
|
||||||
|
public TextField textName;
|
||||||
|
@FXML
|
||||||
|
public TextField textStart;
|
||||||
|
@FXML
|
||||||
|
public TextField textEnd;
|
||||||
|
@FXML
|
||||||
|
public ComboBox<String> ComboBoxTyp;
|
||||||
|
@FXML
|
||||||
|
public ComboBox<String> ComboBoxPriotity;
|
||||||
|
@FXML
|
||||||
|
public CheckBox checkBoxIsFullDay;
|
||||||
|
@FXML
|
||||||
|
public CheckBox checkBoxIsPrivate;
|
||||||
|
|
||||||
|
|
||||||
|
public CreateEventController(){}
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
public void initialize(){}
|
||||||
|
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
protected void createBtnClick(ActionEvent actionEvent){
|
||||||
|
|
||||||
|
Event event = new Event(
|
||||||
|
textName.getText(),
|
||||||
|
ComboBoxPriotity.getSelectionModel().getSelectedIndex(),
|
||||||
|
checkBoxIsFullDay.isSelected(),
|
||||||
|
checkBoxIsPrivate.isSelected(),
|
||||||
|
textStart.getText(),
|
||||||
|
textEnd.getText(),
|
||||||
|
datePickerDate.getValue().atStartOfDay(),
|
||||||
|
1
|
||||||
|
);
|
||||||
|
|
||||||
|
System.out.println(event.getAsUrlParam());
|
||||||
|
|
||||||
|
DataController dataController = new DataController();
|
||||||
|
dataController.createEvent(event);
|
||||||
|
|
||||||
|
Stage stage = (Stage) ((Node) actionEvent.getSource()).getScene().getWindow();
|
||||||
|
stage.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
protected void abortBtnClick(ActionEvent event){
|
||||||
|
Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
|
||||||
|
stage.close();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
package main;
|
package client;
|
||||||
|
|
||||||
public class Launcher {
|
public class Launcher {
|
||||||
|
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
MainApplication.main(args);
|
MainApplication.main(args);
|
||||||
}
|
}
|
||||||
28
hellofx/app/src/main/java/client/MainApplication.java
Normal file
28
hellofx/app/src/main/java/client/MainApplication.java
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
package client;
|
||||||
|
|
||||||
|
import javafx.application.Application;
|
||||||
|
import javafx.fxml.FXMLLoader;
|
||||||
|
import javafx.scene.Node;
|
||||||
|
import javafx.scene.Scene;
|
||||||
|
import javafx.stage.Stage;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
|
public class MainApplication extends Application {
|
||||||
|
@Override
|
||||||
|
public void start(Stage stage) throws IOException {
|
||||||
|
FXMLLoader fxmlLoader = new FXMLLoader(MainApplication.class.getResource("main-view.fxml"));
|
||||||
|
|
||||||
|
Scene scene = new Scene(fxmlLoader.load(), 1200, 700);
|
||||||
|
scene.getStylesheets().add(Objects.requireNonNull(MainApplication.class.getResource("main-view.css")).toExternalForm());
|
||||||
|
stage.setTitle("Hello!");
|
||||||
|
stage.setScene(scene);
|
||||||
|
stage.show();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void main(String[] args) {
|
||||||
|
launch();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,12 +1,13 @@
|
|||||||
package main;
|
package client;
|
||||||
|
|
||||||
import helper.HttpRequestException;
|
import javafx.event.ActionEvent;
|
||||||
|
import javafx.event.EventHandler;
|
||||||
import javafx.fxml.FXML;
|
import javafx.fxml.FXML;
|
||||||
import javafx.fxml.FXMLLoader;
|
import javafx.fxml.FXMLLoader;
|
||||||
import javafx.geometry.Pos;
|
import javafx.geometry.Pos;
|
||||||
import javafx.scene.Scene;
|
import javafx.scene.Scene;
|
||||||
import customUI.Button;
|
import javafx.scene.control.Button;
|
||||||
import customUI.Label;
|
import javafx.scene.control.Label;
|
||||||
import javafx.scene.control.ScrollPane;
|
import javafx.scene.control.ScrollPane;
|
||||||
import javafx.scene.layout.GridPane;
|
import javafx.scene.layout.GridPane;
|
||||||
import javafx.scene.layout.HBox;
|
import javafx.scene.layout.HBox;
|
||||||
@@ -29,7 +30,7 @@ public class MainController {
|
|||||||
private GridPane calendarGrid;
|
private GridPane calendarGrid;
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
private javafx.scene.control.Label LabelMonth;
|
private Label LabelMonth;
|
||||||
|
|
||||||
private final String[] dayNames = {"Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag", "Sonntag"};
|
private final String[] dayNames = {"Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag", "Sonntag"};
|
||||||
private final Label[] dayLabel = new Label[7];
|
private final Label[] dayLabel = new Label[7];
|
||||||
@@ -44,7 +45,7 @@ public class MainController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
public void initialize() {
|
public void initialize(){
|
||||||
createWeek();
|
createWeek();
|
||||||
setDates();
|
setDates();
|
||||||
|
|
||||||
@@ -52,53 +53,24 @@ public class MainController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void updateEvents() {
|
private void updateEvents() {
|
||||||
for (VBox vBox : dayVBoxes) {
|
for(VBox vBox : dayVBoxes){
|
||||||
vBox.getChildren().clear();
|
vBox.getChildren().clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
DataController dataController = new DataController();
|
DataController dataController = new DataController();
|
||||||
try {
|
ArrayList<Event> eventList = dataController.getAllVisibleEvents();
|
||||||
ArrayList<Event> eventList = dataController.getAllVisibleEvents(weekStartDateTime, weekStartDateTime.plusDays(7));
|
|
||||||
|
|
||||||
for (Event event : eventList) {
|
for(Event event : eventList){
|
||||||
addEvent(event);
|
addEvent(event);
|
||||||
}
|
|
||||||
} catch (HttpRequestException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
protected void onBackClick() {
|
protected void onAddBtnClick(){
|
||||||
weekOffset--;
|
try{
|
||||||
setDates();
|
FXMLLoader fxmlLoader = new FXMLLoader(MainApplication.class.getResource("create-event.fxml"));
|
||||||
updateEvents();
|
Scene scene = new Scene(fxmlLoader.load(), 650, 500);
|
||||||
}
|
scene.getStylesheets().add(Objects.requireNonNull(MainApplication.class.getResource("create-event.css")).toExternalForm());
|
||||||
|
|
||||||
@FXML
|
|
||||||
protected void onTodayClick() {
|
|
||||||
weekOffset = 0;
|
|
||||||
setDates();
|
|
||||||
updateEvents();
|
|
||||||
}
|
|
||||||
|
|
||||||
@FXML
|
|
||||||
protected void onNextClick() {
|
|
||||||
weekOffset++;
|
|
||||||
setDates();
|
|
||||||
updateEvents();
|
|
||||||
}
|
|
||||||
|
|
||||||
@FXML
|
|
||||||
protected void onAddBtnClick() {
|
|
||||||
try {
|
|
||||||
FXMLLoader fxmlLoader = new FXMLLoader(
|
|
||||||
MainApplication.class.getResource("create-event.fxml"));
|
|
||||||
Scene scene = new Scene(fxmlLoader.load(), 650, 650);
|
|
||||||
scene.getStylesheets().add(Objects.requireNonNull(
|
|
||||||
MainApplication.class.getResource("create-event.css")).toExternalForm());
|
|
||||||
Stage stage = new Stage();
|
Stage stage = new Stage();
|
||||||
stage.setTitle("Termin erstellen");
|
stage.setTitle("Termin erstellen");
|
||||||
stage.setScene(scene);
|
stage.setScene(scene);
|
||||||
@@ -106,16 +78,17 @@ public class MainController {
|
|||||||
stage.setResizable(false);
|
stage.setResizable(false);
|
||||||
//stage.initStyle(StageStyle.UNDECORATED);
|
//stage.initStyle(StageStyle.UNDECORATED);
|
||||||
stage.showAndWait();
|
stage.showAndWait();
|
||||||
} catch (IOException e) {
|
}
|
||||||
|
catch (IOException e){
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
updateEvents();
|
updateEvents();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void createWeek() {
|
private void createWeek(){
|
||||||
for (int i = 0; i < 7; i++) {
|
for (int i = 0; i < 7; i++) {
|
||||||
Label label = new Label();
|
Label label = new Label();
|
||||||
label.setTextValue(dayNames[i]);
|
label.setText(dayNames[i]);
|
||||||
label.setMaxHeight(Double.MAX_VALUE);
|
label.setMaxHeight(Double.MAX_VALUE);
|
||||||
label.setMaxWidth(Double.MAX_VALUE);
|
label.setMaxWidth(Double.MAX_VALUE);
|
||||||
label.getStyleClass().add("labelDays");
|
label.getStyleClass().add("labelDays");
|
||||||
@@ -139,7 +112,7 @@ public class MainController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void addEvent(Event event) {
|
private void addEvent(Event event){
|
||||||
VBox vBox = new VBox();
|
VBox vBox = new VBox();
|
||||||
vBox.getStyleClass().add("event");
|
vBox.getStyleClass().add("event");
|
||||||
vBox.setSpacing(5);
|
vBox.setSpacing(5);
|
||||||
@@ -147,38 +120,14 @@ public class MainController {
|
|||||||
HBox btnHBox = new HBox();
|
HBox btnHBox = new HBox();
|
||||||
btnHBox.setAlignment(Pos.BOTTOM_RIGHT);
|
btnHBox.setAlignment(Pos.BOTTOM_RIGHT);
|
||||||
Button deleteBtn = new Button();
|
Button deleteBtn = new Button();
|
||||||
deleteBtn.setTextValue(" X ");
|
deleteBtn.setText(" X ");
|
||||||
deleteBtn.setOnAction(e -> {
|
deleteBtn.setOnAction(e -> {
|
||||||
DataController dataController = new DataController();
|
DataController dataController = new DataController();
|
||||||
try {
|
dataController.deleteEvent(event.getId());
|
||||||
dataController.deleteEvent(event.getOwnerId(), event.getId(), event.getDate());
|
|
||||||
} catch (HttpRequestException ex) {
|
|
||||||
ex.printStackTrace();
|
|
||||||
}
|
|
||||||
updateEvents();
|
updateEvents();
|
||||||
});
|
});
|
||||||
Button editBtn = new Button();
|
Button editBtn = new Button();
|
||||||
editBtn.setTextValue("edit");
|
editBtn.setText("edit");
|
||||||
editBtn.setOnAction(event1 -> {
|
|
||||||
try {
|
|
||||||
FXMLLoader fxmlLoader = new FXMLLoader(
|
|
||||||
MainApplication.class.getResource("edit-event.fxml"));
|
|
||||||
Scene scene = new Scene(fxmlLoader.load(), 650, 650);
|
|
||||||
scene.getStylesheets().add(Objects.requireNonNull(
|
|
||||||
MainApplication.class.getResource("create-event.css")).toExternalForm());
|
|
||||||
Stage stage = new Stage();
|
|
||||||
stage.setTitle("Termin bearbeiten");
|
|
||||||
stage.setScene(scene);
|
|
||||||
stage.initModality(Modality.APPLICATION_MODAL);
|
|
||||||
stage.setResizable(false);
|
|
||||||
EditEventController editEventController = fxmlLoader.getController();
|
|
||||||
editEventController.setCurrentEvent(event);
|
|
||||||
stage.showAndWait();
|
|
||||||
updateEvents();
|
|
||||||
} catch (IOException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
btnHBox.getChildren().add(editBtn);
|
btnHBox.getChildren().add(editBtn);
|
||||||
btnHBox.getChildren().add(deleteBtn);
|
btnHBox.getChildren().add(deleteBtn);
|
||||||
vBox.getChildren().add(btnHBox);
|
vBox.getChildren().add(btnHBox);
|
||||||
@@ -186,44 +135,37 @@ public class MainController {
|
|||||||
Label nameLabel = new Label(event.getName());
|
Label nameLabel = new Label(event.getName());
|
||||||
vBox.getChildren().add(nameLabel);
|
vBox.getChildren().add(nameLabel);
|
||||||
|
|
||||||
if (event.getStart() != null || event.getEnd() != null) {
|
Label timeLabel = new Label(event.getStart() + "-" + event.getEnd());
|
||||||
String timeStr = (event.getStart() != null ? formatTime(event.getStart()) : "")
|
vBox.getChildren().add(timeLabel);
|
||||||
+ (event.getEnd() != null ? " - " + formatTime(event.getEnd()) : "");
|
|
||||||
Label timeLabel = new Label(timeStr);
|
|
||||||
vBox.getChildren().add(timeLabel);
|
|
||||||
}
|
|
||||||
|
|
||||||
Label typeLabel = new Label("Wer: " + event.getOwnerName());
|
Label typeLabel = new Label("Wer: " + event.getOwnerName());
|
||||||
vBox.getChildren().add(typeLabel);
|
vBox.getChildren().add(typeLabel);
|
||||||
|
|
||||||
|
/*
|
||||||
|
Ä, ä \u00c4, \u00e4
|
||||||
|
Ö, ö \u00d6, \u00f6
|
||||||
|
Ü, ü \u00dc, \u00fc
|
||||||
|
ß \u00df
|
||||||
|
*/
|
||||||
Label prioLabel = new Label("Priorit\u00e4t: " + event.getPriority());
|
Label prioLabel = new Label("Priorit\u00e4t: " + event.getPriority());
|
||||||
vBox.getChildren().add(prioLabel);
|
vBox.getChildren().add(prioLabel);
|
||||||
|
|
||||||
if (event.isFullDay()) {
|
if(event.isFullDay()){
|
||||||
Label fullDayLabel = new Label("Dieser Termin bockiert den ganzen Tag!");
|
Label fullDayLabel = new Label("Dieser Termin bockiert den ganzen Tag!");
|
||||||
vBox.getChildren().add(fullDayLabel);
|
vBox.getChildren().add(fullDayLabel);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
LocalDateTime eventDate = event.getDate();
|
LocalDateTime eventDate = event.getDate();
|
||||||
|
|
||||||
int day = (int) Duration.between(
|
int day = (int)Duration.between(weekStartDateTime.toLocalDate().atStartOfDay(), eventDate.toLocalDate().atStartOfDay()).toDays();
|
||||||
weekStartDateTime.toLocalDate().atStartOfDay(), eventDate.toLocalDate().atStartOfDay()).toDays();
|
|
||||||
|
|
||||||
if (day >= 0 && day < 7) {
|
if(day >= 0 && day < 7){
|
||||||
dayVBoxes[day].getChildren().add(vBox);
|
dayVBoxes[day].getChildren().add(vBox);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private String formatTime(String time) {
|
private void setDates(){
|
||||||
String[] timeArr = time.split(":");
|
|
||||||
if (timeArr.length > 2) {
|
|
||||||
return timeArr[0] + ":" + timeArr[1];
|
|
||||||
}
|
|
||||||
return time;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void setDates() {
|
|
||||||
DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("LLLL yyyy");
|
DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("LLLL yyyy");
|
||||||
DateTimeFormatter dayFormatter = DateTimeFormatter.ofPattern("E dd.MM");
|
DateTimeFormatter dayFormatter = DateTimeFormatter.ofPattern("E dd.MM");
|
||||||
DateTimeFormatter dayOfWeekFormatter = DateTimeFormatter.ofPattern("e");
|
DateTimeFormatter dayOfWeekFormatter = DateTimeFormatter.ofPattern("e");
|
||||||
@@ -231,10 +173,10 @@ public class MainController {
|
|||||||
LocalDateTime now = LocalDateTime.now();
|
LocalDateTime now = LocalDateTime.now();
|
||||||
int dayOfWeek = Integer.parseInt(dayOfWeekFormatter.format(now));
|
int dayOfWeek = Integer.parseInt(dayOfWeekFormatter.format(now));
|
||||||
|
|
||||||
weekStartDateTime = now.plusDays(weekOffset * 7L - dayOfWeek + 1);
|
weekStartDateTime = now.minusDays(weekOffset * 7L + dayOfWeek - 1);
|
||||||
|
|
||||||
for (int i = 0; i < 7; i++) {
|
for (int i = 0; i < 7; i++) {
|
||||||
dayLabel[i].setTextValue(dayFormatter.format(weekStartDateTime.plusDays(i)));
|
dayLabel[i].setText(dayFormatter.format(weekStartDateTime.plusDays(i)));
|
||||||
}
|
}
|
||||||
|
|
||||||
LabelMonth.setText(dateFormatter.format(weekStartDateTime));
|
LabelMonth.setText(dateFormatter.format(weekStartDateTime));
|
||||||
@@ -28,37 +28,8 @@ Label{
|
|||||||
|
|
||||||
.inputField{
|
.inputField{
|
||||||
-fx-padding: 10px;
|
-fx-padding: 10px;
|
||||||
-fx-background-color: white;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.mainButton{
|
.mainButton{
|
||||||
-fx-font-weight: bold;
|
-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;
|
|
||||||
}
|
|
||||||
|
|
||||||
.inputDate{
|
|
||||||
-fx-background-color: white;
|
|
||||||
}
|
|
||||||
|
|
||||||
.comboBox{
|
|
||||||
-fx-background-color: white;
|
|
||||||
}
|
|
||||||
|
|
||||||
.timePicker{
|
|
||||||
-fx-background-color: white;
|
|
||||||
}
|
}
|
||||||
60
hellofx/app/src/main/resources/client/create-event.fxml
Normal file
60
hellofx/app/src/main/resources/client/create-event.fxml
Normal file
@@ -0,0 +1,60 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
||||||
|
<?import javafx.scene.control.*?>
|
||||||
|
<?import javafx.scene.layout.*?>
|
||||||
|
|
||||||
|
<?import javafx.collections.FXCollections?>
|
||||||
|
<?import java.lang.String?>
|
||||||
|
<GridPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1" fx:controller="client.CreateEventController">
|
||||||
|
|
||||||
|
<columnConstraints>
|
||||||
|
<ColumnConstraints/>
|
||||||
|
<ColumnConstraints/>
|
||||||
|
<ColumnConstraints/>
|
||||||
|
</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>
|
||||||
|
|
||||||
|
<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="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"/>
|
||||||
|
<TextField fx:id="textStart" GridPane.columnIndex="1" GridPane.rowIndex="3" maxWidth="400" minWidth="400"/>
|
||||||
|
<TextField fx:id="textEnd" GridPane.columnIndex="1" GridPane.rowIndex="4" 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">
|
||||||
|
<items>
|
||||||
|
<FXCollections fx:factory="observableArrayList">
|
||||||
|
<String fx:value="gering" />
|
||||||
|
<String fx:value="mittel" />
|
||||||
|
<String fx:value="hoch" />
|
||||||
|
</FXCollections>
|
||||||
|
</items>
|
||||||
|
</ComboBox>
|
||||||
|
<CheckBox fx:id="checkBoxIsFullDay" GridPane.columnIndex="1" GridPane.rowIndex="7"/>
|
||||||
|
<CheckBox fx:id="checkBoxIsPrivate" GridPane.columnIndex="1" GridPane.rowIndex="8"/>
|
||||||
|
|
||||||
|
<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>
|
||||||
|
|
||||||
|
</GridPane>
|
||||||
@@ -72,33 +72,3 @@ Label{
|
|||||||
-fx-max-height: 40px;
|
-fx-max-height: 40px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.navBtn{
|
|
||||||
-fx-background-color: white;
|
|
||||||
}
|
|
||||||
|
|
||||||
.editEventBtn{
|
|
||||||
-fx-background-color: transparent;
|
|
||||||
-fx-border-color: transparent;
|
|
||||||
}
|
|
||||||
|
|
||||||
.editEventBtn .svg {
|
|
||||||
-fx-fill: -fill;
|
|
||||||
}
|
|
||||||
|
|
||||||
.editEventBtn:hover .svg {
|
|
||||||
-fx-fill: -hover-fill;
|
|
||||||
}
|
|
||||||
|
|
||||||
.deleteEventBtn{
|
|
||||||
-fx-background-color: transparent;
|
|
||||||
-fx-border-color: transparent;
|
|
||||||
}
|
|
||||||
|
|
||||||
.deleteEventBtn .svg {
|
|
||||||
-fx-fill: -fill;
|
|
||||||
}
|
|
||||||
|
|
||||||
.deleteEventBtn:hover .svg {
|
|
||||||
-fx-fill: -hover-fill;
|
|
||||||
}
|
|
||||||
|
|
||||||
63
hellofx/app/src/main/resources/client/main-view.fxml
Normal file
63
hellofx/app/src/main/resources/client/main-view.fxml
Normal file
@@ -0,0 +1,63 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
||||||
|
<?import javafx.geometry.*?>
|
||||||
|
<?import javafx.scene.control.*?>
|
||||||
|
<?import javafx.scene.image.*?>
|
||||||
|
<?import javafx.scene.layout.*?>
|
||||||
|
|
||||||
|
<GridPane style="-fx-background-color: #424242;" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1" fx:controller="client.MainController">
|
||||||
|
<columnConstraints>
|
||||||
|
<ColumnConstraints hgrow="NEVER" maxWidth="60.0" minWidth="60.0" />
|
||||||
|
<ColumnConstraints hgrow="ALWAYS" />
|
||||||
|
</columnConstraints>
|
||||||
|
<rowConstraints>
|
||||||
|
<RowConstraints vgrow="SOMETIMES" />
|
||||||
|
</rowConstraints>
|
||||||
|
<VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0" spacing="5.0" style="-fx-background-color: #525E74;">
|
||||||
|
<ImageView fitHeight="50.0" fitWidth="50.0" pickOnBounds="true" preserveRatio="true">
|
||||||
|
|
||||||
|
</ImageView>
|
||||||
|
<Button onAction="#onAddBtnClick" styleClass="main-btn">
|
||||||
|
ADD
|
||||||
|
</Button>
|
||||||
|
<Button onAction="#onAddBtnClick" styleClass="main-btn">
|
||||||
|
ADD
|
||||||
|
</Button>
|
||||||
|
<Button onAction="#onAddBtnClick" styleClass="main-btn">
|
||||||
|
ADD
|
||||||
|
</Button>
|
||||||
|
</VBox>
|
||||||
|
<GridPane prefHeight="200.0" prefWidth="222.0" GridPane.columnIndex="1" GridPane.rowIndex="0">
|
||||||
|
<columnConstraints>
|
||||||
|
<ColumnConstraints hgrow="ALWAYS" />
|
||||||
|
<ColumnConstraints />
|
||||||
|
</columnConstraints>
|
||||||
|
<rowConstraints>
|
||||||
|
<RowConstraints />
|
||||||
|
<RowConstraints vgrow="ALWAYS" />
|
||||||
|
</rowConstraints>
|
||||||
|
<Label fx:id="LabelMonth" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" styleClass="labelMonth" textFill="WHITE" GridPane.columnIndex="0" GridPane.rowIndex="0">
|
||||||
|
Monat
|
||||||
|
<padding>
|
||||||
|
<Insets left="5" />
|
||||||
|
</padding>
|
||||||
|
</Label>
|
||||||
|
|
||||||
|
<GridPane fx:id="calendarGrid" gridLinesVisible="true" styleClass="gridCalendar" GridPane.columnIndex="0" GridPane.rowIndex="1">
|
||||||
|
<columnConstraints>
|
||||||
|
<ColumnConstraints hgrow="ALWAYS" maxWidth="14.2857142857" minWidth="14.2857142857" percentWidth="14.2857142857" />
|
||||||
|
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
|
||||||
|
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
|
||||||
|
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
|
||||||
|
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
|
||||||
|
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
|
||||||
|
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
|
||||||
|
</columnConstraints>
|
||||||
|
<rowConstraints>
|
||||||
|
<RowConstraints maxHeight="55.0" minHeight="25.0" vgrow="NEVER" />
|
||||||
|
<RowConstraints percentHeight="-Infinity" vgrow="ALWAYS" />
|
||||||
|
</rowConstraints>
|
||||||
|
|
||||||
|
</GridPane>
|
||||||
|
</GridPane>
|
||||||
|
</GridPane>
|
||||||
@@ -7,5 +7,4 @@ dependencies {
|
|||||||
implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
|
implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
|
||||||
implementation("com.fasterxml.jackson.core:jackson-core:$jacksonVersion")
|
implementation("com.fasterxml.jackson.core:jackson-core:$jacksonVersion")
|
||||||
implementation("com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion")
|
implementation("com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion")
|
||||||
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonVersion")
|
|
||||||
}
|
}
|
||||||
96
hellofx/data/src/main/java/res/DataController.java
Normal file
96
hellofx/data/src/main/java/res/DataController.java
Normal file
@@ -0,0 +1,96 @@
|
|||||||
|
package res;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
|
||||||
|
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.util.*;
|
||||||
|
|
||||||
|
public class DataController {
|
||||||
|
|
||||||
|
private static final String ALL_EVENTS_ENDPOINT = "http://localhost:8080/vpr/all-events";
|
||||||
|
private static final String ALL_USERS_ENDPOINT = "http://localhost:8080/vpr/all-users";
|
||||||
|
private static final String ADD_EVENT_ENDPOINT = "http://localhost:8080/vpr/add-event";
|
||||||
|
private static final String DELETE_EVENT_ENDPOINT = "http://localhost:8080/vpr/del-event";
|
||||||
|
|
||||||
|
private final HttpRequest httpRequest;
|
||||||
|
|
||||||
|
public DataController(){
|
||||||
|
httpRequest = new HttpRequest();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void createEvent(Event event){
|
||||||
|
try {
|
||||||
|
System.out.println(httpRequest.sendPostRequest(ADD_EVENT_ENDPOINT, event.getAsUrlParam()));
|
||||||
|
} catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void deleteEvent(int eventId){
|
||||||
|
try {
|
||||||
|
System.out.println(httpRequest.sendPostRequest(DELETE_EVENT_ENDPOINT, "eventId=" + eventId));
|
||||||
|
} catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public ArrayList<Event> getAllVisibleEvents() {
|
||||||
|
ArrayList<Event> eventList = new ArrayList<>();
|
||||||
|
|
||||||
|
try {
|
||||||
|
String jsonResponse = httpRequest.sendPostRequest(ALL_EVENTS_ENDPOINT, "userId=1");
|
||||||
|
System.out.println(jsonResponse);
|
||||||
|
|
||||||
|
ObjectMapper objectMapper = new ObjectMapper();
|
||||||
|
//String json = "{ \"color\" : \"Black\", \"type\" : \"BMW\" }";
|
||||||
|
|
||||||
|
for (Object obj : objectMapper.readValue(jsonResponse, Object[].class)){
|
||||||
|
ArrayList<Object> list = new ArrayList<>();
|
||||||
|
if (obj.getClass().isArray()) {
|
||||||
|
list = (ArrayList<Object>) Arrays.asList((Object[])obj);
|
||||||
|
} else if (obj instanceof Collection) {
|
||||||
|
list = new ArrayList<>((Collection<?>) obj);
|
||||||
|
}
|
||||||
|
eventList.add(new Event(list));
|
||||||
|
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
|
||||||
|
return eventList;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Event[] getAllEvents() {
|
||||||
|
Event[] eventList = null;
|
||||||
|
|
||||||
|
try {
|
||||||
|
String jsonResponse = httpRequest.sendGetRequest("http://localhost:8080/vpr/all-events-test");
|
||||||
|
eventList = parseJsonToEventList(jsonResponse);
|
||||||
|
for (Event e : eventList) {
|
||||||
|
System.out.println(e);
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
|
||||||
|
return eventList;
|
||||||
|
}
|
||||||
|
|
||||||
|
private Event[] parseJsonToEventList(String jsonString) throws JsonProcessingException {
|
||||||
|
ArrayList<Event> eventList;
|
||||||
|
|
||||||
|
// Parse JSON
|
||||||
|
ObjectMapper objectMapper = new ObjectMapper();
|
||||||
|
//String json = "{ \"color\" : \"Black\", \"type\" : \"BMW\" }";
|
||||||
|
|
||||||
|
return objectMapper.readValue(jsonString, Event[].class);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,18 +2,9 @@ package res;
|
|||||||
|
|
||||||
import com.sun.jdi.event.StepEvent;
|
import com.sun.jdi.event.StepEvent;
|
||||||
|
|
||||||
import java.io.Serializable;
|
|
||||||
import java.nio.charset.StandardCharsets;
|
|
||||||
import java.sql.SQLOutput;
|
|
||||||
import java.time.Duration;
|
|
||||||
import java.time.LocalDate;
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.time.LocalTime;
|
|
||||||
import java.time.format.DateTimeFormatter;
|
import java.time.format.DateTimeFormatter;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.regex.Matcher;
|
|
||||||
import java.util.regex.Pattern;
|
|
||||||
import java.util.regex.PatternSyntaxException;
|
|
||||||
|
|
||||||
public class Event {
|
public class Event {
|
||||||
|
|
||||||
@@ -46,10 +37,6 @@ public class Event {
|
|||||||
u.name AS uname
|
u.name AS uname
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public Event() {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public Event(ArrayList<Object> arr) {
|
public Event(ArrayList<Object> arr) {
|
||||||
id = (int) arr.get(0);
|
id = (int) arr.get(0);
|
||||||
name = (String) arr.get(1);
|
name = (String) arr.get(1);
|
||||||
@@ -66,86 +53,21 @@ public class Event {
|
|||||||
ownerName = arr.get(8) + " " + arr.get(9);
|
ownerName = arr.get(8) + " " + arr.get(9);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Event(
|
|
||||||
int id,
|
|
||||||
String name,
|
|
||||||
int priority,
|
|
||||||
boolean isFullDay,
|
|
||||||
boolean isPrivate,
|
|
||||||
String start,
|
|
||||||
String end,
|
|
||||||
String date,
|
|
||||||
int ownerId,
|
|
||||||
String ownerName
|
|
||||||
) {
|
|
||||||
this.ownerId = ownerId;
|
|
||||||
this.ownerName = ownerName;
|
|
||||||
this.id = id;
|
|
||||||
this.name = name;
|
|
||||||
this.start = start;
|
|
||||||
this.end = end;
|
|
||||||
this.priority = priority;
|
|
||||||
this.isFullDay = isFullDay;
|
|
||||||
|
|
||||||
|
|
||||||
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
|
|
||||||
this.date = LocalDateTime.parse(date + " 00:00", formatter);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public Event(String name,
|
public Event(String name,
|
||||||
int priority,
|
int priority,
|
||||||
boolean isFullDay,
|
boolean isFullDay,
|
||||||
boolean isPrivate,
|
boolean isPrivate,
|
||||||
LocalTime start,
|
String start,
|
||||||
LocalTime end,
|
String end,
|
||||||
LocalDateTime date,
|
LocalDateTime date,
|
||||||
int ownerId
|
int ownerId
|
||||||
) throws IllegalArgumentException {
|
) {
|
||||||
|
|
||||||
System.out.println("Create Event");
|
|
||||||
if (name.length() < 3) {
|
|
||||||
throw new IllegalArgumentException("Der Name muss eine L\u00e4nge von 3 haben.");
|
|
||||||
}
|
|
||||||
Pattern pattern = Pattern.compile("[A-Za-z\u00e4\u00f6\u00fc\u00c4\u00d6\u00dc\u00df0-9 =!?+*/$.:,;_<>()-]*");
|
|
||||||
Matcher matcher = pattern.matcher(name);
|
|
||||||
if (!matcher.matches()) {
|
|
||||||
System.out.println(name);
|
|
||||||
|
|
||||||
byte[] bytes = name.getBytes(StandardCharsets.UTF_16);
|
|
||||||
|
|
||||||
String utf8EncodedString = new String(bytes, StandardCharsets.UTF_16);
|
|
||||||
System.out.println(utf8EncodedString);
|
|
||||||
|
|
||||||
for (char c : (name).toCharArray()) {
|
|
||||||
System.out.print(c + " " + (int) c + ", ");
|
|
||||||
}
|
|
||||||
System.out.println();
|
|
||||||
for (char c : (name).toCharArray()) {
|
|
||||||
System.out.print(c + " " + (int) c + ", ");
|
|
||||||
}
|
|
||||||
System.out.println();
|
|
||||||
for (char c : ("TäöüÄÖÜ").toCharArray()) {
|
|
||||||
System.out.print(c + " " + (int) c + ", ");
|
|
||||||
}
|
|
||||||
System.out.println();
|
|
||||||
|
|
||||||
throw new IllegalArgumentException("Der Name darf nur aus Zahlen, Buchstaben und folgenden Sonderzeichen bestehen: \u00e4\u00f6\u00fc \u00c4\u00d6\u00dc \u00df =!?+*/$.:,;_ <>()-");
|
|
||||||
}
|
|
||||||
if (priority < 0) {
|
|
||||||
throw new IllegalArgumentException("Bitte eine Priorit\u00e4t w\u00e4hlen.");
|
|
||||||
}
|
|
||||||
LocalDateTime today = LocalDateTime.now().toLocalDate().atStartOfDay();
|
|
||||||
if (Duration.between(today, date).isNegative()) {
|
|
||||||
throw new IllegalArgumentException("Das Datum muss in der Zukunft liegen.");
|
|
||||||
}
|
|
||||||
|
|
||||||
this.name = name;
|
this.name = name;
|
||||||
this.priority = priority;
|
this.priority = priority;
|
||||||
this.isFullDay = isFullDay;
|
this.isFullDay = isFullDay;
|
||||||
this.isPrivate = isPrivate;
|
this.isPrivate = isPrivate;
|
||||||
if (start != null) this.start = start.toString();
|
this.start = start;
|
||||||
if (start != null) this.end = end.toString();
|
this.end = end;
|
||||||
this.date = date;
|
this.date = date;
|
||||||
this.ownerId = ownerId;
|
this.ownerId = ownerId;
|
||||||
}
|
}
|
||||||
@@ -163,7 +85,7 @@ public class Event {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void setName(String name) {
|
public void setName(String name) {
|
||||||
this.name = convertToASCII(name);
|
this.name = name;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getPriority() {
|
public int getPriority() {
|
||||||
@@ -210,9 +132,8 @@ public class Event {
|
|||||||
return date;
|
return date;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setDate(String date) {
|
public void setDate(LocalDateTime date) {
|
||||||
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
|
this.date = date;
|
||||||
this.date = LocalDateTime.parse(date + " 00:00", formatter);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getOwnerId() {
|
public int getOwnerId() {
|
||||||
@@ -246,13 +167,8 @@ public class Event {
|
|||||||
"&name=" + getName() +
|
"&name=" + getName() +
|
||||||
"&start=" + getStart() +
|
"&start=" + getStart() +
|
||||||
"&end=" + getEnd() +
|
"&end=" + getEnd() +
|
||||||
"&priority=" + getPriority() +
|
"&prority=" + getPriority() +
|
||||||
"&isFullDay=" + isFullDay() +
|
"&isFullDay=" + isFullDay() +
|
||||||
"&isPrivate=" + isPrivate();
|
"&isPrivate=" + isPrivate();
|
||||||
}
|
}
|
||||||
|
|
||||||
private String convertToASCII(String s) {
|
|
||||||
byte[] germanBytes = s.getBytes();
|
|
||||||
return new String(germanBytes, StandardCharsets.US_ASCII);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -1,7 +1,5 @@
|
|||||||
package res;
|
package res;
|
||||||
|
|
||||||
import helper.Tuple;
|
|
||||||
|
|
||||||
import java.io.BufferedReader;
|
import java.io.BufferedReader;
|
||||||
import java.io.DataOutputStream;
|
import java.io.DataOutputStream;
|
||||||
import java.io.InputStreamReader;
|
import java.io.InputStreamReader;
|
||||||
@@ -11,25 +9,10 @@ import java.nio.charset.StandardCharsets;
|
|||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
|
||||||
public class HttpRequest {
|
public class HttpRequest {
|
||||||
public static String TOKEN = "";
|
public String sendPostRequest(String urlString, String urlParameters) throws Exception{
|
||||||
|
|
||||||
public Tuple<Integer, String> sendPostRequest(String urlString, String urlParameters, boolean sendAuth) throws Exception {
|
|
||||||
byte[] postData = urlParameters.getBytes(StandardCharsets.UTF_8);
|
byte[] postData = urlParameters.getBytes(StandardCharsets.UTF_8);
|
||||||
int postDataLength = postData.length;
|
int postDataLength = postData.length;
|
||||||
|
|
||||||
/*
|
|
||||||
URL url = new URL("http://test.de:8080/event/add");
|
|
||||||
HttpURLConnection http = (HttpURLConnection)url.openConnection();
|
|
||||||
http.setRequestMethod("POST");
|
|
||||||
http.setDoOutput(true);
|
|
||||||
http.setRequestProperty("Accept", "application/json");
|
|
||||||
http.setRequestProperty("Authorization", "Bearer {token}");
|
|
||||||
http.setRequestProperty("Content-Type", "");
|
|
||||||
http.setRequestProperty("Content-Length", "0");
|
|
||||||
|
|
||||||
System.out.println(http.getResponseCode() + " " + http.getResponseMessage());
|
|
||||||
http.disconnect();
|
|
||||||
*/
|
|
||||||
URL url = new URL(urlString);
|
URL url = new URL(urlString);
|
||||||
HttpURLConnection con = (HttpURLConnection) url.openConnection();
|
HttpURLConnection con = (HttpURLConnection) url.openConnection();
|
||||||
|
|
||||||
@@ -40,38 +23,30 @@ public class HttpRequest {
|
|||||||
con.setRequestProperty("charset", "utf-8");
|
con.setRequestProperty("charset", "utf-8");
|
||||||
con.setRequestProperty("Content-Length", Integer.toString(postDataLength));
|
con.setRequestProperty("Content-Length", Integer.toString(postDataLength));
|
||||||
con.setUseCaches(false);
|
con.setUseCaches(false);
|
||||||
|
|
||||||
if(sendAuth){
|
|
||||||
con.setRequestProperty("Accept", "application/json");
|
|
||||||
con.setRequestProperty("Authorization", "Bearer " + TOKEN);
|
|
||||||
}
|
|
||||||
|
|
||||||
try (DataOutputStream wr = new DataOutputStream(con.getOutputStream())) {
|
try (DataOutputStream wr = new DataOutputStream(con.getOutputStream())) {
|
||||||
wr.write(postData);
|
wr.write(postData);
|
||||||
}
|
}
|
||||||
|
|
||||||
int status = con.getResponseCode();
|
int status = con.getResponseCode();
|
||||||
String inputLine;
|
|
||||||
StringBuilder content = new StringBuilder();
|
|
||||||
BufferedReader in;
|
|
||||||
|
|
||||||
if (status == 200) {
|
if (status == 200) {
|
||||||
in = new BufferedReader(new InputStreamReader(con.getInputStream()));
|
BufferedReader in = new BufferedReader(
|
||||||
|
new InputStreamReader(con.getInputStream()));
|
||||||
|
String inputLine;
|
||||||
|
StringBuilder content = new StringBuilder();
|
||||||
|
while ((inputLine = in.readLine()) != null) {
|
||||||
|
content.append(inputLine);
|
||||||
|
}
|
||||||
|
in.close();
|
||||||
|
|
||||||
|
con.disconnect();
|
||||||
|
return content.toString();
|
||||||
} else {
|
} else {
|
||||||
in = new BufferedReader(new InputStreamReader(con.getErrorStream()));
|
con.disconnect();
|
||||||
|
throw new Exception("Status: " + status);
|
||||||
}
|
}
|
||||||
|
|
||||||
while ((inputLine = in.readLine()) != null) {
|
|
||||||
content.append(inputLine);
|
|
||||||
}
|
|
||||||
in.close();
|
|
||||||
|
|
||||||
con.disconnect();
|
|
||||||
|
|
||||||
return new Tuple<>(status, content.toString());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public String sendGetRequest(String urlString) throws Exception {
|
public String sendGetRequest(String urlString) throws Exception{
|
||||||
URL url = new URL(urlString);
|
URL url = new URL(urlString);
|
||||||
HttpURLConnection con = (HttpURLConnection) url.openConnection();
|
HttpURLConnection con = (HttpURLConnection) url.openConnection();
|
||||||
con.setRequestMethod("GET");
|
con.setRequestMethod("GET");
|
||||||
0
client/gradlew → hellofx/gradlew
vendored
0
client/gradlew → hellofx/gradlew
vendored
Reference in New Issue
Block a user