Adding column for percentage and indicate exercise type by adding icons

ls1intum · Sep 17, 2023 · da59350 · da59350
1 parent 0471340
commit da59350
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 5 deletions.
diff --git a/src/main/webapp/app/exam/participate/summary/exam-participation-summary.component.ts b/src/main/webapp/app/exam/participate/summary/exam-participation-summary.component.ts
@@ -142,10 +142,6 @@ export class ExamParticipationSummaryComponent implements OnInit {
         return exam?.publishResultsDate && dayjs(exam.publishResultsDate).isBefore(this.serverDateService.now());
     }
 
-    getIcon(exerciseType: ExerciseType) {
-        return getIcon(exerciseType);
-    }
-
     asProgrammingExercise(exercise: Exercise): ProgrammingExercise {
         return exercise as ProgrammingExercise;
     }
@@ -248,4 +244,6 @@ export class ExamParticipationSummaryComponent implements OnInit {
         }
         return false;
     }
+
+    protected readonly getIcon = getIcon;
 }
diff --git a/...ain/webapp/app/exam/participate/summary/points-summary/exam-points-summary.component.html b/...ain/webapp/app/exam/participate/summary/points-summary/exam-points-summary.component.html
@@ -11,6 +11,7 @@ <h3>
                     <th scope="col" *ngIf="showIncludedInScoreColumn()">{{ 'artemisApp.exercise.includedInOverallScore' | artemisTranslate }}</th>
                     <th scope="col">{{ 'artemisApp.exam.examSummary.points.yourPoints' | artemisTranslate }}</th>
                     <th scope="col">{{ 'artemisApp.exam.examSummary.points.maxPoints' | artemisTranslate }}</th>
+                    <th scope="col">{{ 'artemisApp.exam.examSummary.points.achievedPercentage' | artemisTranslate }}</th>
                     <th scope="col" *ngIf="getMaxBonusPointsSum() != 0">{{ 'artemisApp.exam.examSummary.points.maxBonus' | artemisTranslate }}</th>
                 </tr>
             </thead>
@@ -24,6 +25,7 @@ <h3>
                 >
                     <th scope="row">{{ exerciseIndex + 1 }}</th>
                     <td>
+                        &nbsp;<fa-icon *ngIf="exercise?.type" [icon]="getIcon(exercise.type!)"></fa-icon>&nbsp;
                         <span>{{ exercise?.exerciseGroup?.title ?? '-' }}</span>
                     </td>
                     <td *ngIf="showIncludedInScoreColumn()">{{ exerciseService.isIncludedInScore(exercise) }}</td>
@@ -35,6 +37,12 @@ <h3>
                             exercise.includedInOverallScore === IncludedInOverallScore.INCLUDED_AS_BONUS ? 0 : exercise.maxPoints
                         }}</span>
                     </td>
+                    <td>
+                        <!--                    TODO adjust calculation-->
+                        <span *ngIf="exercise.maxPoints != undefined">{{
+                            exercise.includedInOverallScore === IncludedInOverallScore.INCLUDED_AS_BONUS ? 0 : exercise.maxPoints
+                        }}</span>
+                    </td>
                     <td *ngIf="getMaxBonusPointsSum() != 0">
                         <span *ngIf="exercise.bonusPoints != undefined">{{
                             exercise.includedInOverallScore === IncludedInOverallScore.INCLUDED_AS_BONUS ? exercise.maxPoints : exercise.bonusPoints
@@ -52,6 +60,9 @@ <h3>
                     <td>
                         {{ getMaxNormalPointsSum() }}
                     </td>
+                    <td>
+                        {{ getAchievedPointsPercentageSum() }}
+                    </td>
                     <td *ngIf="getMaxBonusPointsSum() != 0">
                         {{ getMaxBonusPointsSum() }}
                     </td>

diff --git a/src/main/webapp/app/exam/participate/summary/points-summary/exam-points-summary.component.ts b/src/main/webapp/app/exam/participate/summary/points-summary/exam-points-summary.component.ts
@@ -1,6 +1,6 @@
 import { ChangeDetectorRef, Component, Input, OnInit } from '@angular/core';
 import dayjs from 'dayjs/esm';
-import { Exercise, IncludedInOverallScore } from 'app/entities/exercise.model';
+import { Exercise, IncludedInOverallScore, getIcon } from 'app/entities/exercise.model';
 import { ArtemisServerDateService } from 'app/shared/server-date.service';
 import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service';
 import { GradeType } from 'app/entities/grading-scale.model';
@@ -92,6 +92,10 @@ export class ExamPointsSummaryComponent implements OnInit {
         return this.studentExamWithGrade?.maxPoints ?? 0;
     }
 
+    getAchievedPointsPercentageSum() {
+        return 10;
+    }
+
     getAchievedPoints(exercise: Exercise): number {
         return this.studentExamWithGrade?.achievedPointsPerExercise?.[exercise.id!] ?? 0;
     }
@@ -119,4 +123,6 @@ export class ExamPointsSummaryComponent implements OnInit {
         }
         return false;
     }
+
+    protected readonly getIcon = getIcon;
 }
diff --git a/src/main/webapp/i18n/de/exam.json b/src/main/webapp/i18n/de/exam.json
@@ -82,6 +82,7 @@
                     "total": "Gesamt",
                     "yourPoints": "Deine Punkte",
                     "maxPoints": "Erreichbare Punkte",
+                    "achievedPercentage": "Erreichte Punkte in %",
                     "maxBonus": "Erreichbare Bonuspunkte",
                     "youAchievedWithBonus": "Du hast {{achievedPoints}} Punkte von {{normalPoints}} möglichen Punkten (einschließlich Bonuspunkten) erreicht.",
                     "youAchieved": "Du hast {{achievedPoints}} von möglichen {{normalPoints}} Punkten.",

diff --git a/src/main/webapp/i18n/en/exam.json b/src/main/webapp/i18n/en/exam.json
@@ -82,6 +82,7 @@
                     "total": "Total",
                     "yourPoints": "Your Points",
                     "maxPoints": "Achievable Points",
+                    "achievedPercentage": "Achieved Percentage",
                     "maxBonus": "Achievable Bonus Points",
                     "youAchievedWithBonus": "You achieved {{achievedPoints}} out of a maximum {{normalPoints}} possible points (including bonus points).",
                     "youAchieved": "You achieved {{achievedPoints}} out of {{normalPoints}} possible points.",