Programming exercises: Fix an issue where the result export does not work with structured grading criteria

src/main/webapp/app/entities/result-with-points-per-grading-criterion.model.ts

@@ -6,5 +6,6 @@ type Points = number;
 export class ResultWithPointsPerGradingCriterion {
     result: Result;
     totalPoints: Points;
-    pointsPerCriterion: Map<GradingCriterionId, Points>;
+    // type union is needed here, because deserialized java maps are actually represented as plain JSON key-value pairs
+    pointsPerCriterion: { [key: string]: number } | Map<GradingCriterionId, Points>;
 }

src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores-export-button.component.ts

@@ -219,7 +219,8 @@ class ExerciseScoresRowBuilder {
     private setGradingCriteriaPoints() {
         let unnamedCriterionIndex = 1;
         this.gradingCriteria.forEach((criterion) => {
-            const points = this.resultWithPoints.pointsPerCriterion.get(criterion.id!) || 0;
+            const pointsPerCriterion = this.resultWithPoints.pointsPerCriterion;
+            const points = pointsPerCriterion instanceof Map ? pointsPerCriterion.get(criterion.id!) || 0 : +(pointsPerCriterion[criterion.id!] || 0);
             if (criterion.title) {
                 this.set(criterion.title, points);
             } else {

src/main/webapp/app/exercises/shared/result/result.service.ts

@@ -260,8 +260,8 @@ export class ResultService implements IResultService {
                 this.convertResultDatesFromServer(resultWithPoints.result);
                 const pointsMap = new Map<number, number>();
                 if (resultWithPoints.pointsPerCriterion) {
-                    resultWithPoints.pointsPerCriterion.forEach((value, key) => {
-                        pointsMap.set(Number(key), value);
+                    Object.entries(resultWithPoints.pointsPerCriterion).forEach(([key, value]) => {
+                        pointsMap.set(+key, value);
                     });
                 }
                 resultWithPoints.pointsPerCriterion = pointsMap;

src/test/javascript/spec/service/result.service.spec.ts

@@ -155,7 +155,7 @@ describe('ResultService', () => {
         const resultWithPoints2 = new ResultWithPointsPerGradingCriterion();
         resultWithPoints2.result = result2;
         resultWithPoints2.totalPoints = 50;
-        resultWithPoints2.pointsPerCriterion = new Map(Object.entries({ '1': 20, '2': 30 }).map(([key, value]) => [Number(key), value]));
+        resultWithPoints2.pointsPerCriterion = { '1': 20, '2': 30 };
 
         const results = [resultWithPoints1, resultWithPoints2];