Enhancement/report has button to expand and close (#125)

* add expand/collapse button to Report
* delete unnecessary comments and change Button text to be more useful
* rework design

Co-authored-by: ddamke <[email protected]>
Co-authored-by: Nico <[email protected]>

Author: 3 people

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

@@ -91,6 +91,9 @@ public class ReportController {
    @FXML
    private Canvas colorTimeLineCanvas;
 
+   @FXML
+   private Button expandCollapseButton;
+
    private static final Logger LOG = LoggerFactory.getLogger(ReportController.class);
 
    private final Model model;
@@ -105,6 +108,8 @@ public class ReportController {
 
    private final TreeItem<TableRow> rootItem = new TreeItem<>();
 
+   private boolean expanded = true;
+
    @Autowired
    public ReportController(final Model model, final Controller controller) {
       this.model = model;
@@ -117,8 +122,9 @@ private void initialize() {
       currentReportDate = LocalDate.now();
 
       colorTimeLine = new ColorTimeLine(colorTimeLineCanvas);
-      initTableView();
 
+      expandCollapseButton.setOnMouseClicked(event ->toggleCollapseExpandReport());
+      initTableView();
    }
 
    private void initTableView() {
@@ -207,6 +213,24 @@ protected void updateItem(TableRow workItem, boolean empty) {
       rootItem.setExpanded(true);
    }
 
+   private void toggleCollapseExpandReport(){
+
+      if(expanded){
+         expandAll(false);
+         expandCollapseButton.setText("Expand");
+
+      }else {
+         expandAll(true);
+         expandCollapseButton.setText("Collapse");
+      }
+      expanded = !expanded;
+   }
+
+   private void expandAll(boolean expand){
+      for (int i=0; i<rootItem.getChildren().size(); i++){
+         rootItem.getChildren().get(i).setExpanded(expand);
+      }
+   }
    private void updateReport(final LocalDate dateToShow) {
       this.currentReportDate = dateToShow;
       rootItem.getChildren().clear();
@@ -260,7 +284,7 @@ private void updateReport(final LocalDate dateToShow) {
             projectRow.getChildren().add(workRow);
          }
 
-         projectRow.setExpanded(true);
+         projectRow.setExpanded(expanded);
          rootItem.getChildren().add(projectRow);
 
       }

src/main/resources/layouts/report.fxml

@@ -18,6 +18,7 @@
 
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.canvas.Canvas?>
+<?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.TreeTableView?>
 <?import javafx.scene.layout.AnchorPane?>
@@ -26,13 +27,13 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane fx:id="reportRoot" focusTraversable="true" prefWidth="500.0" xmlns="http://javafx.com/javafx/8.0.202-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptime.view.ReportController">
+<AnchorPane fx:id="reportRoot" focusTraversable="true" prefWidth="500.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptime.view.ReportController">
    <children>
       <VBox>
          <children>
-            <BorderPane fx:id="topBorderPane">
+            <BorderPane fx:id="topBorderPane" prefWidth="480.0">
                <left>
-                  <VBox fillWidth="false" prefHeight="85.0" prefWidth="187.0" BorderPane.alignment="CENTER">
+                  <VBox fillWidth="false" prefHeight="185.0" prefWidth="213.0" BorderPane.alignment="CENTER">
                      <children>
                         <Label text="Report">
                            <font>
@@ -83,12 +84,19 @@
                <VBox.margin>
                   <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
                </VBox.margin>
+               <padding>
+                  <Insets bottom="10.0" />
+               </padding>
             </BorderPane>
-            <Canvas fx:id="colorTimeLineCanvas" height="5.0" width="480.0">
+            <HBox prefHeight="26.0" prefWidth="210.0">
+               <children>
+                  <Button fx:id="expandCollapseButton" mnemonicParsing="false" prefHeight="25.0" prefWidth="80.0" text="Collapse" />
+               </children>
                <VBox.margin>
-                  <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                  <Insets right="10.0" top="10.0" />
                </VBox.margin>
-            </Canvas>
+            </HBox>
+            <Canvas fx:id="colorTimeLineCanvas" height="7.0" width="499.0" />
             <TreeTableView fx:id="workTableTreeView" prefHeight="300.0" prefWidth="500.0" showRoot="false" stylesheets="@../css/dialog.css" />
          </children>
       </VBox>