Compare commits
1 Commits
Update-com
...
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.CONVERT_STR(text));
|
||||
}
|
||||
}
|
||||
@@ -1,21 +0,0 @@
|
||||
package customUI;
|
||||
|
||||
public class Converter {
|
||||
/*
|
||||
Ä, ä \u00c4, \u00e4
|
||||
Ö, ö \u00d6, \u00f6
|
||||
Ü, ü \u00dc, \u00fc
|
||||
ß \u00df
|
||||
*/
|
||||
@SuppressWarnings("all")
|
||||
public static String CONVERT_STR(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.CONVERT_STR(content));
|
||||
}
|
||||
|
||||
public Label(){
|
||||
super();
|
||||
}
|
||||
|
||||
public void setTextValue(String text){
|
||||
super.setText(Converter.CONVERT_STR(text));
|
||||
}
|
||||
}
|
||||
@@ -1,91 +0,0 @@
|
||||
package main;
|
||||
|
||||
import com.jfoenix.controls.*;
|
||||
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.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().toString(),
|
||||
timeEnd.getValue().toString(),
|
||||
datePickerDate.getValue().atStartOfDay(),
|
||||
(int) DataController.USER_ID
|
||||
);
|
||||
|
||||
System.out.println(event.getAsUrlParam());
|
||||
|
||||
DataController dataController = new DataController();
|
||||
dataController.createEvent(event);
|
||||
|
||||
Stage stage = (Stage) ((Node) actionEvent.getSource()).getScene().getWindow();
|
||||
stage.close();
|
||||
} catch (RuntimeException e) {
|
||||
labelError.setText(e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@FXML
|
||||
protected void abortBtnClick(ActionEvent event) {
|
||||
Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
|
||||
stage.close();
|
||||
}
|
||||
}
|
||||
@@ -1,40 +0,0 @@
|
||||
package main;
|
||||
|
||||
import javafx.application.Application;
|
||||
import javafx.fxml.FXMLLoader;
|
||||
import javafx.scene.Scene;
|
||||
import javafx.stage.Stage;
|
||||
import res.DataController;
|
||||
|
||||
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("SharePlaner");
|
||||
stage.setScene(scene);
|
||||
|
||||
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();
|
||||
|
||||
if (DataController.USER_ID >= 0) {
|
||||
stage.show();
|
||||
}
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
launch();
|
||||
}
|
||||
}
|
||||
@@ -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.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 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,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>
|
||||
@@ -16,12 +16,7 @@ application {
|
||||
mainClassName = "client.MainApplication"
|
||||
}
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation("com.jfoenix:jfoenix:9.0.10")
|
||||
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 static void main(String[] 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,11 +1,13 @@
|
||||
package main;
|
||||
package client;
|
||||
|
||||
import javafx.event.ActionEvent;
|
||||
import javafx.event.EventHandler;
|
||||
import javafx.fxml.FXML;
|
||||
import javafx.fxml.FXMLLoader;
|
||||
import javafx.geometry.Pos;
|
||||
import javafx.scene.Scene;
|
||||
import customUI.Button;
|
||||
import customUI.Label;
|
||||
import javafx.scene.control.Button;
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.control.ScrollPane;
|
||||
import javafx.scene.layout.GridPane;
|
||||
import javafx.scene.layout.HBox;
|
||||
@@ -28,7 +30,7 @@ public class MainController {
|
||||
private GridPane calendarGrid;
|
||||
|
||||
@FXML
|
||||
private javafx.scene.control.Label LabelMonth;
|
||||
private Label LabelMonth;
|
||||
|
||||
private final String[] dayNames = {"Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag", "Sonntag"};
|
||||
private final Label[] dayLabel = new Label[7];
|
||||
@@ -43,7 +45,7 @@ public class MainController {
|
||||
}
|
||||
|
||||
@FXML
|
||||
public void initialize() {
|
||||
public void initialize(){
|
||||
createWeek();
|
||||
setDates();
|
||||
|
||||
@@ -51,47 +53,24 @@ public class MainController {
|
||||
}
|
||||
|
||||
private void updateEvents() {
|
||||
for (VBox vBox : dayVBoxes) {
|
||||
for(VBox vBox : dayVBoxes){
|
||||
vBox.getChildren().clear();
|
||||
}
|
||||
|
||||
DataController dataController = new DataController();
|
||||
ArrayList<Event> eventList = dataController.getAllVisibleEvents();
|
||||
|
||||
for (Event event : eventList) {
|
||||
for(Event event : eventList){
|
||||
addEvent(event);
|
||||
}
|
||||
}
|
||||
|
||||
@FXML
|
||||
protected void onBackClick() {
|
||||
weekOffset--;
|
||||
setDates();
|
||||
updateEvents();
|
||||
}
|
||||
|
||||
@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());
|
||||
protected void onAddBtnClick(){
|
||||
try{
|
||||
FXMLLoader fxmlLoader = new FXMLLoader(MainApplication.class.getResource("create-event.fxml"));
|
||||
Scene scene = new Scene(fxmlLoader.load(), 650, 500);
|
||||
scene.getStylesheets().add(Objects.requireNonNull(MainApplication.class.getResource("create-event.css")).toExternalForm());
|
||||
Stage stage = new Stage();
|
||||
stage.setTitle("Termin erstellen");
|
||||
stage.setScene(scene);
|
||||
@@ -99,16 +78,17 @@ public class MainController {
|
||||
stage.setResizable(false);
|
||||
//stage.initStyle(StageStyle.UNDECORATED);
|
||||
stage.showAndWait();
|
||||
} catch (IOException e) {
|
||||
}
|
||||
catch (IOException e){
|
||||
e.printStackTrace();
|
||||
}
|
||||
updateEvents();
|
||||
}
|
||||
|
||||
private void createWeek() {
|
||||
private void createWeek(){
|
||||
for (int i = 0; i < 7; i++) {
|
||||
Label label = new Label();
|
||||
label.setTextValue(dayNames[i]);
|
||||
label.setText(dayNames[i]);
|
||||
label.setMaxHeight(Double.MAX_VALUE);
|
||||
label.setMaxWidth(Double.MAX_VALUE);
|
||||
label.getStyleClass().add("labelDays");
|
||||
@@ -132,7 +112,7 @@ public class MainController {
|
||||
}
|
||||
}
|
||||
|
||||
private void addEvent(Event event) {
|
||||
private void addEvent(Event event){
|
||||
VBox vBox = new VBox();
|
||||
vBox.getStyleClass().add("event");
|
||||
vBox.setSpacing(5);
|
||||
@@ -140,31 +120,14 @@ public class MainController {
|
||||
HBox btnHBox = new HBox();
|
||||
btnHBox.setAlignment(Pos.BOTTOM_RIGHT);
|
||||
Button deleteBtn = new Button();
|
||||
deleteBtn.setTextValue(" X ");
|
||||
deleteBtn.setText(" X ");
|
||||
deleteBtn.setOnAction(e -> {
|
||||
DataController dataController = new DataController();
|
||||
dataController.deleteEvent(event.getId());
|
||||
updateEvents();
|
||||
});
|
||||
Button editBtn = new Button();
|
||||
editBtn.setTextValue("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);
|
||||
stage.showAndWait();
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
});
|
||||
editBtn.setText("edit");
|
||||
btnHBox.getChildren().add(editBtn);
|
||||
btnHBox.getChildren().add(deleteBtn);
|
||||
vBox.getChildren().add(btnHBox);
|
||||
@@ -172,44 +135,37 @@ public class MainController {
|
||||
Label nameLabel = new Label(event.getName());
|
||||
vBox.getChildren().add(nameLabel);
|
||||
|
||||
if (event.getStart() != null || event.getEnd() != null) {
|
||||
String timeStr = (event.getStart() != null ? formatTime(event.getStart()) : "")
|
||||
+ (event.getEnd() != null ? " - " + formatTime(event.getEnd()) : "");
|
||||
Label timeLabel = new Label(timeStr);
|
||||
vBox.getChildren().add(timeLabel);
|
||||
}
|
||||
Label timeLabel = new Label(event.getStart() + "-" + event.getEnd());
|
||||
vBox.getChildren().add(timeLabel);
|
||||
|
||||
Label typeLabel = new Label("Wer: " + event.getOwnerName());
|
||||
vBox.getChildren().add(typeLabel);
|
||||
|
||||
/*
|
||||
Ä, ä \u00c4, \u00e4
|
||||
Ö, ö \u00d6, \u00f6
|
||||
Ü, ü \u00dc, \u00fc
|
||||
ß \u00df
|
||||
*/
|
||||
Label prioLabel = new Label("Priorit\u00e4t: " + event.getPriority());
|
||||
vBox.getChildren().add(prioLabel);
|
||||
|
||||
if (event.isFullDay()) {
|
||||
if(event.isFullDay()){
|
||||
Label fullDayLabel = new Label("Dieser Termin bockiert den ganzen Tag!");
|
||||
vBox.getChildren().add(fullDayLabel);
|
||||
}
|
||||
|
||||
|
||||
|
||||
LocalDateTime eventDate = event.getDate();
|
||||
|
||||
int day = (int) Duration.between(
|
||||
weekStartDateTime.toLocalDate().atStartOfDay(), eventDate.toLocalDate().atStartOfDay()).toDays();
|
||||
int day = (int)Duration.between(weekStartDateTime.toLocalDate().atStartOfDay(), eventDate.toLocalDate().atStartOfDay()).toDays();
|
||||
|
||||
if (day >= 0 && day < 7) {
|
||||
if(day >= 0 && day < 7){
|
||||
dayVBoxes[day].getChildren().add(vBox);
|
||||
}
|
||||
}
|
||||
|
||||
private String formatTime(String time) {
|
||||
String[] timeArr = time.split(":");
|
||||
if (timeArr.length > 2) {
|
||||
return timeArr[0] + ":" + timeArr[1];
|
||||
}
|
||||
return time;
|
||||
}
|
||||
|
||||
private void setDates() {
|
||||
private void setDates(){
|
||||
DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("LLLL yyyy");
|
||||
DateTimeFormatter dayFormatter = DateTimeFormatter.ofPattern("E dd.MM");
|
||||
DateTimeFormatter dayOfWeekFormatter = DateTimeFormatter.ofPattern("e");
|
||||
@@ -217,10 +173,10 @@ public class MainController {
|
||||
LocalDateTime now = LocalDateTime.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++) {
|
||||
dayLabel[i].setTextValue(dayFormatter.format(weekStartDateTime.plusDays(i)));
|
||||
dayLabel[i].setText(dayFormatter.format(weekStartDateTime.plusDays(i)));
|
||||
}
|
||||
|
||||
LabelMonth.setText(dateFormatter.format(weekStartDateTime));
|
||||
@@ -28,37 +28,8 @@ Label{
|
||||
|
||||
.inputField{
|
||||
-fx-padding: 10px;
|
||||
-fx-background-color: white;
|
||||
}
|
||||
|
||||
.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;
|
||||
}
|
||||
|
||||
.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,7 +72,3 @@ Label{
|
||||
-fx-max-height: 40px;
|
||||
}
|
||||
|
||||
.navBtn{
|
||||
-fx-background-color: white;
|
||||
}
|
||||
|
||||
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>
|
||||
@@ -14,47 +14,28 @@ 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 ALL_USERS_ENDPOINT = "http://localhost:8080/user/all";
|
||||
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() {
|
||||
public DataController(){
|
||||
httpRequest = new HttpRequest();
|
||||
}
|
||||
|
||||
public boolean login(String username, String password) {
|
||||
public void createEvent(Event event){
|
||||
try {
|
||||
USER_ID = Long.parseLong(httpRequest.sendPostRequest(
|
||||
LOGIN_ENDPOINT,
|
||||
"login=" + username
|
||||
+ "&password=" + password,
|
||||
false
|
||||
));
|
||||
System.out.println(httpRequest.sendPostRequest(ADD_EVENT_ENDPOINT, event.getAsUrlParam()));
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return false;
|
||||
}
|
||||
return USER_ID >= 0;
|
||||
}
|
||||
|
||||
public void createEvent(Event event) {
|
||||
try {
|
||||
System.out.println(httpRequest.sendPostRequest(ADD_EVENT_ENDPOINT, event.getAsUrlParam(), true));
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException("Es konnte keine Verbindung mit dem Server hergestellt werden.");
|
||||
}
|
||||
}
|
||||
|
||||
public void deleteEvent(int eventId) {
|
||||
public void deleteEvent(int eventId){
|
||||
try {
|
||||
System.out.println(httpRequest.sendPostRequest(DELETE_EVENT_ENDPOINT, "eventId=" + eventId, true));
|
||||
System.out.println(httpRequest.sendPostRequest(DELETE_EVENT_ENDPOINT, "eventId=" + eventId));
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
@@ -64,16 +45,16 @@ public class DataController {
|
||||
ArrayList<Event> eventList = new ArrayList<>();
|
||||
|
||||
try {
|
||||
String jsonResponse = httpRequest.sendPostRequest(ALL_EVENTS_ENDPOINT, "userId=" + USER_ID, true);
|
||||
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)) {
|
||||
for (Object obj : objectMapper.readValue(jsonResponse, Object[].class)){
|
||||
ArrayList<Object> list = new ArrayList<>();
|
||||
if (obj.getClass().isArray()) {
|
||||
list = (ArrayList<Object>) Arrays.asList((Object[]) obj);
|
||||
list = (ArrayList<Object>) Arrays.asList((Object[])obj);
|
||||
} else if (obj instanceof Collection) {
|
||||
list = new ArrayList<>((Collection<?>) obj);
|
||||
}
|
||||
@@ -112,4 +93,4 @@ public class DataController {
|
||||
|
||||
return objectMapper.readValue(jsonString, Event[].class);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2,15 +2,9 @@ package res;
|
||||
|
||||
import com.sun.jdi.event.StepEvent;
|
||||
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.time.Duration;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.ArrayList;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
import java.util.regex.PatternSyntaxException;
|
||||
|
||||
public class Event {
|
||||
|
||||
@@ -67,43 +61,7 @@ public class Event {
|
||||
String end,
|
||||
LocalDateTime date,
|
||||
int ownerId
|
||||
) throws IllegalArgumentException{
|
||||
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.priority = priority;
|
||||
this.isFullDay = isFullDay;
|
||||
@@ -127,7 +85,7 @@ public class Event {
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = convertToASCII(name);
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public int getPriority() {
|
||||
@@ -213,9 +171,4 @@ public class Event {
|
||||
"&isFullDay=" + isFullDay() +
|
||||
"&isPrivate=" + isPrivate();
|
||||
}
|
||||
|
||||
private String convertToASCII(String s){
|
||||
byte[] germanBytes = s.getBytes();
|
||||
return new String(germanBytes, StandardCharsets.US_ASCII);
|
||||
}
|
||||
}
|
||||
@@ -9,23 +9,10 @@ import java.nio.charset.StandardCharsets;
|
||||
import java.util.Arrays;
|
||||
|
||||
public class HttpRequest {
|
||||
public String sendPostRequest(String urlString, String urlParameters, boolean sendAuth) throws Exception {
|
||||
public String sendPostRequest(String urlString, String urlParameters) throws Exception{
|
||||
byte[] postData = urlParameters.getBytes(StandardCharsets.UTF_8);
|
||||
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);
|
||||
HttpURLConnection con = (HttpURLConnection) url.openConnection();
|
||||
|
||||
@@ -36,12 +23,6 @@ public class HttpRequest {
|
||||
con.setRequestProperty("charset", "utf-8");
|
||||
con.setRequestProperty("Content-Length", Integer.toString(postDataLength));
|
||||
con.setUseCaches(false);
|
||||
|
||||
if(sendAuth){
|
||||
con.setRequestProperty("Accept", "application/json");
|
||||
con.setRequestProperty("Authorization", "Bearer {token}");
|
||||
}
|
||||
|
||||
try (DataOutputStream wr = new DataOutputStream(con.getOutputStream())) {
|
||||
wr.write(postData);
|
||||
}
|
||||
@@ -65,7 +46,7 @@ public class HttpRequest {
|
||||
}
|
||||
}
|
||||
|
||||
public String sendGetRequest(String urlString) throws Exception {
|
||||
public String sendGetRequest(String urlString) throws Exception{
|
||||
URL url = new URL(urlString);
|
||||
HttpURLConnection con = (HttpURLConnection) url.openConnection();
|
||||
con.setRequestMethod("GET");
|
||||
0
client/gradlew → hellofx/gradlew
vendored
0
client/gradlew → hellofx/gradlew
vendored
Reference in New Issue
Block a user