From 5643053471244d7c99b1a51f48de565df1412be4 Mon Sep 17 00:00:00 2001
From: lukasmatusiewicz <matusiewiczlukas@gmail.com>
Date: Thu, 23 Apr 2026 10:52:17 +0200
Subject: [PATCH 1/4] feat: implement dashboard and task status toggle
 functionality

---
 .../controller/DashboardController.java       |  45 +++++
 .../controller/TaskController.java            |   7 +
 .../com/lucc/taskmanager/init/DataLoader.java |  31 +--
 .../java/com/lucc/taskmanager/model/Task.java |  35 ++++
 .../repository/TaskRepository.java            |   8 +
 .../lucc/taskmanager/service/TaskService.java |  40 ++++
 src/main/resources/templates/dashboard.html   | 180 ++++++++++++++++++
 src/main/resources/templates/edit-task.html   |   4 +
 src/main/resources/templates/tasks.html       |  62 +++++-
 .../taskmanager/service/TaskServiceTest.java  |  86 ++++++++-
 10 files changed, 479 insertions(+), 19 deletions(-)
 create mode 100644 src/main/java/com/lucc/taskmanager/controller/DashboardController.java
 create mode 100644 src/main/resources/templates/dashboard.html

diff --git a/src/main/java/com/lucc/taskmanager/controller/DashboardController.java b/src/main/java/com/lucc/taskmanager/controller/DashboardController.java
new file mode 100644
index 0000000..cecd83d
--- /dev/null
+++ b/src/main/java/com/lucc/taskmanager/controller/DashboardController.java
@@ -0,0 +1,45 @@
+package com.lucc.taskmanager.controller;
+
+import com.lucc.taskmanager.model.Task;
+import com.lucc.taskmanager.model.User;
+import com.lucc.taskmanager.service.TaskService;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Controller
+@RequestMapping("/dashboard")
+public class DashboardController {
+
+    private final TaskService taskService;
+
+    public DashboardController(TaskService taskService) {
+        this.taskService = taskService;
+    }
+
+    @GetMapping
+    public String getDashboard(@AuthenticationPrincipal User user, Model model) {
+        Map<String, Long> stats = taskService.getDashboardStats(user);
+        model.addAllAttributes(stats);
+
+        List<Task> tasks = taskService.getTasksByUser(user);
+        
+        // Data for status chart
+        Map<String, Long> statusCounts = tasks.stream()
+                .collect(Collectors.groupingBy(t -> t.getStatus().name(), Collectors.counting()));
+        model.addAttribute("statusCounts", statusCounts);
+
+        // Data for priority chart
+        Map<String, Long> priorityCounts = tasks.stream()
+                .collect(Collectors.groupingBy(t -> t.getPriority().name(), Collectors.counting()));
+        model.addAttribute("priorityCounts", priorityCounts);
+
+        return "dashboard";
+    }
+}
diff --git a/src/main/java/com/lucc/taskmanager/controller/TaskController.java b/src/main/java/com/lucc/taskmanager/controller/TaskController.java
index 954e088..f19a799 100644
--- a/src/main/java/com/lucc/taskmanager/controller/TaskController.java
+++ b/src/main/java/com/lucc/taskmanager/controller/TaskController.java
@@ -51,4 +51,11 @@ public void deleteTask(@PathVariable int taskId, @AuthenticationPrincipal @Param
     {
         taskService.deleteTask(taskId, user);
     }
+
+    @PatchMapping("/{taskId}/toggle")
+    @Operation(summary = "Toggle task status between TODO and DONE")
+    public Task toggleTaskStatus(@PathVariable int taskId, @AuthenticationPrincipal @Parameter(hidden = true) User user)
+    {
+        return taskService.toggleTaskStatus(taskId, user);
+    }
 }
diff --git a/src/main/java/com/lucc/taskmanager/init/DataLoader.java b/src/main/java/com/lucc/taskmanager/init/DataLoader.java
index d1c9535..e8371e2 100644
--- a/src/main/java/com/lucc/taskmanager/init/DataLoader.java
+++ b/src/main/java/com/lucc/taskmanager/init/DataLoader.java
@@ -12,6 +12,7 @@
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Component;
 
+import java.time.LocalDate;
 import java.util.List;
 
 @Component
@@ -39,20 +40,26 @@ public void run(String ... args) throws Exception
             userRepository.saveAll(List.of(admin, user));
             System.out.println("Users loaded");
 
