Compare commits

..

No commits in common. "f23a596f47e6d6c920d219b56dcffe174866f2f0" and "59be5048d80498bd1907181da1a65ad063f204cd" have entirely different histories.

3 changed files with 6 additions and 18 deletions

View File

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

View File

@ -4,8 +4,6 @@ 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;
@ -21,17 +19,7 @@ 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());
try{ //timeEnd.setValue(currentEvent.getEnd());
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("SharePlanner"); stage.setTitle("SharePlaner");
stage.setScene(scene); stage.setScene(scene);
stage.show(); stage.show();
} }