MAM/VPR-Frontend
3
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'merge' into 1800-UI-User-bearbeiten

Browse Source 
# Conflicts:
#	client/app/src/main/java/users/EditUserController.java
#	client/app/src/main/resources/users/edit-user.fxml
This commit is contained in:
Alex Aleksej Rechtin
2022-01-31 12:40:03 +01:00
parent 4db6bd1c66 2fbf3895c5
commit 3f41005d84
33 changed files with 1311 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/app/build.gradle.kts
View File

@@ -5,15 +5,19 @@ plugins {
}
javafx {
version = "11"
version = "11.0.2"
modules(
"javafx.controls",
"javafx.fxml"
)
}
tasks.withType<JavaCompile> {
options.encoding = "UTF-8"
}
application {
mainClassName = "client.MainApplication"
mainClassName = "main.MainApplication"
}
repositories {
@@ -27,7 +31,7 @@ dependencies {
val jar by tasks.getting(Jar::class) {
manifest {
attributes["Main-Class"] = "client.Launcher"
attributes["Main-Class"] = "main.Launcher"
}
from({
configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) }

8
client/app/src/main/java/customUI/Button.java
View File

@@ -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));
}
}

21
client/app/src/main/java/customUI/Converter.java
View File

@@ -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");
}
}

15
client/app/src/main/java/customUI/Label.java
View File

@@ -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));
}
}

22
client/app/src/main/java/main/CreateEventController.java
View File