-            Task adminTask1 = new Task("Pizza", "Pizza is a dish of Italian origin made by a mixture of fried bread and tomatoes, usually sliced thinly and topped with a slice of cheese.", admin, Status.TODO, Priority.MEDIUM);
-            Task adminTask2 = new Task("Burger", "A burger is a large, flat, round, steak dressed in lettuce, tomato, cheese, and meat sauce.", admin, Status.TODO, Priority.MEDIUM);
-            Task adminTask3 = new Task("Pasta", "Pasta is a food made from a mixture of flour, eggs, and water, typically cooked under high heat.", admin, Status.TODO, Priority.MEDIUM);
-            Task adminTask4 = new Task("Sandwich", "A sandwich is a flat bread with lettuce and tomato on one side, and a slice of cheese on the other side.", admin, Status.TODO, Priority.MEDIUM);
-            Task adminTask5 = new Task("Coffee", "Coffee is a brewed drink made from roasted coffee beans, ground coffee, and sugar.", admin, Status.TODO, Priority.MEDIUM);
-            Task adminTask6 = new Task("Coffee Shaker", "A coffee shaker is a container for storing and shaking coffee.", admin, Status.TODO, Priority.MEDIUM);
-            Task adminTask7 = new Task("Coffee Mug", "A coffee mug is a container for storing and shaking coffee.", admin, Status.TODO, Priority.MEDIUM);
+            LocalDate today = LocalDate.now();
 
+            Task adminTask1 = new Task("Pizza", "Pizza description", admin, Status.TODO, Priority.MEDIUM, today.plusDays(2));
+            Task adminTask2 = new Task("Burger", "Burger description", admin, Status.TODO, Priority.HIGH, today.minusDays(1)); // Overdue
+            Task adminTask3 = new Task("Pasta", "Pasta description", admin, Status.DONE, Priority.LOW, today.minusDays(2));
+            adminTask3.setCompletionDate(today.minusDays(1)); // Completed this week
+            
+            Task adminTask4 = new Task("Sandwich", "Sandwich description", admin, Status.TODO, Priority.MEDIUM, today.plusDays(5));
+            Task adminTask5 = new Task("Coffee", "Coffee description", admin, Status.TODO, Priority.MEDIUM, today.plusDays(1));
+            Task adminTask6 = new Task("Coffee Shaker", "Coffee shaker description", admin, Status.TODO, Priority.MEDIUM, today.plusDays(3));
+            Task adminTask7 = new Task("Coffee Mug", "Coffee mug description", admin, Status.DONE, Priority.MEDIUM, today.minusDays(10));
+            adminTask7.setCompletionDate(today.minusDays(8)); // Completed more than a week ago
 
-            Task userTask1 = new Task("Pizza", "Pizza is a dish of Italian origin made by a mixture of fried bread and tomatoes, usually sliced thinly and topped with a slice of cheese.", user, Status.TODO, Priority.MEDIUM);
-            Task userTask2 = new Task("Burger", "A burger is a large, flat, round, steak dressed in lettuce, tomato, cheese, and meat sauce.", user, Status.TODO, Priority.MEDIUM);
-            Task userTask3 = new Task("Pasta", "Pasta is a food made from a mixture of flour, eggs, and water, typically cooked under high heat.", user, Status.TODO, Priority.MEDIUM);
-            Task userTask4 = new Task("Sandwich", "A sandwich is a flat bread with lettuce and tomato on one side, and a slice of cheese on the other side.", user, Status.TODO, Priority.MEDIUM);
-            Task userTask5 = new Task("Coffee", "Coffee is a brewed drink made from roasted coffee beans, ground coffee, and sugar.", user, Status.TODO, Priority.MEDIUM);
+            Task userTask1 = new Task("Study Spring Boot", "Learn about Spring Boot security and data.", user, Status.TODO, Priority.HIGH, today.plusDays(3));
+            Task userTask2 = new Task("Workout", "Go to the gym for 1 hour.", user, Status.TODO, Priority.MEDIUM, today.minusDays(2)); // Overdue
+            Task userTask3 = new Task("Buy Groceries", "Buy milk, eggs, and bread.", user, Status.DONE, Priority.LOW, today.minusDays(1));
+            userTask3.setCompletionDate(today); // Completed today
+            
+            Task userTask4 = new Task("Read a Book", "Read at least 30 pages.", user, Status.TODO, Priority.LOW, today.plusDays(7));
+            Task userTask5 = new Task("Clean the Room", "Deep clean the bedroom.", user, Status.TODO, Priority.MEDIUM, today.plusDays(1));
 
             taskRepository.saveAll(List.of(adminTask1, adminTask2, adminTask3, adminTask4, adminTask5, adminTask6, adminTask7, userTask1, userTask2, userTask3, userTask4, userTask5));
             System.out.println("Tasks loaded");
diff --git a/src/main/java/com/lucc/taskmanager/model/Task.java b/src/main/java/com/lucc/taskmanager/model/Task.java
index 19d620d..5b74415 100644
--- a/src/main/java/com/lucc/taskmanager/model/Task.java
+++ b/src/main/java/com/lucc/taskmanager/model/Task.java
@@ -3,6 +3,7 @@
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
+import java.time.LocalDate;
 
 @Entity
 public class Task
