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

Merge branch 'merge'

Browse Source
This commit is contained in:
Marc Beyer 2022-02-09 13:48:08 +01:00
commit f23a596f47
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/app/src/main/java/events/CreateEventController.java
View File

@ -28,15 +28,15 @@ public class CreateEventController {
@FXML
protected JFXComboBox<String> comboBoxPriority;
@FXML
private JFXToggleButton toggleBtnIsFullDay;
protected JFXToggleButton toggleBtnIsFullDay;
@FXML
private JFXToggleButton toggleBtnIsPrivate;
protected JFXToggleButton toggleBtnIsPrivate;
@FXML
private Label labelError;
@FXML
private JFXTimePicker timeStart;
protected JFXTimePicker timeStart;
@FXML
private JFXTimePicker timeEnd;
protected JFXTimePicker timeEnd;
public CreateEventController() {

14
client/app/src/main/java/events/EditEventController.java
View File

@ -4,6 +4,8 @@ import helper.HttpRequestException;
import container.DataController;
import container.Event;
import java.time.LocalTime;
public class EditEventController extends CreateEventController{
private Event currentEvent;
@ -19,7 +21,17 @@ public class EditEventController extends CreateEventController{
datePickerDate.setValue(currentEvent.getDate().toLocalDate());
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

2
client/app/src/main/java/main/MainApplication.java
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("SharePlaner");
stage.setTitle("SharePlanner");
stage.setScene(scene);
stage.show();
}