Task description
+
diff --git a/Sprint-3/todo-list/script.mjs b/Sprint-3/todo-list/script.mjs
index ba0b2ceae..8f845fe53 100644
--- a/Sprint-3/todo-list/script.mjs
+++ b/Sprint-3/todo-list/script.mjs
@@ -7,6 +7,9 @@ const todos = [];
// Set up tasks to be performed once on page load
window.addEventListener("load", () => {
document.getElementById("add-task-btn").addEventListener("click", addNewTodo);
+ document
+ .getElementById("delete-completed-btn")
+ .addEventListener("click", deleteCompletedTodos);
// Populate sample data
Todos.addTask(todos, "Wash the dishes", false);
@@ -20,13 +23,20 @@ window.addEventListener("load", () => {
// append a new task to the todo list.
function addNewTodo() {
const taskInput = document.getElementById("new-task-input");
+ const deadlineInput = document.getElementById("new-task-deadline");
const task = taskInput.value.trim();
if (task) {
- Todos.addTask(todos, task, false);
+ Todos.addTask(todos, task, false, deadlineInput.value);
render();
}
taskInput.value = "";
+ deadlineInput.value = "";
+}
+
+function deleteCompletedTodos() {
+ Todos.deleteCompleted(todos);
+ render();
}
// Note:
@@ -58,6 +68,7 @@ function createListItem(todo, index) {
const li = todoListItemTemplate.cloneNode(true); // true => Do a deep copy of the node
li.querySelector(".description").textContent = todo.task;
+ li.querySelector(".deadline").textContent = todo.deadline ?? "";
if (todo.completed) {
li.classList.add("completed");
}
diff --git a/Sprint-3/todo-list/script.test.mjs b/Sprint-3/todo-list/script.test.mjs
new file mode 100644
index 000000000..f06af6b0e
--- /dev/null
+++ b/Sprint-3/todo-list/script.test.mjs
@@ -0,0 +1,63 @@
+/**
+ * @jest-environment jsdom
+ */
+
+import { readFileSync } from "node:fs";
+
+test("renders and manages todos with optional deadlines", async () => {
+ const html = readFileSync(new URL("./index.html", import.meta.url), "utf8");
+ const appDocument = new DOMParser().parseFromString(html, "text/html");
+ document.body.innerHTML = appDocument.body.innerHTML;
+
+ await import("./script.mjs");
+ window.dispatchEvent(new Event("load"));
+
+ const list = document.getElementById("todo-list");
+ const deadlineInput = document.getElementById("new-task-deadline");
+ const deleteCompletedButton = document.getElementById(
+ "delete-completed-btn"
+ );
+ const taskInput = document.getElementById("new-task-input");
+ const findTodo = (task) =>
+ [...list.querySelectorAll(".todo-item")].find(
+ (item) => item.querySelector(".description").textContent === task
+ );
+ const addTodo = (task, deadline = "") => {
+ taskInput.value = task;
+ deadlineInput.value = deadline;
+ document.getElementById("add-task-btn").click();
+ };
+
+ expect(deadlineInput).not.toBeNull();
+ expect(deadlineInput.type).toBe("date");
+ expect(deleteCompletedButton).not.toBeNull();
+
+ expect(findTodo("Wash the dishes")).not.toBeUndefined();
+ expect(findTodo("Do the shopping").classList.contains("completed")).toBe(true);
+ expect(
+ findTodo("Wash the dishes").querySelector(".deadline").textContent
+ ).toBe("");
+
+ addTodo(" ", "2026-12-01");
+ expect(list.querySelectorAll(".todo-item")).toHaveLength(2);
+
+ addTodo("Submit coursework", "2026-12-01");
+ expect(
+ findTodo("Submit coursework").querySelector(".deadline").textContent
+ ).toBe("2026-12-01");
+
+ findTodo("Wash the dishes").querySelector(".complete-btn").click();
+ expect(findTodo("Wash the dishes").classList.contains("completed")).toBe(true);
+
+ findTodo("Submit coursework").querySelector(".delete-btn").click();
+ expect(findTodo("Submit coursework")).toBeUndefined();
+
+ addTodo("Prepare demo", "2026-12-02");
+ deleteCompletedButton.click();
+
+ expect(list.querySelectorAll(".todo-item")).toHaveLength(1);
+ expect(
+ findTodo("Prepare demo").querySelector(".deadline").textContent
+ ).toBe("2026-12-02");
+ expect(findTodo("Prepare demo").classList.contains("completed")).toBe(false);
+});
diff --git a/Sprint-3/todo-list/style.css b/Sprint-3/todo-list/style.css
index 535e91227..4f59c1f21 100644
--- a/Sprint-3/todo-list/style.css
+++ b/Sprint-3/todo-list/style.css
@@ -76,6 +76,11 @@ h1 {
text-overflow: ellipsis;
}
+.deadline {
+ margin-left: 8px;
+ white-space: nowrap;
+}
+
.actions {
display: flex;
gap: 10px;
diff --git a/Sprint-3/todo-list/todos.mjs b/Sprint-3/todo-list/todos.mjs
index f17ab6a25..369c73b7c 100644
--- a/Sprint-3/todo-list/todos.mjs
+++ b/Sprint-3/todo-list/todos.mjs
@@ -3,15 +3,28 @@
the following manner:
[
- { task: "Description of task 1", completed: false},
+ { task: "Description of task 1", completed: false, deadline: "2026-12-01"},
{ task: "Description of task 2", completed: true}
]
*/
// Append a new task to todos[]
-export function addTask(todos, task, completed = false) {
- todos.push({ task, completed });
+export function addTask(todos, task, completed = false, deadline = "") {
+ const todo = { task, completed };
+ if (deadline) {
+ todo.deadline = deadline;
+ }
+ todos.push(todo);
+}
+
+// Delete all completed tasks from todos[]
+export function deleteCompleted(todos) {
+ for (let index = todos.length - 1; index >= 0; index--) {
+ if (todos[index].completed) {
+ todos.splice(index, 1);
+ }
+ }
}
// Delete todos[taskIndex] if it exists
diff --git a/Sprint-3/todo-list/todos.test.mjs b/Sprint-3/todo-list/todos.test.mjs
index bae7ae491..8adf53a73 100644
--- a/Sprint-3/todo-list/todos.test.mjs
+++ b/Sprint-3/todo-list/todos.test.mjs
@@ -39,6 +39,53 @@ describe("addTask()", () => {
// New task should be appended to the todos
expect(todos[todos.length - 1]).toEqual(theTask);
});
+
+ test("stores a deadline when provided", () => {
+ const todos = [];
+
+ Todos.addTask(todos, "Submit coursework", false, "2026-12-01");
+
+ expect(todos).toEqual([
+ {
+ task: "Submit coursework",
+ completed: false,
+ deadline: "2026-12-01",
+ },
+ ]);
+ });
+
+ test("omits a deadline when none is provided", () => {
+ const todos = [];
+
+ Todos.addTask(todos, "Submit coursework");
+
+ expect(todos).toEqual([{ task: "Submit coursework", completed: false }]);
+ });
+});
+
+describe("deleteCompleted()", () => {
+ test("removes all completed tasks and preserves incomplete task order", () => {
+ const todos = createMockTodos();
+
+ Todos.deleteCompleted(todos);
+
+ expect(todos).toEqual([
+ { task: "Task 2 description", completed: false },
+ { task: "Task 4 description", completed: false },
+ ]);
+ });
+
+ test("leaves the list unchanged when no tasks are completed", () => {
+ const todos = [
+ { task: "Task 1 description", completed: false },
+ { task: "Task 2 description", completed: false },
+ ];
+ const todosBeforeDeletion = [...todos];
+
+ Todos.deleteCompleted(todos);
+
+ expect(todos).toEqual(todosBeforeDeletion);
+ });
});
describe("deleteTask()", () => {