@@ -25,6 +26,10 @@ public class Task
     @Enumerated(EnumType.STRING)
     private Priority priority;
 
+    private LocalDate dueDate;
+
+    private LocalDate completionDate;
+
     @ManyToOne
     @JoinColumn(name = "user_id")
     private User user;
@@ -40,6 +45,16 @@ public Task(String title, String description, User user, Status status, Priority
         this.priority = priority;
     }
 
+    public Task(String title, String description, User user, Status status, Priority priority, LocalDate dueDate)
+    {
+        this.title = title;
+        this.description = description;
+        this.user = user;
+        this.status = status;
+        this.priority = priority;
+        this.dueDate = dueDate;
+    }
+
     public String getTitle()
     {
         return title;
@@ -80,6 +95,26 @@ public void setPriority(Priority priority)
         this.priority = priority;
     }
 
+    public LocalDate getDueDate()
+    {
+        return dueDate;
+    }
+
+    public void setDueDate(LocalDate dueDate)
+    {
+        this.dueDate = dueDate;
+    }
+
+    public LocalDate getCompletionDate()
+    {
+        return completionDate;
+    }
+
+    public void setCompletionDate(LocalDate completionDate)
+    {
+        this.completionDate = completionDate;
+    }
+
     public User getUser()
     {
         return user;
diff --git a/src/main/java/com/lucc/taskmanager/repository/TaskRepository.java b/src/main/java/com/lucc/taskmanager/repository/TaskRepository.java
index 114bf62..eea33da 100644
--- a/src/main/java/com/lucc/taskmanager/repository/TaskRepository.java
+++ b/src/main/java/com/lucc/taskmanager/repository/TaskRepository.java
@@ -1,12 +1,20 @@
 package com.lucc.taskmanager.repository;
 
+import com.lucc.taskmanager.model.Status;
 import com.lucc.taskmanager.model.Task;
 import com.lucc.taskmanager.model.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.time.LocalDate;
 import java.util.List;
 
 public interface TaskRepository extends JpaRepository<Task, Integer>
 {
     List<Task> findByUser(User user);
+
+    long countByUserAndStatus(User user, Status status);
+
+    long countByUserAndStatusAndDueDateBefore(User user, Status status, LocalDate date);
+
+    long countByUserAndStatusAndCompletionDateBetween(User user, Status status, LocalDate start, LocalDate end);
 }
diff --git a/src/main/java/com/lucc/taskmanager/service/TaskService.java b/src/main/java/com/lucc/taskmanager/service/TaskService.java
index 4d92a8a..9639692 100644
--- a/src/main/java/com/lucc/taskmanager/service/TaskService.java
+++ b/src/main/java/com/lucc/taskmanager/service/TaskService.java
@@ -1,11 +1,15 @@
 package com.lucc.taskmanager.service;
 
+import com.lucc.taskmanager.model.Status;
 import com.lucc.taskmanager.model.Task;
 import com.lucc.taskmanager.model.User;
 import com.lucc.taskmanager.repository.TaskRepository;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class TaskService
@@ -25,6 +29,9 @@ public List<Task> getTasksByUser(User user)
     public Task addTask(Task task, User user)
     {
         task.setUser(user);
+        if (task.getStatus() == Status.DONE && task.getCompletionDate() == null) {
+            task.setCompletionDate(LocalDate.now());
+        }
         return taskRepository.save(task);
     }
 
@@ -41,10 +48,19 @@ public Task getTaskById(int taskId, User user)
     public Task updateTask(int taskId, Task updatedTask, User user)
     {
         Task existingTask = getTaskById(taskId, user);
+
+        // Handle completion date logic
+        if (existingTask.getStatus() != Status.DONE && updatedTask.getStatus() == Status.DONE) {
+            existingTask.setCompletionDate(LocalDate.now());
+        } else if (existingTask.getStatus() == Status.DONE && updatedTask.getStatus() != Status.DONE) {
+            existingTask.setCompletionDate(null);
+        }
+
         existingTask.setTitle(updatedTask.getTitle());
         existingTask.setDescription(updatedTask.getDescription());
         existingTask.setStatus(updatedTask.getStatus());
         existingTask.setPriority(updatedTask.getPriority());
+        existingTask.setDueDate(updatedTask.getDueDate());
         return taskRepository.save(existingTask);
     }
 
@@ -57,4 +73,28 @@ public void deleteTask(int taskId, User user)
 
         taskRepository.delete(task);
     }
