put color circle and project name into hbox

Author: Martin Plieske

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

@@ -21,6 +21,8 @@
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.fxml.FXML;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.canvas.Canvas;
 import javafx.scene.control.Button;
@@ -32,6 +34,7 @@
 import javafx.scene.input.ClipboardContent;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.GridPane;
+import javafx.scene.layout.HBox;
 import javafx.scene.shape.Circle;
 import javafx.scene.text.Font;
 import javafx.scene.text.FontWeight;
@@ -99,10 +102,7 @@ private void updateReport(final LocalDate newvalue) {
 
       this.gridPane.getChildren().clear();
       this.gridPane.getRowConstraints().clear();
-      this.gridPane.getColumnConstraints().get(0).setPrefWidth(20);
-      this.gridPane.getColumnConstraints().get(1).setPrefWidth(237);
-      this.gridPane.getColumnConstraints().get(2).setPrefWidth(154);
-      this.gridPane.getColumnConstraints().get(3).setPrefWidth(81);
+      this.gridPane.getColumnConstraints().get(0).setPrefWidth(247);
 
       int rowIndex = 0;
       long currentWorkSeconds = 0;
@@ -115,8 +115,15 @@ private void updateReport(final LocalDate newvalue) {
          projectName.setFont(labelFontBold);
          final Circle circle = new Circle(5, project.getColor());
 
-         this.gridPane.add(circle, 0, rowIndex);
-         this.gridPane.add(projectName, 1, rowIndex);
+         final HBox nameHBox = new HBox();
+         nameHBox.setAlignment(Pos.CENTER_LEFT);
+         nameHBox.setPadding(new Insets(0, 0, 0, 5));
+         nameHBox.setSpacing(5);
+
+         nameHBox.getChildren().add(circle);
+         nameHBox.getChildren().add(projectName);
+
+         this.gridPane.add(nameHBox, 0, rowIndex);
 
          final List<Work> onlyCurrentProjectWork = currentWorkItems.stream().filter(w -> w.getProject() == project)
                .collect(Collectors.toList());
@@ -131,12 +138,12 @@ private void updateReport(final LocalDate newvalue) {
 
          final Label workedTimeLabel = new Label(DateFormatter.secondsToHHMMSS(todaysWorkSeconds));
          workedTimeLabel.setFont(labelFontBold);
-         this.gridPane.add(workedTimeLabel, 3, rowIndex);
+         this.gridPane.add(workedTimeLabel, 2, rowIndex);
 
          // text will be set later
 
          final Button bProjectReport = createProjectReport();
-         this.gridPane.add(bProjectReport, 2, rowIndex);
+         this.gridPane.add(bProjectReport, 1, rowIndex);
 
          rowIndex++;
 
@@ -151,17 +158,17 @@ private void updateReport(final LocalDate newvalue) {
             final Label commentLabel = new Label(currentWorkNote);
             commentLabel.setFont(labelFontNormal);
             commentLabel.setWrapText(true);
-            this.gridPane.add(commentLabel, 1, rowIndex);
+            this.gridPane.add(commentLabel, 0, rowIndex);
 
             final Label fromTillLabel = new Label(DateFormatter.toTimeString(work.getStartTime()) + " - "
                   + DateFormatter.toTimeString(work.getEndTime()));
             fromTillLabel.setFont(labelFontNormal);
             fromTillLabel.setWrapText(true);
-            this.gridPane.add(fromTillLabel, 2, rowIndex);
+            this.gridPane.add(fromTillLabel, 1, rowIndex);
 
             final Label workedHoursLabel = new Label(workedHours);
             workedHoursLabel.setFont(labelFontNormal);
-            this.gridPane.add(workedHoursLabel, 3, rowIndex);
+            this.gridPane.add(workedHoursLabel, 2, rowIndex);
 
             rowIndex++;
          }

src/main/resources/report.fxml

@@ -85,7 +85,6 @@
                <content>
                   <GridPane fx:id="gridPane" prefWidth="498.0">
                     <columnConstraints>
-                        <ColumnConstraints hgrow="SOMETIMES" maxWidth="349.0" minWidth="10.0" prefWidth="34.0" />
                       <ColumnConstraints hgrow="SOMETIMES" maxWidth="374.0" minWidth="0.0" prefWidth="216.0" />
                       <ColumnConstraints hgrow="SOMETIMES" maxWidth="400.0" minWidth="0.0" prefWidth="146.0" />
                         <ColumnConstraints hgrow="SOMETIMES" maxWidth="258.0" minWidth="0.0" prefWidth="102.0" />
@@ -98,12 +97,12 @@
                         <RowConstraints maxHeight="226.0" minHeight="10.0" prefHeight="127.0" vgrow="SOMETIMES" />
                     </rowConstraints>
                      <children>
-                        <Label text="99:99:99" GridPane.columnIndex="3" GridPane.rowIndex="1">
+                        <Label text="99:99:99" GridPane.columnIndex="2" GridPane.rowIndex="1">
                            <font>
                               <Font name="System Bold" size="15.0" />
                            </font>
                         </Label>
-                        <Label layoutX="375.0" layoutY="39.0" text="99:99:99 - 99:99:99" GridPane.columnIndex="2" GridPane.rowIndex="1">
+                        <Label layoutX="375.0" layoutY="39.0" text="99:99:99 - 99:99:99" GridPane.columnIndex="1" GridPane.rowIndex="1">
                            <font>
                               <Font size="15.0" />
                            </font>