Merge pull request #31 from Death111/feature/#10_addNotificationPopup2

Add expired todo notifications on startup. Note field is now a textarea instead of a textfield.

Author: Death111

src/main/java/de/doubleslash/keeptask/App.java

@@ -24,16 +24,22 @@
 import de.doubleslash.keeptask.common.Resources.RESOURCE;
 import de.doubleslash.keeptask.controller.Controller;
 import de.doubleslash.keeptask.model.Model;
+import de.doubleslash.keeptask.model.WorkItem;
+import de.doubleslash.keeptask.view.EditWorkItemController;
 import de.doubleslash.keeptask.view.IconController;
 import de.doubleslash.keeptask.view.MainWindowController;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.util.List;
+import java.util.Optional;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.Dialog;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextArea;
 import javafx.scene.image.Image;
@@ -90,6 +96,7 @@ public void start(final Stage primaryStage) {
     try {
       initialiseApplication(primaryStage);
       LOG.info("UI successfully initialised.");
+      showExpiredTodosDialog(primaryStage);
     } catch (final Exception e) {
       LOG.error("There was an error while initialising the UI", e);
       showExceptionAndExit(e, primaryStage);
@@ -130,6 +137,43 @@ private void initialiseAndShowUI(final Stage primaryStage) throws IOException {
     primaryStage.show();
   }
 
+  private void showExpiredTodosDialog(Stage primaryStage) {
+    List<WorkItem> expiredWorkItems = controller.getExpiredWorkItems();
+    for (int i = 0; i < expiredWorkItems.size(); i++) {
+      WorkItem workItem = expiredWorkItems.get(i);
+      final Dialog<WorkItem> dialog = new Dialog<>();
+      dialog.setTitle("Expired Todo (" + (i + 1) + "/" + expiredWorkItems.size() + ") - "
+          + workItem.getProject() + " - " + workItem.getTodo());
+      dialog.setHeaderText("This todo has expired. Please take action.");
+      dialog.getDialogPane().getButtonTypes().addAll(ButtonType.OK, ButtonType.CANCEL);
+
+      GridPane grid;
+      final FXMLLoader loader = FxmlLayout.createLoaderFor(
+          Resources.RESOURCE.FXML_EDIT_WORKITEM_LAYOUT);
+      try {
+        grid = loader.load();
+      } catch (final IOException e) {
+        throw new RuntimeException("Error while loading expired todo dialog layout", e);
+      }
+      EditWorkItemController editWorkItemController = loader.getController();
+      editWorkItemController.initializeWith(workItem);
+      dialog.getDialogPane().setContent(grid);
+      dialog.initOwner(primaryStage);
+      dialog.setResultConverter((dialogButton) -> {
+        if (dialogButton == ButtonType.OK) {
+          return editWorkItemController.getWorkItemFromUserInput();
+        }
+        return null;
+      });
+
+      final Optional<WorkItem> result = dialog.showAndWait();
+
+      result.ifPresent(updatedWorkItem -> {
+        controller.editWorkItem(workItem, updatedWorkItem);
+      });
+    }
+  }
+
   private static void showExceptionAndExit(Exception e, Stage primaryStage) {
     final Alert alert = new Alert(AlertType.ERROR);
     alert.setTitle("Error");

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

@@ -24,6 +24,7 @@
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
 import javax.annotation.PreDestroy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -105,4 +106,12 @@ public void setFilterPredicate(Predicate<WorkItem> filterPredicate) {
   public void setLatestSelectedProject(String projectName) {
     model.setLatestSelectedProject(projectName);
   }
+
+  public List<WorkItem> getExpiredWorkItems() {
+    return model.getWorkItems().stream()
+        .filter(workItem -> !workItem.isFinished() && workItem.getDueDateTime() != null
+            && workItem.getDueDateTime().isBefore(
+            LocalDateTime.now()))
+        .collect(Collectors.toList());
+  }
 }

src/main/java/de/doubleslash/keeptask/model/Model.java

@@ -1,18 +1,20 @@
-// Copyright 2019 doubleSlash Net Business GmbH
-//
-// This file is part of KeepTime.
-// KeepTime is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
+/*
+ * Copyright 2023 - Death111
+ *
+ * This file is part of KeepTask.
+ * KeepTask is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 
 package de.doubleslash.keeptask.model;
 

src/main/java/de/doubleslash/keeptask/view/EditWorkItemController.java

@@ -19,10 +19,16 @@
 package de.doubleslash.keeptask.view;
 
 import de.doubleslash.keeptask.model.WorkItem;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
 import javafx.fxml.FXML;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.DatePicker;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextArea;
 import javafx.scene.control.TextField;
+import javafx.scene.paint.Color;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -54,7 +60,10 @@ public class EditWorkItemController {
   private DatePicker completedDateDatePicker;
 
   @FXML
-  private TextField noteTextInput;
+  private TextArea noteTextArea;
+
+  @FXML
+  private Label dueDateStatusLabel;
 
   @FXML
   private void initialize() {
@@ -67,6 +76,10 @@ public void initializeWith(final WorkItem workItem) {
     todoTextInput.setText(workItem.getTodo());
     if (workItem.getDueDateTime() != null) {
       dueDateDatePicker.setValue(workItem.getDueDateTime().toLocalDate());
+      dueDateDatePicker.valueProperty().addListener((dp, oldValue, newValue) -> {
+        updateDueDateStatus(newValue.atStartOfDay());
+      });
+      updateDueDateStatus(workItem.getDueDateTime());
     }
     priorityTextInput.setText(workItem.getPriority());
     projectTextInput.setText(workItem.getProject());
@@ -76,7 +89,7 @@ public void initializeWith(final WorkItem workItem) {
     if (workItem.getCompletedDateTime() != null) {
       completedDateDatePicker.setValue(workItem.getCompletedDateTime().toLocalDate());
     }
-    noteTextInput.setText(workItem.getNote());
+    noteTextArea.setText(workItem.getNote());
   }
 
   public WorkItem getWorkItemFromUserInput() {
@@ -94,7 +107,24 @@ public WorkItem getWorkItemFromUserInput() {
     if (completedDateDatePicker.getValue() != null) {
       workItem.setCompletedDateTime(completedDateDatePicker.getValue().atStartOfDay());
     }
-    workItem.setNote(noteTextInput.getText());
+    workItem.setNote(noteTextArea.getText());
     return workItem;
   }
+
+  private void updateDueDateStatus(LocalDateTime dueDateTime) {
+    LocalDate now = LocalDate.now();
+    LocalDate dueDate = dueDateTime.toLocalDate();
+    long daysBetween = ChronoUnit.DAYS.between(now, dueDate);
+
+    if (daysBetween < 0) {
+      dueDateStatusLabel.setText(Math.abs(daysBetween) + " days expired!");
+      dueDateStatusLabel.setTextFill(Color.DARKRED);
+    } else if (daysBetween > 0) {
+      dueDateStatusLabel.setText(daysBetween + " days remaining");
+      dueDateStatusLabel.setTextFill(Color.BLACK);
+    } else {
+      dueDateStatusLabel.setText("Due today");
+      dueDateStatusLabel.setTextFill(Color.ORANGE);
+    }
+  }
 }

src/main/java/de/doubleslash/keeptask/view/MainWindowController.java

@@ -252,7 +252,8 @@ private Node createTodoNode(WorkItem workItem) {
       children1.add(createDueDateTimeLabel(dueDateTime));
     }
 
-    Label noteLabel = new Label("Note: " + workItem.getNote());
+    Label noteLabel = new Label("Note: " + workItem.getNote().replaceAll("\r?\n", " "));
+    noteLabel.setMaxWidth(400);
     if (!workItem.getNote().isEmpty()) {
       children1.add(noteLabel);
     }
@@ -343,7 +344,6 @@ private void editTodoClicked(WorkItem workItem) {
 
     result.ifPresent(project -> {
       controller.editWorkItem(workItem, result.get());
-      refreshTodos();
     });
   }
 

src/main/resources/layouts/EditWorkItemDialog.fxml

@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.CheckBox?>
-<?import javafx.scene.control.DatePicker?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
 
-<GridPane xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptask.view.EditWorkItemController">
+<GridPane xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptask.view.EditWorkItemController">
   <columnConstraints>
     <ColumnConstraints hgrow="SOMETIMES" maxWidth="295.0" minWidth="10.0" prefWidth="120.0" />
     <ColumnConstraints hgrow="SOMETIMES" maxWidth="495.0" minWidth="10.0" prefWidth="409.0" />
@@ -22,7 +17,7 @@
       <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
       <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
       <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+      <RowConstraints minHeight="10.0" prefHeight="100.0" vgrow="SOMETIMES" />
   </rowConstraints>
    <children>
       <Label text="Project" />
@@ -36,11 +31,19 @@
       <TextField fx:id="projectTextInput" promptText="Project" GridPane.columnIndex="1" />
       <TextField fx:id="priorityTextInput" promptText="Priority (High, Medium, Low)" GridPane.columnIndex="1" GridPane.rowIndex="1" />
       <TextField fx:id="todoTextInput" promptText="Todo" GridPane.columnIndex="1" GridPane.rowIndex="2" />
-      <DatePicker fx:id="dueDateDatePicker" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+      <HBox alignment="CENTER_LEFT" spacing="10.0" GridPane.columnIndex="1" GridPane.rowIndex="3">
+         <children>
+            <DatePicker fx:id="dueDateDatePicker" />
+            <Label fx:id="dueDateStatusLabel" contentDisplay="CENTER" />
+         </children>
+         <GridPane.margin>
+            <Insets />
+         </GridPane.margin>
+      </HBox>
       <CheckBox fx:id="completedCheckBox" mnemonicParsing="false" GridPane.columnIndex="1" GridPane.rowIndex="4" />
       <DatePicker fx:id="createdDateDatePicker" GridPane.columnIndex="1" GridPane.rowIndex="5" />
       <DatePicker fx:id="completedDateDatePicker" GridPane.columnIndex="1" GridPane.rowIndex="6" />
-      <TextField fx:id="noteTextInput" promptText="Note" GridPane.columnIndex="1" GridPane.rowIndex="7" />
+      <TextArea fx:id="noteTextArea" promptText="Note" GridPane.columnIndex="1" GridPane.rowIndex="7" />
    </children>
    <padding>
       <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />