From e6d2bde4964194123dee286b7ad5a81fe2152aff Mon Sep 17 00:00:00 2001
From: Martin Mwaka <martinmwaka@hotmail.com>
Date: Fri, 7 Aug 2026 14:24:46 +0100
Subject: [PATCH 1/5] add deleted completed tasks button to index.html

---
 Sprint-3/todo-list/index.html | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/Sprint-3/todo-list/index.html b/Sprint-3/todo-list/index.html
index 4d12c4654..dc13ec245 100644
--- a/Sprint-3/todo-list/index.html
+++ b/Sprint-3/todo-list/index.html
@@ -1,14 +1,16 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
   <meta charset="UTF-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>ToDo List</title>
   <link rel="stylesheet" href="style.css" />
   <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css" rel="stylesheet">
 
   <script type="module" src="script.mjs"></script>
 </head>
+
 <body>
   <div class="todo-container">
     <h1>My ToDo List</h1>
@@ -16,9 +18,10 @@ <h1>My ToDo List</h1>
     <div class="todo-input">
       <input type="text" id="new-task-input" placeholder="Enter a new task..." />
       <button id="add-task-btn">Add</button>
+      <button id="delete-completed-tasks-btn">Delete completed tasks</button>
     </div>
 
-    <ul id="todo-list" class="todo-list">      
+    <ul id="todo-list" class="todo-list">
     </ul>
 
     <!-- 
@@ -37,4 +40,5 @@ <h1>My ToDo List</h1>
 
   </div>
 </body>
-</html>
+
+</html>
\ No newline at end of file

From 1f0b6e967028ecc8115c320ffc7c459f230dbbdf Mon Sep 17 00:00:00 2001
From: Martin Mwaka <martinmwaka@hotmail.com>
Date: Fri, 7 Aug 2026 14:36:00 +0100
Subject: [PATCH 2/5] add deleteCompleted function to todos.mjs

---
 Sprint-3/todo-list/script.mjs | 18 ++++++++----------
 Sprint-3/todo-list/todos.mjs  | 11 ++++++++++-
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/Sprint-3/todo-list/script.mjs b/Sprint-3/todo-list/script.mjs
index ba0b2ceae..d228c9728 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,14 +9,13 @@ 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();
 });
 
-
-// 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");
@@ -45,12 +44,11 @@ function render() {
   });
 }
 
-
 // Note:
 // - First child of #todo-item-template is a <li> 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 <li> element for the given todo task
@@ -62,15 +60,15 @@ function createListItem(todo, index) {
     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();
   });
 
   return li;
-}
\ No newline at end of file
+}
diff --git a/Sprint-3/todo-list/todos.mjs b/Sprint-3/todo-list/todos.mjs
index f17ab6a25..8277e5092 100644
--- a/Sprint-3/todo-list/todos.mjs
+++ b/Sprint-3/todo-list/todos.mjs
@@ -26,4 +26,13 @@ export function toggleCompletedOnTask(todos, taskIndex) {
   if (todos[taskIndex]) {
     todos[taskIndex].completed = !todos[taskIndex].completed;
   }
-}
\ No newline at end of file
+}
+
+// Delete all completed tasks if they exist
+export function deleteCompleted(todos) {
+  todos.forEach((todo, index) => {
+    if (todo.completed) {
+      deleteTask(todos, index);
+    }
+  });
+}

From f9bd02248576802d826cd08a09bb95a7853949d6 Mon Sep 17 00:00:00 2001
From: Martin Mwaka <martinmwaka@hotmail.com>
Date: Fri, 7 Aug 2026 15:17:37 +0100
Subject: [PATCH 3/5] add deleteCompleted tests to todos.test.mjs

---
 Sprint-3/todo-list/todos.test.mjs | 54 +++++++++++++++++++++++++------
 1 file changed, 44 insertions(+), 10 deletions(-)

diff --git a/Sprint-3/todo-list/todos.test.mjs b/Sprint-3/todo-list/todos.test.mjs
index bae7ae491..5562ac014 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,41 @@ describe("toggleCompletedOnTask()", () => {
   });
 });
 
+describe("deleteCompleted()", () => {
+  const todos = createMockTodos();
+  const todosBeforeDeletion = createMockTodos();
+  const lengthBeforeDeletion = todos.length;
+  Todos.deleteCompleted(todos);
+
+  expect(todos).toHaveLength(3);
+
+  // expect the 2nd todo to be the 3rd todo from the original task list
+  expect(todos[1]).toEqual(todosBeforeDeletion[2]);
+
+  // expect the 3rd todo to be the 4th todo from the original task list
+  expect(todos[2]).toEqual(todosBeforeDeletion[3]);
+
+  test("should delete all todos if all todos are completed", () => {
+    const todos = createMockTodos().map((task) => ({
+      ...task,
+      completed: true,
+    }));
+
+    const todosBeforeDeletion = createMockTodos();
+    todos.deleteCompleted(todos);
+
+    expect(todos).toHaveLength(0);
+  });
+
+  test("should not delete todos if none are completed", () => {
+    const todos = createMockTodos().map((task) => ({
+      ...task,
+      completed: false,
+    }));
+
+    const todosBeforeDeletion = createMockTodos();
+    todos.deleteCompleted(todos);
+
+    expect(todos).toHaveLength(todosBeforeDeletion.length);
+  });
+});

From 206eac442076f169673938b999f50a9d6f6b4c6c Mon Sep 17 00:00:00 2001
From: Martin Mwaka <martinmwaka@hotmail.com>
Date: Fri, 7 Aug 2026 16:43:55 +0100
Subject: [PATCH 4/5] complete deleteCompleted event in script.js and confirm
 that all tests pass

