Compare commits
5 Commits
59be5048d8
...
master
Author | SHA1 | Date | |
---|---|---|---|
44a4ca7967 | |||
f23a596f47 | |||
0522908001 | |||
34e51cb72f | |||
88c8a30ad0 |
@@ -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() {
|
||||
@@ -91,7 +91,7 @@ public class CreateEventController {
|
||||
dataController.createEvent(event);
|
||||
}
|
||||
|
||||
//Marc Beyer//
|
||||
//Marco Kühn//
|
||||
@FXML
|
||||
protected void abortBtnClick(ActionEvent event) {
|
||||
Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
|
||||
|
@@ -1,9 +1,12 @@
|
||||
//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;
|
||||
@@ -19,7 +22,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
|
||||
|
@@ -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();
|
||||
}
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/* Marco Kühn, Marc Beyer */
|
||||
// Marco Kühn, Marc Beyer //
|
||||
package main;
|
||||
|
||||
import config.Config;
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/* Marco Kühn */
|
||||
// Marco Kühn //
|
||||
package main;
|
||||
|
||||
import com.jfoenix.controls.*;
|
||||
|
@@ -1,3 +1,4 @@
|
||||
//Marc Beyer//
|
||||
package ui;
|
||||
|
||||
import javafx.scene.control.Label;
|
||||
|
@@ -1,3 +1,4 @@
|
||||
//Marc Beyer, Marco Kühn//
|
||||
package ui;
|
||||
|
||||
import container.Event;
|
||||
|
@@ -1,3 +1,4 @@
|
||||
//Marco Kühn//
|
||||
package ui;
|
||||
|
||||
import javafx.geometry.Bounds;
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/* Marc Beyer */
|
||||
// Marc Beyer //
|
||||
package users;
|
||||
|
||||
import container.DataController;
|
||||
|
@@ -1,3 +1,4 @@
|
||||
//Marc Beyer//
|
||||
package container;
|
||||
|
||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
|
@@ -1,3 +1,4 @@
|
||||
//Marco Kühn//
|
||||
package container;
|
||||
|
||||
import java.time.Duration;
|
||||
|
@@ -1,3 +1,4 @@
|
||||
//Marc Beyer//
|
||||
package container;
|
||||
|
||||
import helper.Tuple;
|
||||
|
@@ -1,3 +1,4 @@
|
||||
//Marco Kühn//
|
||||
package container;
|
||||
|
||||
public class User {
|
||||
|
Reference in New Issue
Block a user