changed gridPane of workItem display in the Report to a TreeTableView

Author: JSchraff

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

@@ -31,31 +31,32 @@
 import com.sun.javafx.scene.control.skin.DatePickerSkin;
 
 import de.doubleslash.keeptime.common.DateFormatter;
-import de.doubleslash.keeptime.common.FontProvider;
 import de.doubleslash.keeptime.common.Resources;
 import de.doubleslash.keeptime.common.Resources.RESOURCE;
 import de.doubleslash.keeptime.controller.Controller;
 import de.doubleslash.keeptime.exceptions.FXMLLoaderException;
 import de.doubleslash.keeptime.model.Model;
 import de.doubleslash.keeptime.model.Project;
 import de.doubleslash.keeptime.model.Work;
+import de.doubleslash.keeptime.view.worktable.ProjectTableRow;
+import de.doubleslash.keeptime.view.worktable.TableRow;
+import de.doubleslash.keeptime.view.worktable.WorkTableRow;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
-import javafx.geometry.Insets;
-import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.canvas.Canvas;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
-import javafx.scene.control.ContextMenu;
 import javafx.scene.control.DateCell;
 import javafx.scene.control.DatePicker;
 import javafx.scene.control.Dialog;
 import javafx.scene.control.Label;
-import javafx.scene.control.MenuItem;
-import javafx.scene.control.ScrollPane;
+import javafx.scene.control.TreeItem;
+import javafx.scene.control.TreeTableColumn;
+import javafx.scene.control.TreeTableView;
+import javafx.scene.control.cell.TreeItemPropertyValueFactory;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
 import javafx.scene.layout.AnchorPane;
