Merge branch 'develop' into bugfix/strg_combos_not_working_in_edit_work_dd

Author: Jan Schraff

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

@@ -258,6 +258,17 @@ public void changed(final ObservableValue<? extends String> observable, final St
          projectComboBox.setOnShown(null);
       });
 
+      // on
+      projectComboBox.setOnKeyReleased(ke -> {
+         if (ke.getCode() == KeyCode.ENTER && projectComboBox.getSelectionModel().isEmpty()) {
+            if (!projectComboBox.getItems().isEmpty()) {
+               projectComboBox.getSelectionModel().selectFirst();
+               comboChange = true;
+            }
+         }
+
+      });
+
    }
 
    public void initializeWith(final Work work) {

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

@@ -118,6 +118,8 @@ public class ReportController {
 
    private LocalDate currentReportDate;
 
+   private final TreeItem<TableRow> rootItem = new TreeItem<>();
+
    @Autowired
    public ReportController(final Model model, final Controller controller) {
       this.model = model;
@@ -185,11 +187,13 @@ protected void updateItem(final TableRow item, final boolean empty) {
 
       workTableTreeView.setShowRoot(false);
 
+      workTableTreeView.setRoot(rootItem);
+      rootItem.setExpanded(true);
    }
 
    private void updateReport(final LocalDate dateToShow) {
       this.currentReportDate = dateToShow;
-
+      rootItem.getChildren().clear();
       reportRoot.requestFocus();
 
       this.currentDayLabel.setText(DateFormatter.toDayDateString(this.currentReportDate));
@@ -204,8 +208,6 @@ private void updateReport(final LocalDate dateToShow) {
       long currentWorkSeconds = 0;
       long currentSeconds = 0;
 
-      final TreeItem<TableRow> root = new TreeItem<>();
-
       for (final Project project : workedProjectsSet) {
          final List<Work> onlyCurrentProjectWork = currentWorkItems.stream().filter(w -> w.getProject() == project)
                .collect(Collectors.toList());
@@ -234,12 +236,10 @@ private void updateReport(final LocalDate dateToShow) {
          }
 
          projectRow.setExpanded(true);
-         root.getChildren().add(projectRow);
+         rootItem.getChildren().add(projectRow);
 
       }
 
-      root.setExpanded(true);
-      workTableTreeView.setRoot(root);
       this.currentDayTimeLabel.setText(DateFormatter.secondsToHHMMSS(currentSeconds));
       this.currentDayWorkTimeLabel.setText(DateFormatter.secondsToHHMMSS(currentWorkSeconds));
 

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

@@ -11,7 +11,7 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.text.Font?>
 
-<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.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptime.view.ManageWorkController">
+<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">
   <columnConstraints>
     <ColumnConstraints hgrow="SOMETIMES" />
     <ColumnConstraints hgrow="SOMETIMES" maxWidth="200.0" minWidth="100.0" prefWidth="150.0" />
@@ -50,7 +50,7 @@
     </Label>
     <Spinner fx:id="startTimeSpinner" editable="true" GridPane.columnIndex="2" />
     <Spinner fx:id="endTimeSpinner" editable="true" GridPane.columnIndex="2" GridPane.rowIndex="1" />
-    <TextArea fx:id="noteTextArea" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="4" />
+    <TextArea fx:id="noteTextArea" prefHeight="200.0" prefWidth="200.0" wrapText="true" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="4" />
     <Label text="Changing the times may result in overlapping times!" textFill="#ffa100" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="2">
       <font>
         <Font name="Open Sans Regular" size="12.0" />