Compare commits
1 Commits
merge
...
59be5048d8
Author | SHA1 | Date | |
---|---|---|---|
59be5048d8 |
@@ -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() {
|
||||||
|
@@ -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
|
||||||
|
@@ -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();
|
||||||
}
|
}
|
||||||
|
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
-fx-bright-border-color: #B0B0B0;
|
-fx-bright-border-color: #B0B0B0;
|
||||||
|
|
||||||
-fx-bright-text-color: ##ff5555;
|
-fx-bright-text-color: #ff5555;
|
||||||
-fx-brighter-text-color: #ffffff;
|
-fx-brighter-text-color: #ffffff;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -26,7 +26,7 @@
|
|||||||
<JFXTextField styleClass="userField" GridPane.columnIndex="1" GridPane.rowIndex="1" fx:id="userField"/>
|
<JFXTextField styleClass="userField" GridPane.columnIndex="1" GridPane.rowIndex="1" fx:id="userField"/>
|
||||||
<Label styleClass="errorLbl" GridPane.columnIndex="2" GridPane.rowIndex="1" fx:id="userErrLabel"/>
|
<Label styleClass="errorLbl" GridPane.columnIndex="2" GridPane.rowIndex="1" fx:id="userErrLabel"/>
|
||||||
|
|
||||||
<Label GridPane.rowIndex="2">Paswort</Label>
|
<Label GridPane.rowIndex="2">Passwort</Label>
|
||||||
<JFXPasswordField styleClass="passField" GridPane.columnIndex="1" GridPane.rowIndex="2" fx:id="passField"/>
|
<JFXPasswordField styleClass="passField" GridPane.columnIndex="1" GridPane.rowIndex="2" fx:id="passField"/>
|
||||||
<Label styleClass="errorLbl" GridPane.columnIndex="2" GridPane.rowIndex="2" fx:id="passErrLabel"/>
|
<Label styleClass="errorLbl" GridPane.columnIndex="2" GridPane.rowIndex="2" fx:id="passErrLabel"/>
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user