+
+    public Map<String, Long> getDashboardStats(User user) {
+        LocalDate now = LocalDate.now();
+        LocalDate weekAgo = now.minusDays(7);
+
+        Map<String, Long> stats = new HashMap<>();
+        stats.put("pending", taskRepository.countByUserAndStatus(user, Status.TODO));
+        stats.put("overdue", taskRepository.countByUserAndStatusAndDueDateBefore(user, Status.TODO, now));
+        stats.put("completedThisWeek", taskRepository.countByUserAndStatusAndCompletionDateBetween(user, Status.DONE, weekAgo, now));
+
+        return stats;
+    }
+
+    public Task toggleTaskStatus(int taskId, User user) {
+        Task task = getTaskById(taskId, user);
+        if (task.getStatus() == Status.TODO) {
+            task.setStatus(Status.DONE);
+            task.setCompletionDate(LocalDate.now());
+        } else {
+            task.setStatus(Status.TODO);
+            task.setCompletionDate(null);
+        }
+        return taskRepository.save(task);
+    }
 }
diff --git a/src/main/resources/templates/dashboard.html b/src/main/resources/templates/dashboard.html
new file mode 100644
index 0000000..443235f
--- /dev/null
+++ b/src/main/resources/templates/dashboard.html
@@ -0,0 +1,180 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Dashboard - Task Manager</title>
+    <!-- Bootstrap 5 CSS -->
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
+    <!-- Custom CSS -->
+    <link rel="stylesheet" th:href="@{/styles.css}">
+    <!-- Chart.js -->
+    <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
+</head>
+<body>
+
+<nav class="navbar navbar-expand-lg navbar-dark bg-primary mb-4">
+    <div class="container">
+        <a class="navbar-brand" href="#">Task Manager</a>
+        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+        <div class="collapse navbar-collapse" id="navbarNav">
+            <ul class="navbar-nav me-auto">
+                <li class="nav-item">
+                    <a class="nav-link" th:href="@{/tasks}">My Tasks</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link active" th:href="@{/dashboard}">Dashboard</a>
+                </li>
+            </ul>
+            <div class="d-flex align-items-center">
+                <span class="navbar-text me-3 text-white" th:text="'Logged in as: ' + ${#authentication.name}"></span>
+                <form th:action="@{/logout}" method="post" class="m-0">
+                    <button class="btn btn-outline-light btn-sm" type="submit">Logout</button>
+                </form>
+            </div>
+        </div>
+    </div>
+</nav>
+
+<div class="container">
+    <h2 class="mb-4">Task Dashboard</h2>
+    
+    <!-- Stats Cards -->
+    <div class="row mb-4">
+        <div class="col-md-4">
+            <div class="card text-white bg-info mb-3 shadow-sm border-0">
+                <div class="card-body">
+                    <h5 class="card-title">Pending Tasks</h5>
+                    <p class="card-text display-4 fw-bold" th:text="${pending}">0</p>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-4">
+            <div class="card text-white bg-danger mb-3 shadow-sm border-0">
+                <div class="card-body">
+                    <h5 class="card-title">Overdue Tasks</h5>
+                    <p class="card-text display-4 fw-bold" th:text="${overdue}">0</p>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-4">
+            <div class="card text-white bg-success mb-3 shadow-sm border-0">
+                <div class="card-body">
+                    <h5 class="card-title">Completed (7 Days)</h5>
+                    <p class="card-text display-4 fw-bold" th:text="${completedThisWeek}">0</p>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <!-- Charts Row -->
+    <div class="row">
+        <div class="col-md-6 mb-4">
+            <div class="card shadow-sm h-100 border-0">
+                <div class="card-body">
+                    <h5 class="card-title mb-4">Tasks by Status</h5>
+                    <div style="height: 300px; position: relative;">
+                        <canvas id="statusChart"></canvas>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-6 mb-4">
+            <div class="card shadow-sm h-100 border-0">
+                <div class="card-body">
+                    <h5 class="card-title mb-4">Tasks by Priority</h5>
+                    <div style="height: 300px; position: relative;">
+                        <canvas id="priorityChart"></canvas>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!-- Bootstrap 5 JS Bundle -->
+<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
+
+<script th:inline="javascript">
+    /*<![CDATA[*/
+    const statusData = /*[[${statusCounts}]]*/ {};
+    const priorityData = /*[[${priorityCounts}]]*/ {};
+
+    // Mapping colors to labels
+    const statusColors = {
+        'TODO': '#17a2b8',
+        'DONE': '#28a745'
+    };
+
+    const priorityColors = {
+        'LOW': '#28a745',
+        'MEDIUM': '#ffc107',
+        'HIGH': '#dc3545'
+    };
+
+    function getColors(data, colorMap) {
+        return Object.keys(data).map(key => colorMap[key] || '#6c757d');
+    }
+
+    // Status Chart
+    const ctxStatus = document.getElementById('statusChart').getContext('2d');
+    if (Object.keys(statusData).length > 0) {
+        new Chart(ctxStatus, {
+            type: 'pie',
+            data: {
+                labels: Object.keys(statusData),
+                datasets: [{
+                    data: Object.values(statusData),
+                    backgroundColor: getColors(statusData, statusColors),
+                    borderWidth: 0
+                }]
+            },
+            options: {
+                maintainAspectRatio: false,
+                plugins: {
+                    legend: {
+                        position: 'bottom'
+                    }
+                }
+            }
+        });
+    } else {
+        ctxStatus.font = "16px Arial";
+        ctxStatus.textAlign = "center";
+        ctxStatus.fillText("No status data available", 150, 150);
+    }
+
+    // Priority Chart
+    const ctxPriority = document.getElementById('priorityChart').getContext('2d');
+    if (Object.keys(priorityData).length > 0) {
+        new Chart(ctxPriority, {
+            type: 'doughnut',
+            data: {
+                labels: Object.keys(priorityData),
+                datasets: [{
+                    data: Object.values(priorityData),
+                    backgroundColor: getColors(priorityData, priorityColors),
+                    borderWidth: 0
+                }]
+            },
+            options: {
+                maintainAspectRatio: false,
+                plugins: {
+                    legend: {
+                        position: 'bottom'
+                    }
+                }
+            }
+        });
+    } else {
+        ctxPriority.font = "16px Arial";
+        ctxPriority.textAlign = "center";
+        ctxPriority.fillText("No priority data available", 150, 150);
+    }
+    /*]]>*/
+</script>
+
+</body>
+</html>
diff --git a/src/main/resources/templates/edit-task.html b/src/main/resources/templates/edit-task.html
index 2b2bd6e..07299cf 100644
--- a/src/main/resources/templates/edit-task.html
+++ b/src/main/resources/templates/edit-task.html
@@ -46,6 +46,10 @@ <h2 class="card-title mb-4 text-center">Edit Task</h2>
                         </select>
                     </div>
                 </div>
