ls1intum · krusche · Jan 7, 2024 · Nov 13, 2023 · Nov 19, 2023 · Nov 20, 2023
@@ -7,7 +7,10 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
-import de.tum.in.www1.artemis.domain.iris.settings.*;
+import de.tum.in.www1.artemis.domain.iris.settings.IrisCourseSettings;
+import de.tum.in.www1.artemis.domain.iris.settings.IrisExerciseSettings;
+import de.tum.in.www1.artemis.domain.iris.settings.IrisGlobalSettings;
+import de.tum.in.www1.artemis.domain.iris.settings.IrisSettings;
 import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException;
 
 /**
@@ -38,6 +41,12 @@ default IrisGlobalSettings findGlobalSettingsElseThrow() {
             """)
     Optional<IrisCourseSettings> findCourseSettings(Long courseId);
 
+    /**
+     * Retrieves Iris exercise settings for a given exercise ID.
+     *
+     * @param exerciseId for which settings are to be retrieved.
+     * @return An Optional containing IrisExerciseSettings if found, otherwise empty.
+     */
     @Query("""
             SELECT irisSettings
             FROM IrisExerciseSettings irisSettings

@@ -424,7 +424,8 @@ private Map<Long, BonusSourceResultDTO> calculateExamScoresAsBonusSource(Long ex
             StudentExam studentExam = studentExamRepository.findWithExercisesByUserIdAndExamId(targetUser.getId(), examId, IS_TEST_RUN)
                     .orElseThrow(() -> new EntityNotFoundException("No student exam found for examId " + examId + " and userId " + studentId));
 
-            StudentExamWithGradeDTO studentExamWithGradeDTO = getStudentExamGradesForSummaryAsStudent(targetUser, studentExam, IS_TEST_RUN);
+            StudentExamWithGradeDTO studentExamWithGradeDTO = getStudentExamGradesForSummary(targetUser, studentExam,
+                    authorizationCheckService.isAtLeastInstructorInCourse(studentExam.getExam().getCourse(), targetUser));
             var studentResult = studentExamWithGradeDTO.studentResult();
             return Map.of(studentId, new BonusSourceResultDTO(studentResult.overallPointsAchieved(), studentResult.mostSeverePlagiarismVerdict(), null, null,
                     Boolean.TRUE.equals(studentResult.submitted())));
@@ -443,20 +444,22 @@ private Map<Long, BonusSourceResultDTO> calculateExamScoresAsBonusSource(Long ex
      * <p>
      * See {@link StudentExamWithGradeDTO} for more explanation.
      *
-     * @param targetUser  the user who submitted the studentExam
-     * @param studentExam the student exam to be evaluated
-     * @param isTestRun   set if an instructor executes a test run
+     * @param targetUser                       the user who submitted the studentExam
+     * @param studentExam                      the student exam to be evaluated
+     * @param accessingUserIsAtLeastInstructor is passed to decide the access (e.g. for test runs access will be needed regardless of submission or published dates)
      * @return the student exam result with points and grade
      */
-    public StudentExamWithGradeDTO getStudentExamGradesForSummaryAsStudent(User targetUser, StudentExam studentExam, boolean isTestRun) {
+    public StudentExamWithGradeDTO getStudentExamGradesForSummary(User targetUser, StudentExam studentExam, boolean accessingUserIsAtLeastInstructor) {
 
         loadQuizExercisesForStudentExam(studentExam);
 
+        boolean accessToSummaryAlwaysAllowed = studentExam.isTestRun() || accessingUserIsAtLeastInstructor;
+
         // check that the studentExam has been submitted, otherwise /student-exams/conduction should be used
-        if (!Boolean.TRUE.equals(studentExam.isSubmitted()) && !isTestRun) {
+        if (!Boolean.TRUE.equals(studentExam.isSubmitted()) && !accessToSummaryAlwaysAllowed) {
             throw new AccessForbiddenException(NOT_ALLOWED_TO_ACCESS_THE_GRADE_SUMMARY + "which was NOT submitted!");
         }
-        if (!studentExam.areResultsPublishedYet() && !isTestRun) {
+        if (!studentExam.areResultsPublishedYet() && !accessToSummaryAlwaysAllowed) {
             throw new AccessForbiddenException(NOT_ALLOWED_TO_ACCESS_THE_GRADE_SUMMARY + "before the release date of results");
         }
 

@@ -537,12 +537,8 @@ public ResponseEntity<StudentExamWithGradeDTO> getStudentExamGradesForSummary(@P
         if (!isAtLeastInstructor && !currentUser.getId().equals(targetUser.getId())) {
             throw new AccessForbiddenException("Current user cannot access grade info for target user");
         }
-        boolean nonInstructorSetsTestRunToTrue = !isAtLeastInstructor && isTestRun;
-        if (nonInstructorSetsTestRunToTrue) {
-            throw new AccessForbiddenException("Test runs are only accessible for instructors");
-        }
 
-        StudentExamWithGradeDTO studentExamWithGradeDTO = examService.getStudentExamGradesForSummaryAsStudent(targetUser, studentExam, isTestRun);
+        StudentExamWithGradeDTO studentExamWithGradeDTO = examService.getStudentExamGradesForSummary(targetUser, studentExam, isAtLeastInstructor);
 
         log.info("getStudentExamGradesForSummary done in {}ms for {} exercises for target user {} by caller user {}", System.currentTimeMillis() - start,
                 studentExam.getExercises().size(), targetUser.getLogin(), currentUser.getLogin());

@@ -4,7 +4,7 @@ <h3 id="general-information-title">
             {{ 'artemisApp.exam.examSummary.generalInformation' | artemisTranslate }}
         </h3>
     }
-    <div class="mt-3 mb-4 text-center">
+    <div class="ml-4 mt-3 mb-4">
         <table class="table table-borderless mx-auto d-block">
             <tbody>
                 @if (isTestExam) {

@@ -1,7 +1,3 @@
-table {
-    width: fit-content;
-}
-
 th,
 td {
     text-align: start;

@@ -0,0 +1,12 @@
+<div class="question card">
+    <div class="card-header d-flex align-items-center justify-content-between" (click)="toggleCollapse()">
+        <ng-content select=".header"></ng-content>
+        <button class="btn rotate-icon" [class.rotated]="!isCardContentCollapsed" [attr.aria-expanded]="isCardContentCollapsed" [attr.aria-controls]="isCardContentCollapsed">
+            <fa-icon size="2x" [icon]="faAngleRight"></fa-icon>
+        </button>
+    </div>
+
+    <div class="card-body question-card-body" [ngbCollapse]="isCardContentCollapsed">
+        <ng-content select=".collapsible-content"></ng-content>
+    </div>
+</div>
@@ -0,0 +1,19 @@
+import { Component, Input } from '@angular/core';
+import { faAngleRight } from '@fortawesome/free-solid-svg-icons';
+
+@Component({
+    selector: 'jhi-collapsible-card',
+    templateUrl: './collapsible-card.component.html',
+    styleUrls: [
+        '../../../course/manage/course-exercise-card.component.scss',
+        '../../../exercises/quiz/shared/quiz.scss',
+        'exam-result-summary.component.scss',
+        'collapsible-card.component.scss',
+    ],
+})
+export class CollapsibleCardComponent {
+    @Input() isCardContentCollapsed: boolean;
+    @Input() toggleCollapse: () => void;
+
+    faAngleRight = faAngleRight;
+}
@@ -9,6 +9,13 @@ <h2>
         </button>
     </h2>
 </div>
+@if (studentExam && !studentExam.submitted) {
+    <div class="alert alert-danger text-center">
+        <strong>
+            {{ 'artemisApp.exam.examSummary.youAreViewingAnUnsubmittedExam' | artemisTranslate }}
+        </strong>
+    </div>
+}
 @if (studentExam?.exam) {
     <jhi-exam-general-information
         [exam]="studentExam.exam!"
@@ -38,9 +45,11 @@ <h3>
 </h3>
 @for (exercise of studentExam?.exercises; track exercise; let i = $index) {
     <div [id]="'exercise-' + exercise.id">
-        <div class="question card">
-            <jhi-result-summary-exercise-card-header [index]="i" [exercise]="exercise" [exerciseInfo]="exerciseInfos[exercise.id!]" [resultsPublished]="resultsArePublished" />
-            <div class="card-body question-card-body" [ngbCollapse]="exerciseInfos[exercise.id!].isCollapsed">
+        <jhi-collapsible-card [isCardContentCollapsed]="exerciseInfos[exercise.id!].isCollapsed" [toggleCollapse]="toggleCollapseExercise(exerciseInfos[exercise.id!])">
+            <div class="header">
+                <jhi-result-summary-exercise-card-header [index]="i" [exercise]="exercise" [exerciseInfo]="exerciseInfos[exercise.id!]" [resultsPublished]="resultsArePublished" />
+            </div>
+            <div class="collapsible-content">
                 <div class="clearfix">
                     <span class="exercise-buttons">
                         @if (plagiarismCaseInfos[exercise.id!]) {
@@ -183,7 +192,7 @@ <h3>
                     }
                 }
             </div>
-        </div>
+        </jhi-collapsible-card>
     </div>
 }
 <button class="btn btn-light mx-auto d-block" (click)="scrollToOverviewOrTop()" id="back-to-overview-button">

@@ -24,6 +24,7 @@ import { captureException } from '@sentry/angular-ivy';
 import { AlertService } from 'app/core/util/alert.service';
 import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
 import { isExamResultPublished } from 'app/exam/participate/exam.utils';
+import { Course } from 'app/entities/course.model';
 
 export type ResultSummaryExerciseInfo = {
     icon: IconProp;
@@ -345,7 +346,7 @@ export class ExamResultSummaryComponent implements OnInit {
                 icon: getIcon(exercise.type),
                 isCollapsed: false,
                 achievedPoints: this.getPointsByExerciseIdFromExam(exercise.id, studentExamWithGrade),
-                achievedPercentage: this.getAchievedPercentageByExerciseId(exercise.id),
+                achievedPercentage: this.getAchievedPercentageByExerciseId(exercise.id, studentExamWithGrade),
                 colorClass: textColorClass,
                 resultIconClass: resultIconClass,
 
@@ -406,23 +407,46 @@ export class ExamResultSummaryComponent implements OnInit {
         this.exerciseInfos[exerciseId].displayExampleSolution = !this.exerciseInfos[exerciseId].displayExampleSolution;
     }
 
-    getAchievedPercentageByExerciseId(exerciseId?: number): number | undefined {
-        const result = this.getExerciseResultByExerciseId(exerciseId);
-        if (result === undefined) {
-            return undefined;
+    private calculateAchievedPercentageFromScoreAndMaxPoints(achievedPoints?: number, maxScore?: number, course?: Course) {
+        const canCalculatePercentage = maxScore !== undefined && achievedPoints !== undefined;
+        if (canCalculatePercentage) {
+            return roundScorePercentSpecifiedByCourseSettings(achievedPoints! / maxScore, course);
         }
 
-        const course = this.studentExamGradeInfoDTO.studentExam?.exam?.course;
+        return undefined;
+    }
+
+    private getAchievedPercentageFromResult(result: ExerciseResult, course?: Course) {
         if (result.achievedScore !== undefined) {
             return roundScorePercentSpecifiedByCourseSettings(result.achievedScore / 100, course);
         }
 
-        const canCalculatePercentage = result.maxScore && result.achievedPoints !== undefined;
-        if (canCalculatePercentage) {
-            return roundScorePercentSpecifiedByCourseSettings(result.achievedPoints! / result.maxScore, course);
+        return this.calculateAchievedPercentageFromScoreAndMaxPoints(result.achievedPoints, result.maxScore, course);
+    }
+
+    /**
+     * This should only be needed when unsubmitted exercises are viewed, otherwise the results should be set
+     */
+    private getAchievedPercentageFromExamResults(exerciseId?: number, studentExamWithGrade?: StudentExamWithGradeDTO | undefined, course?: Course) {
+        if (exerciseId === undefined) {
+            return undefined;
         }
 
-        return undefined;
+        const maxPoints = studentExamWithGrade?.studentExam?.exercises?.find((exercise) => exercise.id === exerciseId)?.maxPoints;
+        const achievedPoints = this.getPointsByExerciseIdFromExam(exerciseId, studentExamWithGrade);
+
+        return this.calculateAchievedPercentageFromScoreAndMaxPoints(achievedPoints, maxPoints, course);
+    }
+
+    getAchievedPercentageByExerciseId(exerciseId?: number, studentExamWithGrade?: StudentExamWithGradeDTO | undefined): number | undefined {
+        const result = this.getExerciseResultByExerciseId(exerciseId);
+        const course = this.studentExamGradeInfoDTO?.studentExam?.exam?.course;
+
+        if (result === undefined) {
+            return this.getAchievedPercentageFromExamResults(exerciseId, studentExamWithGrade, course);
+        }
+
+        return this.getAchievedPercentageFromResult(result, course);
     }
 
     getTextColorAndIconClassByExercise(exercise: Exercise) {
@@ -439,5 +463,9 @@ export class ExamResultSummaryComponent implements OnInit {
         };
     }
 
+    toggleCollapseExercise(exerciseInfo: ResultSummaryExerciseInfo) {
+        return () => (exerciseInfo!.isCollapsed = !exerciseInfo!.isCollapsed);
+    }
+
     protected readonly getIcon = getIcon;
 }
@@ -31,6 +31,7 @@ import { ArtemisModelingParticipationModule } from 'app/exercises/modeling/parti
 import { ArtemisTextParticipationModule } from 'app/exercises/text/participate/text-participation.module';
 import { ArtemisFileUploadParticipationModule } from 'app/exercises/file-upload/participate/file-upload-participation.module';
 import { ArtemisFeedbackModule } from 'app/exercises/shared/feedback/feedback.module';
+import { CollapsibleCardComponent } from 'app/exam/participate/summary/collapsible-card.component';
 
 @NgModule({
     imports: [
@@ -69,6 +70,7 @@ import { ArtemisFeedbackModule } from 'app/exercises/shared/feedback/feedback.mo
         ExamResultSummaryExerciseCardHeaderComponent,
         TestRunRibbonComponent,
         ExampleSolutionComponent,
+        CollapsibleCardComponent,
     ],
     exports: [ExamResultSummaryComponent, ExamGeneralInformationComponent, TestRunRibbonComponent],
 })

@@ -1,4 +1,4 @@
-<div class="card-header d-flex align-items-center justify-content-between">
+<div class="d-flex align-items-center">
     <div class="d-flex align-items-center">
         <h5 class="mb-0" [id]="'exercise-group-title-' + exercise.id">
             #{{ index + 1 }} &nbsp;
@@ -31,14 +31,4 @@ <h5 class="mb-0" [id]="'exercise-group-title-' + exercise.id">
             <span class="badge bg-danger" jhiTranslate="artemisApp.assessment.assessmentIllegalSubmission"> Warning: You are viewing an illegal submission. </span>
         </div>
     }
-    <button
-        id="{{ 'toggleCollapseExerciseButton-' + exercise.id! }}"
-        class="btn rotate-icon"
-        [class.rotated]="!exerciseInfo?.isCollapsed"
-        (click)="toggleCollapseExercise()"
-        [attr.aria-expanded]="exerciseInfo?.isCollapsed"
-        [attr.aria-controls]="exerciseInfo?.isCollapsed"
-    >
-        <fa-icon size="2x" [icon]="faAngleRight"></fa-icon>
-    </button>
 </div>
@@ -1,25 +1,17 @@
 import { Component, Input } from '@angular/core';
 import { Exercise } from 'app/entities/exercise.model';
-import { faAngleRight } from '@fortawesome/free-solid-svg-icons';
 import { ResultSummaryExerciseInfo } from 'app/exam/participate/summary/exam-result-summary.component';
 import { SubmissionType } from 'app/entities/submission.model';
 
 @Component({
     selector: 'jhi-result-summary-exercise-card-header',
     templateUrl: './exam-result-summary-exercise-card-header.component.html',
-    styleUrls: ['./exam-result-summary-exercise-card-header.component.scss'],
 })
 export class ExamResultSummaryExerciseCardHeaderComponent {
     @Input() index: number;
     @Input() exercise: Exercise;
     @Input() exerciseInfo?: ResultSummaryExerciseInfo;
     @Input() resultsPublished: boolean;
 
-    faAngleRight = faAngleRight;
-
-    toggleCollapseExercise() {
-        this.exerciseInfo!.isCollapsed = !this.exerciseInfo!.isCollapsed;
-    }
-
     readonly SUBMISSION_TYPE_ILLEGAL = SubmissionType.ILLEGAL;
 }