Update grading tables to include student username (#2641)

chownces · web-flow · commit 70d24af1f5e9 · 2023-08-25T11:32:18.000+08:00
* Update grading tables to include student username

* Fix lint

* Add assessment number to CSV export
diff --git a/src/commons/application/actions/__tests__/SessionActions.ts b/src/commons/application/actions/__tests__/SessionActions.ts
@@ -509,6 +509,7 @@ test('updateGradingOverviews generates correct action object', () => {
   const overviews: GradingOverview[] = [
     {
       assessmentId: 1,
+      assessmentNumber: 'M1A',
       assessmentName: 'test assessment',
       assessmentType: 'Contests',
       initialXp: 0,
@@ -518,6 +519,7 @@ test('updateGradingOverviews generates correct action object', () => {
       maxXp: 500,
       studentId: 100,
       studentName: 'test student',
+      studentUsername: 'E0123456',
       submissionId: 1,
       submissionStatus: 'attempting',
       groupName: 'group',
@@ -541,6 +543,7 @@ test('updateGrading generates correct action object', () => {
       question: jest.genMockFromModule('../../../../features/grading/GradingTypes'),
       student: {
         name: 'test student',
+        username: 'E0123456',
         id: 234
       },
       grade: {
diff --git a/src/commons/application/reducers/__tests__/SessionReducer.ts b/src/commons/application/reducers/__tests__/SessionReducer.ts
@@ -385,6 +385,7 @@ const gradingTest1: Grading = [
     question: jest.genMockFromModule('../../../../features/grading/GradingTypes'),
     student: {
       name: 'test student',
+      username: 'E0123456',
       id: 234
     },
     grade: {
@@ -400,6 +401,7 @@ const gradingTest2: Grading = [
     question: jest.genMockFromModule('../../../../features/grading/GradingTypes'),
     student: {
       name: 'another test student',
+      username: 'E0000000',
       id: 345
     },
     grade: {
@@ -473,6 +475,7 @@ test('UPDATE_GRADING works correctly in updating gradings', () => {
 const gradingOverviewTest1: GradingOverview[] = [
   {
     assessmentId: 1,
+    assessmentNumber: 'M1A',
     assessmentName: 'test assessment',
     assessmentType: 'Contests',
     initialXp: 0,
@@ -482,6 +485,7 @@ const gradingOverviewTest1: GradingOverview[] = [
     maxXp: 500,
     studentId: 100,
     studentName: 'test student',
+    studentUsername: 'E0123456',
     submissionId: 1,
     submissionStatus: 'attempting',
     groupName: 'group',
@@ -494,6 +498,7 @@ const gradingOverviewTest1: GradingOverview[] = [
 const gradingOverviewTest2: GradingOverview[] = [
   {
     assessmentId: 2,
+    assessmentNumber: 'P2',
     assessmentName: 'another assessment',
     assessmentType: 'Quests',
     initialXp: 20,
@@ -503,6 +508,7 @@ const gradingOverviewTest2: GradingOverview[] = [
     maxXp: 1000,
     studentId: 20,
     studentName: 'another student',
+    studentUsername: 'E0000000',
     submissionId: 2,
     submissionStatus: 'attempted',
     groupName: 'another group',
diff --git a/src/commons/mocks/GradingMocks.ts b/src/commons/mocks/GradingMocks.ts
@@ -9,6 +9,7 @@ export const mockGradingOverviews: GradingOverview[] = [
   {
     xpAdjustment: 0,
     assessmentType: 'Missions',
+    assessmentNumber: 'M1A',
     assessmentId: 0,
     assessmentName: 'Mission 0 ',
     currentXp: 69,
@@ -17,6 +18,7 @@ export const mockGradingOverviews: GradingOverview[] = [
     maxXp: 100,
     studentId: 0,
     studentName: 'Al Gorithm',
+    studentUsername: 'E0123456',
     submissionId: 1,
     submissionStatus: 'submitted',
     groupName: '1D',
@@ -27,6 +29,7 @@ export const mockGradingOverviews: GradingOverview[] = [
   {
     xpAdjustment: -2,
     assessmentType: 'Missions',
+    assessmentNumber: 'M2',
     assessmentId: 1,
     assessmentName: 'Mission 1',
     currentXp: -2,
@@ -35,6 +38,7 @@ export const mockGradingOverviews: GradingOverview[] = [
     maxXp: 400,
     studentId: 0,
     studentName: 'Dee Sign',
+    studentUsername: 'E0000000',
     submissionId: 2,
     submissionStatus: 'submitted',
     groupName: '1F',
@@ -45,6 +49,7 @@ export const mockGradingOverviews: GradingOverview[] = [
   {
     xpAdjustment: 4,
     assessmentType: 'Missions',
+    assessmentNumber: 'M3',
     assessmentId: 0,
     assessmentName: 'Mission 0',
     currentXp: 1000,
@@ -53,6 +58,7 @@ export const mockGradingOverviews: GradingOverview[] = [
     maxXp: 1000,
     studentId: 1,
     studentName: 'May Trix',
+    studentUsername: 'E0000001',
     submissionId: 3,
     submissionStatus: 'submitted',
     groupName: '1F',
@@ -208,6 +214,7 @@ _italics_
     },
     student: {
       name: 'Al Gorithm',
+      username: 'E0123456',
       id: 0
     }
   },
@@ -298,6 +305,7 @@ New message from **Avenger**!
     },
     student: {
       name: 'Al Gorithm',
+      username: 'E0000000',
       id: 0
     }
   },
@@ -372,6 +380,7 @@ New message from **Avenger**!
     },
     student: {
       name: 'Al Gorithm',
+      username: 'E0000000',
       id: 0
     }
   }
diff --git a/src/commons/sagas/RequestsSaga.ts b/src/commons/sagas/RequestsSaga.ts
@@ -619,9 +619,11 @@ export const getGradingOverviews = async (
     .map((overview: any) => {
       const gradingOverview: GradingOverview = {
         assessmentId: overview.assessment.id,
+        assessmentNumber: overview.assessment.assessmentNumber,
         assessmentName: overview.assessment.title,
         assessmentType: overview.assessment.type,
         studentId: overview.student.id,
+        studentUsername: overview.student.username,
         studentName: overview.student.name,
         submissionId: overview.id,
         submissionStatus: overview.status,
diff --git a/src/features/grading/GradingTypes.ts b/src/features/grading/GradingTypes.ts
@@ -14,6 +14,7 @@ import { Notification } from '../../commons/notificationBadge/NotificationBadgeT
  */
 export type GradingOverview = {
   assessmentId: number;
+  assessmentNumber: string;
   assessmentName: string;
   assessmentType: AssessmentType;
   initialXp: number;
@@ -23,6 +24,7 @@ export type GradingOverview = {
   maxXp: number;
   studentId: number;
   studentName: string;
+  studentUsername: string;
   submissionId: number;
   submissionStatus: string;
   groupName: string;
@@ -50,6 +52,7 @@ export type GradingQuestion = {
   question: AnsweredQuestion;
   student: {
     name: string;
+    username: string;
     id: number;
   };
   grade: {
diff --git a/src/pages/academy/grading/Grading.tsx b/src/pages/academy/grading/Grading.tsx
@@ -65,12 +65,14 @@ const Grading: React.FC = () => {
 
     const content = new Blob(
       [
-        '"Assessment Name","Student Name","Group","Status","Grading","Question Count","Questions Graded","Initial XP","XP Adjustment","Current XP (excl. bonus)","Max XP","Bonus XP"\n',
+        '"Assessment Number","Assessment Name","Student Name","Student Username","Group","Status","Grading","Question Count","Questions Graded","Initial XP","XP Adjustment","Current XP (excl. bonus)","Max XP","Bonus XP"\n',
         ...gradingOverviews.map(
           e =>
             [
+              e.assessmentNumber,
               e.assessmentName,
               e.studentName,
+              e.studentUsername,
               e.groupName,
               e.submissionStatus,
               e.gradingStatus,
diff --git a/src/pages/academy/grading/subcomponents/GradingEditor.tsx b/src/pages/academy/grading/subcomponents/GradingEditor.tsx
@@ -47,6 +47,7 @@ type OwnProps = {
   xpAdjustment: number;
   maxXp: number;
   studentName: string;
+  studentUsername: string;
   comments: string;
   graderName?: string;
   gradedAt?: string;
@@ -234,7 +235,9 @@ const GradingEditor: React.FC<GradingEditorProps> = props => {
       />
 
       <div className="grading-editor-header">
-        <H3>Currently Grading: {props.studentName}</H3>
+        <H3>
+          Currently Grading: {props.studentName} ({props.studentUsername})
+        </H3>
       </div>
       {props.solution !== null ? (
         <div className="grading-editor-marking-scheme">
diff --git a/src/pages/academy/grading/subcomponents/GradingSubmissionsTable.tsx b/src/pages/academy/grading/subcomponents/GradingSubmissionsTable.tsx
@@ -56,6 +56,10 @@ const columns = [
     header: 'Student',
     cell: info => <Filterable column={info.column} value={info.getValue()} />
   }),
+  columnHelper.accessor('studentUsername', {
+    header: 'Username',
+    cell: info => <Filterable column={info.column} value={info.getValue()} />
+  }),
   columnHelper.accessor('groupName', {
     header: 'Group',
     cell: info => <Filterable column={info.column} value={info.getValue()} />
diff --git a/src/pages/academy/grading/subcomponents/GradingWorkspace.tsx b/src/pages/academy/grading/subcomponents/GradingWorkspace.tsx
@@ -305,6 +305,7 @@ const GradingWorkspace: React.FC<GradingWorkspaceProps> = props => {
             xpAdjustment={grading![questionId].grade.xpAdjustment}
             maxXp={grading![questionId].question.maxXp}
             studentName={grading![questionId].student.name}
+            studentUsername={grading![questionId].student.username}
             comments={grading![questionId].grade.comments ?? ''}
             graderName={
               grading![questionId].grade.grader
