From a21d41df525b156bcc4e4a39a5dcf3d531d56b01 Mon Sep 17 00:00:00 2001
From: SanjanaBottu <bottusanjanasridhar@gmail.com>
Date: Wed, 29 Apr 2026 19:56:06 +1000
Subject: [PATCH 01/10] Resolve merge conflict and add core progress indicator

---
 .../task-dropdown/task-dropdown.component.html    |  9 +++++++++
 src/app/doubtfire-angularjs.module.ts             |  2 ++
 .../states/dashboard/directives/directives.coffee |  1 +
 .../progress-dashboard/progress-dashboard.scss    | 15 +++++++++++++++
 .../progress-dashboard.tpl.html                   |  9 +++++++++
 src/app/projects/states/states.coffee             |  1 +
 6 files changed, 37 insertions(+)

diff --git a/src/app/common/header/task-dropdown/task-dropdown.component.html b/src/app/common/header/task-dropdown/task-dropdown.component.html
index 9e848d0c5b..99a237fd7c 100644
--- a/src/app/common/header/task-dropdown/task-dropdown.component.html
+++ b/src/app/common/header/task-dropdown/task-dropdown.component.html
@@ -63,6 +63,15 @@
         >
           <mat-icon aria-label="Dashboard icon" fontIcon="dashboard"></mat-icon> Dashboard
         </button>
+        <button
+          uiSref="projects/core-progress-indicator"
+          [uiParams]="{projectId: currentProject.id, taskAbbr: ''}"
+          mat-menu-item
+        >
+          <mat-icon fontIcon="insights"></mat-icon> Core Progress Indicator
+        </button>
+
+<mat-divider></mat-divider>
         <mat-divider></mat-divider>
         <button
           uiSref="projects/outcomes"
diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index 868e381213..04673712e5 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -68,6 +68,8 @@ import 'build/src/app/projects/states/groups/groups.js';
 import 'build/src/app/projects/states/feedback/feedback.js';
 import 'build/src/app/projects/states/states.js';
 import 'build/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.js';
+import 'build/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.js';
+import 'build/src/app/projects/states/core-progress-indicator/core-progress-indicator.js';
 import 'build/src/app/projects/states/dashboard/directives/student-task-list/student-task-list.js';
 import 'build/src/app/projects/states/dashboard/directives/directives.js';
 import 'build/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.js';
diff --git a/src/app/projects/states/dashboard/directives/directives.coffee b/src/app/projects/states/dashboard/directives/directives.coffee
index 8ac3fe3ed8..04c11eb05f 100644
--- a/src/app/projects/states/dashboard/directives/directives.coffee
+++ b/src/app/projects/states/dashboard/directives/directives.coffee
@@ -2,4 +2,5 @@ angular.module('doubtfire.projects.states.dashboard.directives', [
   'doubtfire.projects.states.dashboard.directives.student-task-list'
   'doubtfire.projects.states.dashboard.directives.progress-dashboard'
   'doubtfire.projects.states.dashboard.directives.task-dashboard'
+  'doubtfire.projects.states.dashboard.directives.core-progress-indicator'
 ])
diff --git a/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.scss b/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.scss
index e69de29bb2..ad5c3a3013 100644
--- a/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.scss
+++ b/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.scss
@@ -0,0 +1,15 @@
+.core-progress-bar {
+  display: inline-block;
+  width: 180px;
+  height: 16px;
+  background: #e5e7eb;
+  border: 1px solid #777;
+  vertical-align: middle;
+  margin: 0 8px;
+}
+
+.core-progress-fill {
+  display: block;
+  height: 100%;
+  background: #2f64b7;
+}
diff --git a/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.tpl.html b/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.tpl.html
index 53269a2a95..f5a307bd81 100644
--- a/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.tpl.html
+++ b/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.tpl.html
@@ -5,6 +5,15 @@ <h4 class="panel-title">
     </h4>
   </div><!--/panel-heading-->
   <div class="panel-body">
+
+    <div class="col-sm-12 col-xl-12">
+      <div class="card">
+        <f-task-planner-card [project]="project"></f-task-planner-card>
+      </div>
+    </div>
+    <div class="col-sm-12 col-xl-12">
+  <core-progress-indicator project="project"></core-progress-indicator>
+</div>
     <div class="col-sm-12 col-xl-6">
       <div class="card card-default card-sm card-target-grade">
         <div class="card-heading">