@@ -1,6 +1,7 @@
package main;
import com.jfoenix.controls.*;
import helper.HttpRequestException;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.scene.Node;
@@ -9,8 +10,8 @@ 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 container.DataController;
import container.Event;
import java.time.LocalTime;
import java.time.format.FormatStyle;
@@ -43,7 +44,6 @@ public class CreateEventController {
@FXML
public void initialize() {
StringConverter<LocalTime> defaultConverter = new LocalTimeStringConverter(FormatStyle.SHORT, Locale.GERMANY);
timeStart.set24HourView(true);
timeStart.setConverter(defaultConverter);
@@ -60,29 +60,35 @@ public class CreateEventController {
throw new IllegalArgumentException("Bitte w\u00e4hle ein Datum aus");
}
System.out.println(datePickerDate.getValue());
Event event = new Event(
textName.getText(),
ComboBoxPriotity.getSelectionModel().getSelectedIndex(),
toggleBtnIsFullDay.isSelected(),
toggleBtnIsPrivate.isSelected(),
timeStart.getValue().toString(),
timeEnd.getValue().toString(),
timeStart.getValue(),
timeEnd.getValue(),
datePickerDate.getValue().atStartOfDay(),
(int) DataController.USER_ID
);
System.out.println(event.getAsUrlParam());
DataController dataController = new DataController();
dataController.createEvent(event);
sendHttpRequest(event);
Stage stage = (Stage) ((Node) actionEvent.getSource()).getScene().getWindow();
stage.close();
} catch (RuntimeException e) {
} catch (Exception e) {
labelError.setText(e.getMessage());
}
}
protected void sendHttpRequest(Event event) throws HttpRequestException {
DataController dataController = new DataController();
dataController.createEvent(event);
}
@FXML
protected void abortBtnClick(ActionEvent event) {
Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();

30
client/app/src/main/java/main/EditEventController.java Normal file
View File

@@ -0,0 +1,30 @@
package main;
import helper.HttpRequestException;
import container.DataController;
import container.Event;
public class EditEventController extends CreateEventController{
private Event currentEvent;
public Event getCurrentEvent() {
return currentEvent;
}
public void setCurrentEvent(Event currentEvent) {
this.currentEvent = currentEvent;
textName.setText(currentEvent.getName());
datePickerDate.setValue(currentEvent.getDate().toLocalDate());
ComboBoxPriotity.getSelectionModel().select(currentEvent.getPriority());
//timeEnd.setValue(currentEvent.getEnd());
}
@Override
protected void sendHttpRequest(Event event) throws HttpRequestException {
DataController dataController = new DataController();
dataController.editEvent(currentEvent, event);
}
}

47
client/app/src/main/java/main/MainApplication.java
View File

@@ -1,10 +1,13 @@
package main;
import config.Config;
import config.ConfigLoader;
import javafx.application.Application;
import javafx.fxml.FXMLLoader;
import javafx.scene.Scene;
import javafx.stage.Stage;
import res.DataController;
import container.DataController;
import container.HttpRequest;
import java.io.IOException;
import java.util.Objects;
@@ -12,28 +15,56 @@ import java.util.Objects;
public class MainApplication extends Application {
@Override
public void start(Stage stage) throws IOException {
Config config = ConfigLoader.load();
if(config == null){
config = new Config(false, -1, "");
}
System.out.println("Ignore 'Illegal reflective access operation'-Warning. See https://github.com/sshahine/JFoenix/issues/1170");
if(
!config.isSaveLogin()
|| !new DataController().loginWithToken(config.getId(), config.getToken())
){
// Load login-scene
loadLoginScene();
}
if (DataController.USER_ID >= 0) {
if(config.isSaveLogin()){
config.setId(DataController.USER_ID);
config.setToken(HttpRequest.TOKEN);
ConfigLoader.save(config);
}
// Load main-scene
loadMainScene(stage);
System.out.println("Logged in...");
}
}
private void loadMainScene(Stage stage) throws IOException {
FXMLLoader fxmlLoader = new FXMLLoader(MainApplication.class.getResource("main-view.fxml"));
Scene scene = new Scene(fxmlLoader.load(), 1200, 700);
scene.getStylesheets().add(Objects.requireNonNull(
MainApplication.class.getResource("main-view.css")).toExternalForm());
MainApplication.class.getResource("main-view.css")).toExternalForm()
);
stage.setTitle("SharePlaner");
stage.setScene(scene);
stage.show();
}
private void loadLoginScene() throws IOException {
FXMLLoader fxmlLoaderLogin = new FXMLLoader(MainApplication.class.getResource("../users/login.fxml"));
Scene sceneLogin = new Scene(fxmlLoaderLogin.load(), 650, 500);
sceneLogin.getStylesheets().add(Objects.requireNonNull(
MainApplication.class.getResource("../users/login.css")).toExternalForm());
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) {

191
client/app/src/main/java/main/MainController.java
View File

@@ -1,19 +1,27 @@
package main;
import config.Config;
import config.ConfigLoader;
import ui.DayPane;
import ui.SvgBtnCreator;
import helper.HttpRequestException;
import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader;
import javafx.geometry.Pos;
import javafx.scene.Group;
import javafx.scene.Node;
import javafx.scene.Scene;
import customUI.Button;
import customUI.Label;
import javafx.scene.control.ScrollPane;
import javafx.scene.control.*;
import javafx.scene.layout.GridPane;
import javafx.scene.layout.HBox;
import javafx.scene.layout.VBox;
import javafx.stage.Modality;
import javafx.stage.Stage;
import res.DataController;
import res.Event;
import container.DataController;
import container.Event;
import javafx.event.ActionEvent;
import container.HttpRequest;
import java.io.IOException;
import java.time.Duration;
@@ -24,6 +32,12 @@ import java.util.Objects;
public class MainController {
@FXML
public VBox leftNav;
@FXML
public GridPane mainGridPane;
@FXML
public HBox buttonBox;
@FXML
private GridPane calendarGrid;
@@ -46,8 +60,9 @@ public class MainController {
public void initialize() {
createWeek();
setDates();
updateEvents();
createBtns();
leftNav.setSpacing(40);
}
private void updateEvents() {
@@ -56,10 +71,14 @@ public class MainController {
}
DataController dataController = new DataController();
ArrayList<Event> eventList = dataController.getAllVisibleEvents();
try {
ArrayList<Event> eventList = dataController.getAllVisibleEvents(weekStartDateTime, weekStartDateTime.plusDays(7));
for (Event event : eventList) {
addEvent(event);
for (Event event : eventList) {
addEvent(event);
}
} catch (HttpRequestException e) {
e.printStackTrace();
}
}
@@ -105,30 +124,39 @@ public class MainController {
updateEvents();
}
protected void onSettingBtnClick(){
try{
FXMLLoader fxmlLoader = new FXMLLoader(
MainApplication.class.getResource("option-view.fxml"));
Scene scene = new Scene(fxmlLoader.load(), 650, 650);
scene.getStylesheets().add(Objects.requireNonNull(
MainApplication.class.getResource("option-view.css")).toExternalForm());
Stage stage = new Stage();
stage.setTitle("Einstellungen");
stage.setScene(scene);
stage.initModality(Modality.APPLICATION_MODAL);
stage.setResizable(false);
stage.showAndWait();
} catch (IOException e) {
e.printStackTrace();
}
}
protected void onLogoutBtnClick(ActionEvent event){
ConfigLoader.save(new Config());
DataController.USER_ID = -1;
HttpRequest.TOKEN = "";
Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
stage.close();
}
private void createWeek() {
for (int i = 0; i < 7; i++) {
Label label = new Label();
label.setTextValue(dayNames[i]);
label.setMaxHeight(Double.MAX_VALUE);
label.setMaxWidth(Double.MAX_VALUE);
label.getStyleClass().add("labelDays");
dayLabel[i] = label;
calendarGrid.add(label, i, 0);
ScrollPane scrollPane = new ScrollPane();
VBox vBox = new VBox();
vBox.getStyleClass().add("vBoxDays");
vBox.setSpacing(10);
dayVBoxes[i] = vBox;
scrollPane.setContent(vBox);
scrollPane.setFitToWidth(true);
scrollPane.setFitToHeight(true);
scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
scrollPane.getStyleClass().add("scrollDays");
calendarGrid.add(scrollPane, i, 1);
DayPane dayPane = new DayPane(dayNames[i]);
this.dayLabel[i] = dayPane.getDayLabel();
calendarGrid.add(dayPane.getDayLabel(), i, 0);
dayVBoxes[i] = dayPane.getDayVBox();
calendarGrid.add(dayPane.getScrollPane(), i, 1);
}
}
@@ -139,15 +167,32 @@ public class MainController {
HBox btnHBox = new HBox();
btnHBox.setAlignment(Pos.BOTTOM_RIGHT);
Button deleteBtn = new Button();
deleteBtn.setTextValue(" X ");
Group svgDel = new Group(
SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
SvgBtnCreator.createPath("M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z",
"white", "gray")
);
Button deleteBtn = SvgBtnCreator.createBtn(svgDel, 24, "", "Löschen des Termins");
deleteBtn.getStyleClass().add("deleteEventBtn");
deleteBtn.setOnAction(e -> {
DataController dataController = new DataController();
dataController.deleteEvent(event.getId());
try {
dataController.deleteEvent(event.getOwnerId(), event.getId(), event.getDate());
} catch (HttpRequestException ex) {
ex.printStackTrace();
}
updateEvents();
});
Button editBtn = new Button();
editBtn.setTextValue("edit");
Group svgEdit = new Group(
SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
SvgBtnCreator.createPath("M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25zM20.71 7.04c.39-.39.39-1.02 0-1.41l-2.34-2.34c-.39-.39-1.02-.39-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z",
"white", "gray")
);
Button editBtn = SvgBtnCreator.createBtn(svgEdit, 24, "", "Bearbeiten des Termins");
editBtn.getStyleClass().add("editEventBtn");
editBtn.setOnAction(event1 -> {
try {
FXMLLoader fxmlLoader = new FXMLLoader(
@@ -160,7 +205,10 @@ public class MainController {
stage.setScene(scene);
stage.initModality(Modality.APPLICATION_MODAL);
stage.setResizable(false);
EditEventController editEventController = fxmlLoader.getController();
editEventController.setCurrentEvent(event);
stage.showAndWait();
updateEvents();
} catch (IOException e) {
e.printStackTrace();
}
@@ -170,6 +218,7 @@ public class MainController {
vBox.getChildren().add(btnHBox);
Label nameLabel = new Label(event.getName());
nameLabel.setWrapText(true);
vBox.getChildren().add(nameLabel);
if (event.getStart() != null || event.getEnd() != null) {
@@ -182,11 +231,12 @@ public class MainController {
Label typeLabel = new Label("Wer: " + event.getOwnerName());
vBox.getChildren().add(typeLabel);
Label prioLabel = new Label("Priorit\u00e4t: " + event.getPriority());
Label prioLabel = new Label("Priorität: " + event.getPriority());
vBox.getChildren().add(prioLabel);
if (event.isFullDay()) {
Label fullDayLabel = new Label("Dieser Termin bockiert den ganzen Tag!");
fullDayLabel.setWrapText(true);
vBox.getChildren().add(fullDayLabel);
}
@@ -220,10 +270,75 @@ public class MainController {
weekStartDateTime = now.plusDays(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));
}
private void createBtns(){
Group svgAdd = new Group(
SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
SvgBtnCreator.createPath("M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z",
"white", "gray")
);
Button addBtn = SvgBtnCreator.createBtn(svgAdd, 40, "main-btn", "Erstellt einen neuen Termin");
addBtn.setOnAction(e -> onAddBtnClick());
addBtn.getStyleClass().add("main-btn");
leftNav.getChildren().add(addBtn);
Group svgSettings = new Group(
SvgBtnCreator.createPath("M0 0h24v24H0V0z", "transparent", "transparent"),
SvgBtnCreator.createPath("M19.14,12.94c0.04-0.3,0.06-0.61,0.06-0.94c0-0.32-0.02-0.64-0.07-0.94l2.03-1.58c0.18-0.14,0.23-0.41,0.12-0.61 l-1.92-3.32c-0.12-0.22-0.37-0.29-0.59-0.22l-2.39,0.96c-0.5-0.38-1.03-0.7-1.62-0.94L14.4,2.81c-0.04-0.24-0.24-0.41-0.48-0.41 h-3.84c-0.24,0-0.43,0.17-0.47,0.41L9.25,5.35C8.66,5.59,8.12,5.92,7.63,6.29L5.24,5.33c-0.22-0.08-0.47,0-0.59,0.22L2.74,8.87 C2.62,9.08,2.66,9.34,2.86,9.48l2.03,1.58C4.84,11.36,4.8,11.69,4.8,12s0.02,0.64,0.07,0.94l-2.03,1.58 c-0.18,0.14-0.23,0.41-0.12,0.61l1.92,3.32c0.12,0.22,0.37,0.29,0.59,0.22l2.39-0.96c0.5,0.38,1.03,0.7,1.62,0.94l0.36,2.54 c0.05,0.24,0.24,0.41,0.48,0.41h3.84c0.24,0,0.44-0.17,0.47-0.41l0.36-2.54c0.59-0.24,1.13-0.56,1.62-0.94l2.39,0.96 c0.22,0.08,0.47,0,0.59-0.22l1.92-3.32c0.12-0.22,0.07-0.47-0.12-0.61L19.14,12.94z M12,15.6c-1.98,0-3.6-1.62-3.6-3.6 s1.62-3.6,3.6-3.6s3.6,1.62,3.6,3.6S13.98,15.6,12,15.6z",
"white", "gray")
);
Button settingsBtn = SvgBtnCreator.createBtn(svgSettings, 40, "main-btn", "Öffnet die Einstellungen");
settingsBtn.setOnAction(e -> onSettingBtnClick());
settingsBtn.getStyleClass().add("main-btn");
leftNav.getChildren().add(settingsBtn);
Group svgLogout = new Group(
SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
SvgBtnCreator.createPath("M17 7l-1.41 1.41L18.17 11H8v2h10.17l-2.58 2.58L17 17l5-5zM4 5h8V3H4c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h8v-2H4V5z",
"white", "gray")
);
Button logoutBtn = SvgBtnCreator.createBtn(svgLogout, 40, "main-btn", "Abmelden");
logoutBtn.setOnAction(this::onLogoutBtnClick);
logoutBtn.getStyleClass().add("main-btn");
leftNav.getChildren().add(logoutBtn);
Group svgBack = new Group(
SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
SvgBtnCreator.createPath("M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z",
"white", "lightgray")
);
Button backBtn = SvgBtnCreator.createBtn(svgBack, 40, "navBtn", "Zeigt die vorherige Woche");
backBtn.setOnAction(e -> onBackClick());
backBtn.getStyleClass().add("navBtn");
GridPane.setColumnIndex(backBtn, 1);
buttonBox.getChildren().add(backBtn);
Group svgToday = new Group(
SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
SvgBtnCreator.createPath("M20 3h-1V1h-2v2H7V1H5v2H4c-1.1 0-2 .9-2 2v16c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 18H4V8h16v13z",
"white", "lightgray")
);
Button todayBtn = SvgBtnCreator.createBtn(svgToday, 40, "navBtn", "Zeigt die aktuelle Woche");
todayBtn.setOnAction(e -> onTodayClick());
todayBtn.getStyleClass().add("navBtn");
GridPane.setColumnIndex(todayBtn, 2);
buttonBox.getChildren().add(todayBtn);
Group svgNext = new Group(
SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
SvgBtnCreator.createPath("M12 4l-1.41 1.41L16.17 11H4v2h12.17l-5.58 5.59L12 20l8-8z",
"white", "lightgray")
);
Button nextBtn = SvgBtnCreator.createBtn(svgNext, 40, "navBtn", "Zeigt die nächste Woche");
nextBtn.setOnAction(e -> onNextClick());
nextBtn.getStyleClass().add("navBtn");
GridPane.setColumnIndex(nextBtn, 3);
buttonBox.getChildren().add(nextBtn);
}
}

158
client/app/src/main/java/main/OptionController.java Normal file
View File

@@ -0,0 +1,158 @@
package main;
import com.jfoenix.controls.*;
import config.Config;
import config.ConfigLoader;
import container.HttpRequest;
import helper.HttpRequestException;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader;
import javafx.scene.Node;
import javafx.scene.Scene;
import javafx.scene.control.Alert;
import javafx.scene.control.ButtonType;
import javafx.scene.control.Label;
import javafx.scene.layout.GridPane;
import javafx.stage.Modality;
import javafx.stage.Stage;
import container.DataController;
import container.User;
import users.EditUserController;
import java.awt.*;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.function.Consumer;
public class OptionController {
@FXML
public JFXButton updateUserBtn;
@FXML
public JFXButton deleteUserBtn;
@FXML
public JFXButton createUserBtn;
@FXML
public JFXToggleButton saveLoginTBtn;
@FXML
public Label labelError;
@FXML
public GridPane mainGrid;
private JFXComboBox<String> comboBox;
private DataController dataController;
private List<User> users;
private Config config;
@FXML
public void initialize(){
dataController = new DataController();
try{
users = dataController.getAllUser();
} catch (HttpRequestException e){
users = new ArrayList<>();
}
ObservableList<String> observableUserList = FXCollections.observableArrayList();
for (User user: users) {
observableUserList.add(user.getLogin());
}
comboBox = new JFXComboBox<>(observableUserList);
comboBox.getStyleClass().add("comboBox");
mainGrid.add(comboBox, 2,2);
config = ConfigLoader.load();
if(config == null){
config = new Config(false, -1, "");
}
saveLoginTBtn.setSelected(config.isSaveLogin());
}
public void onBackBtnClick(ActionEvent actionEvent) {
Stage stage = (Stage) ((Node) actionEvent.getSource()).getScene().getWindow();
stage.close();
}
public void onCreateBtnClick(ActionEvent actionEvent) {
loadUserScene(actionEvent, "User erstellen", "../users/create-user.fxml", null);
}
public void onUpdateBtnClick(ActionEvent actionEvent) {
int editIndex = comboBox.getSelectionModel().getSelectedIndex();
if(editIndex < 0 || editIndex >= users.size()) return;
FXMLLoader fxmlLoader = loadUserScene(
actionEvent,
"User bearbeiten",
"../users/edit-user.fxml",
this::setUserAtController
);
}
public void onDeleteBtnClick(ActionEvent actionEvent) {
Alert alert = new Alert(Alert.AlertType.CONFIRMATION, "Wirklich löschen?");
Optional<ButtonType> result = alert.showAndWait();
if(result.isPresent() && result.get() == ButtonType.OK){
int removeIndex = comboBox.getSelectionModel().getSelectedIndex();
try {
dataController.deleteUser(users.get(removeIndex));
} catch (HttpRequestException e) {
Alert alert1 = new Alert(Alert.AlertType.ERROR, e.getMessage());
alert1.showAndWait();
return;
}
comboBox.getItems().remove(removeIndex);
users.remove(removeIndex);
}
}
private FXMLLoader loadUserScene(ActionEvent actionEvent, String title, String fxml, Consumer<FXMLLoader> method) {
FXMLLoader fxmlLoader = new FXMLLoader(
MainApplication.class.getResource(fxml));
try {
Scene scene = new Scene(fxmlLoader.load(), 800, 650);
scene.getStylesheets().add(Objects.requireNonNull(
MainApplication.class.getResource("../users/create-user.css")).toExternalForm());
Stage stage = new Stage();
stage.setTitle(title);
stage.setScene(scene);
stage.initModality(Modality.APPLICATION_MODAL);
stage.setResizable(false);
if(method != null)method.accept(fxmlLoader);
stage.showAndWait();
Stage stageOld = (Stage) ((Node) actionEvent.getSource()).getScene().getWindow();
stageOld.close();
} catch (IOException e) {
e.printStackTrace();
e.printStackTrace();
}
return fxmlLoader;
}
private void setUserAtController(FXMLLoader fxmlLoader){
int editIndex = comboBox.getSelectionModel().getSelectedIndex();
EditUserController editUserController = fxmlLoader.getController();
editUserController.setCurrentUser(users.get(editIndex));
}
public void toggledBtn(ActionEvent actionEvent) {
config.setSaveLogin(saveLoginTBtn.isSelected());
if(config.isSaveLogin()){
config.setId(DataController.USER_ID);
config.setToken(HttpRequest.TOKEN);
} else {
config.setId(-1);
config.setToken("");
}
ConfigLoader.save(config);
}
}

44
client/app/src/main/java/ui/DayPane.java Normal file
View File

@@ -0,0 +1,44 @@
package ui;
import javafx.scene.control.Label;
import javafx.scene.control.ScrollPane;
import javafx.scene.layout.VBox;
public class DayPane {
private Label dayLabel;
private VBox dayVBox;
private ScrollPane scrollPane;
public DayPane(String name) {
dayLabel = new Label();
dayLabel.setText(name);
dayLabel.setMaxHeight(Double.MAX_VALUE);
dayLabel.setMaxWidth(Double.MAX_VALUE);
dayLabel.getStyleClass().add("labelDays");
scrollPane = new ScrollPane();
dayVBox = new VBox();
dayVBox.getStyleClass().add("vBoxDays");
dayVBox.setSpacing(10);
scrollPane.setContent(dayVBox);
scrollPane.setFitToWidth(true);
scrollPane.setFitToHeight(true);
scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
scrollPane.getStyleClass().add("scrollDays");
}
public Label getDayLabel() {
return dayLabel;
}
public VBox getDayVBox() {
return dayVBox;
}
public ScrollPane getScrollPane() {
return scrollPane;
}
}

66
client/app/src/main/java/ui/SvgBtnCreator.java Normal file
View File

@@ -0,0 +1,66 @@
package ui;
import javafx.geometry.Bounds;
import javafx.scene.Group;
import javafx.scene.control.*;
import javafx.scene.shape.SVGPath;
public class SvgBtnCreator {
public static Button createBtn(Group group, int svgSize) {
Button btn = new Button();
Bounds boundsDel = group.getBoundsInParent();
double scaleDel = Math.min(svgSize / boundsDel.getWidth(), svgSize / boundsDel.getHeight());
group.setScaleX(scaleDel);
group.setScaleY(scaleDel);
btn.setGraphic(group);
btn.setMaxSize(svgSize, svgSize);
btn.setMinSize(svgSize, svgSize);
btn.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
return btn;
}
public static Button createBtn(Group group, int svgSize, String styleClass) {
Button btn = new Button();
Bounds boundsDel = group.getBoundsInParent();
double scaleDel = Math.min(svgSize / boundsDel.getWidth(), svgSize / boundsDel.getHeight());
group.setScaleX(scaleDel);
group.setScaleY(scaleDel);
btn.setGraphic(group);
btn.setMaxSize(svgSize, svgSize);
btn.setMinSize(svgSize, svgSize);
btn.getStyleClass().add(styleClass);
return btn;
}
public static Button createBtn(Group group, int svgSize, String styleClass, String toolTip) {
Button btn = new Button();
Bounds boundsDel = group.getBoundsInParent();
double scaleDel = Math.min(svgSize / boundsDel.getWidth(), svgSize / boundsDel.getHeight());
group.setScaleX(scaleDel);
group.setScaleY(scaleDel);
btn.setGraphic(group);
btn.setMaxSize(svgSize, svgSize);
btn.setMinSize(svgSize, svgSize);
btn.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
btn.getStyleClass().add(styleClass);
Tooltip tooltip = new Tooltip(toolTip);
btn.setTooltip(tooltip);
return btn;
}
public static SVGPath createPath(String d, String fill, String hoverFill) {
SVGPath path = new SVGPath();
path.getStyleClass().add("svg");
path.setContent(d);
path.setStyle("-fill:" + fill + ";-hover-fill:"+hoverFill+';');
return path;
}
}

31
client/app/src/main/java/users/CreateUserController.java
View File

@@ -1,20 +1,24 @@
package users;
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;
import java.util.Objects;
public class CreateUserController {
public TextField textName;
public TextField textPassword;
public TextField textPasswordSecond;
public PasswordField textPassword;
public PasswordField textPasswordSecond;
public ToggleButton checkButtonIsAdmin;
public TextField textLogin;
public TextField textForename;
@@ -38,15 +42,38 @@ public class CreateUserController {
labelError.setText("Bitte Passwort eingeben!");
return;
}
if (textPassword.getText().trim().length() < 8) {
labelError.setText("Das Passwort muss mindestens 8 Zeichen lang sein!");
return;
}
if (!Objects.equals(textPassword.getText(), textPasswordSecond.getText())){
labelError.setText("Passwörter stimmen nicht überein!");
return;
}
User user = new User();
user.setLogin(textLogin.getText().trim());
user.setForename(textForename.getText().trim());
user.setName(textName.getText().trim());
user.setPassword(textPassword.getText().trim());
user.setAdmin(checkButtonIsAdmin.isSelected());
try {
sendHttpRequest(user);
} catch (HttpRequestException e) {
labelError.setText(e.getMessage());
return;
}
Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
stage.close();
}
protected void sendHttpRequest(User user) throws HttpRequestException {
DataController dataController = new DataController();
dataController.createUser(user);
}
@FXML
protected void abortBtnClick(ActionEvent event) {
Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();

86
client/app/src/main/java/users/EditUserController.java
View File

@@ -1,28 +1,33 @@
package users;
import container.DataController;
import container.User;
import helper.HttpRequestException;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.scene.Node;
import javafx.scene.control.Label;
import javafx.scene.control.TextField;
import javafx.scene.control.ToggleButton;
import javafx.scene.paint.Paint;
import javafx.scene.control.Alert;
import javafx.stage.Stage;
import java.util.Objects;
public class EditUserController {
public class EditUserController extends CreateUserController{
private User currentUser;
public TextField textName;
public TextField textPassword;
public TextField textPasswordSecond;
public ToggleButton checkButtonIsAdmin;
public TextField textLogin;
public TextField textForename;
public Label labelError;
public User getCurrentUser() {
return currentUser;
}
@FXML
public void saveUser(ActionEvent event) {
labelError.setTextFill(Paint.valueOf("Red"));
public void setCurrentUser(User currentUser) {
this.currentUser = currentUser;
textForename.setText(currentUser.getForename());
textName.setText(currentUser.getName());
textLogin.setText(currentUser.getLogin());
checkButtonIsAdmin.setSelected(currentUser.isAdmin());
}
@Override
protected void createUser(ActionEvent event){
if (textLogin.getText().trim().isEmpty()){
labelError.setText("Bitte Login Namen angeben");
return;
@@ -35,22 +40,53 @@ public class EditUserController {
labelError.setText("Bitte Nachnamen eingeben!");
return;
}
if (textPassword.getText().trim().isEmpty()) {
labelError.setText("Bitte Passwort eingeben!");
User user = new User();
if(!textPassword.getText().trim().isEmpty() || !textPasswordSecond.getText().trim().isEmpty()){
if (textPassword.getText().trim().isEmpty()) {
labelError.setText("Bitte Passwort eingeben!");
return;
}
if (textPassword.getText().trim().length() < 8) {
labelError.setText("Das Passwort muss mindestens 8 Zeichen lang sein!");
return;
}
if (!Objects.equals(textPassword.getText(), textPasswordSecond.getText())){
labelError.setText("Passwörter stimmen nicht überein!");
return;
}
user.setPassword(textPassword.getText().trim());
}
user.setUserId(currentUser.getUserId());
user.setLogin(textLogin.getText().trim());
user.setForename(textForename.getText().trim());
user.setName(textName.getText().trim());
user.setAdmin(checkButtonIsAdmin.isSelected());
try {
sendHttpRequest(user);
} catch (HttpRequestException e) {
labelError.setText(e.getMessage());
return;
}
if (!Objects.equals(textPassword.getText(), textPasswordSecond.getText())){
labelError.setText("Passwörter stimmen nicht überein!");
return;
if(currentUser.getUserId() == DataController.USER_ID){
Alert alert = new Alert(
Alert.AlertType.WARNING,
"Bitte starte das Programm neu um die Änderungen anzuwenden."
);
alert.showAndWait();
}
Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
stage.close();
}
@FXML
public void abortBtnClick(ActionEvent event) {
Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
stage.close();
@Override
protected void sendHttpRequest(User user) throws HttpRequestException {
DataController dataController = new DataController();
dataController.editUser(user);
}
}

2
client/app/src/main/java/users/LoginController.java
View File

@@ -6,7 +6,7 @@ import javafx.fxml.FXML;
import javafx.scene.Node;
import javafx.scene.control.Label;
import javafx.stage.Stage;
import res.DataController;
import container.DataController;
public class LoginController {
@FXML

2
client/app/src/main/resources/main/edit-event.fxml
View File

@@ -8,7 +8,7 @@
<?import com.jfoenix.controls.*?>
<GridPane fx:id="mainGrid" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="main.CreateEventController">
fx:controller="main.EditEventController">
<columnConstraints>
<ColumnConstraints/>

58
client/app/src/main/resources/main/main-view.css
View File

@@ -63,16 +63,58 @@ Label{
}
.main-btn{
-fx-background-color: #ffffff;
-fx-text-fill: -fx-main-text-color;
-fx-background-radius: 5em;
-fx-min-width: 40px;
-fx-min-height: 40px;
-fx-max-width: 40px;
-fx-max-height: 40px;
-fx-background-color: transparent;
-fx-border-color: transparent;
}
.main-btn .svg {
-fx-fill: -fill;
}
.main-btn:hover .svg {
-fx-fill: -hover-fill;
}
.buttonBox{
-fx-background-color: #77859E;
}
.navBtn{
-fx-background-color: white;
-fx-background-color: transparent;
-fx-border-color: transparent;
}
.navBtn .svg {
-fx-fill: -fill;
}
.navBtn:hover .svg {
-fx-fill: -hover-fill;
}
.editEventBtn{
-fx-background-color: transparent;
-fx-border-color: transparent;
}
.editEventBtn .svg {
-fx-fill: -fill;
}
.editEventBtn:hover .svg {
-fx-fill: -hover-fill;
}
.deleteEventBtn{
-fx-background-color: transparent;
-fx-border-color: transparent;
}
.deleteEventBtn .svg {
-fx-fill: -fill;
}
.deleteEventBtn:hover .svg {
-fx-fill: -hover-fill;
}

19
client/app/src/main/resources/main/main-view.fxml
View File

@@ -4,7 +4,6 @@
<?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">
@@ -15,22 +14,13 @@
<rowConstraints>
<RowConstraints vgrow="SOMETIMES"/>
</rowConstraints>
<VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0" spacing="5.0"
<VBox fx:id="leftNav" 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">
<GridPane fx:id="mainGridPane" prefHeight="200.0" prefWidth="222.0" GridPane.columnIndex="1" GridPane.rowIndex="0">
<columnConstraints>
<ColumnConstraints hgrow="ALWAYS"/>
<ColumnConstraints/>
@@ -49,9 +39,8 @@
<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>
<HBox fx:id="buttonBox" styleClass="buttonBox" GridPane.columnIndex="1" alignment="CENTER"/>
<GridPane fx:id="calendarGrid" gridLinesVisible="true" styleClass="gridCalendar" GridPane.columnSpan="4"
GridPane.columnIndex="0" GridPane.rowIndex="1">

58
client/app/src/main/resources/main/option-view.css Normal file
View File

@@ -0,0 +1,58 @@
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: 200px;
-fx-min-width: 200px;
}
.mainLabel{
-fx-background-color: #8D99AE;
-fx-padding: 10px;
-fx-max-width: 200px;
-fx-min-width: 200px;
-fx-font-weight: bold;
-fx-alignment: center;
}
.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;
}
.comboBox{
-fx-background-color: white;
-fx-max-width: 200px;
-fx-min-width: 200px;
}
.userBtn{
-fx-max-width: 200px;
-fx-min-width: 200px;
}

51
client/app/src/main/resources/main/option-view.fxml Normal file
View File

@@ -0,0 +1,51 @@
<?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="main.OptionController"
prefHeight="400.0" prefWidth="600.0"
fx:id="mainGrid">
<columnConstraints>
<ColumnConstraints minWidth="100"/>
<ColumnConstraints minWidth="100"/>
<ColumnConstraints minWidth="200"/>
<ColumnConstraints minWidth="100"/>
<ColumnConstraints minWidth="100"/>
</columnConstraints>
<rowConstraints>
<RowConstraints vgrow="ALWAYS" />
<RowConstraints vgrow="ALWAYS" />
<RowConstraints vgrow="ALWAYS" />
<RowConstraints vgrow="ALWAYS" />
<RowConstraints vgrow="ALWAYS" />
<RowConstraints vgrow="ALWAYS" />
<RowConstraints vgrow="ALWAYS" />
<RowConstraints vgrow="ALWAYS" />
<RowConstraints vgrow="ALWAYS" />
<RowConstraints vgrow="ALWAYS" />
</rowConstraints>
<Label styleClass="mainLabel" GridPane.columnIndex="2" GridPane.halignment="CENTER" >Einstellungen</Label>
<Label GridPane.columnIndex="1" GridPane.rowIndex="2" GridPane.halignment="CENTER">User:</Label>
<JFXButton styleClass="userBtn" fx:id="updateUserBtn" GridPane.columnIndex="1" GridPane.columnSpan="3"
GridPane.rowIndex="4" GridPane.halignment="CENTER" onAction="#onUpdateBtnClick">User bearbeiten</JFXButton>
<JFXButton styleClass="userBtn" fx:id="deleteUserBtn" GridPane.columnIndex="1" GridPane.columnSpan="3"
GridPane.rowIndex="5" GridPane.halignment="CENTER" onAction="#onDeleteBtnClick">User löschen</JFXButton>
<JFXButton styleClass="userBtn" fx:id="createUserBtn" GridPane.columnIndex="1" GridPane.columnSpan="3"
GridPane.rowIndex="7" GridPane.halignment="CENTER" onAction="#onCreateBtnClick">User anlegen</JFXButton>
<Label styleClass="loginLbl" GridPane.columnIndex="1" GridPane.rowIndex="8"
GridPane.halignment="CENTER">Angemeldet bleiben:</Label>
<JFXToggleButton fx:id="saveLoginTBtn" GridPane.columnIndex="3" GridPane.rowIndex="8" onAction="#toggledBtn"/>
<Label fx:id="labelError" styleClass="errorMessage" GridPane.columnIndex="1" GridPane.rowIndex="9"/>
<JFXButton GridPane.columnIndex="4" GridPane.rowIndex="9" onAction="#onBackBtnClick">Zurück</JFXButton>
</GridPane>

11
client/app/src/main/resources/users/create-user.fxml
View File

@@ -3,6 +3,7 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import javafx.geometry.Insets?>
<?import com.jfoenix.controls.JFXToggleButton?>
<GridPane xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml"
fx:controller="users.CreateUserController">
@@ -37,19 +38,19 @@
<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" />
<TextField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" />
<TextField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" />
<PasswordField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" />
<PasswordField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" />
<ToggleButton fx:id="checkButtonIsAdmin" GridPane.columnIndex="2" GridPane.rowIndex="6"/>
<JFXToggleButton fx:id="checkButtonIsAdmin" GridPane.columnIndex="2" GridPane.rowIndex="6"/>
<Label fx:id="labelError" styleClass="errorMessage" GridPane.columnIndex="2" GridPane.rowIndex="7"/>
<Label fx:id="labelError" wrapText="true" styleClass="errorMessage" GridPane.columnIndex="2" GridPane.rowIndex="7"/>
<HBox GridPane.columnIndex="2" GridPane.rowIndex="8" alignment="CENTER_RIGHT">
<HBox.margin>
<Insets right="100" left="100"/>
</HBox.margin>
<Button onAction="#abortBtnClick">Abbrechen</Button>
<Button onAction="#createUser" styleClass="btnLogin" >Anmelden</Button>
<Button onAction="#createUser" styleClass="btnLogin" >Anlegen</Button>
</HBox>
</GridPane>

14
client/app/src/main/resources/users/edit-user.fxml
View File

@@ -3,6 +3,7 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import javafx.geometry.Insets?>
<?import com.jfoenix.controls.JFXToggleButton?>
<GridPane xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml"
fx:controller="users.EditUserController">
@@ -24,7 +25,7 @@
<RowConstraints vgrow="ALWAYS" />
</rowConstraints>
<Label styleClass="mainLabel" GridPane.columnIndex="2" >User Bearbeiten</Label>
<Label styleClass="mainLabel" GridPane.columnIndex="2" >User bearbeiten</Label>
<Label styleClass="inputLabel" GridPane.rowIndex="1" GridPane.columnIndex="1">Login:</Label>
<Label styleClass="inputLabel" GridPane.rowIndex="2" GridPane.columnIndex="1">Vorname:</Label>
@@ -37,19 +38,20 @@
<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" />
<TextField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" />
<TextField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" />
<PasswordField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" />
<PasswordField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" />
<ToggleButton fx:id="checkButtonIsAdmin" GridPane.columnIndex="2" GridPane.rowIndex="6"/>
<JFXToggleButton fx:id="checkButtonIsAdmin" GridPane.columnIndex="2" GridPane.rowIndex="6"/>
<Label fx:id="labelError" styleClass="errorMessage" GridPane.columnIndex="2" GridPane.rowIndex="7"/>
<Label fx:id="labelError" wrapText="true" styleClass="errorMessage" GridPane.columnIndex="2" GridPane.rowIndex="7"/>
<HBox GridPane.columnIndex="2" GridPane.rowIndex="8" alignment="CENTER_RIGHT">
<HBox.margin>
<Insets right="100" left="100"/>
</HBox.margin>
<Button onAction="#abortBtnClick">Abbrechen</Button>
<Button onAction="#saveUser" styleClass="btnLogin" >Speichern</Button>
<Button onAction="#createUser" styleClass="btnLogin" >Bearbeiten</Button>
</HBox>
</GridPane>