---
 Sprint-3/todo-list/script.mjs     | 19 ++++++++++++++++++-
 Sprint-3/todo-list/todos.mjs      |  8 +++-----
 Sprint-3/todo-list/todos.test.mjs | 24 +++++++++++++-----------
 3 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/Sprint-3/todo-list/script.mjs b/Sprint-3/todo-list/script.mjs
index d228c9728..24bf601cc 100644
--- a/Sprint-3/todo-list/script.mjs
+++ b/Sprint-3/todo-list/script.mjs
@@ -69,6 +69,23 @@ function createListItem(todo, index) {
     Todos.deleteTask(todos, index);
     render();
   });
-
   return li;
 }
+
+// handling deletion of all completed todos
+const deleteCompletedButton = document.getElementById(
+  "delete-completed-tasks-btn"
+);
+
+deleteCompletedButton.addEventListener("click", (e) => {
+  Todos.deleteCompleted(todos);
+  // if (completedTodos.length === 0) return;
+  // completedTodos = Array.from(completedTodos);
+  // todos.forEach((todo, index) => {
+  //   console.log(completedTodos.includes(todo.task));
+  //   if (todo.completed === true) {
+  //     todos.splice(index, 1);
+  //   }
+  // });
+  render();
+});
diff --git a/Sprint-3/todo-list/todos.mjs b/Sprint-3/todo-list/todos.mjs
index 8277e5092..f4238717b 100644
--- a/Sprint-3/todo-list/todos.mjs
+++ b/Sprint-3/todo-list/todos.mjs
@@ -30,9 +30,7 @@ export function toggleCompletedOnTask(todos, taskIndex) {
 
 // Delete all completed tasks if they exist
 export function deleteCompleted(todos) {
-  todos.forEach((todo, index) => {
-    if (todo.completed) {
-      deleteTask(todos, index);
-    }
-  });
+  for (let index = todos.length - 1; index >= 0; index--) {
+    if (todos[index].completed === true) todos.splice(index, 1);
+  }
 }
diff --git a/Sprint-3/todo-list/todos.test.mjs b/Sprint-3/todo-list/todos.test.mjs
index 5562ac014..7529152d1 100644
--- a/Sprint-3/todo-list/todos.test.mjs
+++ b/Sprint-3/todo-list/todos.test.mjs
@@ -127,18 +127,20 @@ describe("toggleCompletedOnTask()", () => {
 });
 
 describe("deleteCompleted()", () => {
-  const todos = createMockTodos();
-  const todosBeforeDeletion = createMockTodos();
-  const lengthBeforeDeletion = todos.length;
-  Todos.deleteCompleted(todos);
+  test("should delete all completed todos from todos array", () => {
+    const todos = createMockTodos();
+    const todosBeforeDeletion = createMockTodos();
+    const lengthBeforeDeletion = todos.length;
+    Todos.deleteCompleted(todos);
 
-  expect(todos).toHaveLength(3);
+    expect(todos).toHaveLength(2);
 
-  // expect the 2nd todo to be the 3rd todo from the original task list
-  expect(todos[1]).toEqual(todosBeforeDeletion[2]);
+    // expect the 1st todo to be the 2nd todo from the original task list
+    expect(todos[0]).toEqual(todosBeforeDeletion[1]);
 
-  // expect the 3rd todo to be the 4th todo from the original task list
-  expect(todos[2]).toEqual(todosBeforeDeletion[3]);
+    // expect the 2nd todo to be the 4th todo from the original task list
+    expect(todos[1]).toEqual(todosBeforeDeletion[3]);
+  });
 
   test("should delete all todos if all todos are completed", () => {
     const todos = createMockTodos().map((task) => ({
@@ -147,7 +149,7 @@ describe("deleteCompleted()", () => {
     }));
 
     const todosBeforeDeletion = createMockTodos();
-    todos.deleteCompleted(todos);
+    Todos.deleteCompleted(todos);
 
     expect(todos).toHaveLength(0);
   });
@@ -159,7 +161,7 @@ describe("deleteCompleted()", () => {
     }));
 
     const todosBeforeDeletion = createMockTodos();
-    todos.deleteCompleted(todos);
+    Todos.deleteCompleted(todos);
 
     expect(todos).toHaveLength(todosBeforeDeletion.length);
   });

From 7ef35850a1936cebd0dd2241fc605e3d00885773 Mon Sep 17 00:00:00 2001
From: Martin Mwaka <martinmwaka@hotmail.com>
Date: Mon, 10 Aug 2026 14:34:15 +0100
Subject: [PATCH 5/5] remove comments from script.js

---
 Sprint-3/todo-list/script.mjs | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/Sprint-3/todo-list/script.mjs b/Sprint-3/todo-list/script.mjs
index 24bf601cc..5b30ec7e1 100644
--- a/Sprint-3/todo-list/script.mjs
+++ b/Sprint-3/todo-list/script.mjs
@@ -79,13 +79,5 @@ const deleteCompletedButton = document.getElementById(
 
 deleteCompletedButton.addEventListener("click", (e) => {
   Todos.deleteCompleted(todos);
-  // if (completedTodos.length === 0) return;
-  // completedTodos = Array.from(completedTodos);
-  // todos.forEach((todo, index) => {
-  //   console.log(completedTodos.includes(todo.task));
-  //   if (todo.completed === true) {
-  //     todos.splice(index, 1);
-  //   }
-  // });
   render();
 });
