Compare commits

..

No commits in common. "master" and "Comments" have entirely different histories.

22 changed files with 96 additions and 156 deletions

View File

@ -28,15 +28,15 @@ public class CreateEventController {
@FXML
protected JFXComboBox<String> comboBoxPriority;
@FXML
protected JFXToggleButton toggleBtnIsFullDay;
private JFXToggleButton toggleBtnIsFullDay;
@FXML
protected JFXToggleButton toggleBtnIsPrivate;
private JFXToggleButton toggleBtnIsPrivate;
@FXML
private Label labelError;
@FXML
protected JFXTimePicker timeStart;
private JFXTimePicker timeStart;
@FXML
protected JFXTimePicker timeEnd;
private JFXTimePicker timeEnd;
public CreateEventController() {
@ -91,7 +91,7 @@ public class CreateEventController {
dataController.createEvent(event);
}
//Marco Kühn//
//Marc Beyer//
@FXML
protected void abortBtnClick(ActionEvent event) {
Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();

View File

@ -1,12 +1,9 @@
//Marc Beyer//
package events;
import helper.HttpRequestException;
import container.DataController;
import container.Event;
import java.time.LocalTime;
public class EditEventController extends CreateEventController{
private Event currentEvent;
@ -22,17 +19,7 @@ public class EditEventController extends CreateEventController{
datePickerDate.setValue(currentEvent.getDate().toLocalDate());
comboBoxPriority.getSelectionModel().select(currentEvent.getPriority());
try{
timeStart.setValue(LocalTime.parse(currentEvent.getStart()));
}catch (Exception e){}
try{
timeEnd.setValue(LocalTime.parse(currentEvent.getEnd()));
}catch (Exception e){}
toggleBtnIsFullDay.setSelected(currentEvent.isFullDay());
toggleBtnIsPrivate.setSelected(currentEvent.isPrivate());
//timeEnd.setValue(currentEvent.getEnd());
}
@Override

View File

@ -57,7 +57,7 @@ public class MainApplication extends Application {
scene.getStylesheets().add(Objects.requireNonNull(
MainApplication.class.getResource("main-view.css")).toExternalForm()
);
stage.setTitle("SharePlanner");
stage.setTitle("SharePlaner");
stage.setScene(scene);
stage.show();
}

View File

@ -1,4 +1,4 @@
// Marco Kühn, Marc Beyer //
/* Marco Kühn, Marc Beyer */
package main;
import config.Config;

View File

@ -1,4 +1,4 @@
// Marco Kühn //
/* Marco Kühn */
package main;
import com.jfoenix.controls.*;

View File

@ -1,4 +1,3 @@
//Marc Beyer//
package ui;
import javafx.scene.control.Label;

View File

@ -1,4 +1,3 @@
//Marc Beyer, Marco Kühn//
package ui;
import container.Event;

View File

@ -1,4 +1,3 @@
//Marco Kühn//
package ui;
import javafx.geometry.Bounds;

View File

@ -1,14 +1,14 @@
//Alex Rechtin//
package users;
import com.jfoenix.controls.JFXPasswordField;
import com.jfoenix.controls.JFXTextField;
import com.jfoenix.controls.JFXToggleButton;
import helper.HttpRequestException;
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 container.DataController;
import container.User;
@ -18,17 +18,17 @@ import java.util.Objects;
public class CreateUserController {
@FXML
protected JFXTextField textName;
protected TextField textName;
@FXML
protected JFXPasswordField textPassword;
protected PasswordField textPassword;
@FXML
protected JFXPasswordField textPasswordSecond;
protected PasswordField textPasswordSecond;
@FXML
protected JFXToggleButton checkButtonIsAdmin;
protected ToggleButton checkButtonIsAdmin;
@FXML
protected JFXTextField textLogin;
protected TextField textLogin;
@FXML
protected JFXTextField textForename;
protected TextField textForename;
@FXML
protected Label labelError;

View File

@ -1,4 +1,4 @@
// Marc Beyer //
/* Marc Beyer */
package users;
import container.DataController;

View File

@ -1,38 +1,25 @@
/*Marco Kühn*/
* {
-fx-dark-background-color: #3E415F;
-fx-darkest-background-color: #2B2D42;
-fx-bright-background-color: #8D99AE;
-fx-brighter-background-color: #ff5555;
-fx-brightest-background-color: #ffffff;
-fx-bright-border-color: #B0B0B0;
-fx-brighter-text-color: #ffffff;
}
GridPane{
-fx-background-color: -fx-dark-background-color;
-fx-background-color: #3E415F;
-fx-padding: 20px;
-fx-font-size: 20px;
-fx-font-family: Segoe UI;
-fx-border-insets: 1;
-fx-border-color: -fx-bright-border-color;
-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: -fx-brighter-text-color;
-fx-text-fill: white;
-fx-max-width: 150px;
-fx-min-width: 150px;
}
.mainLabel{
-fx-background-color: -fx-bright-background-color;
-fx-background-color: #8D99AE;
-fx-padding: 10px;
-fx-max-width: 200px;
-fx-min-width: 200px;
@ -42,22 +29,22 @@ Label{
.inputField{
-fx-padding: 10px;
-fx-background-color: -fx-brightest-background-color;
-fx-background-color: white;
}
.mainButton{
-fx-font-weight: bold;
-fx-background-color: -fx-brightest-background-color;
-fx-background-color: white;
}
JFXButton{
-fx-background-color: -fx-brightest-background-color;
-fx-background-color: white;
}
#labelError{
-fx-font-weight: bold;
-fx-max-width: 1000px;
-fx-text-fill: -fx-brighter-background-color;
-fx-text-fill: #ff5555;
-fx-padding: 16px;
-fx-min-height: 140px;
-fx-max-height: 400px;
@ -66,15 +53,15 @@ JFXButton{
}
.inputDate{
-fx-background-color: -fx-brightest-background-color;
-fx-background-color: white;
}
.comboBox{
-fx-background-color: -fx-brightest-background-color;
-fx-background-color: white;
}
.timePicker{
-fx-background-color: -fx-brightest-background-color;
-fx-background-color: white;
}
.jfx-time-picker .date-picker-popup{

View File

@ -1,70 +1,66 @@
/*Alex Rechtin, Marco Kühn*/
* {
-fx-dark-background-color: #525E74;
-fx-darkest-background-color: #2B2D42;
-fx-base-background-color: #2B2D42;
-fx-base1-background-color: #525E74;
-fx-bright-background-color: #77859E;
-fx-brighter-background-color: #282C34 ;
-fx-brightest-background-color: #333333 ;
-fx-bright-border-color: #B0B0B0;
-fx-brighter-text-color: #ffffff;
-fx-main-border-color: #B0B0B0;
-fx-main-text-color: #ffffff;
}
GridPane{
-fx-background-color: -fx-darkest-background-color;
-fx-background-color: -fx-base-background-color;
}
.main-panel{
-fx-background-color: -fx-brighter-background-color;
-fx-background-color: #282C34;
}
.vbox-main{
-fx-background-color: -fx-brightest-background-color;
-fx-background-color: #333333;
-fx-alignment: top-center;
}
.gridCalendar Line{
-fx-stroke: -fx-bright-border-color;
-fx-stroke: -fx-main-border-color;
}
.gridCalender{
-fx-background-color: -fx-darkest-background-color;
-fx-background-color: -fx-base-background-color;
-fx-min-height: 80px;
-fx-max-height: 80px;
}
.labelMonth{
-fx-padding: 0 0 0 20;
-fx-background-color: -fx-bright-background-color;
-fx-background-color: #77859E;
-fx-font-size: 35px;
-fx-font-weight: bold;
}
.scrollDays{
-fx-background-color: -fx-darkest-background-color;
-fx-border-color: -fx-bright-border-color;
-fx-background-color: -fx-base-background-color;
-fx-border-color: -fx-main-border-color;
}
.vBoxDays{
-fx-background-color: -fx-darkest-background-color;
-fx-background-color: -fx-base-background-color;
}
.labelDays{
-fx-alignment: center;
-fx-background-color: -fx-dark-background-color;
-fx-background-color: -fx-base1-background-color;
-fx-font-size: 25px;
-fx-border-color: -fx-bright-border-color;
-fx-border-color: -fx-main-border-color;
}
Label{
-fx-text-fill: -fx-brighter-text-color;
-fx-text-fill: -fx-main-text-color;
}
.event{
-fx-background-color: -fx-dark-background-color;
-fx-background-color: -fx-base1-background-color;
}
.main-btn{
@ -81,7 +77,7 @@ Label{
}
.buttonBox{
-fx-background-color: -fx-bright-background-color;
-fx-background-color: #77859E;
}
.navBtn{

View File

@ -1,35 +1,25 @@
/* Marco Kühn */
* {
-fx-dark-background-color: #3E415F;
-fx-bright-background-color: #ff5555;
-fx-brighter-background-color: #8D99AE;
-fx-brightest-background-color: #ffffff;
-fx-bright-border-color: #B0B0B0;
-fx-brighter-text-color: #ffffff;
}
GridPane{
-fx-background-color: -fx-dark-background-color;
-fx-background-color: #3E415F;
-fx-padding: 20px;
-fx-font-size: 20px;
-fx-font-family: Segoe UI;
-fx-border-insets: 1;
-fx-border-color: -fx-bright-border-color;
-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: -fx-brighter-text-color;
-fx-text-fill: white;
-fx-max-width: 200px;
-fx-min-width: 200px;
}
.mainLabel{
-fx-background-color: -fx-brighter-background-color;
-fx-background-color: #8D99AE;
-fx-padding: 10px;
-fx-max-width: 200px;
-fx-min-width: 200px;
@ -39,17 +29,17 @@ Label{
.mainButton{
-fx-font-weight: bold;
-fx-background-color: -fx-brightest-background-color;
-fx-background-color: white;
}
JFXButton{
-fx-background-color: -fx-brightest-background-color;
-fx-background-color: white;
}
#labelError{
-fx-font-weight: bold;
-fx-max-width: 1000px;
-fx-text-fill: -fx-bright-background-color;
-fx-text-fill: #ff5555;
-fx-padding: 16px;
-fx-min-height: 140px;
-fx-max-height: 400px;
@ -58,7 +48,7 @@ JFXButton{
}
.comboBox{
-fx-background-color: -fx-brightest-background-color;
-fx-background-color: white;
-fx-max-width: 200px;
-fx-min-width: 200px;
}

View File

@ -1,21 +1,21 @@
/*Alex Rechtin*/
* {
-fx-dark-background-color: #3E415F;
-fx-bright-background-color: #ffffff;
-fx-bright-border-color: #B0B0B0;
-fx-brighter-text-color: #ff5555;
-fx-brightest-text-color: #ffffff;
-fx-base-background-color: #2B2D42;
-fx-base1-background-color: #525E74;
-fx-main-border-color: #B0B0B0;
-fx-main-text-color: #ffffff;
}
GridPane{
-fx-background-color: -fx-dark-background-color;
-fx-background-color: #3E415F;
-fx-padding: 20px;
-fx-font-size: 20px;
-fx-font-family: Segoe UI;
-fx-border-insets: 1;
-fx-border-color: -fx-bright-border-color;
-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);
@ -31,13 +31,12 @@ GridPane{
Label{
-fx-text-fill: -fx-brightest-text-color;
-fx-text-fill: white;
-fx-max-width: 150px;
-fx-min-width: 150px;
}
.textField{
-fx-background-color: -fx-bright-background-color;
-fx-max-width: 400px;
-fx-min-width: 400px;
}
@ -45,11 +44,9 @@ Label{
.errorMessage{
-fx-max-width: 400px;
-fx-min-width: 400px;
-fx-text-fill: -fx-brighter-text-color;
}
JFXButton{
-fx-background-color: -fx-bright-background-color;
Button{
-fx-max-width: 150px;
-fx-min-width: 150px;
}

View File

@ -2,13 +2,10 @@
<!-- Alex Rechtin -->
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import javafx.geometry.Insets?>
<?import com.jfoenix.controls.JFXToggleButton?>
<?import com.jfoenix.controls.JFXButton?>
<?import com.jfoenix.controls.JFXPasswordField?>
<?import com.jfoenix.controls.JFXTextField?>
<GridPane xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml"
fx:controller="users.CreateUserController">
@ -36,15 +33,15 @@
<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" wrapText="true" GridPane.rowIndex="5" GridPane.columnIndex="1">Passwort wiederholen:</Label>
<Label styleClass="inputLabel" GridPane.rowIndex="5" GridPane.columnIndex="1">Passwort wiederholen:</Label>
<Label styleClass="inputLabelAdmin" GridPane.rowIndex="6" GridPane.columnIndex="1">Admin:</Label>
<JFXTextField fx:id="textLogin" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="1" />
<JFXTextField fx:id="textForename" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="2" />
<JFXTextField fx:id="textName" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="3" />
<JFXPasswordField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" />
<JFXPasswordField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" />
<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" />
<JFXToggleButton fx:id="checkButtonIsAdmin" GridPane.columnIndex="2" GridPane.rowIndex="6"/>
@ -54,8 +51,8 @@
<HBox.margin>
<Insets right="100" left="100"/>
</HBox.margin>
<JFXButton onAction="#abortBtnClick">Abbrechen</JFXButton>
<JFXButton onAction="#createUser" styleClass="btnLogin" >Anlegen</JFXButton>
<Button onAction="#abortBtnClick">Abbrechen</Button>
<Button onAction="#createUser" styleClass="btnLogin" >Anlegen</Button>
</HBox>
</GridPane>

View File

@ -1,13 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Alex Rechtin-->
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import javafx.geometry.Insets?>
<?import com.jfoenix.controls.JFXToggleButton?>
<?import com.jfoenix.controls.JFXTextField?>
<?import com.jfoenix.controls.JFXPasswordField?>
<?import com.jfoenix.controls.JFXButton?>
<?import javafx.scene.control.Label?>
<GridPane xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml"
fx:controller="users.EditUserController">
@ -35,15 +31,15 @@
<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" wrapText="true" GridPane.rowIndex="5" GridPane.columnIndex="1">Passwort wiederholen:</Label>
<Label styleClass="inputLabel" GridPane.rowIndex="5" GridPane.columnIndex="1">Passwort wiederholen:</Label>
<Label styleClass="inputLabelAdmin" GridPane.rowIndex="6" GridPane.columnIndex="1">Admin:</Label>
<JFXTextField fx:id="textLogin" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="1" />
<JFXTextField fx:id="textForename" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="2" />
<JFXTextField fx:id="textName" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="3" />
<JFXPasswordField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" />
<JFXPasswordField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" />
<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" />
<JFXToggleButton fx:id="checkButtonIsAdmin" GridPane.columnIndex="2" GridPane.rowIndex="6"/>
@ -53,8 +49,8 @@
<HBox.margin>
<Insets right="100" left="100"/>
</HBox.margin>
<JFXButton onAction="#abortBtnClick">Abbrechen</JFXButton>
<JFXButton onAction="#createUser" styleClass="btnLogin" >Bearbeiten</JFXButton>
<Button onAction="#abortBtnClick">Abbrechen</Button>
<Button onAction="#createUser" styleClass="btnLogin" >Bearbeiten</Button>
</HBox>
</GridPane>

View File

@ -1,30 +1,27 @@
/* Marco Kühn*/
* {
-fx-dark-background-color: #3E415F;
-fx-base-background-color: #2B2D42;
-fx-base1-background-color: #525E74;
-fx-brightest-background-color: #ffffff;
-fx-bright-border-color: #B0B0B0;
-fx-bright-text-color: #ff5555;
-fx-brighter-text-color: #ffffff;
-fx-main-border-color: #B0B0B0;
-fx-main-text-color: #ffffff;
}
GridPane{
-fx-background-color: -fx-dark-background-color;
-fx-background-color: #3E415F;
-fx-padding: 20px;
-fx-font-size: 20px;
-fx-font-family: Segoe UI;
-fx-border-insets: 1;
-fx-border-color: -fx-bright-border-color;
-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: -fx-brighter-text-color;
-fx-text-fill: white;
-fx-max-width: 150px;
-fx-min-width: 150px;
}
@ -32,7 +29,7 @@ Label{
.errorLbl{
-fx-font-weight: bold;
-fx-max-width: 200px;
-fx-text-fill: -fx-bright-text-color;
-fx-text-fill: #ff5555;
-fx-padding: 16px;
-fx-min-height: 140px;
-fx-max-height: 400px;
@ -41,17 +38,17 @@ Label{
}
.userField{
-fx-background-color: -fx-brightest-background-color;
-fx-background-color: white;
}
.passField{
-fx-background-color: -fx-brightest-background-color;
-fx-background-color: white;
}
.quitBtn{
-fx-background-color: -fx-brightest-background-color;
-fx-background-color: white;
}
.loginBtn{
-fx-background-color: -fx-brightest-background-color;
-fx-background-color: white;
}

View File

@ -26,7 +26,7 @@
<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">Passwort</Label>
<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"/>

View File

@ -1,4 +1,3 @@
//Marc Beyer//
package container;
import com.fasterxml.jackson.core.JsonProcessingException;

View File

@ -1,4 +1,3 @@
//Marco Kühn//
package container;
import java.time.Duration;

View File

@ -1,4 +1,3 @@
//Marc Beyer//
package container;
import helper.Tuple;

View File

@ -1,4 +1,3 @@
//Marco Kühn//
package container;
public class User {