+
diff --git a/Sprint-3/todo-list/script.mjs b/Sprint-3/todo-list/script.mjs
index ba0b2ceae..e14135704 100644
--- a/Sprint-3/todo-list/script.mjs
+++ b/Sprint-3/todo-list/script.mjs
@@ -1,4 +1,4 @@
-// Store everything imported from './todos.mjs' module as properties of an object named Todos
+// Store everything imported from './todos.mjs' module as properties of an object named Todos
import * as Todos from "./todos.mjs";
// To store the todo tasks
@@ -9,24 +9,33 @@ window.addEventListener("load", () => {
document.getElementById("add-task-btn").addEventListener("click", addNewTodo);
// Populate sample data
- Todos.addTask(todos, "Wash the dishes", false);
+ Todos.addTask(todos, "Wash the dishes", false);
Todos.addTask(todos, "Do the shopping", true);
render();
-});
+ document
+ .getElementById("delete-completed-btn")
+ .addEventListener("click", () => {
+ Todos.deleteCompleted(todos);
+
+ render();
+ });
+});
-// A callback that reads the task description from an input field and
+// A callback that reads the task description from an input field and
// 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 = "";
}
// Note:
@@ -45,32 +54,38 @@ function render() {
});
}
-
// Note:
// - First child of #todo-item-template is a
element.
// We will create each ToDo list item as a clone of this node.
// - This variable is declared here to be close to the only function that uses it.
-const todoListItemTemplate =
+const todoListItemTemplate =
document.getElementById("todo-item-template").content.firstElementChild;
// Create a
element for the given todo task
function createListItem(todo, index) {
const li = todoListItemTemplate.cloneNode(true); // true => Do a deep copy of the node
+ const deadlineElement = li.querySelector(".deadline");
li.querySelector(".description").textContent = todo.task;
if (todo.completed) {
li.classList.add("completed");
}
- li.querySelector('.complete-btn').addEventListener("click", () => {
+ li.querySelector(".complete-btn").addEventListener("click", () => {
Todos.toggleCompletedOnTask(todos, index);
render();
});
-
- li.querySelector('.delete-btn').addEventListener("click", () => {
+
+ li.querySelector(".delete-btn").addEventListener("click", () => {
Todos.deleteTask(todos, index);
render();
});
+ if (todo.deadline) {
+ deadlineElement.textContent = Todos.describeDeadline(todo.deadline);
+ } else {
+ deadlineElement.remove();
+ }
+
return li;
-}
\ No newline at end of file
+}
diff --git a/Sprint-3/todo-list/style.css b/Sprint-3/todo-list/style.css
index 535e91227..f2f19cbd4 100644
--- a/Sprint-3/todo-list/style.css
+++ b/Sprint-3/todo-list/style.css
@@ -30,6 +30,17 @@ h1 {
margin-bottom: 20px;
}
+.visually-hidden {
+ position: absolute;
+ width: 1px;
+ height: 1px;
+ margin: -1px;
+ padding: 0;
+ overflow: hidden;
+ white-space: nowrap;
+ border: 0;
+}
+
.todo-input input {
flex: 1;
padding: 10px;
@@ -41,7 +52,7 @@ h1 {
.todo-input button {
padding: 10px 20px;
font-size: 16px;
- background-color: #4CAF50;
+ background-color: #4caf50;
color: white;
border: none;
border-radius: 6px;
diff --git a/Sprint-3/todo-list/todos.mjs b/Sprint-3/todo-list/todos.mjs
index f17ab6a25..fc863543d 100644
--- a/Sprint-3/todo-list/todos.mjs
+++ b/Sprint-3/todo-list/todos.mjs
@@ -10,8 +10,12 @@
*/
// 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 todos[taskIndex] if it exists
@@ -26,4 +30,46 @@ export function toggleCompletedOnTask(todos, taskIndex) {
if (todos[taskIndex]) {
todos[taskIndex].completed = !todos[taskIndex].completed;
}
-}
\ No newline at end of file
+}
+
+// Remove every task whose "completed" property is true
+export function deleteCompleted(todos) {
+ for (let i = todos.length - 1; i >= 0; i--) {
+ if (todos[i].completed) {
+ todos.splice(i, 1);
+ }
+ }
+}
+
+export function daysLeft(deadline, today = new Date()) {
+ const [year, month, day] = deadline.split("-").map(Number);
+ const deadlineDate = new Date(year, month - 1, day);
+
+ if (
+ deadlineDate.getFullYear() !== year ||
+ deadlineDate.getMonth() !== month - 1 ||
+ deadlineDate.getDate() !== day
+ ) {
+ return NaN;
+ }
+
+ const todaysDate = new Date(
+ today.getFullYear(),
+ today.getMonth(),
+ today.getDate()
+ );
+ const MS_PER_DAY = 24 * 60 * 60 * 1000;
+
+ return Math.round((deadlineDate - todaysDate) / MS_PER_DAY);
+}
+
+export function describeDeadline(deadline, today = new Date()) {
+ const days = daysLeft(deadline, today);
+
+ if (Number.isNaN(days)) return "Invalid date";
+ if (days < 0) return `Overdue by ${-days} day${days === -1 ? "" : "s"}`;
+ if (days === 0) return "Due today";
+ if (days === 1) return "Due tomorrow";
+
+ return `${days} days left`;
+}
diff --git a/Sprint-3/todo-list/todos.test.mjs b/Sprint-3/todo-list/todos.test.mjs
index bae7ae491..646a9d766 100644
--- a/Sprint-3/todo-list/todos.test.mjs
+++ b/Sprint-3/todo-list/todos.test.mjs
@@ -13,7 +13,7 @@ function createMockTodos() {
{ task: "Task 1 description", completed: true },
{ task: "Task 2 description", completed: false },
{ task: "Task 3 description", completed: true },
- { task: "Task 4 description", completed: false },
+ { task: "Task 4 description", completed: false },
];
}
@@ -29,7 +29,6 @@ describe("addTask()", () => {
});
test("Should append a new task to the end of a ToDo list", () => {
-
const todos = createMockTodos();
const lengthBeforeAddition = todos.length;
Todos.addTask(todos, theTask.task, theTask.completed);
@@ -42,7 +41,6 @@ describe("addTask()", () => {
});
describe("deleteTask()", () => {
-
test("Delete the first task", () => {
const todos = createMockTodos();
const todosBeforeDeletion = createMockTodos();
@@ -53,7 +51,7 @@ describe("deleteTask()", () => {
expect(todos[0]).toEqual(todosBeforeDeletion[1]);
expect(todos[1]).toEqual(todosBeforeDeletion[2]);
- expect(todos[2]).toEqual(todosBeforeDeletion[3]);
+ expect(todos[2]).toEqual(todosBeforeDeletion[3]);
});
test("Delete the second task (a middle task)", () => {
@@ -66,7 +64,7 @@ describe("deleteTask()", () => {
expect(todos[0]).toEqual(todosBeforeDeletion[0]);
expect(todos[1]).toEqual(todosBeforeDeletion[2]);
- expect(todos[2]).toEqual(todosBeforeDeletion[3]);
+ expect(todos[2]).toEqual(todosBeforeDeletion[3]);
});
test("Delete the last task", () => {
@@ -79,7 +77,7 @@ describe("deleteTask()", () => {
expect(todos[0]).toEqual(todosBeforeDeletion[0]);
expect(todos[1]).toEqual(todosBeforeDeletion[1]);
- expect(todos[2]).toEqual(todosBeforeDeletion[2]);
+ expect(todos[2]).toEqual(todosBeforeDeletion[2]);
});
test("Delete a non-existing task", () => {
@@ -94,7 +92,6 @@ describe("deleteTask()", () => {
});
describe("toggleCompletedOnTask()", () => {
-
test("Expect the 'completed' property to toggle on an existing task", () => {
const todos = createMockTodos();
const taskIndex = 1;
@@ -111,13 +108,12 @@ describe("toggleCompletedOnTask()", () => {
const todos = createMockTodos();
const todosBeforeToggle = createMockTodos();
Todos.toggleCompletedOnTask(todos, 1);
-
- expect(todos[0]).toEqual(todosBeforeToggle[0]);
+
+ expect(todos[0]).toEqual(todosBeforeToggle[0]);
expect(todos[2]).toEqual(todosBeforeToggle[2]);
expect(todos[3]).toEqual(todosBeforeToggle[3]);
});
-
test("Expect no change when toggling on a non-existing task", () => {
const todos = createMockTodos();
const todosBeforeToggle = createMockTodos();
@@ -130,3 +126,63 @@ describe("toggleCompletedOnTask()", () => {
});
});
+describe("deleteCompleted()", () => {
+ test("Removes all completed tasks", () => {
+ const todos = createMockTodos();
+ Todos.deleteCompleted(todos);
+
+ expect(todos).toHaveLength(2);
+ expect(todos.every((task) => !task.completed)).toBe(true);
+ });
+
+ test("Keeps the remaining tasks in their original order", () => {
+ const todos = createMockTodos();
+ const before = createMockTodos();
+ Todos.deleteCompleted(todos);
+
+ expect(todos[0]).toEqual(before[1]);
+ expect(todos[1]).toEqual(before[3]);
+ });
+
+ test("Empties the list when every task is completed", () => {
+ const todos = [
+ { task: "A", completed: true },
+ { task: "B", completed: true },
+ ];
+ Todos.deleteCompleted(todos);
+
+ expect(todos).toEqual([]);
+ });
+
+ test("Changes nothing when no task is completed", () => {
+ const todos = [{ task: "A", completed: false }];
+ Todos.deleteCompleted(todos);
+
+ expect(todos).toEqual([{ task: "A", completed: false }]);
+ });
+});
+
+describe("daysLeft()", () => {
+ const today = new Date(2026, 10, 12);
+
+ test("Future date", () => {
+ expect(Todos.daysLeft("2026-11-15", today)).toBe(3);
+ });
+ test("Today", () => {
+ expect(Todos.daysLeft("2026-11-12", today)).toBe(0);
+ });
+ test("Past date is negative", () => {
+ expect(Todos.daysLeft("2026-11-10", today)).toBe(-2);
+ });
+ test("Returns NaN for a date that does not exist", () => {
+ expect(Number.isNaN(Todos.daysLeft("2026-02-31", today))).toBe(true);
+ });
+});
+
+describe("addTask() with deadline", () => {
+ test("Stores the deadline when given", () => {
+ const todos = [];
+ Todos.addTask(todos, "Wash car", false, "2026-12-01");
+ expect(todos[0].deadline).toBe("2026-12-01");
+ });
+});