[#12596 ] Instructor extending individual deadlines: table doesn't sort by team…

src/e2e/java/teammates/e2e/cases/InstructorSessionIndividualExtensionPageE2ETest.java

@@ -32,7 +32,7 @@ public class InstructorSessionIndividualExtensionPageE2ETest extends BaseE2ETest
     protected void prepareTestData() {
         testData = loadDataBundle("/InstructorSessionIndividualExtensionPageE2ETest.json");
         testEmail = TestProperties.TEST_EMAIL;
-        testData.students.get("[email protected]").setEmail(testEmail);
+        removeAndRestoreDataBundle(testData);
         instructor = testData.instructors.get("ISesIe.instructor1");
         course = testData.courses.get("course");
         feedbackSession = testData.feedbackSessions.get("firstSession");
@@ -58,7 +58,7 @@ public void testAll() {
 
         ______TS("verify extend some deadlines, notifyUsers enabled");
 
-        individualExtensionPage.selectStudents(0, 2); // alice and charlie
+        individualExtensionPage.selectStudents(0, 1); // alice and charlie
         individualExtensionPage.selectInstructor(0); // instructor 1
 
         individualExtensionPage.extendDeadlineByTwelveHours(true);
@@ -69,7 +69,7 @@ public void testAll() {
         Map<String, Instant> updatedInstructorDeadlines = updatedSession.getInstructorDeadlines();
         Instant expectedDeadline = feedbackSession.getEndTime().plus(Duration.ofHours(12));
 
-        verifyUpdatedDeadlinesMap(updatedStudentDeadlines, TestProperties.TEST_EMAIL, "[email protected]");
+        verifyUpdatedDeadlinesMap(updatedStudentDeadlines, testEmail, "[email protected]");
         verifyUpdatedDeadlinesMap(updatedInstructorDeadlines, "[email protected]");
         verifyDeadlineExtensionsPresentOrAbsent(updatedStudentDeadlines, updatedInstructorDeadlines, expectedDeadline);
 
@@ -92,7 +92,7 @@ public void testAll() {
         updatedStudentDeadlines = updatedSession.getStudentDeadlines();
         updatedInstructorDeadlines = updatedSession.getInstructorDeadlines();
 
-        verifyUpdatedDeadlinesMap(updatedStudentDeadlines, TestProperties.TEST_EMAIL, "[email protected]");
+        verifyUpdatedDeadlinesMap(updatedStudentDeadlines, testEmail, "[email protected]");
         verifyUpdatedDeadlinesMap(updatedInstructorDeadlines, "[email protected]");
         verifyDeadlineExtensionsPresentOrAbsent(updatedStudentDeadlines, updatedInstructorDeadlines, expectedDeadline);
 

src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json

@@ -122,8 +122,39 @@
       "isOpeningEmailEnabled": true,
       "isClosingEmailEnabled": true,
       "isPublishedEmailEnabled": true,
-      "studentDeadlines": {},
-      "instructorDeadlines": {}
+      "studentDeadlines": {
+        "[email protected]": "2032-04-30T17:00:00Z",
+        "[email protected]": "2032-04-30T17:00:00Z"
+      },
+      "instructorDeadlines": {
+        "[email protected]": "2032-04-30T17:00:00Z"
+      }
+    },
+    "openSession": {
+      "feedbackSessionName": "Open Session",
+      "courseId": "tm.e2e.ISesIe.CS2104",
+      "creatorEmail": "[email protected]",
+      "instructions": "<p>Instructions for Open Session</p>",
+      "createdTime": "2012-04-01T23:59:00Z",
+      "startTime": "2012-04-01T22:00:00Z",
+      "endTime": "2032-04-30T16:00:00Z",
+      "sessionVisibleFromTime": "2012-04-01T22:00:00Z",
+      "resultsVisibleFromTime": "2032-05-01T22:00:00Z",
+      "timeZone": "Asia/Singapore",
+      "gracePeriod": 10,
+      "sentOpenEmail": false,
+      "sentClosingEmail": false,
+      "sentClosedEmail": false,
+      "sentPublishedEmail": false,
+      "isOpeningEmailEnabled": true,
+      "isClosingEmailEnabled": true,
+      "isPublishedEmailEnabled": true,
+      "studentDeadlines": {
+        "[email protected]": "2032-04-30T17:00:00Z"
+      },
+      "instructorDeadlines": {
+        "[email protected]": "2032-04-30T17:00:00Z"
+      }
     }
   },
   "feedbackQuestions": {
@@ -160,7 +191,7 @@
     },
     "qn2": {
       "feedbackSessionName": "First Session",
-      "courseId": "tm.e2e.FRes.CS2104",
+      "courseId": "tm.e2e.ISesIe.CS2104",
       "questionDetails": {
         "questionType": "TEXT",
         "questionText": "First instructor question"
@@ -198,5 +229,38 @@
       }
     }
   },
-  "feedbackResponseComments": {}
+  "feedbackResponseComments": {},
+  "notifications": {},
+  "deadlineExtensions": {
+    "student1InCourse1Session1": {
+      "courseId": "tm.e2e.ISesIe.CS2104",
+      "feedbackSessionName": "First Session",
+      "userEmail": "[email protected]",
+      "isInstructor": false,
+      "endTime": "2032-05-01T05:00:00Z",
+      "sentClosingEmail": false,
+      "createdAt": "2032-05-01T01:00:00Z",
+      "updatedAt": "2032-05-01T01:00:00Z"
+    },
+    "student2InCourse1Session1": {
+      "courseId": "tm.e2e.ISesIe.CS2104",
+      "feedbackSessionName": "First Session",
+      "userEmail": "[email protected]",
+      "isInstructor": false,
+      "endTime": "2032-05-01T05:00:00Z",
+      "sentClosingEmail": false,
+      "createdAt": "2032-05-01T01:00:00Z",
+      "updatedAt": "2032-05-01T01:00:00Z"
+    },
+    "instructor1InCourse1Session1": {
+      "courseId": "tm.e2e.ISesIe.CS2104",
+      "feedbackSessionName": "First Session",
+      "userEmail": "[email protected]",
+      "isInstructor": true,
+      "endTime": "2032-05-01T05:00:00Z",
+      "sentClosingEmail": false,
+      "createdAt": "2032-05-01T01:00:00Z",
+      "updatedAt": "2032-05-01T01:00:00Z"
+    }
+  }
 }

src/e2e/resources/data/InstructorStudentActivityLogsPageE2ETest.json

@@ -43,7 +43,7 @@
   "students": {
     "[email protected]": {
       "googleId": "tm.e2e.ISActLogs.alice.tmms",
-      "email": "alice.b.[email protected]",
+      "email": "[email protected]",
       "course": "tm.e2e.ISActLogs.CS2104",
       "name": "Alice Betsy",
       "comments": "This student's name is Alice Betsy",

src/web/app/pages-instructor/instructor-session-individual-extension-page/instructor-session-individual-extension-page.component.ts

@@ -531,8 +531,8 @@ export class InstructorSessionIndividualExtensionPageComponent implements OnInit
           strB = b.sectionName;
           break;
         case SortBy.TEAM_NAME:
-          strA = a.sectionName;
-          strB = b.sectionName;
+          strA = a.teamName;
+          strB = b.teamName;
           break;
         case SortBy.RESPONDENT_NAME:
           strA = a.name;