+                <div class="mb-3">
+                    <label class="form-label fw-bold">Due Date</label>
+                    <input type="date" th:field="*{dueDate}" class="form-control">
+                </div>
                 <div class="d-grid gap-2 mt-3">
                     <button type="submit" class="btn btn-primary btn-lg">Update Task</button>
                     <a th:href="@{/tasks}" class="btn btn-outline-secondary">Cancel</a>
diff --git a/src/main/resources/templates/tasks.html b/src/main/resources/templates/tasks.html
index 6b9214d..5f41f15 100644
--- a/src/main/resources/templates/tasks.html
+++ b/src/main/resources/templates/tasks.html
@@ -9,17 +9,32 @@
     <!-- Custom CSS -->
     <link rel="stylesheet" th:href="@{/styles.css}">
     <!-- CSRF Token for AJAX -->
+    <meta th:name="_csrf" th:content="${#csrf.token}"/>
+    <meta th:name="_csrf_header" th:content="${#csrf.headerName}"/>
 </head>
 <body>
 
 <nav class="navbar navbar-expand-lg navbar-dark bg-primary mb-4">
     <div class="container">
         <a class="navbar-brand" href="#">Task Manager</a>
-        <div class="d-flex">
-            <span class="navbar-text me-3" th:text="'Logged in as: ' + ${#authentication.name}"></span>
-            <form th:action="@{/logout}" method="post">
-                <button class="btn btn-outline-light btn-sm" type="submit">Logout</button>
-            </form>
+        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+        <div class="collapse navbar-collapse" id="navbarNav">
+            <ul class="navbar-nav me-auto">
+                <li class="nav-item">
+                    <a class="nav-link active" th:href="@{/tasks}">My Tasks</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" th:href="@{/dashboard}">Dashboard</a>
+                </li>
+            </ul>
+            <div class="d-flex align-items-center">
+                <span class="navbar-text me-3 text-white" th:text="'Logged in as: ' + ${#authentication.name}"></span>
+                <form th:action="@{/logout}" method="post" class="m-0">
+                    <button class="btn btn-outline-light btn-sm" type="submit">Logout</button>
+                </form>
+            </div>
         </div>
     </div>
 </nav>
@@ -37,12 +52,22 @@ <h2 class="mb-4">My Tasks</h2>
                             <div>
                                 <h5 class="card-title" th:text="${task.title}"></h5>
                                 <p class="card-text text-muted" th:text="${task.description}"></p>
+                                <div class="mb-2" th:if="${task.dueDate != null}">
+                                    <small class="text-muted">
+                                        <strong>Due:</strong> <span th:text="${task.dueDate}"></span>
+                                    </small>
+                                </div>
                                 <span class="badge rounded-pill bg-info text-dark" th:text="${task.status}"></span>
                                 <span class="badge rounded-pill" 
                                       th:classappend="${task.priority == T(com.lucc.taskmanager.model.Priority).HIGH ? 'bg-danger' : (task.priority == T(com.lucc.taskmanager.model.Priority).MEDIUM ? 'bg-warning text-dark' : 'bg-success')}"
                                       th:text="${task.priority}"></span>
                             </div>
                             <div class="btn-group">
