From 822f46f1360c51541da04446917bd9d0e0ed31f6 Mon Sep 17 00:00:00 2001
From: Jonathan Lim-Breitbart <breity10@gmail.com>
Date: Thu, 29 Feb 2024 15:12:55 -0800
Subject: [PATCH] fix(Classroom Monitor): Grade by Student sort by location
 (#1667)

---
 .../shared/testing/ClassroomMonitorTestHelper.ts |  7 ++++++-
 .../student-progress.component.html              |  2 +-
 .../student-progress.component.ts                | 16 ++++++----------
 .../wise5/services/classroomStatusService.ts     | 13 +++++--------
 4 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/testing/ClassroomMonitorTestHelper.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/testing/ClassroomMonitorTestHelper.ts
index 9b28eb897a7..5461b028e51 100644
--- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/testing/ClassroomMonitorTestHelper.ts
+++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/testing/ClassroomMonitorTestHelper.ts
@@ -10,6 +10,7 @@ export class ClassroomMonitorTestHelper {
   students: StudentProgress[] = [
     new StudentProgress({
       location: '1.2: Open Response',
+      order: 2,
       workgroupId: this.workgroupId1,
       username: 'Spongebob Squarepants',
       firstName: 'Spongebob',
@@ -19,6 +20,7 @@ export class ClassroomMonitorTestHelper {
     }),
     new StudentProgress({
       location: '1.1: Open Response',
+      order: 1,
       workgroupId: this.workgroupId5,
       username: 'Patrick Star',
       firstName: 'Patrick',
@@ -28,6 +30,7 @@ export class ClassroomMonitorTestHelper {
     }),
     new StudentProgress({
       location: '1.5: Open Response',
+      order: 5,
       workgroupId: this.workgroupId3,
       username: 'Squidward Tentacles',
       firstName: 'Squidward',
@@ -36,7 +39,8 @@ export class ClassroomMonitorTestHelper {
       scorePct: 0.4
     }),
     new StudentProgress({
-      location: '1.9: Open Response',
+      location: '1.11: Open Response',
+      order: 11,
       workgroupId: this.workgroupId2,
       username: 'Sandy Cheeks',
       firstName: 'Sandy',
@@ -46,6 +50,7 @@ export class ClassroomMonitorTestHelper {
     }),
     new StudentProgress({
       location: '1.5: Open Response',
+      order: 5,
       workgroupId: this.workgroupId4,
       username: 'Sheldon Plankton',
       firstName: 'Sheldon',
diff --git a/src/assets/wise5/classroomMonitor/student-progress/student-progress.component.html b/src/assets/wise5/classroomMonitor/student-progress/student-progress.component.html
index fe1432293cf..6367f676dcc 100644
--- a/src/assets/wise5/classroomMonitor/student-progress/student-progress.component.html
+++ b/src/assets/wise5/classroomMonitor/student-progress/student-progress.component.html
@@ -74,7 +74,7 @@
                 </td>
               </ng-container>
               <td class="center td--wrap td--max-width">
-                {{ student.location }}
+                {{ student.position }}
               </td>
               <td fxLayout="row" fxLayoutAlign="center center">
                 <project-progress
diff --git a/src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts b/src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts
index a9e29d5e604..40304847b98 100644
--- a/src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts
+++ b/src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts
@@ -42,7 +42,7 @@ export class StudentProgressComponent implements OnInit {
     },
     location: {
       label: $localize`Location`,
-      fieldName: 'location',
+      fieldName: 'order',
       isNumeric: true
     },
     completion: {
@@ -117,7 +117,7 @@ export class StudentProgressComponent implements OnInit {
   }
 
   private updateTeam(workgroupId: number): void {
-    const location = this.getCurrentNodeForWorkgroupId(workgroupId) || '';
+    const location = this.classroomStatusService.getCurrentNodeLocationForWorkgroupId(workgroupId);
     const completion = this.classroomStatusService.getStudentProjectCompletion(workgroupId);
     const score = this.getStudentTotalScore(workgroupId) || 0;
     let maxScore = this.classroomStatusService.getMaxScoreForWorkgroupId(workgroupId);
@@ -125,7 +125,8 @@ export class StudentProgressComponent implements OnInit {
 
     for (const student of this.students) {
       if (student.workgroupId === workgroupId) {
-        student.location = location;
+        student.position = location?.position || '';
+        student.order = location?.order || 0;
         student.completion = completion;
         student.completionPct = completion.completionPct || 0;
         student.score = score;
@@ -135,12 +136,6 @@ export class StudentProgressComponent implements OnInit {
     }
   }
 
-  private getCurrentNodeForWorkgroupId(workgroupId: number): string {
-    return this.classroomStatusService.getCurrentNodePositionAndNodeTitleForWorkgroupId(
-      workgroupId
-    );
-  }
-
   private getStudentTotalScore(workgroupId: number): number {
     return this.dataService.getTotalScoreByWorkgroupId(workgroupId);
   }
@@ -214,7 +209,8 @@ export class StudentProgress {
   username: string;
   firstName: string;
   lastName: string;
-  location: string;
+  position: string;
+  order: number;
   completion: ProjectCompletion;
   completionPct: number;
   score: number;
diff --git a/src/assets/wise5/services/classroomStatusService.ts b/src/assets/wise5/services/classroomStatusService.ts
index 0d5dec36879..a9c59f4a767 100644
--- a/src/assets/wise5/services/classroomStatusService.ts
+++ b/src/assets/wise5/services/classroomStatusService.ts
@@ -51,17 +51,14 @@ export class ClassroomStatusService {
     return this.studentStatuses;
   }
 
-  /**
-   * Get the current node position and title for a workgroup
-   * e.g. 2.2: Newton Scooter Concepts
-   * @param workgroupId the workgroup id
-   * @returns the node position and title
-   */
-  getCurrentNodePositionAndNodeTitleForWorkgroupId(workgroupId) {
+  getCurrentNodeLocationForWorkgroupId(workgroupId: number): any {
     const studentStatus = this.getStudentStatusForWorkgroupId(workgroupId);
     if (studentStatus != null) {
       const currentNodeId = studentStatus.currentNodeId;
-      return this.projectService.getNodePositionAndTitle(currentNodeId);
+      return {
+        position: this.projectService.getNodePositionAndTitle(currentNodeId),
+        order: this.projectService.getNodeOrderById(currentNodeId)
+      };
     }
     return null;
   }