diff --git a/src/app/projects/states/states.coffee b/src/app/projects/states/states.coffee
index 01b9d42dd4..5e48daaf4a 100644
--- a/src/app/projects/states/states.coffee
+++ b/src/app/projects/states/states.coffee
@@ -5,4 +5,5 @@ angular.module('doubtfire.projects.states', [
   'doubtfire.projects.states.portfolio'
   'doubtfire.projects.states.groups'
   'doubtfire.projects.states.outcomes'
+  'doubtfire.projects.states.core-progress-indicator'
 ])

From c02ffbdc53a0918db17bd4afd93b16e860a01b8d Mon Sep 17 00:00:00 2001
From: SanjanaBottu <bottusanjanasridhar@gmail.com>
Date: Wed, 29 Apr 2026 21:31:53 +1000
Subject: [PATCH 02/10] Add core progress indicator files

---
 .../core-progress-indicator.coffee            | 14 ++++++++
 .../core-progress-indicator.tpl.html          |  9 ++++++
 .../core-progress-indicator.coffee            | 22 +++++++++++++
 .../core-progress-indicator.tpl.html          | 32 +++++++++++++++++++
 4 files changed, 77 insertions(+)
 create mode 100644 src/app/projects/states/core-progress-indicator/core-progress-indicator.coffee
 create mode 100644 src/app/projects/states/core-progress-indicator/core-progress-indicator.tpl.html
 create mode 100644 src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.coffee
 create mode 100644 src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.tpl.html

diff --git a/src/app/projects/states/core-progress-indicator/core-progress-indicator.coffee b/src/app/projects/states/core-progress-indicator/core-progress-indicator.coffee
new file mode 100644
index 0000000000..3e3b0be02d
--- /dev/null
+++ b/src/app/projects/states/core-progress-indicator/core-progress-indicator.coffee
@@ -0,0 +1,14 @@
+angular.module('doubtfire.projects.states.core-progress-indicator', [])
+
+.config ($stateProvider) ->
+  $stateProvider.state 'projects/core-progress-indicator',
+    parent: 'projects/index'
+    url: '/core-progress-indicator'
+    controller: 'CoreProgressIndicatorStateCtrl'
+    templateUrl: 'projects/states/core-progress-indicator/core-progress-indicator.tpl.html'
+    data:
+      task: "Core Progress Indicator"
+      pageTitle: "_Home_"
+      roleWhitelist: ['Student']
+
+.controller 'CoreProgressIndicatorStateCtrl', ($scope) ->
diff --git a/src/app/projects/states/core-progress-indicator/core-progress-indicator.tpl.html b/src/app/projects/states/core-progress-indicator/core-progress-indicator.tpl.html
new file mode 100644
index 0000000000..503c6c1b53
--- /dev/null
+++ b/src/app/projects/states/core-progress-indicator/core-progress-indicator.tpl.html
@@ -0,0 +1,9 @@
+<div class="panel panel-default">
+  <div class="panel-heading">
+    <h4>Core Progress Indicator</h4>
+  </div>
+
+  <div class="panel-body">
+    <core-progress-indicator project="project"></core-progress-indicator>
+  </div>
+</div>
diff --git a/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.coffee b/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.coffee
new file mode 100644
index 0000000000..8744bf2d98
--- /dev/null
+++ b/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.coffee
@@ -0,0 +1,22 @@
+
+angular.module('doubtfire.projects.states.dashboard.directives.core-progress-indicator', [])
+.directive 'coreProgressIndicator', ($http) ->
+  restrict: 'E'
+  scope:
+    project: '='
+  templateUrl: 'projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.tpl.html'
+
+  link: (scope) ->
+
+    scope.progress = null
+
+    scope.$watch 'project', (project) ->
+      return unless project?
+      console.log "Core progress project:", project
+
+      unitId = project.unit.id
+      studentId = project.user_id || project.user?.id || project.student?.id
+
+      $http.get("/api/peer_progress/#{unitId}/#{studentId}")
+        .then (res) ->
+          scope.progress = res.data
diff --git a/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.tpl.html b/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.tpl.html
new file mode 100644
index 0000000000..6694d18d1b
--- /dev/null
+++ b/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.tpl.html
@@ -0,0 +1,32 @@
+<div class="card card-default card-lg card-core-progress-indicator">
+  <div class="card-heading">
+    <h4>Core Progress Summary</h4>
+  </div>
+
+  <div class="card-body" ng-if="!progress">
+    Loading progress...
+  </div>
+
+  <div class="card-body" ng-if="progress">
+    <p>
+      <strong>Target Grade:</strong>
+      {{progress.target_grade}}
+    </p>
+
+    <p>
+  <strong>Progress:</strong>
+  <span class="core-progress-bar">
+    <span
+      class="core-progress-fill"
+      ng-style="{width: progress.progress_percentage + '%'}">
+    </span>
+  </span>
+  {{progress.progress_percentage}}%
+</p>
+
+    <p>
+      <strong>Tasks Completed:</strong>
+      {{progress.tasks_completed}} / {{progress.tasks_required}}
+    </p>
+  </div>
+</div>