+                                <button class="btn btn-sm" 
+                                        th:classappend="${task.status == T(com.lucc.taskmanager.model.Status).DONE ? 'btn-outline-success' : 'btn-outline-primary'}"
+                                        th:onclick="'toggleTaskStatus(' + ${task.id} + ')'"
+                                        th:text="${task.status == T(com.lucc.taskmanager.model.Status).DONE ? 'Undone' : 'Done'}">
+                                </button>
                                 <a th:href="@{/tasks/edit/{id}(id=${task.id})}" class="btn btn-sm btn-outline-secondary">Edit</a>
                                 <button class="btn btn-sm btn-outline-danger" th:onclick="'deleteTask(' + ${task.id} + ')'">Delete</button>
                             </div>
@@ -83,6 +108,10 @@ <h4 class="card-title mb-3">Add New Task</h4>
                                 <option th:each="p : ${priorities}" th:value="${p}" th:text="${p}"></option>
                             </select>
                         </div>
+                        <div class="mb-3">
+                            <label class="form-label">Due Date</label>
+                            <input type="date" th:field="*{dueDate}" class="form-control">
+                        </div>
                         <button type="submit" class="btn btn-primary w-100">Add Task</button>
                     </form>
                 </div>
@@ -95,6 +124,29 @@ <h4 class="card-title mb-3">Add New Task</h4>
 <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
 
 <script>
