Merge pull request #52 from doubleSlashde/feature/delete_work_item

added delete functionality

Author: Death111

src/main/java/de/doubleslash/keeptime/controller/Controller.java

@@ -208,17 +208,24 @@ public void editWork(final Work workToBeEdited, final Work newValuedWork) {
 
    }
 
+   public void deleteWork(final Work workToBeDeleted) {
+      LOG.info("Deleting work '{}'.", workToBeDeleted);
+
+      model.getPastWorkItems().removeIf(w -> (w.getId() == workToBeDeleted.getId()));
+      model.getWorkRepository().delete(workToBeDeleted);
+   }
+
    /**
     * Changes the indexes of the originalList parameter to have a consistent order.
     * 
     * @param originalList
-    *                          list of all projects to adapt the indexes for
+    *           list of all projects to adapt the indexes for
     * @param changedProject
-    *                          the project which has changed which already has the new index
+    *           the project which has changed which already has the new index
     * @param oldIndex
-    *                          the old index of the changed project
+    *           the old index of the changed project
     * @param newIndex
-    *                          the new index of the changed project (which the projects also already has)
+    *           the new index of the changed project (which the projects also already has)
     * @return all projects whose index has been adapted
     */
    List<Project> resortProjectIndexes(final List<Project> originalList, final Project changedProject,
@@ -255,9 +262,9 @@ List<Project> resortProjectIndexes(final List<Project> originalList, final Proje
     * Decreases all indexes by one, after the removed index
     * 
     * @param originalList
-    *                        list of all projects to adapt the indexes for
+    *           list of all projects to adapt the indexes for
     * @param removedIndex
-    *                        the index which has been removed
+    *           the index which has been removed
     * @return all projects whose index has been adapted
     */
    List<Project> adaptProjectIndexesAfterRemoving(final List<Project> originalList, final int removedIndex) {

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

@@ -43,13 +43,17 @@
 import de.doubleslash.keeptime.view.worktable.ProjectTableRow;
 import de.doubleslash.keeptime.view.worktable.TableRow;
 import de.doubleslash.keeptime.view.worktable.WorkTableRow;
+import de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon;
+import de.jensd.fx.glyphs.fontawesome.FontAwesomeIconView;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Node;
 import javafx.scene.canvas.Canvas;
+import javafx.scene.control.Alert;
+import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.DateCell;
@@ -222,8 +226,9 @@ private void updateReport(final LocalDate dateToShow) {
                new ProjectTableRow(project, projectWorkSeconds, projectButtonBox), circle);
 
          for (final Work w : onlyCurrentProjectWork) {
-            final HBox workButtonBox = new HBox();
+            final HBox workButtonBox = new HBox(5.0);
             workButtonBox.getChildren().add(createEditWorkButton(w));
+            workButtonBox.getChildren().add(createDeleteWorkButton(w));
             final TreeItem<TableRow> workRow = new TreeItem<>(new WorkTableRow(w, workButtonBox));
             projectRow.getChildren().add(workRow);
          }
@@ -268,9 +273,31 @@ public void updateItem(final LocalDate item, final boolean empty) {
 
    }
 
+   private Button createDeleteWorkButton(final Work w) {
+      final Button deleteButton = new Button("", new FontAwesomeIconView(FontAwesomeIcon.TRASH));
+      deleteButton.setOnAction(e -> {
+         LOG.info("Delete work clicked.");
+         final Alert alert = new Alert(AlertType.CONFIRMATION);
+         alert.setTitle("Delete Work");
+         alert.setHeaderText("Delete work item");
+         alert.setContentText(w.toString());
+         alert.initOwner(stage);
+
+         final Optional<ButtonType> result = alert.showAndWait();
+
+         result.ifPresent(buType -> {
+            if (buType.equals(ButtonType.OK)) {
+               controller.deleteWork(w);
+               this.update();
+            }
+         });
+      });
+      return deleteButton;
+   }
+
    private Button createEditWorkButton(final Work work) {
-      final Button bProjectReport = new Button("edit");
-      bProjectReport.setOnAction(e -> {
+      final Button editButton = new Button("", new FontAwesomeIconView(FontAwesomeIcon.PENCIL));
+      editButton.setOnAction(e -> {
          LOG.info("Edit work clicked.");
          final Dialog<Work> dialog = setupEditWorkDialog(work);
 
@@ -282,7 +309,7 @@ private Button createEditWorkButton(final Work work) {
             this.update();
          });
       });
-      return bProjectReport;
+      return editButton;
    }
 
    private Dialog<Work> setupEditWorkDialog(final Work work) {
@@ -321,7 +348,7 @@ private GridPane setUpEditWorkGridPane(final Work work, final Dialog<Work> dialo
    }
 
    private Button createProjectReportButton(final List<Work> projectWork) {
-      final Button bProjectReport = new Button("Copy to clipboard");
+      final Button bProjectReport = new Button("", new FontAwesomeIconView(FontAwesomeIcon.CLIPBOARD));
       final EventHandler<ActionEvent> eventListener = actionEvent -> {
          LOG.debug("Copy to Clipboard clicked.");
          final ProjectReport pr = new ProjectReport(projectWork.size());

src/test/java/de/doubleslash/keeptime/controller/ControllerTest.java

@@ -22,6 +22,7 @@
 import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -405,4 +406,44 @@ public void shouldNotUpdateOthersWhenWorkItemIsEdited() {
 
    }
 
+   @Test
+   public void shouldDeleteWorkPersistentlyWhenWorkIsDeleted() {
+
+      final Project project1 = new Project("workProject1", "Some description", Color.RED, true, 0);
+      model.getAllProjects().add(project1);
+
+      final LocalDate localDateNow = LocalDate.now();
+      final LocalDateTime localDateTimeMorning = LocalDateTime.now().withHour(4);
+
+      final Work work = new Work(localDateNow, localDateTimeMorning.plusHours(0), localDateTimeMorning.plusHours(1),
+            project1, "originalWork");
+      model.getPastWorkItems().add(work);
+
+      testee.deleteWork(work);
+
+      final ArgumentCaptor<Work> argument = ArgumentCaptor.forClass(Work.class);
+      Mockito.verify(mockedWorkRepository, Mockito.times(1)).delete(argument.capture());
+      assertThat("Edited work was not deleted persistently", argument.getValue(), is(work));
+
+   }
+
+   @Test
+   public void shouldRemoveWorkFromPastWorkItemsWhenWorkIsDeleted() {
+
+      final Project project1 = new Project("workProject1", "Some description", Color.RED, true, 0);
+      model.getAllProjects().add(project1);
+
+      final LocalDate localDateNow = LocalDate.now();
+      final LocalDateTime localDateTimeMorning = LocalDateTime.now().withHour(4);
+
+      final Work work = new Work(localDateNow, localDateTimeMorning.plusHours(0), localDateTimeMorning.plusHours(1),
+            project1, "originalWork");
+      model.getPastWorkItems().add(work);
+
+      testee.deleteWork(work);
+
+      assertTrue("work Items contain work when it should have been deleted", model.getPastWorkItems().isEmpty());
+
+   }
+
 }