Grading CSV

src/commons/application/actions/__tests__/SessionActions.ts

@@ -539,6 +539,7 @@ test('updateGradingOverviews generates correct action object', () => {
         assessmentNumber: 'M1A',
         assessmentName: 'test assessment',
         assessmentType: 'Contests',
+        questions: '',
         initialXp: 0,
         xpBonus: 100,
         xpAdjustment: 50,

src/commons/application/reducers/__tests__/SessionReducer.ts

@@ -502,6 +502,7 @@ const gradingOverviewTest1: GradingOverview[] = [
     assessmentId: 1,
     assessmentNumber: 'M1A',
     assessmentName: 'test assessment',
+    questions: '',
     assessmentType: 'Contests',
     initialXp: 0,
     xpBonus: 100,
@@ -525,6 +526,7 @@ const gradingOverviewTest2: GradingOverview[] = [
     assessmentId: 2,
     assessmentNumber: 'P2',
     assessmentName: 'another assessment',
+    questions: '',
     assessmentType: 'Quests',
     initialXp: 20,
     xpBonus: 250,

src/commons/mocks/GradingMocks.ts

@@ -17,6 +17,7 @@ export const mockGradingOverviews: GradingOverview[] = [
     assessmentNumber: 'M1A',
     assessmentId: 0,
     assessmentName: 'Mission 0 ',
+    questions: '',
     currentXp: 69,
     xpBonus: 10,
     initialXp: 69,
@@ -37,6 +38,7 @@ export const mockGradingOverviews: GradingOverview[] = [
     assessmentNumber: 'M2',
     assessmentId: 1,
     assessmentName: 'Mission 1',
+    questions: '',
     currentXp: -2,
     xpBonus: 12,
     initialXp: 0,
@@ -57,6 +59,7 @@ export const mockGradingOverviews: GradingOverview[] = [
     assessmentNumber: 'M3',
     assessmentId: 0,
     assessmentName: 'Mission 0',
+    questions: '',
     currentXp: 1000,
     xpBonus: 12,
     initialXp: 996,

src/commons/sagas/RequestsSaga.ts

@@ -634,6 +634,7 @@ export const getGradingOverviews = async (
           studentId: overview.student.id,
           studentUsername: overview.student.username,
           studentName: overview.student.name,
+          questions: overview.questions,
           submissionId: overview.id,
           submissionStatus: overview.status,
           groupName: overview.student.groupName,

src/features/grading/GradingTypes.ts

@@ -27,6 +27,7 @@ export type GradingOverview = {
   studentUsername: string;
   submissionId: number;
   submissionStatus: string;
+  questions: string;
   groupName: string;
   groupLeaderId?: number;
   gradingStatus: GradingStatus;

src/features/grading/GradingUtils.ts

@@ -22,19 +22,15 @@ export const exportGradingCSV = (gradingOverviews: GradingOverview[] | undefined
 
   const content = new Blob(
     [
-      '"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',
+      '"Student Name","Student Username","Group","Status","Question","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,
-            e.questionCount,
-            e.gradedCount,
+            e.questions,
             e.initialXp,
             e.xpAdjustment,
             e.currentXp,

src/pages/academy/grading/subcomponents/GradingEditor.tsx

@@ -46,6 +46,7 @@ type Props = {
   maxXp: number;
   studentName: string;
   studentUsername: string;
+  questions: string;
   comments: string;
   graderName?: string;
   gradedAt?: string;

src/pages/academy/grading/subcomponents/GradingWorkspace.tsx

@@ -309,6 +309,7 @@ const GradingWorkspace: React.FC<Props> = props => {
             maxXp={grading!.answers[questionId].question.maxXp}
             studentName={grading!.answers[questionId].student.name}
             studentUsername={grading!.answers[questionId].student.username}
+            questions={''}
             comments={grading!.answers[questionId].grade.comments ?? ''}
             graderName={
               grading!.answers[questionId].grade.grader