Compare commits
	
		
			5 Commits
		
	
	
		
			0410-Switc
			...
			c754b77c81
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| c754b77c81 | |||
| 66edff8ed5 | |||
| ded0b9042f | |||
| e7b376e722 | |||
| cb6c55a639 | 
@@ -30,7 +30,6 @@ public class CreateEventController {
 | 
			
		||||
    public Label labelError;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    public CreateEventController() {
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
@@ -42,7 +41,7 @@ public class CreateEventController {
 | 
			
		||||
    @FXML
 | 
			
		||||
    protected void createBtnClick(ActionEvent actionEvent) {
 | 
			
		||||
        try {
 | 
			
		||||
            if(datePickerDate.getValue() == null){
 | 
			
		||||
            if (datePickerDate.getValue() == null) {
 | 
			
		||||
                throw new IllegalArgumentException("Bitte w\u00e4hle ein Datum aus");
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
@@ -54,7 +53,7 @@ public class CreateEventController {
 | 
			
		||||
                    textStart.getText(),
 | 
			
		||||
                    textEnd.getText(),
 | 
			
		||||
                    datePickerDate.getValue().atStartOfDay(),
 | 
			
		||||
                    1
 | 
			
		||||
                    (int) DataController.USER_ID
 | 
			
		||||
            );
 | 
			
		||||
 | 
			
		||||
            System.out.println(event.getAsUrlParam());
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,7 @@
 | 
			
		||||
package main;
 | 
			
		||||
 | 
			
		||||
public class Launcher {
 | 
			
		||||
    
 | 
			
		||||
 | 
			
		||||
    public static void main(String[] args) {
 | 
			
		||||
        MainApplication.main(args);
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
@@ -4,6 +4,7 @@ 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;
 | 
			
		||||
@@ -14,19 +15,23 @@ public class MainApplication extends Application {
 | 
			
		||||
        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());
 | 
			
		||||
        scene.getStylesheets().add(Objects.requireNonNull(
 | 
			
		||||
                MainApplication.class.getResource("main-view.css")).toExternalForm());
 | 
			
		||||
        stage.setTitle("SharePlaner");
 | 
			
		||||
        stage.setScene(scene);
 | 
			
		||||
        stage.show();
 | 
			
		||||
 | 
			
		||||
        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());
 | 
			
		||||
        sceneLogin.getStylesheets().add(Objects.requireNonNull(
 | 
			
		||||
                MainApplication.class.getResource("../users/login.css")).toExternalForm());
 | 
			
		||||
        Stage stageLogin = new Stage();
 | 
			
		||||
        stageLogin.setTitle("Anmelden");
 | 
			
		||||
        stageLogin.setScene(sceneLogin);
 | 
			
		||||
        stageLogin.show();
 | 
			
		||||
        stageLogin.showAndWait();
 | 
			
		||||
 | 
			
		||||
        if (DataController.USER_ID >= 0) {
 | 
			
		||||
            stage.show();
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    public static void main(String[] args) {
 | 
			
		||||
 
 | 
			
		||||
@@ -73,7 +73,7 @@ public class MainController {
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @FXML
 | 
			
		||||
    protected void onTodayClick(){
 | 
			
		||||
    protected void onTodayClick() {
 | 
			
		||||
        weekOffset = 0;
 | 
			
		||||
        setDates();
 | 
			
		||||
        updateEvents();
 | 
			
		||||
@@ -89,9 +89,11 @@ public class MainController {
 | 
			
		||||
    @FXML
 | 
			
		||||
    protected void onAddBtnClick() {
 | 
			
		||||
        try {
 | 
			
		||||
            FXMLLoader fxmlLoader = new FXMLLoader(MainApplication.class.getResource("create-event.fxml"));
 | 
			
		||||
            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());
 | 
			
		||||
            scene.getStylesheets().add(Objects.requireNonNull(
 | 
			
		||||
                    MainApplication.class.getResource("create-event.css")).toExternalForm());
 | 
			
		||||
            Stage stage = new Stage();
 | 
			
		||||
            stage.setTitle("Termin erstellen");
 | 
			
		||||
            stage.setScene(scene);
 | 
			
		||||
@@ -182,7 +184,8 @@ public class MainController {
 | 
			
		||||
 | 
			
		||||
        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) {
 | 
			
		||||
            dayVBoxes[day].getChildren().add(vBox);
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +0,0 @@
 | 
			
		||||
package users;
 | 
			
		||||
 | 
			
		||||
public class LoginControler {
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										50
									
								
								client/app/src/main/java/users/LoginController.java
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										50
									
								
								client/app/src/main/java/users/LoginController.java
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,50 @@
 | 
			
		||||
package users;
 | 
			
		||||
 | 
			
		||||
import javafx.event.ActionEvent;
 | 
			
		||||
import javafx.fxml.FXML;
 | 
			
		||||
import javafx.scene.Node;
 | 
			
		||||
import javafx.scene.control.Label;
 | 
			
		||||
import javafx.scene.control.TextField;
 | 
			
		||||
import javafx.stage.Stage;
 | 
			
		||||
import res.DataController;
 | 
			
		||||
 | 
			
		||||
public class LoginController {
 | 
			
		||||
    @FXML
 | 
			
		||||
    public TextField userField;
 | 
			
		||||
    @FXML
 | 
			
		||||
    public TextField 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();
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
@@ -5,7 +5,8 @@
 | 
			
		||||
 | 
			
		||||
<?import javafx.collections.FXCollections?>
 | 
			
		||||
<?import java.lang.String?>
 | 
			
		||||
<GridPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1" fx:controller="main.CreateEventController">
 | 
			
		||||
<GridPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1"
 | 
			
		||||
          fx:controller="main.CreateEventController">
 | 
			
		||||
 | 
			
		||||
    <columnConstraints>
 | 
			
		||||
        <ColumnConstraints/>
 | 
			
		||||
@@ -13,16 +14,16 @@
 | 
			
		||||
        <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 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 vgrow="ALWAYS"/>
 | 
			
		||||
    </rowConstraints>
 | 
			
		||||
 | 
			
		||||
    <Label styleClass="mainLabel">Termin anlegen</Label>
 | 
			
		||||
@@ -44,9 +45,9 @@
 | 
			
		||||
    <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" />
 | 
			
		||||
                <String fx:value="gering"/>
 | 
			
		||||
                <String fx:value="mittel"/>
 | 
			
		||||
                <String fx:value="hoch"/>
 | 
			
		||||
            </FXCollections>
 | 
			
		||||
        </items>
 | 
			
		||||
    </ComboBox>
 | 
			
		||||
@@ -54,8 +55,8 @@
 | 
			
		||||
    <CheckBox fx:id="checkBoxIsPrivate" GridPane.columnIndex="1" GridPane.rowIndex="8"/>
 | 
			
		||||
    <Label fx:id="labelError" GridPane.columnIndex="1" GridPane.rowIndex="9"/>
 | 
			
		||||
 | 
			
		||||
    <HBox GridPane.columnIndex="1" GridPane.rowIndex="10" GridPane.columnSpan="2"  alignment="CENTER_RIGHT">
 | 
			
		||||
        <Button onAction="#abortBtnClick" maxWidth="150" minWidth="150" >Abbrechen</Button>
 | 
			
		||||
    <HBox GridPane.columnIndex="1" GridPane.rowIndex="10" 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>
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -5,15 +5,17 @@
 | 
			
		||||
<?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="main.MainController">
 | 
			
		||||
<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 hgrow="NEVER" maxWidth="60.0" minWidth="60.0"/>
 | 
			
		||||
        <ColumnConstraints hgrow="ALWAYS"/>
 | 
			
		||||
    </columnConstraints>
 | 
			
		||||
    <rowConstraints>
 | 
			
		||||
        <RowConstraints vgrow="SOMETIMES" />
 | 
			
		||||
        <RowConstraints vgrow="SOMETIMES"/>
 | 
			
		||||
    </rowConstraints>
 | 
			
		||||
    <VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0" spacing="5.0" style="-fx-background-color: #525E74;">
 | 
			
		||||
    <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>
 | 
			
		||||
@@ -29,39 +31,42 @@
 | 
			
		||||
    </VBox>
 | 
			
		||||
    <GridPane prefHeight="200.0" prefWidth="222.0" GridPane.columnIndex="1" GridPane.rowIndex="0">
 | 
			
		||||
        <columnConstraints>
 | 
			
		||||
        <ColumnConstraints hgrow="ALWAYS" />
 | 
			
		||||
            <ColumnConstraints />
 | 
			
		||||
            <ColumnConstraints />
 | 
			
		||||
            <ColumnConstraints />
 | 
			
		||||
            <ColumnConstraints />
 | 
			
		||||
            <ColumnConstraints hgrow="ALWAYS"/>
 | 
			
		||||
            <ColumnConstraints/>
 | 
			
		||||
            <ColumnConstraints/>
 | 
			
		||||
            <ColumnConstraints/>
 | 
			
		||||
            <ColumnConstraints/>
 | 
			
		||||
        </columnConstraints>
 | 
			
		||||
        <rowConstraints>
 | 
			
		||||
            <RowConstraints />
 | 
			
		||||
            <RowConstraints vgrow="ALWAYS" />
 | 
			
		||||
            <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">
 | 
			
		||||
        <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" />
 | 
			
		||||
                <Insets left="5"/>
 | 
			
		||||
            </padding>
 | 
			
		||||
        </Label>
 | 
			
		||||
        <Button onAction="#onBackClick" GridPane.columnIndex="1" maxHeight="1.7976931348623157E308">zurück</Button>
 | 
			
		||||
        <Button onAction="#onTodayClick" GridPane.columnIndex="2" maxHeight="1.7976931348623157E308">heute</Button>
 | 
			
		||||
        <Button onAction="#onNextClick" GridPane.columnIndex="3" maxHeight="1.7976931348623157E308">weiter</Button>
 | 
			
		||||
 | 
			
		||||
        <GridPane fx:id="calendarGrid" gridLinesVisible="true"  styleClass="gridCalendar" GridPane.columnSpan="4" GridPane.columnIndex="0" GridPane.rowIndex="1">
 | 
			
		||||
        <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 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 maxHeight="55.0" minHeight="25.0" vgrow="NEVER"/>
 | 
			
		||||
                <RowConstraints percentHeight="-Infinity" vgrow="ALWAYS"/>
 | 
			
		||||
            </rowConstraints>
 | 
			
		||||
 | 
			
		||||
        </GridPane>
 | 
			
		||||
 
 | 
			
		||||
@@ -0,0 +1,37 @@
 | 
			
		||||
* {
 | 
			
		||||
   -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;
 | 
			
		||||
}
 | 
			
		||||
@@ -1,12 +1,8 @@
 | 
			
		||||
<?xml version="1.0" encoding="UTF-8"?>
 | 
			
		||||
 | 
			
		||||
<?import java.lang.*?>
 | 
			
		||||
<?import java.util.*?>
 | 
			
		||||
<?import javafx.scene.*?>
 | 
			
		||||
<?import javafx.scene.control.*?>
 | 
			
		||||
<?import javafx.scene.layout.*?>
 | 
			
		||||
 | 
			
		||||
<GridPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"  fx:controller="users.LoginControler">
 | 
			
		||||
<GridPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="users.LoginController">
 | 
			
		||||
 | 
			
		||||
    <columnConstraints>
 | 
			
		||||
        <ColumnConstraints/>
 | 
			
		||||
@@ -14,23 +10,23 @@
 | 
			
		||||
        <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>
 | 
			
		||||
 | 
			
		||||
    <Label GridPane.columnIndex="1">Anmelden</Label>
 | 
			
		||||
 | 
			
		||||
    <Label GridPane.rowIndex="1">Username</Label>
 | 
			
		||||
    <TextField GridPane.columnIndex="1" GridPane.rowIndex="1" fx:id="userField"></TextField>
 | 
			
		||||
    <Label GridPane.columnIndex="2" GridPane.rowIndex="1" fx:id="userErrLabel">Error</Label>
 | 
			
		||||
    <TextField 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>
 | 
			
		||||
    <PasswordField GridPane.columnIndex="1" GridPane.rowIndex="2" fx:id="passField"></PasswordField>
 | 
			
		||||
    <Label GridPane.columnIndex="2" GridPane.rowIndex="2" fx:id="passErrLabel">Error</Label>
 | 
			
		||||
    <PasswordField GridPane.columnIndex="1" GridPane.rowIndex="2" fx:id="passField"/>
 | 
			
		||||
    <Label styleClass="errorLbl" GridPane.columnIndex="2" GridPane.rowIndex="2" fx:id="passErrLabel"/>
 | 
			
		||||
 | 
			
		||||
    <Button GridPane.columnIndex="1" GridPane.rowIndex="3">Beenden</Button>
 | 
			
		||||
    <Button GridPane.columnIndex="2" GridPane.rowIndex="3">Anmelden</Button>
 | 
			
		||||
    <Button onAction="#abortBtnClick" GridPane.columnIndex="1" GridPane.rowIndex="3">Beenden</Button>
 | 
			
		||||
    <Button onAction="#login" GridPane.columnIndex="2" GridPane.rowIndex="3">Anmelden</Button>
 | 
			
		||||
 | 
			
		||||
</GridPane>
 | 
			
		||||
 
 | 
			
		||||
@@ -14,18 +14,35 @@ import java.util.*;
 | 
			
		||||
 | 
			
		||||
public class DataController {
 | 
			
		||||
 | 
			
		||||
    public static long USER_ID = -1;
 | 
			
		||||
 | 
			
		||||
    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 static final String LOGIN_ENDPOINT = "http://localhost:8080/vpr/login";
 | 
			
		||||
 | 
			
		||||
    private final HttpRequest httpRequest;
 | 
			
		||||
 | 
			
		||||
    public DataController(){
 | 
			
		||||
    public DataController() {
 | 
			
		||||
        httpRequest = new HttpRequest();
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    public void createEvent(Event event){
 | 
			
		||||
    public boolean login(String username, String password) {
 | 
			
		||||
        try {
 | 
			
		||||
            USER_ID = Long.parseLong(httpRequest.sendPostRequest(
 | 
			
		||||
                    LOGIN_ENDPOINT,
 | 
			
		||||
                    "login=" + username
 | 
			
		||||
                            + "&password=" + password
 | 
			
		||||
            ));
 | 
			
		||||
        } 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()));
 | 
			
		||||
        } catch (Exception e) {
 | 
			
		||||
@@ -33,7 +50,7 @@ public class DataController {
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    public void deleteEvent(int eventId){
 | 
			
		||||
    public void deleteEvent(int eventId) {
 | 
			
		||||
        try {
 | 
			
		||||
            System.out.println(httpRequest.sendPostRequest(DELETE_EVENT_ENDPOINT, "eventId=" + eventId));
 | 
			
		||||
        } catch (Exception e) {
 | 
			
		||||
@@ -45,16 +62,16 @@ public class DataController {
 | 
			
		||||
        ArrayList<Event> eventList = new ArrayList<>();
 | 
			
		||||
 | 
			
		||||
        try {
 | 
			
		||||
            String jsonResponse = httpRequest.sendPostRequest(ALL_EVENTS_ENDPOINT, "userId=1");
 | 
			
		||||
            String jsonResponse = httpRequest.sendPostRequest(ALL_EVENTS_ENDPOINT, "userId=" + USER_ID);
 | 
			
		||||
            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);
 | 
			
		||||
                }
 | 
			
		||||
 
 | 
			
		||||
@@ -66,20 +66,21 @@ public class Event {
 | 
			
		||||
                 String end,
 | 
			
		||||
                 LocalDateTime date,
 | 
			
		||||
                 int ownerId
 | 
			
		||||
    ) throws IllegalArgumentException{
 | 
			
		||||
        if(name.length() < 3){
 | 
			
		||||
    ) 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ÄÖÜäöü0-9 =!?+*/$%€.:,;_<>()-]*");
 | 
			
		||||
        Matcher matcher = pattern.matcher(name);
 | 
			
		||||
        if(!matcher.matches()){
 | 
			
		||||
            throw new IllegalArgumentException("Der Name Darf nur aus Zahlen, Buchstaben und folgenden Sonderzeichen bestehen: =!?+*/$%€.:,;_ <>()-");
 | 
			
		||||
        if (!matcher.matches()) {
 | 
			
		||||
            throw new IllegalArgumentException("Der Name Darf nur aus Zahlen, Buchstaben und " +
 | 
			
		||||
                    "folgenden Sonderzeichen bestehen: =!?+*/$%€.:,;_ <>()-");
 | 
			
		||||
        }
 | 
			
		||||
        if(priority < 0){
 | 
			
		||||
        if (priority < 0) {
 | 
			
		||||
            throw new IllegalArgumentException("Bitte eine Priorit\u00e4t w\u00e4hlen.");
 | 
			
		||||
        }
 | 
			
		||||
        LocalDateTime today = LocalDateTime.now().toLocalDate().atStartOfDay();
 | 
			
		||||
        if(Duration.between(today, date).isNegative()){
 | 
			
		||||
        if (Duration.between(today, date).isNegative()) {
 | 
			
		||||
            throw new IllegalArgumentException("Das Datum muss in der Zukunft liegen.");
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -9,7 +9,7 @@ import java.nio.charset.StandardCharsets;
 | 
			
		||||
import java.util.Arrays;
 | 
			
		||||
 | 
			
		||||
public class HttpRequest {
 | 
			
		||||
    public String sendPostRequest(String urlString, String urlParameters) throws Exception{
 | 
			
		||||
    public String sendPostRequest(String urlString, String urlParameters) throws Exception {
 | 
			
		||||
        byte[] postData = urlParameters.getBytes(StandardCharsets.UTF_8);
 | 
			
		||||
        int postDataLength = postData.length;
 | 
			
		||||
 | 
			
		||||
@@ -46,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");
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user