+    async function toggleTaskStatus(taskId) {
+        const token = document.querySelector('meta[name="_csrf"]').getAttribute('content');
+        const header = document.querySelector('meta[name="_csrf_header"]').getAttribute('content');
+
+        try {
+            const response = await fetch(`/api/tasks/${taskId}/toggle`, {
+                method: 'PATCH',
+                headers: {
+                    [header]: token
+                }
+            });
+
+            if (response.ok) {
+                location.reload(); // Simplest way to reflect changes
+            } else {
+                alert('Failed to toggle task status.');
+            }
+        } catch (error) {
+            console.error('Error:', error);
+            alert('An error occurred while toggling the task status.');
+        }
+    }
+
     async function deleteTask(taskId) {
         if (!confirm('Are you sure you want to delete this task?')) return;
 
diff --git a/src/test/java/com/lucc/taskmanager/service/TaskServiceTest.java b/src/test/java/com/lucc/taskmanager/service/TaskServiceTest.java
index 9e70bc8..af0c38c 100644
--- a/src/test/java/com/lucc/taskmanager/service/TaskServiceTest.java
+++ b/src/test/java/com/lucc/taskmanager/service/TaskServiceTest.java
@@ -12,12 +12,15 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
+import java.time.LocalDate;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.*;
 
 @ExtendWith(MockitoExtension.class)
@@ -103,13 +106,92 @@ void updateTask_ShouldUpdateAndSaveTask() {
         updatedInfo.setPriority(Priority.HIGH);
 
         when(taskRepository.findById(1)).thenReturn(Optional.of(task));
-        when(taskRepository.save(any(Task.class))).thenReturn(task);
+        when(taskRepository.save(any(Task.class))).thenAnswer(invocation -> invocation.getArgument(0));
 
         Task result = taskService.updateTask(1, updatedInfo, user);
 
         assertEquals("Updated Title", result.getTitle());
         assertEquals(Status.DONE, result.getStatus());
-        verify(taskRepository, times(1)).save(task);
+        assertNotNull(result.getCompletionDate());
+        verify(taskRepository, times(1)).save(any(Task.class));
+    }
+
+    @Test
+    void updateTask_ShouldSetCompletionDate_WhenStatusChangedToDone() {
+        Task updatedInfo = new Task();
+        updatedInfo.setStatus(Status.DONE);
+        updatedInfo.setTitle("Test Task");
+        updatedInfo.setDescription("Test Description");
+        updatedInfo.setPriority(Priority.MEDIUM);
+
+        when(taskRepository.findById(1)).thenReturn(Optional.of(task)); // current status is TODO
+        when(taskRepository.save(any(Task.class))).thenAnswer(invocation -> invocation.getArgument(0));
+
+        Task result = taskService.updateTask(1, updatedInfo, user);
+
+        assertEquals(Status.DONE, result.getStatus());
+        assertNotNull(result.getCompletionDate());
+        assertEquals(LocalDate.now(), result.getCompletionDate());
+    }
+
+    @Test
+    void updateTask_ShouldClearCompletionDate_WhenStatusChangedFromDoneToTodo() {
+        task.setStatus(Status.DONE);
+        task.setCompletionDate(LocalDate.now().minusDays(1));
+
+        Task updatedInfo = new Task();
+        updatedInfo.setStatus(Status.TODO);
+        updatedInfo.setTitle("Test Task");
+        updatedInfo.setDescription("Test Description");
+        updatedInfo.setPriority(Priority.MEDIUM);
+
+        when(taskRepository.findById(1)).thenReturn(Optional.of(task));
+        when(taskRepository.save(any(Task.class))).thenAnswer(invocation -> invocation.getArgument(0));
+
+        Task result = taskService.updateTask(1, updatedInfo, user);
+
+        assertEquals(Status.TODO, result.getStatus());
+        assertNull(result.getCompletionDate());
+    }
+
+    @Test
+    void getDashboardStats_ShouldReturnCorrectStats() {
+        when(taskRepository.countByUserAndStatus(eq(user), eq(Status.TODO))).thenReturn(5L);
+        when(taskRepository.countByUserAndStatusAndDueDateBefore(eq(user), eq(Status.TODO), any(LocalDate.class))).thenReturn(2L);
+        when(taskRepository.countByUserAndStatusAndCompletionDateBetween(eq(user), eq(Status.DONE), any(LocalDate.class), any(LocalDate.class))).thenReturn(3L);
+
+        Map<String, Long> stats = taskService.getDashboardStats(user);
+
+        assertEquals(5L, stats.get("pending"));
+        assertEquals(2L, stats.get("overdue"));
+        assertEquals(3L, stats.get("completedThisWeek"));
+    }
+
+    @Test
+    void toggleTaskStatus_ShouldToggleFromTodoToDone() {
+        when(taskRepository.findById(1)).thenReturn(Optional.of(task)); // current is TODO
+        when(taskRepository.save(any(Task.class))).thenAnswer(invocation -> invocation.getArgument(0));
+
+        Task result = taskService.toggleTaskStatus(1, user);
+
+        assertEquals(Status.DONE, result.getStatus());
+        assertNotNull(result.getCompletionDate());
+        verify(taskRepository, times(1)).save(any(Task.class));
+    }
+
+    @Test
+    void toggleTaskStatus_ShouldToggleFromDoneToTodo() {
+        task.setStatus(Status.DONE);
+        task.setCompletionDate(LocalDate.now());
+
+        when(taskRepository.findById(1)).thenReturn(Optional.of(task));
+        when(taskRepository.save(any(Task.class))).thenAnswer(invocation -> invocation.getArgument(0));
+
+        Task result = taskService.toggleTaskStatus(1, user);
+
+        assertEquals(Status.TODO, result.getStatus());
+        assertNull(result.getCompletionDate());
+        verify(taskRepository, times(1)).save(any(Task.class));
     }
 
     @Test

From 84c0f64e305e46e2a542e916a36530cfb6eb0b47 Mon Sep 17 00:00:00 2001
From: lukasmatusiewicz <matusiewiczlukas@gmail.com>
Date: Thu, 23 Apr 2026 10:55:51 +0200
Subject: [PATCH 2/4] fix: resolve thymeleaf parsing error in tasks.html by
 fixing csrf meta tags

---
 src/main/resources/templates/tasks.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/templates/tasks.html b/src/main/resources/templates/tasks.html
index 5f41f15..6f8dc7e 100644
--- a/src/main/resources/templates/tasks.html
+++ b/src/main/resources/templates/tasks.html
@@ -9,8 +9,8 @@
     <!-- Custom CSS -->
     <link rel="stylesheet" th:href="@{/styles.css}">
     <!-- CSRF Token for AJAX -->
-    <meta th:name="_csrf" th:content="${#csrf.token}"/>
-    <meta th:name="_csrf_header" th:content="${#csrf.headerName}"/>
+    <meta name="_csrf" th:content="${_csrf.token}"/>
+    <meta name="_csrf_header" th:content="${_csrf.headerName}"/>
 </head>
 <body>
 

From e1860fc74229a700af9975f1a5f6878b2285e484 Mon Sep 17 00:00:00 2001
From: lukasmatusiewicz <matusiewiczlukas@gmail.com>
Date: Thu, 23 Apr 2026 10:58:36 +0200
Subject: [PATCH 3/4] docs: update README with dashboard, due dates and status
 toggle features

---
 README.md | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index cb76029..1d0c5e1 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,8 @@ This project is designed to be easily testable by anyone, whether they are a dev
 
 ### **1. The Full Experience (Web UI)**
 *   **Register a New Account**: Navigate to `http://localhost:8080/register` and create your own user.
-*   **Manage Your Tasks**: Add, edit, and delete tasks. Notice the **AJAX-powered deletion** that happens instantly without a page reload.
+*   **Explore the Dashboard**: Visit the new **Dashboard** to see live statistics like pending tasks, overdue items, and your weekly completion rate. Check out the interactive charts for status and priority distribution.
+*   **Manage Your Tasks**: Add tasks with **Due Dates**. Use the new **Quick Toggle** (Done/Undone) to update task status instantly from the list.
 *   **Security Check**: Try to access `http://localhost:8080/tasks` without logging in—you'll be automatically redirected to the secure login page.
 
 ### **2. Interactive API Testing (Swagger)**
@@ -67,7 +68,8 @@ To run the tests locally, use:
 ### **Frontend & UX**
 *   **Thymeleaf**: Modern server-side Java template engine.
 *   **Bootstrap 5**: Responsive, mobile-first design for a professional look.
-*   **AJAX (Fetch API)**: Interactive, "snappy" UI features like task deletion without full-page reloads.
+*   **Chart.js**: Interactive data visualization for task statistics.
+*   **AJAX (Fetch API)**: Interactive, "snappy" UI features like task deletion and status toggling without full-page reloads.
 
 ### **DevOps & Documentation**
 *   **Docker & Docker Compose**: Full containerization for one-command environment setup.
@@ -77,10 +79,12 @@ To run the tests locally, use:
 ---
 
 ## ✨ Key Features
+*   **Interactive Dashboard**: Real-time summary of pending, overdue, and recently completed tasks with visual charts.
 *   **Full CRUD Cycle**: Create, Read, Update, and Delete tasks.
+*   **Due Date Tracking**: Set deadlines for tasks and track overdue items.
+*   **Quick Status Toggle**: Instantly mark tasks as Done or Undone from the main list view.
 *   **User Lifecycle**: Public registration and secure login system.
 *   **Task Metadata**: Categorize tasks by **Status** (TODO, DONE) and **Priority** (HIGH, MEDIUM, LOW).
-*   **Interactive UI**: Smooth, JavaScript-powered deletions with real-time DOM updates.
 *   **RESTful API**: Comprehensive API endpoints for programmatic task management, fully documented with Swagger.
 
 ---

From 881659f1ecbc93a20be316282c54eebfa09ba0ce Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 23 Apr 2026 09:01:38 +0000
Subject: [PATCH 4/4] Update coverage badge

---
 .github/badges/branches.svg | 2 +-
 .github/badges/jacoco.svg   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/badges/branches.svg b/.github/badges/branches.svg
index fe9c87b..e9ee233 100644
--- a/.github/badges/branches.svg
+++ b/.github/badges/branches.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="106" height="20" role="img" aria-label="branches: 31.2%"><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="106" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="61" height="20" fill="#555"/><rect x="61" width="45" height="20" fill="#e05d44"/><rect width="106" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="315" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="507">branches</text><text x="315" y="140" transform="scale(.1)" fill="#fff" textLength="507">branches</text><text aria-hidden="true" x="825" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="350">31.2%</text><text x="825" y="140" transform="scale(.1)" fill="#fff" textLength="350">31.2%</text></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="106" height="20" role="img" aria-label="branches: 43.3%"><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="106" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="61" height="20" fill="#555"/><rect x="61" width="45" height="20" fill="#e05d44"/><rect width="106" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="315" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="507">branches</text><text x="315" y="140" transform="scale(.1)" fill="#fff" textLength="507">branches</text><text aria-hidden="true" x="825" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="350">43.3%</text><text x="825" y="140" transform="scale(.1)" fill="#fff" textLength="350">43.3%</text></g></svg>
\ No newline at end of file
diff --git a/.github/badges/jacoco.svg b/.github/badges/jacoco.svg
index bf86c61..b649c50 100644
--- a/.github/badges/jacoco.svg
+++ b/.github/badges/jacoco.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="106" height="20" role="img" aria-label="coverage: 72.9%"><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="106" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="61" height="20" fill="#555"/><rect x="61" width="45" height="20" fill="#dfb317"/><rect width="106" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="315" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="510">coverage</text><text x="315" y="140" transform="scale(.1)" fill="#fff" textLength="510">coverage</text><text aria-hidden="true" x="825" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="350">72.9%</text><text x="825" y="140" transform="scale(.1)" fill="#fff" textLength="350">72.9%</text></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="96" height="20" role="img" aria-label="coverage: 72%"><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="96" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="61" height="20" fill="#555"/><rect x="61" width="35" height="20" fill="#dfb317"/><rect width="96" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="315" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="510">coverage</text><text x="315" y="140" transform="scale(.1)" fill="#fff" textLength="510">coverage</text><text aria-hidden="true" x="775" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="245">72%</text><text x="775" y="140" transform="scale(.1)" fill="#fff" textLength="245">72%</text></g></svg>
\ No newline at end of file