From 44624ea820add25ee11fecfdba5637469a29e80a Mon Sep 17 00:00:00 2001
From: SanjanaBottu <bottusanjanasridhar@gmail.com>
Date: Wed, 29 Apr 2026 21:40:25 +1000
Subject: [PATCH 03/10] Remove debug console log

---
 .../core-progress-indicator/core-progress-indicator.coffee       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.coffee b/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.coffee
index 8744bf2d98..5da9f70fb6 100644
--- a/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.coffee
+++ b/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.coffee
@@ -12,7 +12,6 @@ angular.module('doubtfire.projects.states.dashboard.directives.core-progress-ind
 
     scope.$watch 'project', (project) ->
       return unless project?
-      console.log "Core progress project:", project
 
       unitId = project.unit.id
       studentId = project.user_id || project.user?.id || project.student?.id

From 1ae1484f2d94db98e7d195ece48d27a77b916f90 Mon Sep 17 00:00:00 2001
From: SanjanaBottu <bottusanjanasridhar@gmail.com>
Date: Wed, 29 Apr 2026 22:37:26 +1000
Subject: [PATCH 04/10] Restore progress dashboard sections

---
 .../progress-dashboard.tpl.html               | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.tpl.html b/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.tpl.html
index f5a307bd81..e777f14ffe 100644
--- a/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.tpl.html
+++ b/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.tpl.html
@@ -4,21 +4,23 @@ <h4 class="panel-title">
       Progress Dashboard <span ng-show="tutor">for {{project.student.name}}</span>
     </h4>
   </div><!--/panel-heading-->
-  <div class="panel-body">
 
+  <div class="panel-body">
     <div class="col-sm-12 col-xl-12">
       <div class="card">
         <f-task-planner-card [project]="project"></f-task-planner-card>
       </div>
     </div>
+
     <div class="col-sm-12 col-xl-12">
-  <core-progress-indicator project="project"></core-progress-indicator>
-</div>
+      <core-progress-indicator project="project"></core-progress-indicator>
+    </div>
+
     <div class="col-sm-12 col-xl-6">
       <div class="card card-default card-sm card-target-grade">
         <div class="card-heading">
           <h4>Target Grade</h4>
-        </div><!--/target-grade-heading-->
+        </div>
         <div class="card-body">
           <select
             class="form-control input-lg"
@@ -26,27 +28,29 @@ <h4>Target Grade</h4>
             ng-options="grade as grades.names[grade] for grade in grades.values"
             ng-if="$index != 4"
             ng-change="updateTargetGrade(project.targetGrade)"></select>
-        </div><!--/target-grade-body-->
-      </div><!--/target-grade-card-->
+        </div>
+      </div>
+
       <div class="card card-default card-lg card-burndown">
         <div class="card-heading">
           <h4>Progress Burndown</h4>
           <div class="text-muted">
             The burndown chart shows how much work remains for you to achieve your target grade.
           </div>
-        </div><!--/burndown-heading-->
+        </div>
         <div class="card-body">
           <progress-burndown-chart project="project" unit="project.unit"></progress-burndown-chart>
-        </div><!--/burndown-body-->
+        </div>
         <div class="card-footer">
           Aim to keep your
           <strong style="color: #e01b5d">Complete</strong>
           line close to or ahead of the
           <strong class="text-muted">Target</strong>
           line to keep on track.
-        </div><!--/burndown-footer-->
-      </div><!--/burndown-card-->
-    </div><!--/burndown-column-->
+        </div>
+      </div>
+    </div>
+
     <div class="col-sm-12 col-xl-6">
       <div class="card card-default card-lg card-pie-chart">
         <div class="card-heading">
@@ -54,14 +58,14 @@ <h4>Task Statuses</h4>
           <div class="text-muted">
             Breakdown summary of each of your task statuses.
           </div>
-        </div><!--/pie-chart-heading-->
+        </div>
         <div class="card-body">
           <student-task-status-pie-chart
             project="project"
             update-data="renderTaskStatusPieChart">
           </student-task-status-pie-chart>
-        </div><!--/pie-chart-body-->
-      </div><!--/pie-chart-card-->
-    </div><!--/pie-chart-column-->
+        </div>
+      </div>
+    </div>
   </div><!--/panel-body-->
 </div>

From 9c32605988be548777a88a7ba885f8fdb7503327 Mon Sep 17 00:00:00 2001
From: SanjanaBottu <bottusanjanasridhar@gmail.com>
Date: Thu, 30 Apr 2026 13:43:38 +1000
Subject: [PATCH 05/10] Fix peer progress API URL

---
 .../core-progress-indicator.coffee                        | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.coffee b/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.coffee
index 5da9f70fb6..c0f0009d03 100644
--- a/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.coffee
+++ b/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.coffee
@@ -14,8 +14,10 @@ angular.module('doubtfire.projects.states.dashboard.directives.core-progress-ind
       return unless project?
 
       unitId = project.unit.id
-      studentId = project.user_id || project.user?.id || project.student?.id
-
-      $http.get("/api/peer_progress/#{unitId}/#{studentId}")
+      studentId = project.student?.id || project.studentId || project.userId || project.user_id
+      $http.get("http://localhost:3000/api/peer_progress/#{unitId}/#{studentId}")
         .then (res) ->
           scope.progress = res.data
+
+
+

From 47d28dc6fa624b422f43d24295e1c72a6f7f5896 Mon Sep 17 00:00:00 2001
From: SanjanaBottu <bottusanjanasridhar@gmail.com>
Date: Mon, 4 May 2026 16:32:27 +1000
Subject: [PATCH 06/10] Refined core progress indicator UI and comments

---
 .../core-progress-indicator.tpl.html          | 39 ++++++++++---------
 .../progress-dashboard.scss                   | 37 ++++++++++++++----
 .../progress-dashboard.tpl.html               | 24 ++++++------
 3 files changed, 63 insertions(+), 37 deletions(-)

diff --git a/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.tpl.html b/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.tpl.html
index 6694d18d1b..888c13b170 100644
--- a/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.tpl.html
+++ b/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.tpl.html
@@ -1,32 +1,35 @@
-<div class="card card-default card-lg card-core-progress-indicator">
+<div class="card card-default card-core-progress-indicator">
   <div class="card-heading">
     <h4>Core Progress Summary</h4>
+    <div class="text-muted">
+      Track your progress toward your selected target grade based on completed tasks.
+    </div>
   </div>
 
   <div class="card-body" ng-if="!progress">
     Loading progress...
   </div>
 
-  <div class="card-body" ng-if="progress">
-    <p>
+  <div class="card-body core-progress-body" ng-if="progress">
+    <div class="core-progress-line">
       <strong>Target Grade:</strong>
-      {{progress.target_grade}}
-    </p>
+      <span>{{progress.target_grade}}</span>
+    </div>
 
-    <p>
-  <strong>Progress:</strong>
-  <span class="core-progress-bar">
-    <span
-      class="core-progress-fill"
-      ng-style="{width: progress.progress_percentage + '%'}">
-    </span>
-  </span>
-  {{progress.progress_percentage}}%
-</p>
+    <div class="core-progress-line">
+      <strong>Progress:</strong>
+      <span class="core-progress-bar">
+        <span
+          class="core-progress-fill"
+          ng-style="{width: progress.progress_percentage + '%'}">
+        </span>
+      </span>
+      <span>{{progress.progress_percentage}}%</span>
+    </div>
 
-    <p>
+    <div class="core-progress-line">
       <strong>Tasks Completed:</strong>
-      {{progress.tasks_completed}} / {{progress.tasks_required}}
-    </p>
+      <span>{{progress.tasks_completed}} / {{progress.tasks_required}}</span>
+    </div>
   </div>
 </div>
diff --git a/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.scss b/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.scss
index ad5c3a3013..aad67dec2b 100644
--- a/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.scss
+++ b/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.scss
@@ -1,15 +1,38 @@
+.card-core-progress-indicator {
+  margin-bottom: 16px;
+  min-height: unset;
+}
+
+.card-core-progress-indicator .card-body {
+  min-height: unset;
+}
+
+.core-progress-body {
+  padding: 14px 20px;
+}
+
+.core-progress-line {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  margin-bottom: 8px;
+}
+
+.core-progress-line strong {
+  width: 150px;
+}
+
 .core-progress-bar {
   display: inline-block;
-  width: 180px;
-  height: 16px;
-  background: #e5e7eb;
-  border: 1px solid #777;
-  vertical-align: middle;
-  margin: 0 8px;
+  width: 220px;
+  height: 18px;
+  background: #e5e5e5;
+  border: 1px solid #aaa;
+  overflow: hidden;
 }
 
 .core-progress-fill {
   display: block;
   height: 100%;
-  background: #2f64b7;
+  background: #3b6dbb;
 }
diff --git a/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.tpl.html b/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.tpl.html
index e777f14ffe..74af557b32 100644
--- a/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.tpl.html
+++ b/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.tpl.html
@@ -20,7 +20,7 @@ <h4 class="panel-title">
       <div class="card card-default card-sm card-target-grade">
         <div class="card-heading">
           <h4>Target Grade</h4>
-        </div>
+        </div><!--/target-grade-heading-->
         <div class="card-body">
           <select
             class="form-control input-lg"
@@ -28,28 +28,28 @@ <h4>Target Grade</h4>
             ng-options="grade as grades.names[grade] for grade in grades.values"
             ng-if="$index != 4"
             ng-change="updateTargetGrade(project.targetGrade)"></select>
-        </div>
-      </div>
+        </div><!--/target-grade-body-->
+      </div><!--/target-grade-card-->
 
       <div class="card card-default card-lg card-burndown">
         <div class="card-heading">
           <h4>Progress Burndown</h4>
           <div class="text-muted">
             The burndown chart shows how much work remains for you to achieve your target grade.
-          </div>
+          </div><!--/burndown-heading-->
         </div>
         <div class="card-body">
           <progress-burndown-chart project="project" unit="project.unit"></progress-burndown-chart>
-        </div>
+        </div><!--/burndown-body-->
         <div class="card-footer">
           Aim to keep your
           <strong style="color: #e01b5d">Complete</strong>
           line close to or ahead of the
           <strong class="text-muted">Target</strong>
           line to keep on track.
-        </div>
-      </div>
-    </div>
+        </div><!--/burndown-footer-->
+      </div><!--/burndown-card-->
+    </div><!--/burndown-column-->
 
     <div class="col-sm-12 col-xl-6">
       <div class="card card-default card-lg card-pie-chart">
@@ -57,15 +57,15 @@ <h4>Progress Burndown</h4>
           <h4>Task Statuses</h4>
           <div class="text-muted">
             Breakdown summary of each of your task statuses.
-          </div>
+          </div><!--/pie-chart-heading-->
         </div>
         <div class="card-body">
           <student-task-status-pie-chart
             project="project"
             update-data="renderTaskStatusPieChart">
           </student-task-status-pie-chart>
-        </div>
-      </div>
-    </div>
+        </div><!--/pie-chart-body-->
+      </div><!--/pie-chart-card-->
+    </div><!--/pie-chart-column-->
   </div><!--/panel-body-->
 </div>

From 4797919af9754e7b6d6677827529feae9e998814 Mon Sep 17 00:00:00 2001
From: SanjanaBottu <bottusanjanasridhar@gmail.com>
Date: Wed, 6 May 2026 21:07:58 +1000
Subject: [PATCH 07/10] Update peer progress flow and UI

---
 .../task-dropdown.component.html              |  3 +-
 .../core-progress-indicator.coffee            |  2 +-
 .../core-progress-indicator.tpl.html          | 22 ++++--
 .../core-progress-indicator.coffee            |  6 +-
 .../core-progress-indicator.tpl.html          | 53 +++++++-------
 .../progress-dashboard.scss                   | 71 +++++++++++++++++++
 .../progress-dashboard.tpl.html               |  4 --
 7 files changed, 119 insertions(+), 42 deletions(-)

diff --git a/src/app/common/header/task-dropdown/task-dropdown.component.html b/src/app/common/header/task-dropdown/task-dropdown.component.html
index 99a237fd7c..9457fe3c16 100644
--- a/src/app/common/header/task-dropdown/task-dropdown.component.html
+++ b/src/app/common/header/task-dropdown/task-dropdown.component.html
@@ -68,10 +68,9 @@
           [uiParams]="{projectId: currentProject.id, taskAbbr: ''}"
           mat-menu-item
         >
-          <mat-icon fontIcon="insights"></mat-icon> Core Progress Indicator
+          <mat-icon fontIcon="trending_up"></mat-icon> Peer Progress
         </button>
 
-<mat-divider></mat-divider>
         <mat-divider></mat-divider>
         <button
           uiSref="projects/outcomes"
diff --git a/src/app/projects/states/core-progress-indicator/core-progress-indicator.coffee b/src/app/projects/states/core-progress-indicator/core-progress-indicator.coffee
index 3e3b0be02d..0b7c615aed 100644
--- a/src/app/projects/states/core-progress-indicator/core-progress-indicator.coffee
+++ b/src/app/projects/states/core-progress-indicator/core-progress-indicator.coffee
@@ -7,7 +7,7 @@ angular.module('doubtfire.projects.states.core-progress-indicator', [])
     controller: 'CoreProgressIndicatorStateCtrl'
     templateUrl: 'projects/states/core-progress-indicator/core-progress-indicator.tpl.html'
     data:
-      task: "Core Progress Indicator"
+      task: "Peer Progress"
       pageTitle: "_Home_"
       roleWhitelist: ['Student']
 
diff --git a/src/app/projects/states/core-progress-indicator/core-progress-indicator.tpl.html b/src/app/projects/states/core-progress-indicator/core-progress-indicator.tpl.html
index 503c6c1b53..7c4231317f 100644
--- a/src/app/projects/states/core-progress-indicator/core-progress-indicator.tpl.html
+++ b/src/app/projects/states/core-progress-indicator/core-progress-indicator.tpl.html
@@ -1,9 +1,19 @@
-<div class="panel panel-default">
-  <div class="panel-heading">
-    <h4>Core Progress Indicator</h4>
-  </div>
+<div class="peer-progress-page">
+  <h1>Peer Progress</h1>
+  <p class="peer-progress-subtitle">
+    {{project.unit.code}} — {{project.unit.name}}
+  </p>
+
+  <div class="card card-default peer-progress-card">
+    <div class="card-heading">
+      <h4>Progress Summary</h4>
+      <div class="text-muted">
+        Track your progress toward your selected target grade based on completed tasks.
+      </div>
+    </div>
 
-  <div class="panel-body">
-    <core-progress-indicator project="project"></core-progress-indicator>
+    <div class="card-body">
+      <core-progress-indicator project="project"></core-progress-indicator>
+    </div>
   </div>
 </div>
diff --git a/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.coffee b/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.coffee
index c0f0009d03..09adc037b8 100644
--- a/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.coffee
+++ b/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.coffee
@@ -1,6 +1,6 @@
 
 angular.module('doubtfire.projects.states.dashboard.directives.core-progress-indicator', [])
-.directive 'coreProgressIndicator', ($http) ->
+.directive 'coreProgressIndicator', ($http, DoubtfireConstants) ->
   restrict: 'E'
   scope:
     project: '='
@@ -15,9 +15,11 @@ angular.module('doubtfire.projects.states.dashboard.directives.core-progress-ind
 
       unitId = project.unit.id
       studentId = project.student?.id || project.studentId || project.userId || project.user_id
-      $http.get("http://localhost:3000/api/peer_progress/#{unitId}/#{studentId}")
+      $http.get("#{DoubtfireConstants.API_URL}/peer_progress/#{unitId}/#{studentId}")
         .then (res) ->
           scope.progress = res.data
+          .catch ->
+          scope.error = 'Unable to load progress data.'
 
 
 
diff --git a/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.tpl.html b/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.tpl.html
index 888c13b170..8ef5555b83 100644
--- a/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.tpl.html
+++ b/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.tpl.html
@@ -1,35 +1,34 @@
-<div class="card card-default card-core-progress-indicator">
-  <div class="card-heading">
-    <h4>Core Progress Summary</h4>
-    <div class="text-muted">
-      Track your progress toward your selected target grade based on completed tasks.
-    </div>
-  </div>
+<div ng-if="error" class="peer-progress-error">
+  {{error}}
+</div>
+
+<div ng-if="!progress && !error">
+  Loading progress...
+</div>
 
-  <div class="card-body" ng-if="!progress">
-    Loading progress...
+<div ng-if="progress" class="peer-progress-summary">
+  <div class="peer-progress-stat">
+    <div class="peer-progress-stat-value">{{progress.target_grade}}</div>
+    <div class="peer-progress-stat-label">Target grade</div>
   </div>
 
-  <div class="card-body core-progress-body" ng-if="progress">
-    <div class="core-progress-line">
-      <strong>Target Grade:</strong>
-      <span>{{progress.target_grade}}</span>
-    </div>
+  <div class="peer-progress-stat">
+    <div class="peer-progress-stat-value">{{progress.tasks_completed}}</div>
+    <div class="peer-progress-stat-label">Tasks completed</div>
+  </div>
 
-    <div class="core-progress-line">
-      <strong>Progress:</strong>
-      <span class="core-progress-bar">
-        <span
-          class="core-progress-fill"
-          ng-style="{width: progress.progress_percentage + '%'}">
-        </span>
-      </span>
-      <span>{{progress.progress_percentage}}%</span>
-    </div>
+  <div class="peer-progress-stat">
+    <div class="peer-progress-stat-value">{{progress.progress_percentage}}%</div>
+    <div class="peer-progress-stat-label">Progress</div>
+  </div>
 
-    <div class="core-progress-line">
-      <strong>Tasks Completed:</strong>
-      <span>{{progress.tasks_completed}} / {{progress.tasks_required}}</span>
+  <div class="peer-progress-bar-row">
+    <div class="peer-progress-bar">
+      <div
+        class="peer-progress-bar-fill"
+        ng-style="{ width: progress.progress_percentage + '%' }">
+      </div>
     </div>
+    <strong>{{progress.tasks_completed}} / {{progress.tasks_required}}</strong>
   </div>
 </div>
diff --git a/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.scss b/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.scss
index aad67dec2b..1d7145acde 100644
--- a/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.scss
+++ b/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.scss
@@ -36,3 +36,74 @@
   height: 100%;
   background: #3b6dbb;
 }
+
+.peer-progress-page {
+  max-width: 1200px;
+  margin: 32px auto;
+  padding: 0 24px;
+}
+
+.peer-progress-page h1 {
+  font-size: 28px;
+  font-weight: 600;
+  margin-bottom: 8px;
+}
+
+.peer-progress-subtitle {
+  font-size: 18px;
+  color: #444;
+  margin-bottom: 24px;
+}
+
+.peer-progress-card {
+  margin-bottom: 24px;
+}
+
+.peer-progress-summary {
+  display: grid;
+  gap: 18px;
+}
+
+.peer-progress-stat {
+  display: inline-block;
+  width: 31%;
+  margin-right: 2%;
+  padding: 18px 20px;
+  background: #f5f7ff;
+  border-radius: 4px;
+  vertical-align: top;
+}
+
+.peer-progress-stat-value {
+  font-size: 28px;
+  font-weight: 600;
+  color: #333;
+}
+
+.peer-progress-stat-label {
+  color: #666;
+  margin-top: 4px;
+}
+
+.peer-progress-bar-row {
+  display: flex;
+  align-items: center;
+  gap: 16px;
+}
+
+.peer-progress-bar {
+  flex: 1;
+  height: 18px;
+  background: #e5e5e5;
+  border-radius: 4px;
+  overflow: hidden;
+}
+
+.peer-progress-bar-fill {
+  height: 100%;
+  background: #3b45f5;
+}
+
+.peer-progress-error {
+  color: #a94442;
+}
diff --git a/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.tpl.html b/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.tpl.html
index 74af557b32..62b6abd231 100644
--- a/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.tpl.html
+++ b/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.tpl.html
@@ -12,10 +12,6 @@ <h4 class="panel-title">
       </div>
     </div>
 
-    <div class="col-sm-12 col-xl-12">
-      <core-progress-indicator project="project"></core-progress-indicator>
-    </div>
-
     <div class="col-sm-12 col-xl-6">
       <div class="card card-default card-sm card-target-grade">
         <div class="card-heading">

From 91927bb64c64e2f2bf8a690861f0e5e8f0286d0b Mon Sep 17 00:00:00 2001
From: SanjanaBottu <bottusanjanasridhar@gmail.com>
Date: Thu, 7 May 2026 04:23:26 +1000
Subject: [PATCH 08/10] Fix peer progress route and API integration

---
 .../core-progress-indicator.coffee            |  2 +-
 .../core-progress-indicator.coffee            | 20 ++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/app/projects/states/core-progress-indicator/core-progress-indicator.coffee b/src/app/projects/states/core-progress-indicator/core-progress-indicator.coffee
index 0b7c615aed..d12b03eb52 100644
--- a/src/app/projects/states/core-progress-indicator/core-progress-indicator.coffee
+++ b/src/app/projects/states/core-progress-indicator/core-progress-indicator.coffee
@@ -3,7 +3,7 @@ angular.module('doubtfire.projects.states.core-progress-indicator', [])
 .config ($stateProvider) ->
   $stateProvider.state 'projects/core-progress-indicator',
     parent: 'projects/index'
-    url: '/core-progress-indicator'
+    url: '/peer-progress'
     controller: 'CoreProgressIndicatorStateCtrl'
     templateUrl: 'projects/states/core-progress-indicator/core-progress-indicator.tpl.html'
     data:
diff --git a/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.coffee b/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.coffee
index 09adc037b8..51df120ba2 100644
--- a/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.coffee
+++ b/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.coffee
@@ -1,25 +1,27 @@
-
 angular.module('doubtfire.projects.states.dashboard.directives.core-progress-indicator', [])
-.directive 'coreProgressIndicator', ($http, DoubtfireConstants) ->
+
+.directive 'coreProgressIndicator', ['$http', 'DoubtfireConstants', ($http, DoubtfireConstants) ->
   restrict: 'E'
   scope:
     project: '='
   templateUrl: 'projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.tpl.html'
 
   link: (scope) ->
-
     scope.progress = null
+    scope.error = null
 
     scope.$watch 'project', (project) ->
       return unless project?
 
-      unitId = project.unit.id
-      studentId = project.student?.id || project.studentId || project.userId || project.user_id
+      unitId = project.unit?.id
+      studentId = project.user_id || project.user?.id || project.student?.id
+
+      return unless unitId? && studentId?
+
       $http.get("#{DoubtfireConstants.API_URL}/peer_progress/#{unitId}/#{studentId}")
         .then (res) ->
           scope.progress = res.data
-          .catch ->
+          scope.error = null
+        .catch ->
           scope.error = 'Unable to load progress data.'
-
-
-
+]

From aceb354d5145db08793d461a789a9266aa09fba5 Mon Sep 17 00:00:00 2001
From: SanjanaBottu <bottusanjanasridhar@gmail.com>
Date: Fri, 15 May 2026 00:49:18 +1000
Subject: [PATCH 09/10] Fix peer progress API integration and project data
 loading

---
 .../core-progress-indicator/core-progress-indicator.coffee  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.coffee b/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.coffee
index 51df120ba2..0a80954254 100644
--- a/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.coffee
+++ b/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.coffee
@@ -13,9 +13,13 @@ angular.module('doubtfire.projects.states.dashboard.directives.core-progress-ind
     scope.$watch 'project', (project) ->
       return unless project?
 
-      unitId = project.unit?.id
+      unitId = project.unit_id || project.unit?.id
       studentId = project.user_id || project.user?.id || project.student?.id
 
+      console.log "Peer progress project:", project
+      console.log "Peer progress unitId:", unitId
+      console.log "Peer progress studentId:", studentId
+
       return unless unitId? && studentId?
 
       $http.get("#{DoubtfireConstants.API_URL}/peer_progress/#{unitId}/#{studentId}")

From 8f217843659e29ef4e9432c747657d073d2bc8d9 Mon Sep 17 00:00:00 2001
From: SanjanaBottu <bottusanjanasridhar@gmail.com>
Date: Sun, 17 May 2026 16:30:55 +1000
Subject: [PATCH 10/10] Remove debug logging from peer progress

---
 .../core-progress-indicator/core-progress-indicator.coffee     | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.coffee b/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.coffee
index 0a80954254..4e5939ebaa 100644
--- a/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.coffee
+++ b/src/app/projects/states/dashboard/directives/core-progress-indicator/core-progress-indicator.coffee
@@ -16,9 +16,6 @@ angular.module('doubtfire.projects.states.dashboard.directives.core-progress-ind
       unitId = project.unit_id || project.unit?.id
       studentId = project.user_id || project.user?.id || project.student?.id
 
-      console.log "Peer progress project:", project
-      console.log "Peer progress unitId:", unitId
-      console.log "Peer progress studentId:", studentId
 
       return unless unitId? && studentId?