@@ -85,10 +86,7 @@ public class ReportController {
    private Label currentDayTimeLabel;
 
    @FXML
-   private GridPane gridPane;
-
-   @FXML
-   private ScrollPane scrollPane;
+   private TreeTableView<TableRow> workTableTreeView;
 
    @FXML
    private AnchorPane reportRoot;
@@ -98,8 +96,6 @@ public class ReportController {
 
    private static final Logger LOG = LoggerFactory.getLogger(ReportController.class);
 
-   private DatePicker datePicker; // for calendar element
-
    private Model model;
 
    private Controller controller;
@@ -114,121 +110,89 @@ public class ReportController {
    private void initialize() {
       LOG.info("Init reportController");
       currentReportDate = LocalDate.now();
-
+      initTableView();
       colorTimeLine = new ColorTimeLine(colorTimeLineCanvas);
    }
 
+   private void initTableView() {
+      final TreeTableColumn<TableRow, String> noteColumn = new TreeTableColumn<>("Notes");
+      noteColumn.setCellValueFactory(new TreeItemPropertyValueFactory<TableRow, String>("notes"));
+      noteColumn.setMinWidth(200);
+      this.workTableTreeView.getColumns().add(noteColumn);
+
+      final TreeTableColumn<TableRow, String> timeRangeColumn = new TreeTableColumn<>("Timeslot");
+      timeRangeColumn.setCellValueFactory(new TreeItemPropertyValueFactory<TableRow, String>("timeRange"));
+      timeRangeColumn.setMinWidth(100);
+      this.workTableTreeView.getColumns().add(timeRangeColumn);
+
+      final TreeTableColumn<TableRow, String> timeSumColumn = new TreeTableColumn<>("Duration");
+      timeSumColumn.setCellValueFactory(new TreeItemPropertyValueFactory<TableRow, String>("timeSum"));
+      timeSumColumn.setMinWidth(100);
+      this.workTableTreeView.getColumns().add(timeSumColumn);
+
+      final TreeTableColumn<TableRow, Button> buttonColumn = new TreeTableColumn<>();
+      buttonColumn.setCellValueFactory(new TreeItemPropertyValueFactory<TableRow, Button>("buttonBox"));
+      buttonColumn.setMinWidth(100);
+      buttonColumn.setSortable(false);
+      this.workTableTreeView.getColumns().add(buttonColumn);
+
+      workTableTreeView.setShowRoot(false);
+
+   }
+
    private void updateReport(final LocalDate dateToShow) {
       this.currentReportDate = dateToShow;
       this.loadCalenderWidget();
       reportRoot.requestFocus();
 
-      this.currentDayLabel.setText(DateFormatter.toDayDateString(dateToShow));
-      final List<Work> currentWorkItems = model.getWorkRepository().findByCreationDateOrderByStartTimeAsc(dateToShow);
-      ;
+      this.currentDayLabel.setText(DateFormatter.toDayDateString(this.currentReportDate));
+      final List<Work> currentWorkItems = model.getWorkRepository()
+            .findByCreationDateOrderByStartTimeAsc(this.currentReportDate);
 
       colorTimeLine.update(currentWorkItems, controller.calcSeconds(currentWorkItems));
 
       final SortedSet<Project> workedProjectsSet = currentWorkItems.stream().map(Work::getProject)
             .collect(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(Project::getName))));
 
-      this.gridPane.getChildren().clear();
-      this.gridPane.getRowConstraints().clear();
-      this.gridPane.getColumnConstraints().get(0).setPrefWidth(300);
-
-      int rowIndex = 0;
       long currentWorkSeconds = 0;
       long currentSeconds = 0;
 
-      for (final Project project : workedProjectsSet) {
-         final Label projectName = new Label(project.getName());
-         projectName.setFont(FontProvider.getBoldFont());
-         projectName.setUnderline(project.isWork());
-         final Circle circle = new Circle(5, project.getColor());
-
-         final HBox projectNameHBox = new HBox();
-         projectNameHBox.setAlignment(Pos.CENTER_LEFT);
-         projectNameHBox.setPadding(new Insets(0, 0, 0, 5));
-         projectNameHBox.setSpacing(5);
-
-         projectNameHBox.getChildren().add(circle);
-         projectNameHBox.getChildren().add(projectName);
-
-         this.gridPane.add(projectNameHBox, 0, rowIndex);
+      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());
 
-         final long todaysWorkSeconds = controller.calcSeconds(onlyCurrentProjectWork);
+         final long projectWorkSeconds = controller.calcSeconds(onlyCurrentProjectWork);
 
-         currentSeconds += todaysWorkSeconds;
+         currentSeconds += projectWorkSeconds;
          if (project.isWork()) {
-            currentWorkSeconds += todaysWorkSeconds;
+            currentWorkSeconds += projectWorkSeconds;
          }
 
-         final Label workedTimeLabel = new Label(DateFormatter.secondsToHHMMSS(todaysWorkSeconds));
-         workedTimeLabel.setFont(FontProvider.getBoldFont());
-         this.gridPane.add(workedTimeLabel, 2, rowIndex);
-
-         // text will be set later
-         final Button bProjectReport = createProjectReport();
-         this.gridPane.add(bProjectReport, 1, rowIndex);
-
-         rowIndex++;
-
-         final ProjectReport pr = new ProjectReport(onlyCurrentProjectWork.size());
-         for (int j = 0; j < onlyCurrentProjectWork.size(); j++) {
-            final Work work = onlyCurrentProjectWork.get(j);
-            final String workedHours = DateFormatter
-                  .secondsToHHMMSS(DateFormatter.getSecondsBewtween(work.getStartTime(), work.getEndTime()));
+         final HBox projectButtonBox = new HBox();
+         projectButtonBox.getChildren().add(createProjectReportButton(onlyCurrentProjectWork));
+         // TODO center Dot
 
-            final String currentWorkNote = work.getNotes();
-            pr.appendToWorkNotes(currentWorkNote);
-            final Label commentLabel = new Label(currentWorkNote);
-            commentLabel.setFont(FontProvider.getDefaultFont());
-            commentLabel.setWrapText(true);
-            this.gridPane.add(commentLabel, 0, rowIndex);
+         final Circle circle = new Circle(9, project.getColor());
 
-            final Label fromTillLabel = new Label(DateFormatter.toTimeString(work.getStartTime()) + " - "
-                  + DateFormatter.toTimeString(work.getEndTime()));
-            fromTillLabel.setFont(FontProvider.getDefaultFont());
-            fromTillLabel.setWrapText(true);
-            this.gridPane.add(fromTillLabel, 1, rowIndex);
+         final TreeItem<TableRow> projectRow = new TreeItem<>(
+               new ProjectTableRow(project, projectWorkSeconds, projectButtonBox), circle);
 
-            final Label workedHoursLabel = new Label(workedHours);
-            workedHoursLabel.setFont(FontProvider.getDefaultFont());
-            this.gridPane.add(workedHoursLabel, 2, rowIndex);
-
-            final HBox clickDummy = new HBox();
-            final ContextMenu contextMenu = new ContextMenu();
-            final MenuItem editMenuItem = new MenuItem("edit");
-
-            editMenuItem.setOnAction(e -> {
-               LOG.info("Edit work");
-               final Dialog<Work> dialog = setupEditWorkDialog("Edit work", "Edit work ", work);
-
-               final Optional<Work> result = dialog.showAndWait();
-
-               result.ifPresent(editedWork -> {
-                  controller.editWork(work, editedWork);
-
-                  this.update();
-               });
-            });
-
-            contextMenu.getItems().add(editMenuItem);
-
-            clickDummy.setOnContextMenuRequested(
-                  event -> contextMenu.show(clickDummy, event.getScreenX(), event.getScreenY()));
+         for (final Work w : onlyCurrentProjectWork) {
+            final HBox workButtonBox = new HBox();
+            workButtonBox.getChildren().add(createEditWorkButton(w));
+            final TreeItem<TableRow> workRow = new TreeItem<>(new WorkTableRow(w, workButtonBox));
+            projectRow.getChildren().add(workRow);
+         }
 
-            this.gridPane.add(clickDummy, 0, rowIndex, 3, 1);
+         projectRow.setExpanded(true);
+         root.getChildren().add(projectRow);
 
-            rowIndex++;
-         }
-         bProjectReport.setUserData(pr.getNotes(true));
       }
-      this.scrollPane.setVvalue(0); // scroll to the top
 
+      root.setExpanded(true);
+      workTableTreeView.setRoot(root);
       this.currentDayTimeLabel.setText(DateFormatter.secondsToHHMMSS(currentSeconds));
       this.currentDayWorkTimeLabel.setText(DateFormatter.secondsToHHMMSS(currentWorkSeconds));
 
@@ -262,6 +226,24 @@ public void updateItem(final LocalDate item, final boolean empty) {
 
    }
 
+   private Button createEditWorkButton(final Work work) {
+      final Button bProjectReport = new Button("edit");
+
+      bProjectReport.setOnAction(e -> {
+         LOG.info("Edit work");
+         final Dialog<Work> dialog = setupEditWorkDialog("Edit work", "Edit work ", work);
+
+         final Optional<Work> result = dialog.showAndWait();
+
+         result.ifPresent(editedWork -> {
+            controller.editWork(work, editedWork);
+
+            this.update();
+         });
+      });
+      return bProjectReport;
+   }
+
    private Dialog<Work> setupEditWorkDialog(final String title, final String headerText, final Work work) {
       final Dialog<Work> dialog = new Dialog<>();
 
@@ -299,20 +281,23 @@ private GridPane setUpEditWorkGridPane(final Work work, final Dialog<Work> dialo
       return grid;
    }
 
-   private Button createProjectReport() {
+   private Button createProjectReportButton(final List<Work> projectWork) {
       final Button bProjectReport = new Button("Copy to clipboard");
       final EventHandler<ActionEvent> eventListener = new EventHandler<ActionEvent>() {
 
          @Override
          public void handle(final ActionEvent event) {
-            final Object source = event.getSource();
-            final Button btn = (Button) source;
-            final Object userData = btn.getUserData();
-            final String notes = (String) userData;
+            LOG.debug("copied to Clipboard");
+            final ProjectReport pr = new ProjectReport(projectWork.size());
+            for (int j = 0; j < projectWork.size(); j++) {
+               final Work work = projectWork.get(j);
+               final String currentWorkNote = work.getNotes();
+               pr.appendToWorkNotes(currentWorkNote);
 
+            }
             final Clipboard clipboard = Clipboard.getSystemClipboard();
             final ClipboardContent content = new ClipboardContent();
-            content.putString(notes);
+            content.putString(pr.getNotes(true));
             clipboard.setContent(content);
          }
 
@@ -323,8 +308,6 @@ public void handle(final ActionEvent event) {
 
    public void setModel(final Model model) {
       this.model = model;
-
-      this.loadCalenderWidget();
    }
 
    public void update() {

src/main/java/de/doubleslash/keeptime/view/worktable/ProjectTableRow.java

@@ -0,0 +1,41 @@
+package de.doubleslash.keeptime.view.worktable;
+
+import de.doubleslash.keeptime.common.DateFormatter;
+import de.doubleslash.keeptime.model.Project;
+import javafx.scene.layout.HBox;
+
+public class ProjectTableRow implements TableRow {
+
+   private final Project project;
+   private final long projectWorkSeconds;
+   private final HBox buttonBox;
+
+   public ProjectTableRow(final Project project, final long projectWorkSeconds, final HBox buttonBox) {
+      this.projectWorkSeconds = projectWorkSeconds;
+      this.project = project;
+      this.buttonBox = buttonBox;
+   }
+
+   @Override
+   public String getNotes() {
+      return project.getName();
+   }
+
+   @Override
+   public String getTimeRange() {
+      return null;
+
+   }
+
+   @Override
+   public String getTimeSum() {
+      return DateFormatter.secondsToHHMMSS(projectWorkSeconds);
+
+   }
+
+   @Override
+   public HBox getButtonBox() {
+      return buttonBox;
+   }
+
+}

src/main/java/de/doubleslash/keeptime/view/worktable/TableRow.java

@@ -0,0 +1,15 @@
+package de.doubleslash.keeptime.view.worktable;
+
+import javafx.scene.layout.HBox;
+
+public interface TableRow {
+
+   public String getNotes();
+
+   public String getTimeRange();
+
+   public String getTimeSum();
+
+   public HBox getButtonBox();
+
+}

src/main/java/de/doubleslash/keeptime/view/worktable/WorkTableRow.java

@@ -0,0 +1,39 @@
+
+package de.doubleslash.keeptime.view.worktable;
+
+import de.doubleslash.keeptime.common.DateFormatter;
+import de.doubleslash.keeptime.model.Work;
+import javafx.scene.layout.HBox;
+
+public class WorkTableRow implements TableRow {
+   private final Work work;
+   private final HBox buttonBox;
+
+   public WorkTableRow(final Work work, final HBox buttonBox) {
+      this.work = work;
+      this.buttonBox = buttonBox;
+   }
+
+   @Override
+   public String getNotes() {
+      return work.getNotes();
+   }
+
+   @Override
+   public String getTimeRange() {
+      return DateFormatter.toTimeString(work.getStartTime()) + " - " + DateFormatter.toTimeString(work.getEndTime());
+
+   }
+
+   @Override
+   public String getTimeSum() {
+      return DateFormatter.secondsToHHMMSS(DateFormatter.getSecondsBewtween(work.getStartTime(), work.getEndTime()));
+
+   }
+
+   @Override
+   public HBox getButtonBox() {
+      return buttonBox;
+   }
+
+}