5 Commits

Author SHA1 Message Date
44a4ca7967 Added missing comments 2022-02-10 09:23:39 +01:00
f23a596f47 Merge branch 'merge' 2022-02-09 13:48:08 +01:00
0522908001 Fixed edit-event 2022-02-09 13:45:12 +01:00
34e51cb72f Merge remote-tracking branch 'origin/merge' into merge 2022-02-08 08:51:05 +01:00
88c8a30ad0 Refactor 2022-02-08 08:50:34 +01:00
13 changed files with 30 additions and 10 deletions

View File

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

View File

@@ -1,9 +1,12 @@
//Marc Beyer//
package events; package events;
import helper.HttpRequestException; import helper.HttpRequestException;
import container.DataController; import container.DataController;
import container.Event; import container.Event;
import java.time.LocalTime;
public class EditEventController extends CreateEventController{ public class EditEventController extends CreateEventController{
private Event currentEvent; private Event currentEvent;
@@ -19,7 +22,17 @@ public class EditEventController extends CreateEventController{
datePickerDate.setValue(currentEvent.getDate().toLocalDate()); datePickerDate.setValue(currentEvent.getDate().toLocalDate());
comboBoxPriority.getSelectionModel().select(currentEvent.getPriority()); comboBoxPriority.getSelectionModel().select(currentEvent.getPriority());
//timeEnd.setValue(currentEvent.getEnd()); 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());
} }
@Override @Override

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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