Skip to content

Commit 15c1ebf

Browse files
committed
removed ability to edit creationDate, uses date of start
1 parent efeea47 commit 15c1ebf

File tree

3 files changed

+14
-21
lines changed

3 files changed

+14
-21
lines changed

src/main/java/de/doubleslash/keeptime/model/Work.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public class Work {
3636
@Column(name = "id", updatable = false, nullable = false)
3737
private long id;
3838

39+
// TODO revise CreationDate Logic to use Date of StartTime
3940
private LocalDate creationDate;
4041
private LocalDateTime startTime;
4142
private LocalDateTime endTime;

src/main/java/de/doubleslash/keeptime/view/ManageWorkController.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,6 @@ public class ManageWorkController {
6262
@FXML
6363
private DatePicker endDatePicker;
6464

65-
@FXML
66-
private DatePicker creationDatePicker;
67-
6865
@FXML
6966
private TextField noteTextBox;
7067

@@ -80,9 +77,7 @@ public void initializeWith(final Work work) {
8077
startDatePicker.setValue(work.getStartTime().toLocalDate());
8178
endDatePicker.setValue(work.getEndTime().toLocalDate());
8279

83-
8480
startTimeSpinner.getEditor().textProperty().addListener((observable, oldValue, newValue) -> {
85-
LOG.debug("textChanged");
8681
final LocalTimeStringConverter stringConverter = new LocalTimeStringConverter(FormatStyle.MEDIUM);
8782
final StringProperty text = (StringProperty) observable;
8883
try {
@@ -156,7 +151,6 @@ public void increment(final int steps) {
156151
startTimeSpinner.getValueFactory().setValue(work.getStartTime().toLocalTime());
157152
endTimeSpinner.getValueFactory().setValue(work.getEndTime().toLocalTime());
158153

159-
creationDatePicker.setValue(work.getCreationDate());
160154
noteTextBox.setText(work.getNotes());
161155
projectComboBox.getItems().addAll(model.getAvailableProjects());
162156

@@ -202,7 +196,7 @@ public Project fromString(final String string) {
202196

203197
public Work getWorkFromUserInput() {
204198

205-
return new Work(creationDatePicker.getValue(),
199+
return new Work(startDatePicker.getValue(),
206200
LocalDateTime.of(startDatePicker.getValue(), startTimeSpinner.getValue()),
207201
LocalDateTime.of(endDatePicker.getValue(), endTimeSpinner.getValue()),
208202
projectComboBox.getSelectionModel().getSelectedItem(), noteTextBox.getText());

src/main/resources/layouts/manage-work.fxml

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,35 @@
44
<?import javafx.scene.control.ComboBox?>
55
<?import javafx.scene.control.DatePicker?>
66
<?import javafx.scene.control.Label?>
7+
<?import javafx.scene.control.Spinner?>
78
<?import javafx.scene.control.TextField?>
89
<?import javafx.scene.layout.ColumnConstraints?>
910
<?import javafx.scene.layout.GridPane?>
1011
<?import javafx.scene.layout.RowConstraints?>
11-
<?import tornadofx.control.DateTimePicker?>
1212

13-
<GridPane fx:id="grid" hgap="5.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="160.0" prefWidth="263.0" vgap="5.0" xmlns="http://javafx.com/javafx/8.0.202-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptime.view.ManageWorkController">
13+
<GridPane fx:id="grid" hgap="5.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="214.0" prefWidth="371.0" vgap="5.0" xmlns="http://javafx.com/javafx/8.0.202-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptime.view.ManageWorkController">
1414
<columnConstraints>
1515
<ColumnConstraints hgrow="SOMETIMES" />
16-
<ColumnConstraints hgrow="SOMETIMES" />
16+
<ColumnConstraints hgrow="SOMETIMES" maxWidth="200.0" minWidth="100.0" prefWidth="150.0" />
17+
<ColumnConstraints hgrow="SOMETIMES" maxWidth="200.0" minWidth="100.0" prefWidth="150.0" />
1718
</columnConstraints>
1819
<rowConstraints>
1920
<RowConstraints vgrow="SOMETIMES" />
2021
<RowConstraints vgrow="SOMETIMES" />
2122
<RowConstraints vgrow="SOMETIMES" />
2223
<RowConstraints vgrow="SOMETIMES" />
23-
<RowConstraints vgrow="SOMETIMES" />
24-
<RowConstraints vgrow="SOMETIMES" />
25-
<RowConstraints vgrow="SOMETIMES" />
2624
</rowConstraints>
2725
<children>
2826
<Label text="Start Time" />
29-
<DateTimePicker fx:id="startTimePicker" GridPane.columnIndex="1" />
27+
<DatePicker fx:id="startDatePicker" GridPane.columnIndex="1" />
3028
<Label text="End Time" GridPane.rowIndex="1" />
31-
<DateTimePicker fx:id="endTimePicker" GridPane.columnIndex="1" GridPane.rowIndex="1" />
32-
<Label text="Creation Date" GridPane.rowIndex="2" />
33-
<DatePicker fx:id="creationDatePicker" GridPane.columnIndex="1" GridPane.rowIndex="2" />
34-
<Label text="Project" GridPane.rowIndex="3" />
35-
<ComboBox fx:id="projectComboBox" prefHeight="25.0" prefWidth="174.0" visibleRowCount="4" GridPane.columnIndex="1" GridPane.rowIndex="3" />
36-
<Label text="notes" GridPane.rowIndex="4" />
37-
<TextField fx:id="noteTextBox" GridPane.columnIndex="1" GridPane.rowIndex="4" />
29+
<DatePicker fx:id="endDatePicker" GridPane.columnIndex="1" GridPane.rowIndex="1" />
30+
<Label text="Project" GridPane.rowIndex="2" />
31+
<ComboBox fx:id="projectComboBox" prefWidth="400.0" visibleRowCount="4" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="2" />
32+
<Label text="notes" GridPane.rowIndex="3" />
33+
<TextField fx:id="noteTextBox" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="3" />
34+
<Spinner fx:id="startTimeSpinner" editable="true" GridPane.columnIndex="2" />
35+
<Spinner fx:id="endTimeSpinner" editable="true" GridPane.columnIndex="2" GridPane.rowIndex="1" />
3836
</children>
3937
<padding>
4038
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />

0 commit comments

Comments
 (0)