diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ExamResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ExamResource.java index 25ba7982aa8c..575f34619666 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ExamResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ExamResource.java @@ -191,6 +191,7 @@ public ResponseEntity createExam(@PathVariable Long courseId, @RequestBody @EnforceAtLeastInstructor public ResponseEntity updateExam(@PathVariable Long courseId, @RequestBody Exam updatedExam) throws URISyntaxException { log.debug("REST request to update an exam : {}", updatedExam); + if (updatedExam.getId() == null) { return createExam(courseId, updatedExam); } @@ -201,6 +202,7 @@ public ResponseEntity updateExam(@PathVariable Long courseId, @RequestBody // Make sure that the original references are preserved. Exam originalExam = examRepository.findByIdElseThrow(updatedExam.getId()); + var originalExamDuration = originalExam.getDuration(); // The Exam Mode cannot be changed after creation -> Compare request with version in the database if (updatedExam.isTestExam() != originalExam.isTestExam()) { @@ -216,21 +218,22 @@ public ResponseEntity updateExam(@PathVariable Long courseId, @RequestBody Exam savedExam = examRepository.save(updatedExam); + // NOTE: We have to get exercises and groups as we need them for re-scheduling + Exam examWithExercises = examService.findByIdWithExerciseGroupsAndExercisesElseThrow(savedExam.getId()); + // We can't test dates for equality as the dates retrieved from the database lose precision. Also use instant to take timezones into account Comparator comparator = Comparator.comparing(date -> date.truncatedTo(ChronoUnit.SECONDS).toInstant()); if (comparator.compare(originalExam.getVisibleDate(), updatedExam.getVisibleDate()) != 0 || comparator.compare(originalExam.getStartDate(), updatedExam.getStartDate()) != 0) { - // get all exercises - Exam examWithExercises = examService.findByIdWithExerciseGroupsAndExercisesElseThrow(savedExam.getId()); // for all programming exercises in the exam, send their ids for scheduling examWithExercises.getExerciseGroups().stream().flatMap(group -> group.getExercises().stream()).filter(ProgrammingExercise.class::isInstance).map(Exercise::getId) .forEach(instanceMessageSendService::sendProgrammingExerciseSchedule); } - if (comparator.compare(originalExam.getEndDate(), updatedExam.getEndDate()) != 0) { - // get all exercises - Exam examWithExercises = examService.findByIdWithExerciseGroupsAndExercisesElseThrow(savedExam.getId()); - examService.scheduleModelingExercises(examWithExercises); + // NOTE: if the end date was changed, we need to update student exams and re-schedule exercises + if (!originalExam.getEndDate().equals(savedExam.getEndDate())) { + int workingTimeChange = savedExam.getDuration() - originalExamDuration; + updateStudentExamsAndRescheduleExercises(examWithExercises, originalExamDuration, workingTimeChange); } if (updatedChannel != null) { @@ -259,9 +262,7 @@ public ResponseEntity updateExamWorkingTime(@PathVariable Long courseId, @ throw new BadRequestException(); } - var now = now(); - - // We have to get exercise groups as `scheduleModelingExercises` needs them + // NOTE: We have to get exercise groups as `scheduleModelingExercises` needs them Exam exam = examService.findByIdWithExerciseGroupsAndExercisesElseThrow(examId); var originalExamDuration = exam.getDuration(); @@ -270,10 +271,18 @@ public ResponseEntity updateExamWorkingTime(@PathVariable Long courseId, @ exam.setWorkingTime(exam.getWorkingTime() + workingTimeChange); examRepository.save(exam); + // 2. Re-calculate the working times of all student exams + updateStudentExamsAndRescheduleExercises(exam, originalExamDuration, workingTimeChange); + + return ResponseEntity.ok(exam); + } + + private void updateStudentExamsAndRescheduleExercises(Exam exam, Integer originalExamDuration, Integer workingTimeChange) { + var now = now(); + User instructor = userRepository.getUser(); - // 2. Re-calculate the working times of all student exams - var studentExams = studentExamRepository.findByExamId(examId); + var studentExams = studentExamRepository.findByExamId(exam.getId()); for (var studentExam : studentExams) { Integer originalStudentWorkingTime = studentExam.getWorkingTime(); int originalTimeExtension = originalStudentWorkingTime - originalExamDuration; @@ -288,7 +297,9 @@ public ResponseEntity updateExamWorkingTime(@PathVariable Long courseId, @ int adjustedWorkingTime = Math.max(newNormalWorkingTime + timeAdjustment, 0); studentExam.setWorkingTime(adjustedWorkingTime); } + // TODO: probably batch these updates? var savedStudentExam = studentExamRepository.save(studentExam); + // NOTE: if the exam is already visible, notify the student about the working time change if (now.isAfter(exam.getVisibleDate())) { examLiveEventsService.createAndSendWorkingTimeUpdateEvent(savedStudentExam, savedStudentExam.getWorkingTime(), originalStudentWorkingTime, true, instructor); @@ -300,12 +311,10 @@ public ResponseEntity updateExamWorkingTime(@PathVariable Long courseId, @ instanceMessageSendService.sendRescheduleAllStudentExams(exam.getId()); } + // NOTE: potentially re-schedule clustering of modeling submissions (in case Compass is active) if (now.isBefore(examDateService.getLatestIndividualExamEndDate(exam))) { - // potentially re-schedule clustering of modeling submissions (in case Compass is active) examService.scheduleModelingExercises(exam); } - - return ResponseEntity.ok(exam); } /** diff --git a/src/main/webapp/app/exam/manage/exam-management-resolve.service.ts b/src/main/webapp/app/exam/manage/exam-management-resolve.service.ts index 0b35c150992e..49a8462bc98d 100644 --- a/src/main/webapp/app/exam/manage/exam-management-resolve.service.ts +++ b/src/main/webapp/app/exam/manage/exam-management-resolve.service.ts @@ -8,6 +8,27 @@ import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; import { Observable, filter, map, of } from 'rxjs'; import { HttpResponse } from '@angular/common/http'; import { StudentExamWithGradeDTO } from 'app/exam/exam-scores/exam-score-dtos.model'; +import { Course } from 'app/entities/course.model'; +import { CourseManagementService } from 'app/course/manage/course-management.service'; +import { catchError } from 'rxjs/operators'; + +@Injectable({ providedIn: 'root' }) +export class CourseResolve implements Resolve { + constructor(private courseManagementService: CourseManagementService) {} + + resolve(route: ActivatedRouteSnapshot): Observable { + const courseId = route.params['courseId']; + + if (courseId) { + return this.courseManagementService.find(courseId).pipe( + map((response) => response.body), + catchError(() => of(null)), + ); + } + + return of(null); + } +} @Injectable({ providedIn: 'root' }) export class ExamResolve implements Resolve { diff --git a/src/main/webapp/app/exam/manage/exam-management.route.ts b/src/main/webapp/app/exam/manage/exam-management.route.ts index cf7b396060f0..5d9b09e74882 100644 --- a/src/main/webapp/app/exam/manage/exam-management.route.ts +++ b/src/main/webapp/app/exam/manage/exam-management.route.ts @@ -53,7 +53,7 @@ import { OrionTutorAssessmentComponent } from 'app/orion/assessment/orion-tutor- import { isOrion } from 'app/shared/orion/orion'; import { FileUploadExerciseManagementResolve } from 'app/exercises/file-upload/manage/file-upload-exercise-management-resolve.service'; import { ModelingExerciseResolver } from 'app/exercises/modeling/manage/modeling-exercise-resolver.service'; -import { ExamResolve, ExerciseGroupResolve, StudentExamResolve } from 'app/exam/manage/exam-management-resolve.service'; +import { CourseResolve, ExamResolve, ExerciseGroupResolve, StudentExamResolve } from 'app/exam/manage/exam-management-resolve.service'; import { BonusComponent } from 'app/grading-system/bonus/bonus.component'; import { SuspiciousBehaviorComponent } from 'app/exam/manage/suspicious-behavior/suspicious-behavior.component'; import { SuspiciousSessionsOverviewComponent } from 'app/exam/manage/suspicious-behavior/suspicious-sessions-overview/suspicious-sessions-overview.component'; @@ -73,6 +73,7 @@ export const examManagementRoute: Routes = [ component: ExamUpdateComponent, resolve: { exam: ExamResolve, + course: CourseResolve, }, data: { authorities: [Authority.INSTRUCTOR, Authority.ADMIN], @@ -85,6 +86,7 @@ export const examManagementRoute: Routes = [ component: ExamUpdateComponent, resolve: { exam: ExamResolve, + course: CourseResolve, }, data: { authorities: [Authority.INSTRUCTOR, Authority.ADMIN], @@ -113,6 +115,7 @@ export const examManagementRoute: Routes = [ component: ExamUpdateComponent, resolve: { exam: ExamResolve, + course: CourseResolve, }, data: { authorities: [Authority.INSTRUCTOR, Authority.ADMIN], diff --git a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time-dialog.component.html b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time-dialog.component.html index 36e7d8210cbb..f1847f493456 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time-dialog.component.html +++ b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time-dialog.component.html @@ -11,16 +11,14 @@

name="workingTimeSeconds" durationLabelText="artemisApp.examManagement.editWorkingTime.label" [(ngModel)]="workingTimeSeconds" + [allowNegative]="true" [showRelative]="false" [disabled]="isLoading" /> + -

+
+
diff --git a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time-dialog.component.ts b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time-dialog.component.ts index c0f8a231564d..277be237f86d 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time-dialog.component.ts +++ b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time-dialog.component.ts @@ -1,12 +1,11 @@ -import { Component, EventEmitter, Input, Output } from '@angular/core'; import { HttpResponse } from '@angular/common/http'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { faBan, faCheck, faSpinner } from '@fortawesome/free-solid-svg-icons'; import { Exam } from 'app/entities/exam.model'; import { ExamManagementService } from 'app/exam/manage/exam-management.service'; -import { normalWorkingTime } from 'app/exam/participate/exam.utils'; -import dayjs from 'dayjs/esm'; +import { examWorkingTime } from 'app/exam/participate/exam.utils'; @Component({ selector: 'jhi-edit-working-time-dialog', @@ -27,11 +26,12 @@ export class ExamEditWorkingTimeDialogComponent { workingTimeSeconds = 0; - get absoluteWorkingTimeDuration() { - const currentWorkingTimeSeconds = normalWorkingTime(this.exam); - if (!currentWorkingTimeSeconds) return undefined; - const duration = dayjs.duration(currentWorkingTimeSeconds + this.workingTimeSeconds, 'seconds'); - return [duration.asHours() >= 1 ? `${Math.floor(duration.asHours())} h` : null, duration.format('m [min] s [s]')].filter(Boolean).join(' '); + get oldWorkingTime() { + return examWorkingTime(this.exam); + } + + get newWorkingTime() { + return this.oldWorkingTime ? this.oldWorkingTime + this.workingTimeSeconds : undefined; } constructor( diff --git a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time.component.ts b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time.component.ts index ba39fe36298d..c64acade7caf 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time.component.ts +++ b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time.component.ts @@ -5,8 +5,8 @@ import dayjs from 'dayjs/esm'; import { Subscription, from } from 'rxjs'; import { Exam } from 'app/entities/exam.model'; -import { ExamEditWorkingTimeDialogComponent } from 'app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time-dialog.component'; import { AlertService } from 'app/core/util/alert.service'; +import { ExamEditWorkingTimeDialogComponent } from './exam-edit-working-time-dialog.component'; @Component({ selector: 'jhi-exam-edit-working-time', diff --git a/src/main/webapp/app/exam/manage/exams/exam-update.component.html b/src/main/webapp/app/exam/manage/exams/exam-update.component.html index fb31d85cb749..9317415ad0dd 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-update.component.html +++ b/src/main/webapp/app/exam/manage/exams/exam-update.component.html @@ -1,6 +1,6 @@
-
+

{{ 'artemisApp.examManagement.createExam' | artemisTranslate }}

{{ 'artemisApp.examManagement.importExam' | artemisTranslate }}

@@ -56,6 +56,19 @@
Exam Conduction
+
+ + + + Changing the times of an active exam will disrupt the workflow of the students! + + +
+ +
+ +
+
Ex labelTooltip="{{ 'artemisApp.examManagement.visibleDateTooltip' | artemisTranslate }}" [(ngModel)]="exam.visibleDate" [error]="!isValidVisibleDate" + [startAt]="exam.visibleDate" name="visibleDate" id="visibleDate" - > + />
+ />
+ />
- + Ex [customMin]="1" [customMax]="maxWorkingTimeInMinutes" [(ngModel)]="workingTimeInMinutes" - (change)="convertWorkingTimeFromMinutesToSeconds($event)" />
@@ -230,7 +245,7 @@
Exam Tex
-
diff --git a/src/main/webapp/app/exam/manage/exams/exam-update.component.ts b/src/main/webapp/app/exam/manage/exams/exam-update.component.ts index 0997d8694461..55642d60eb60 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-update.component.ts +++ b/src/main/webapp/app/exam/manage/exams/exam-update.component.ts @@ -1,42 +1,45 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import dayjs from 'dayjs/esm'; +import { omit } from 'lodash-es'; +import { combineLatest, takeWhile } from 'rxjs'; +import { map } from 'rxjs/operators'; +import { Component, OnDestroy, OnInit, TemplateRef, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { faBan, faExclamationTriangle, faSave } from '@fortawesome/free-solid-svg-icons'; + import { Exam } from 'app/entities/exam.model'; import { ExamManagementService } from 'app/exam/manage/exam-management.service'; -import { Observable } from 'rxjs'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; import { AlertService } from 'app/core/util/alert.service'; import { Course, isMessagingEnabled } from 'app/entities/course.model'; -import { CourseManagementService } from 'app/course/manage/course-management.service'; -import dayjs from 'dayjs/esm'; import { onError } from 'app/shared/util/global.utils'; import { ArtemisNavigationUtilService } from 'app/utils/navigation.utils'; -import { faBan, faCheckDouble, faExclamationTriangle, faFont, faSave } from '@fortawesome/free-solid-svg-icons'; -import { tap } from 'rxjs/operators'; -import { ExerciseType } from 'app/entities/exercise.model'; import { ExamExerciseImportComponent } from 'app/exam/manage/exams/exam-exercise-import/exam-exercise-import.component'; -import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service'; import { DocumentationType } from 'app/shared/components/documentation-button/documentation-button.component'; +import { ConfirmAutofocusModalComponent } from 'app/shared/components/confirm-autofocus-modal.component'; +import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; +import { examWorkingTime, normalWorkingTime } from 'app/exam/participate/exam.utils'; @Component({ selector: 'jhi-exam-update', templateUrl: './exam-update.component.html', }) -export class ExamUpdateComponent implements OnInit { +export class ExamUpdateComponent implements OnInit, OnDestroy { exam: Exam; course: Course; isSaving: boolean; - // The exam.workingTime is stored in seconds, but the working time should be displayed in minutes to the user - workingTimeInMinutes: number; - // The maximum working time in Minutes (used as a dynamic max-value for the working time Input) - maxWorkingTimeInMinutes: number; isImport = false; isImportInSameCourse = false; hideChannelNameInput = false; - // Expose enums to the template - exerciseType = ExerciseType; + private originalStartDate?: dayjs.Dayjs; + private originalEndDate?: dayjs.Dayjs; + + private componentActive = true; + // Link to the component enabling the selection of exercise groups and exercises for import @ViewChild(ExamExerciseImportComponent) examExerciseImportComponent: ExamExerciseImportComponent; + @ViewChild('workingTimeConfirmationContent') public workingTimeConfirmationContent: TemplateRef; documentationType = DocumentationType.Exams; @@ -44,99 +47,178 @@ export class ExamUpdateComponent implements OnInit { faSave = faSave; faBan = faBan; faExclamationTriangle = faExclamationTriangle; - faCheckDouble = faCheckDouble; - faFont = faFont; - - readonly FeatureToggle = FeatureToggle; constructor( private route: ActivatedRoute, private examManagementService: ExamManagementService, private alertService: AlertService, - private courseManagementService: CourseManagementService, private navigationUtilService: ArtemisNavigationUtilService, + private modalService: NgbModal, private router: Router, + private artemisTranslatePipe: ArtemisTranslatePipe, ) {} ngOnInit(): void { - this.route.data.subscribe(({ exam }) => { - this.exam = exam; + combineLatest([this.route.url, this.route.data]) + .pipe(takeWhile(() => this.componentActive)) + .subscribe(([segments, data]) => { + const isImport = segments.some(({ path }) => path === 'import'); + const exam: Exam = isImport ? prepareExamForImport(data.exam) : data.exam; + + if (!exam.gracePeriod) { + exam.gracePeriod = 180; + } - // Tap the URL to determine, if the Exam should be imported - this.route.url.pipe(tap((segments) => (this.isImport = segments.some((segment) => segment.path === 'import')))).subscribe(); + // test exam only feature automatic assessment + if (exam.testExam) { + exam.numberOfCorrectionRoundsInExam = 0; + } else if (!exam.numberOfCorrectionRoundsInExam) { + exam.numberOfCorrectionRoundsInExam = 1; + } - if (this.isImport) { - this.resetIdAndDatesForImport(); - this.isImportInSameCourse = this.exam.course?.id === Number(this.route.snapshot.paramMap.get('courseId')); - } + this.exam = exam; + this.isImport = isImport; + this.isImportInSameCourse = isImport && exam.course?.id === data.course.id; + this.originalStartDate = exam.startDate?.clone(); + this.originalEndDate = exam.endDate?.clone(); - this.courseManagementService.find(Number(this.route.snapshot.paramMap.get('courseId'))).subscribe({ - next: (response: HttpResponse) => { - this.exam.course = response.body!; - this.course = response.body!; - this.hideChannelNameInput = (exam.id !== undefined && exam.channelName === undefined) || !isMessagingEnabled(this.course); - }, - error: (err: HttpErrorResponse) => onError(this.alertService, err), + this.course = data.course; + this.exam.course = data.course; + this.hideChannelNameInput = (!!exam.id && !exam.channelName) || !isMessagingEnabled(this.course); }); + } - if (!this.exam.gracePeriod) { - this.exam.gracePeriod = 180; - } - // test exam only feature automatic assessment - if (this.exam.testExam) { - this.exam.numberOfCorrectionRoundsInExam = 0; - } else if (!this.exam.numberOfCorrectionRoundsInExam) { - this.exam.numberOfCorrectionRoundsInExam = 1; - } - }); - // Initialize helper attributes - this.workingTimeInMinutes = this.exam.workingTime! / 60; - this.calculateMaxWorkingTime(); + ngOnDestroy() { + this.componentActive = false; + } + + /** + * Sets the exam working time in minutes. + * @param minutes + */ + set workingTimeInMinutes(minutes: number) { + this.exam.workingTime = minutes * 60; + } + + /** + * Returns the exam working time in minutes. + */ + get workingTimeInMinutes(): number { + return this.exam.workingTime ? this.exam.workingTime / 60 : 0; + } + + get oldWorkingTime(): number | undefined { + return normalWorkingTime(this.originalStartDate, this.originalEndDate); + } + + get newWorkingTime(): number | undefined { + return this.exam.workingTime; } /** * Revert to the previous state, equivalent with pressing the back button on your browser - * Returns to the detail page if there is no previous state and we edited an existing exam - * Returns to the overview page if there is no previous state and we created a new exam + * Returns to the detail page if there is no previous state, and we edited an existing exam + * Returns to the overview page if there is no previous state, and we created a new exam */ - previousState() { + resetToPreviousState() { this.navigationUtilService.navigateBackWithOptional(['course-management', this.course.id!.toString(), 'exams'], this.exam.id?.toString()); } + /** + * Updates the working time for real exams based on the start and end dates. + */ + updateExamWorkingTime() { + if (this.exam.testExam) return; + + this.exam.workingTime = examWorkingTime(this.exam) ?? 0; + } + + /** + * Returns the maximum working time in minutes for test exams. + */ + get maxWorkingTimeInMinutes(): number { + if (!this.exam.testExam) return 0; + + if (this.exam.startDate && this.exam.endDate) { + return dayjs(this.exam.endDate).diff(this.exam.startDate, 'm'); + } else { + // In case of an import, the exam.workingTime is imported, but the start / end date are deleted -> no error should be shown to the user in this case + return this.isImport ? this.workingTimeInMinutes : 0; + } + } + + /** + * Saves the exam. If the dates have changed and the exam is ongoing, a confirmation modal is shown to the user. + * If either the user confirms the modal, the exam is not ongoing or the dates have not changed, the exam is saved. + */ + handleSubmit() { + const datesChanged = !(this.exam.startDate?.isSame(this.originalStartDate) && this.exam.endDate?.isSame(this.originalEndDate)); + + if (datesChanged && this.isOngoingExam) { + const modalRef = this.modalService.open(ConfirmAutofocusModalComponent, { keyboard: true, size: 'lg' }); + modalRef.componentInstance.title = 'artemisApp.examManagement.dateChange.title'; + modalRef.componentInstance.text = this.artemisTranslatePipe.transform('artemisApp.examManagement.dateChange.message'); + modalRef.componentInstance.contentRef = this.workingTimeConfirmationContent; + modalRef.result.then(this.save.bind(this)); + } else { + this.save(); + } + } + + /** + * Saves the exam and navigates to the detail page of the exam if the save was successful. + * If the save was not successful, an error is shown to the user. + */ save() { this.isSaving = true; - if (this.isImport) { + this.createOrUpdateOrImportExam() + ?.pipe( + map((response: HttpResponse) => response.body!), + takeWhile(() => this.componentActive), + ) + .subscribe({ + next: this.onSaveSuccess.bind(this), + error: this.onSaveError.bind(this), + }); + } + + /** + * Creates, updates or imports the exam depending on the current state of the component. + * @private + */ + private createOrUpdateOrImportExam() { + if (this.isImport && this.exam?.exerciseGroups) { // We validate the user input for the exercise group selection here, so it is only called once the user desires to import the exam - if (this.exam?.exerciseGroups) { - if (!this.examExerciseImportComponent.validateUserInput()) { - this.alertService.error('artemisApp.examManagement.exerciseGroup.importModal.invalidExerciseConfiguration'); - this.isSaving = false; - return; - } - this.exam.exerciseGroups = this.examExerciseImportComponent.mapSelectedExercisesToExerciseGroups(); + if (!this.examExerciseImportComponent.validateUserInput()) { + this.alertService.error('artemisApp.examManagement.exerciseGroup.importModal.invalidExerciseConfiguration'); + this.isSaving = false; + return; } - this.subscribeToSaveResponse(this.examManagementService.import(this.course.id!, this.exam)); - } else if (this.exam.id !== undefined) { - this.subscribeToSaveResponse(this.examManagementService.update(this.course.id!, this.exam)); + return this.examManagementService.import(this.course.id!, this.exam); + } else if (this.exam.id) { + return this.examManagementService.update(this.course.id!, this.exam); } else { - this.subscribeToSaveResponse(this.examManagementService.create(this.course.id!, this.exam)); + return this.examManagementService.create(this.course.id!, this.exam); } } - subscribeToSaveResponse(result: Observable>) { - result.subscribe({ - next: (response: HttpResponse) => this.onSaveSuccess(response.body!), - error: (err: HttpErrorResponse) => this.onSaveError(err), - }); - } - - private onSaveSuccess(exam: Exam) { + /** + * Navigates to the detail page of the exam if the save was successful. + * @param exam + * @private + */ + private async onSaveSuccess(exam: Exam) { this.isSaving = false; - this.router.navigate(['course-management', this.course.id, 'exams', exam.id]); + await this.router.navigate(['course-management', this.course.id, 'exams', exam.id]); window.scrollTo(0, 0); } + /** + * Shows an error to the user if the save was not successful. + * @param httpErrorResponse + * @private + */ private onSaveError(httpErrorResponse: HttpErrorResponse) { const errorKey = httpErrorResponse.error?.errorKey; if (errorKey === 'invalidKey') { @@ -159,6 +241,13 @@ export class ExamUpdateComponent implements OnInit { this.isSaving = false; } + /** + * Returns true if the original exam is currently ongoing before any changes, false otherwise. + */ + get isOngoingExam(): boolean { + return !!(this.exam.id && this.originalStartDate && this.originalEndDate && dayjs().isBetween(this.originalStartDate, this.originalEndDate)); + } + get isValidConfiguration(): boolean { const examConductionDatesValid = this.isValidVisibleDate && this.isValidStartDate && this.isValidEndDate; const examReviewDatesValid = this.isValidPublishResultsDate && this.isValidExamStudentReviewStart && this.isValidExamStudentReviewEnd; @@ -177,7 +266,7 @@ export class ExamUpdateComponent implements OnInit { } get isValidVisibleDate(): boolean { - return this.exam.visibleDate !== undefined; + return !!this.exam.visibleDate; } get isValidNumberOfCorrectionRounds(): boolean { @@ -190,7 +279,7 @@ export class ExamUpdateComponent implements OnInit { } get isValidMaxPoints(): boolean { - return this.exam?.examMaxPoints !== undefined && this.exam?.examMaxPoints > 0; + return !!this.exam?.examMaxPoints && this.exam?.examMaxPoints > 0; } /** @@ -199,9 +288,8 @@ export class ExamUpdateComponent implements OnInit { * For test exams, the visibleDate has to be prior or equal to the startDate. */ get isValidStartDate(): boolean { - if (this.exam.startDate === undefined) { - return false; - } + if (!this.exam.startDate) return false; + if (this.exam.testExam) { return dayjs(this.exam.startDate).isSameOrAfter(this.exam.visibleDate); } else { @@ -213,22 +301,7 @@ export class ExamUpdateComponent implements OnInit { * Validates the EndDate inputted by the user. */ get isValidEndDate(): boolean { - return this.exam.endDate !== undefined && dayjs(this.exam.endDate).isAfter(this.exam.startDate); - } - - /** - * Calculates the WorkingTime for real exams based on the start- and end-time. - */ - get calculateWorkingTime(): number { - if (!this.exam.testExam) { - if (this.exam.startDate && this.exam.endDate) { - this.exam.workingTime = dayjs(this.exam.endDate).diff(this.exam.startDate, 's'); - } else { - this.exam.workingTime = 0; - } - this.workingTimeInMinutes = this.exam.workingTime / 60; - } - return this.workingTimeInMinutes; + return !!this.exam.endDate && dayjs(this.exam.endDate).isAfter(this.exam.startDate); } /** @@ -252,38 +325,13 @@ export class ExamUpdateComponent implements OnInit { return false; } - /** - * Used to convert workingTimeInMinutes into exam.workingTime (in seconds) every time, the user inputs a new - * working time for a test exam - * @param event when the user inputs a new working time - */ - convertWorkingTimeFromMinutesToSeconds(event: any) { - this.workingTimeInMinutes = event.target.value; - this.exam.workingTime = this.workingTimeInMinutes * 60; - } - - /** - * Used to determine the maximum working time every time, the user changes the start- or endDate. - * Used to show a graphical warning at the working time input field - */ - calculateMaxWorkingTime() { - if (this.exam.testExam) { - if (this.exam.startDate && this.exam.endDate) { - this.maxWorkingTimeInMinutes = dayjs(this.exam.endDate).diff(this.exam.startDate, 's') / 60; - } else { - // In case of an import, the exam.workingTime is imported, but the start / end date are deleted -> no error should be shown to the user in this case - this.maxWorkingTimeInMinutes = this.isImport ? this.workingTimeInMinutes : 0; - } - } - } - get isValidPublishResultsDate(): boolean { // allow instructors to set publishResultsDate later if (!this.exam.publishResultsDate) { return true; } // check for undefined because undefined is otherwise treated as the now dayjs - return this.exam.endDate !== undefined && dayjs(this.exam.publishResultsDate).isAfter(this.exam.endDate); + return !!this.exam.endDate && dayjs(this.exam.publishResultsDate).isAfter(this.exam.endDate); } get isValidExamStudentReviewStart(): boolean { @@ -292,7 +340,7 @@ export class ExamUpdateComponent implements OnInit { return true; } // check for undefined because undefined is otherwise treated as the now dayjs - return this.exam.publishResultsDate !== undefined && dayjs(this.exam.examStudentReviewStart).isAfter(this.exam.publishResultsDate); + return !!this.exam.publishResultsDate && dayjs(this.exam.examStudentReviewStart).isAfter(this.exam.publishResultsDate); } get isValidExamStudentReviewEnd(): boolean { @@ -301,7 +349,7 @@ export class ExamUpdateComponent implements OnInit { return !this.exam.examStudentReviewStart || !this.exam.examStudentReviewStart.isValid(); } // check for undefined because undefined is otherwise treated as the now dayjs - return this.exam.examStudentReviewStart !== undefined && dayjs(this.exam.examStudentReviewEnd).isAfter(this.exam.examStudentReviewStart); + return !!this.exam.examStudentReviewStart && dayjs(this.exam.examStudentReviewEnd).isAfter(this.exam.examStudentReviewStart); } get isValidExampleSolutionPublicationDate(): boolean { @@ -315,19 +363,12 @@ export class ExamUpdateComponent implements OnInit { dayjs(this.exam.exampleSolutionPublicationDate).isBefore(this.exam.endDate || null) ); } - - /** - * Helper-Method to reset the Exam Id and Exam dates when importing the Exam - */ - private resetIdAndDatesForImport() { - this.exam.id = undefined; - this.exam.visibleDate = undefined; - this.exam.startDate = undefined; - this.exam.endDate = undefined; - this.exam.publishResultsDate = undefined; - this.exam.examStudentReviewStart = undefined; - this.exam.examStudentReviewEnd = undefined; - this.exam.examUsers = undefined; - this.exam.studentExams = undefined; - } } + +/** + * Prepares the exam for import by omitting all properties that should not be imported. + */ +export const prepareExamForImport = (exam: Exam): Exam => ({ + ...omit(exam, ['id', 'visibleDate', 'startDate', 'endDate', 'publishResultsDate', 'examStudentReviewStart', 'examStudentReviewEnd', 'examUsers', 'studentExams']), + workingTime: 0, +}); diff --git a/src/main/webapp/app/exam/manage/student-exams/student-exam-detail.component.ts b/src/main/webapp/app/exam/manage/student-exams/student-exam-detail.component.ts index 20c289066a86..1efd9d381346 100644 --- a/src/main/webapp/app/exam/manage/student-exams/student-exam-detail.component.ts +++ b/src/main/webapp/app/exam/manage/student-exams/student-exam-detail.component.ts @@ -12,7 +12,7 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { getLatestSubmissionResult, setLatestSubmissionResult } from 'app/entities/submission.model'; import { GradeType } from 'app/entities/grading-scale.model'; import { faSave } from '@fortawesome/free-solid-svg-icons'; -import { getRelativeWorkingTimeExtension, normalWorkingTime } from 'app/exam/participate/exam.utils'; +import { examWorkingTime, getRelativeWorkingTimeExtension } from 'app/exam/participate/exam.utils'; import { Exercise } from 'app/entities/exercise.model'; import { StudentExamWithGradeDTO } from 'app/exam/exam-scores/exam-score-dtos.model'; @@ -197,7 +197,7 @@ export class StudentExamDetailComponent implements OnInit { * Updates the working time duration values of the form whenever the percent value has been changed by the user. */ updateWorkingTimeDuration() { - const regularWorkingTime = normalWorkingTime(this.studentExam.exam!)!; + const regularWorkingTime = examWorkingTime(this.studentExam.exam)!; const seconds = round(regularWorkingTime * (1.0 + this.workingTimeFormValues.percent / 100), 0); this.setWorkingTimeDuration(seconds); } diff --git a/src/main/webapp/app/exam/manage/student-exams/student-exams.component.ts b/src/main/webapp/app/exam/manage/student-exams/student-exams.component.ts index 53123eb952bb..8ca3aed74f49 100644 --- a/src/main/webapp/app/exam/manage/student-exams/student-exams.component.ts +++ b/src/main/webapp/app/exam/manage/student-exams/student-exams.component.ts @@ -11,7 +11,7 @@ import { ExamManagementService } from 'app/exam/manage/exam-management.service'; import { AlertService } from 'app/core/util/alert.service'; import { HttpErrorResponse } from '@angular/common/http'; import { Exam } from 'app/entities/exam.model'; -import { ConfirmAutofocusModalComponent } from 'app/shared/components/confirm-autofocus-button.component'; +import { ConfirmAutofocusModalComponent } from 'app/shared/components/confirm-autofocus-modal.component'; import dayjs from 'dayjs/esm'; import { AccountService } from 'app/core/auth/account.service'; import { onError } from 'app/shared/util/global.utils'; diff --git a/src/main/webapp/app/exam/participate/exam.utils.ts b/src/main/webapp/app/exam/participate/exam.utils.ts index c77c0ad3056e..d3038851c1b0 100644 --- a/src/main/webapp/app/exam/participate/exam.utils.ts +++ b/src/main/webapp/app/exam/participate/exam.utils.ts @@ -8,9 +8,9 @@ import { round } from 'app/shared/util/utils'; * * @param exam * @param studentExam - * @return {dayjs} + * @return {dayjs.Dayjs | undefined} */ -export const endTime = (exam: Exam, studentExam: StudentExam) => { +export const endTime = (exam: Exam, studentExam: StudentExam): dayjs.Dayjs | undefined => { if (!exam) { return undefined; } @@ -21,17 +21,24 @@ export const endTime = (exam: Exam, studentExam: StudentExam) => { }; /** - * Calculates the working time of the exam in seconds + * Calculates the working time of the exam in seconds. + * If either the exam or the exam dates are not set, undefined is returned. * * @param exam * @return {number | undefined} */ -export const normalWorkingTime = (exam: Exam): number | undefined => { - if (!exam || !exam.endDate || !exam.startDate) { - return undefined; - } - return dayjs(exam.endDate).diff(exam.startDate, 'seconds'); -}; +export const examWorkingTime = (exam?: Exam): number | undefined => normalWorkingTime(exam?.startDate, exam?.endDate); + +/** + * Calculates the time between start and end date in seconds. + * If either the start or end date is not set, undefined is returned. + * + * @param startDate + * @param endDate + * @return {number | undefined} + */ +export const normalWorkingTime = (startDate?: dayjs.Dayjs, endDate?: dayjs.Dayjs): number | undefined => + startDate && endDate ? dayjs(endDate).diff(startDate, 'seconds') : undefined; /** * Calculates the additional working time in seconds @@ -57,7 +64,7 @@ export const getAdditionalWorkingTime = (exam: Exam, studentExam: StudentExam): * @return The relative working time extension in percent points rounded to two digits after the decimal separator. */ export const getRelativeWorkingTimeExtension = (exam: Exam, studentExamWorkingTime: number): number => { - const regularExamDuration = normalWorkingTime(exam)!; + const regularExamDuration = examWorkingTime(exam)!; return round((studentExamWorkingTime / regularExamDuration - 1.0) * 100, 2); }; diff --git a/src/main/webapp/app/exam/participate/general-information/exam-general-information.component.ts b/src/main/webapp/app/exam/participate/general-information/exam-general-information.component.ts index 7fe2a58cc4ff..810549d0b949 100644 --- a/src/main/webapp/app/exam/participate/general-information/exam-general-information.component.ts +++ b/src/main/webapp/app/exam/participate/general-information/exam-general-information.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnChanges } from '@angular/core'; import { StudentExam } from 'app/entities/student-exam.model'; import { Exam } from 'app/entities/exam.model'; -import { endTime, getAdditionalWorkingTime, isExamOverMultipleDays, normalWorkingTime } from 'app/exam/participate/exam.utils'; +import { endTime, examWorkingTime, getAdditionalWorkingTime, isExamOverMultipleDays } from 'app/exam/participate/exam.utils'; import dayjs from 'dayjs/esm'; @Component({ @@ -27,7 +27,7 @@ export class ExamGeneralInformationComponent implements OnChanges { ngOnChanges(): void { this.examEndDate = endTime(this.exam, this.studentExam); - this.normalWorkingTime = normalWorkingTime(this.exam); + this.normalWorkingTime = examWorkingTime(this.exam); this.additionalWorkingTime = getAdditionalWorkingTime(this.exam, this.studentExam); this.isExamOverMultipleDays = isExamOverMultipleDays(this.exam, this.studentExam); this.isTestExam = this.exam?.testExam; diff --git a/src/main/webapp/app/exam/shared/events/exam-live-event.component.html b/src/main/webapp/app/exam/shared/events/exam-live-event.component.html index bc16073f1426..b8e3844b6db3 100644 --- a/src/main/webapp/app/exam/shared/events/exam-live-event.component.html +++ b/src/main/webapp/app/exam/shared/events/exam-live-event.component.html @@ -13,24 +13,15 @@ | {{ event.acknowledgeTimestamps!.user! | artemisDate: 'time' }}
-
+
-
+
The working time of the exam has been changed.
-
+
The working time of your exam has been changed.
-
- -
-
New working time
-
{{ eventAsWorkingTimeUpdateEvent().newWorkingTime | artemisDurationFromSeconds }}
-
-
+
-
-
-

{{ text | artemisTranslate }}

-

{{ text }}

+
+
+ +

{{ text | artemisTranslate }}

+

{{ text }}

+ +
+
diff --git a/src/main/webapp/app/shared/components/confirm-autofocus-modal.component.ts b/src/main/webapp/app/shared/components/confirm-autofocus-modal.component.ts new file mode 100644 index 000000000000..58a946bf7673 --- /dev/null +++ b/src/main/webapp/app/shared/components/confirm-autofocus-modal.component.ts @@ -0,0 +1,16 @@ +import { Component, Input, TemplateRef } from '@angular/core'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; + +@Component({ + selector: 'jhi-confirm-modal', + templateUrl: './confirm-autofocus-modal.component.html', +}) +export class ConfirmAutofocusModalComponent { + @Input() title: string; + @Input() text: string; + @Input() translateText: boolean; + @Input() textIsMarkdown: boolean; + @Input() contentRef?: TemplateRef; + + constructor(public modal: NgbActiveModal) {} +} diff --git a/src/main/webapp/app/shared/components/shared-component.module.ts b/src/main/webapp/app/shared/components/shared-component.module.ts index c570c8b10386..9f02b47fedde 100644 --- a/src/main/webapp/app/shared/components/shared-component.module.ts +++ b/src/main/webapp/app/shared/components/shared-component.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { ChecklistCheckComponent } from 'app/shared/components/checklist-check.component'; import { ArtemisSharedModule } from 'app/shared/shared.module'; import { FeatureToggleModule } from 'app/shared/feature-toggle/feature-toggle.module'; -import { ConfirmAutofocusButtonComponent, ConfirmAutofocusModalComponent } from 'app/shared/components/confirm-autofocus-button.component'; +import { ConfirmAutofocusModalComponent } from 'app/shared/components/confirm-autofocus-modal.component'; import { HelpIconComponent } from 'app/shared/components/help-icon.component'; import { ButtonComponent } from 'app/shared/components/button.component'; import { CloneRepoButtonComponent } from 'app/shared/components/clone-repo-button/clone-repo-button.component'; @@ -23,6 +23,7 @@ import { IncludedInScoreBadgeComponent } from 'app/exercises/shared/exercise-hea import { ExerciseImportTabsComponent } from 'app/exercises/shared/import/exercise-import-tabs.component'; import { ExerciseImportFromFileComponent } from 'app/exercises/shared/import/from-file/exercise-import-from-file.component'; import { ExerciseImportWrapperComponent } from 'app/exercises/shared/import/exercise-import-wrapper/exercise-import-wrapper.component'; +import { ConfirmAutofocusButtonComponent } from 'app/shared/components/confirm-autofocus-button.component'; @NgModule({ imports: [ArtemisSharedModule, ArtemisCoursesRoutingModule, FeatureToggleModule, ClipboardModule], @@ -70,6 +71,7 @@ import { ExerciseImportWrapperComponent } from 'app/exercises/shared/import/exer ExerciseImportTabsComponent, ExerciseImportFromFileComponent, ExerciseImportWrapperComponent, + ConfirmAutofocusModalComponent, ], }) export class ArtemisSharedComponentModule {} diff --git a/src/main/webapp/app/shared/date-time-picker/date-time-picker.component.html b/src/main/webapp/app/shared/date-time-picker/date-time-picker.component.html index e04e178dd6e7..438f3ed1cf3d 100644 --- a/src/main/webapp/app/shared/date-time-picker/date-time-picker.component.html +++ b/src/main/webapp/app/shared/date-time-picker/date-time-picker.component.html @@ -16,8 +16,8 @@ [ngClass]="{ 'is-invalid': error }" [ngModel]="value" [disabled]="disabled" - [min]="convert(min)" - [max]="convert(max)" + [min]="minDate" + [max]="maxDate" (ngModelChange)="updateField($event)" [owlDateTime]="dt" name="datePicker" @@ -25,5 +25,5 @@ - +
diff --git a/src/main/webapp/app/shared/date-time-picker/date-time-picker.component.ts b/src/main/webapp/app/shared/date-time-picker/date-time-picker.component.ts index b143f95ab9dd..67e7edd553cb 100644 --- a/src/main/webapp/app/shared/date-time-picker/date-time-picker.component.ts +++ b/src/main/webapp/app/shared/date-time-picker/date-time-picker.component.ts @@ -22,7 +22,7 @@ export class FormDateTimePickerComponent implements ControlValueAccessor { @Input() value: any; @Input() disabled: boolean; @Input() error: boolean; - @Input() startAt: dayjs.Dayjs = dayjs().startOf('minutes'); // Default selected date. By default this sets it to the current time without seconds or milliseconds; + @Input() startAt?: dayjs.Dayjs; // Default selected date. By default this sets it to the current time without seconds or milliseconds; @Input() min: dayjs.Dayjs; // Dates before this date are not selectable. @Input() max: dayjs.Dayjs; // Dates after this date are not selectable. @Input() shouldDisplayTimeZoneWarning = true; // Displays a warning that the current time zone might differ from the participants'. @@ -34,8 +34,7 @@ export class FormDateTimePickerComponent implements ControlValueAccessor { faClock = faClock; faQuestionCircle = faQuestionCircle; - // eslint-disable-next-line @typescript-eslint/no-unused-vars - _onChange = (val: dayjs.Dayjs) => {}; + private onChange?: (val?: dayjs.Dayjs) => void; /** * Emits the value change from component. @@ -44,15 +43,6 @@ export class FormDateTimePickerComponent implements ControlValueAccessor { this.valueChange.emit(); } - /** - * Function that converts a possibly undefined dayjs value to a date or null. - * - * @param value as dayjs - */ - convert(value?: dayjs.Dayjs) { - return value != undefined && value.isValid() ? value.toDate() : null; - } - /** * Function that writes the value safely. * @param value as dayjs or date @@ -78,7 +68,7 @@ export class FormDateTimePickerComponent implements ControlValueAccessor { * @param fn */ registerOnChange(fn: any) { - this._onChange = fn; + this.onChange = fn; } /** @@ -87,7 +77,7 @@ export class FormDateTimePickerComponent implements ControlValueAccessor { */ updateField(newValue: dayjs.Dayjs) { this.value = newValue; - this._onChange(dayjs(this.value)); + this.onChange?.(dayjs(this.value)); this.valueChanged(); } @@ -97,4 +87,25 @@ export class FormDateTimePickerComponent implements ControlValueAccessor { get currentTimeZone(): string { return Intl.DateTimeFormat().resolvedOptions().timeZone; } + + get startDate(): Date | null { + return this.convertToDate(this.startAt ?? dayjs().startOf('minutes')); + } + + get minDate(): Date | null { + return this.convertToDate(this.min); + } + + get maxDate(): Date | null { + return this.convertToDate(this.max); + } + + /** + * Function that converts a possibly undefined dayjs value to a date or null. + * + * @param value as dayjs + */ + convertToDate(value?: dayjs.Dayjs) { + return value != undefined && value.isValid() ? value.toDate() : null; + } } diff --git a/src/main/webapp/i18n/de/exam.json b/src/main/webapp/i18n/de/exam.json index adb9582608fe..43558759db49 100644 --- a/src/main/webapp/i18n/de/exam.json +++ b/src/main/webapp/i18n/de/exam.json @@ -688,6 +688,11 @@ "actions": "Aktionen", "viewResultsOrRunDetection": "Ergebnisse anzeigen oder Plagiatsprüfung starten", "viewCases": "Fälle anzeigen" + }, + "dateChange": { + "title": "Bestätige Änderung der Prüfungszeit", + "message": "Die Prüfung wird gerade abgehalten. Wenn du die Zeiten einer aktiven Prüfung änderst, werden alle aktiven Studenten über die Änderung der Dauer informiert!", + "label": "Die Prüfung wird gerade abgehalten" } }, "studentExamDetail": { diff --git a/src/main/webapp/i18n/en/exam.json b/src/main/webapp/i18n/en/exam.json index 941100e03f9a..ef516acd7a37 100644 --- a/src/main/webapp/i18n/en/exam.json +++ b/src/main/webapp/i18n/en/exam.json @@ -651,7 +651,7 @@ }, "editWorkingTime": { "title": "Edit Exam Duration", - "label": "Exam duration change", + "label": "Change exam duration", "duration": "The new duration of the exam will be {{ duration }}.", "question": "This will change the working time for all students. Do you really want to edit the duration of the exam {{ title }}?", "typeNameToConfirm": "Please type in the name of the exam to confirm." @@ -689,6 +689,11 @@ "actions": "Actions", "viewResultsOrRunDetection": "View Results or Run Detection", "viewCases": "View Cases" + }, + "dateChange": { + "title": "Confirm working time change", + "message": "The exam conduction is currently in progress. Changing the times of an active exam will notify all active students about the duration change!", + "label": "The exam conduction is currently in progress" } }, "studentExamDetail": { diff --git a/src/test/java/de/tum/in/www1/artemis/exam/ProgrammingExamIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exam/ProgrammingExamIntegrationTest.java index e3cfcb57bc23..f82818bb01a7 100644 --- a/src/test/java/de/tum/in/www1/artemis/exam/ProgrammingExamIntegrationTest.java +++ b/src/test/java/de/tum/in/www1/artemis/exam/ProgrammingExamIntegrationTest.java @@ -2,7 +2,11 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -36,7 +40,10 @@ import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseTestService; import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService; import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.*; +import de.tum.in.www1.artemis.repository.ExamRepository; +import de.tum.in.www1.artemis.repository.ExerciseRepository; +import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; +import de.tum.in.www1.artemis.repository.StudentExamRepository; import de.tum.in.www1.artemis.service.scheduled.ParticipantScoreScheduleService; import de.tum.in.www1.artemis.user.UserUtilService; import de.tum.in.www1.artemis.util.ExamPrepareExercisesTestUtil; @@ -155,6 +162,39 @@ void testUpdateExam_rescheduleProgramming_startDateChanged() throws Exception { verify(instanceMessageSendService).sendProgrammingExerciseSchedule(programmingEx.getId()); } + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testUpdateExam_rescheduleProgramming_endDateChanged() throws Exception { + var programmingEx = programmingExerciseUtilService.addCourseExamExerciseGroupWithOneProgrammingExerciseAndTestCases(); + var examWithProgrammingEx = programmingEx.getExerciseGroup().getExam(); + + ZonedDateTime visibleDate = examWithProgrammingEx.getVisibleDate(); + ZonedDateTime startDate = examWithProgrammingEx.getStartDate(); + ZonedDateTime endDate = examWithProgrammingEx.getEndDate(); + examUtilService.setVisibleStartAndEndDateOfExam(examWithProgrammingEx, visibleDate, startDate, endDate.plusMinutes(1)); + + request.put("/api/courses/" + examWithProgrammingEx.getCourse().getId() + "/exams", examWithProgrammingEx, HttpStatus.OK); + verify(instanceMessageSendService).sendRescheduleAllStudentExams(examWithProgrammingEx.getId()); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testUpdateExamWorkingTime_rescheduleProgramming_endDateChanged() throws Exception { + var programmingEx = programmingExerciseUtilService.addCourseExamExerciseGroupWithOneProgrammingExerciseAndTestCases(); + var examWithProgrammingEx = programmingEx.getExerciseGroup().getExam(); + + var workingTimeExtensionSeconds = 60; + + ZonedDateTime visibleDate = examWithProgrammingEx.getVisibleDate(); + ZonedDateTime startDate = examWithProgrammingEx.getStartDate(); + ZonedDateTime endDate = examWithProgrammingEx.getEndDate(); + examUtilService.setVisibleStartAndEndDateOfExam(examWithProgrammingEx, visibleDate, startDate, endDate); + + request.patch("/api/courses/" + examWithProgrammingEx.getCourse().getId() + "/exams/" + examWithProgrammingEx.getId() + "/working-time", workingTimeExtensionSeconds, + HttpStatus.OK); + verify(instanceMessageSendService).sendRescheduleAllStudentExams(examWithProgrammingEx.getId()); + } + @Test @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") void lockAllRepositories() throws Exception { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseScheduleServiceTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseScheduleServiceTest.java index 6b546e374c79..c74de5e5e648 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseScheduleServiceTest.java +++ b/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseScheduleServiceTest.java @@ -1,7 +1,15 @@ package de.tum.in.www1.artemis.exercise.programmingexercise; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.after; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.eq; +import static org.mockito.Mockito.inOrder; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.timeout; +import static org.mockito.Mockito.verify; import java.time.ZonedDateTime; import java.time.temporal.ChronoUnit; @@ -25,7 +33,10 @@ import de.tum.in.www1.artemis.domain.ProgrammingExercise; import de.tum.in.www1.artemis.domain.User; import de.tum.in.www1.artemis.domain.VcsRepositoryUrl; -import de.tum.in.www1.artemis.domain.enumeration.*; +import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; +import de.tum.in.www1.artemis.domain.enumeration.ExerciseLifecycle; +import de.tum.in.www1.artemis.domain.enumeration.ParticipationLifecycle; +import de.tum.in.www1.artemis.domain.enumeration.Visibility; import de.tum.in.www1.artemis.domain.exam.Exam; import de.tum.in.www1.artemis.domain.exam.StudentExam; import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; @@ -34,7 +45,11 @@ import de.tum.in.www1.artemis.exam.ExamUtilService; import de.tum.in.www1.artemis.exercise.ExerciseUtilService; import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.*; +import de.tum.in.www1.artemis.repository.ExamRepository; +import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; +import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.in.www1.artemis.repository.StudentExamRepository; import de.tum.in.www1.artemis.service.messaging.InstanceMessageReceiveService; import de.tum.in.www1.artemis.user.UserUtilService; import de.tum.in.www1.artemis.util.LocalRepository; @@ -600,7 +615,7 @@ void shouldCancelAllTasksIfSchedulingNoLongerNeeded() throws Exception { @Test @WithMockUser(username = "admin", roles = "ADMIN") - void testExamWorkingTimeChangeDuringConduction() { + void testStudentExamIndividualWorkingTimeChangeDuringConduction() { ProgrammingExercise examExercise = programmingExerciseUtilService.addCourseExamExerciseGroupWithOneProgrammingExercise(); Exam exam = examExercise.getExamViaExerciseGroupOrCourseMember(); exam.setStartDate(ZonedDateTime.now().minusMinutes(1)); @@ -619,6 +634,28 @@ void testExamWorkingTimeChangeDuringConduction() { participation.getStudents()); } + @Test + @WithMockUser(username = "admin", roles = "ADMIN") + void testRescheduleExamDuringConduction() { + ProgrammingExercise examExercise = programmingExerciseUtilService.addCourseExamExerciseGroupWithOneProgrammingExercise(); + Exam exam = examExercise.getExamViaExerciseGroupOrCourseMember(); + exam.setStartDate(ZonedDateTime.now().minusMinutes(1)); + exam = examRepository.saveAndFlush(exam); + User user = userUtilService.getUserByLogin(TEST_PREFIX + "student1"); + StudentExam studentExam = examUtilService.addStudentExamWithUser(exam, user); + ProgrammingExerciseStudentParticipation participation = (ProgrammingExerciseStudentParticipation) participationUtilService + .addProgrammingParticipationWithResultForExercise(examExercise, TEST_PREFIX + "student1").getParticipation(); + studentExam.setExercises(List.of(examExercise)); + studentExam.setWorkingTime(1); + studentExamRepository.saveAndFlush(studentExam); + + instanceMessageReceiveService.processRescheduleExamDuringConduction(exam.getId()); + + verify(versionControlService, timeout(TIMEOUT_MS)).setRepositoryPermissionsToReadOnly(participation.getVcsRepositoryUrl(), examExercise.getProjectKey(), + participation.getStudents()); + verify(programmingExerciseParticipationService, timeout(TIMEOUT_MS)).lockStudentRepositoryAndParticipation(examExercise, participation); + } + /** * Sets the due date and build and test after due date for the {@code programmingExercise} to NOW + the delay. * diff --git a/src/test/javascript/spec/component/exam/exam-update.component.spec.ts b/src/test/javascript/spec/component/exam/exam-update.component.spec.ts index a5e668ad7e97..9afac8f2e64d 100644 --- a/src/test/javascript/spec/component/exam/exam-update.component.spec.ts +++ b/src/test/javascript/spec/component/exam/exam-update.component.spec.ts @@ -1,30 +1,32 @@ -import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { ExamUpdateComponent } from 'app/exam/manage/exams/exam-update.component'; +import dayjs from 'dayjs/esm'; +import { of, throwError } from 'rxjs'; +import { Component } from '@angular/core'; +import cloneDeep from 'lodash-es/cloneDeep'; +import { FormsModule } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; +import { RouterTestingModule } from '@angular/router/testing'; +import { ActivatedRoute, Router, UrlSegment } from '@angular/router'; +import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; +import { HttpClientModule, HttpErrorResponse, HttpResponse } from '@angular/common/http'; +import { MockComponent, MockDirective, MockModule, MockPipe, MockProvider } from 'ng-mocks'; + +import { ExamUpdateComponent, prepareExamForImport } from 'app/exam/manage/exams/exam-update.component'; import { FeatureToggleDirective } from 'app/shared/feature-toggle/feature-toggle.directive'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; import { ExamManagementService } from 'app/exam/manage/exam-management.service'; import { Exam } from 'app/entities/exam.model'; -import { HttpClientModule, HttpErrorResponse, HttpResponse } from '@angular/common/http'; -import { MockComponent, MockDirective, MockModule, MockPipe, MockProvider } from 'ng-mocks'; -import { of, throwError } from 'rxjs'; -import { RouterTestingModule } from '@angular/router/testing'; -import { FormsModule } from '@angular/forms'; import { FontAwesomeTestingModule } from '@fortawesome/angular-fontawesome/testing'; import { Course, CourseInformationSharingConfiguration } from 'app/entities/course.model'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { FormDateTimePickerComponent } from 'app/shared/date-time-picker/date-time-picker.component'; import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component'; -import { CourseManagementService } from 'app/course/manage/course-management.service'; -import dayjs from 'dayjs/esm'; -import { Component } from '@angular/core'; + import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { GradingSystemService } from 'app/grading-system/grading-system.service'; import { GradingScale } from 'app/entities/grading-scale.model'; import { DataTableComponent } from 'app/shared/data-table/data-table.component'; import { AlertService } from 'app/core/util/alert.service'; -import { ActivatedRoute, Params, Router, UrlSegment, convertToParamMap } from '@angular/router'; import { TranslateDirective } from 'app/shared/language/translate.directive'; import { HelpIconComponent } from 'app/shared/components/help-icon.component'; import { ArtemisExamModePickerModule } from 'app/exam/manage/exams/exam-mode-picker/exam-mode-picker.module'; @@ -35,7 +37,6 @@ import { User } from 'app/core/user/user.model'; import { StudentExam } from 'app/entities/student-exam.model'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; import { ModelingExercise, UMLDiagramType } from 'app/entities/modeling-exercise.model'; -import cloneDeep from 'lodash-es/cloneDeep'; import { ExamExerciseImportComponent } from 'app/exam/manage/exams/exam-exercise-import/exam-exercise-import.component'; import { ButtonComponent } from 'app/shared/components/button.component'; import { DifficultyBadgeComponent } from 'app/exercises/shared/exercise-headers/difficulty-badge.component'; @@ -101,31 +102,12 @@ describe('Exam Update Component', () => { { provide: ActivatedRoute, useValue: { - data: { - subscribe: (fn: (value: Params) => void) => - fn({ - exam: examWithoutExercises, - }), - }, - snapshot: { - paramMap: convertToParamMap({ - courseId: '1', - }), - }, - url: of([{ path: '' } as UrlSegment]), + data: of({ exam: examWithoutExercises, course }), + params: of({ courseId: '1' }), + url: of([{ path: '' }] as UrlSegment[]), }, }, MockProvider(AlertService), - MockProvider(CourseManagementService, { - find: () => { - return of( - new HttpResponse({ - body: course, - status: 200, - }), - ); - }, - }), MockProvider(GradingSystemService, { findGradingScaleForExam: () => { return of( @@ -244,7 +226,16 @@ describe('Exam Update Component', () => { const navigateSpy = jest.spyOn(router, 'navigate'); fixture.detectChanges(); - const updateSpy = jest.spyOn(examManagementService, 'update').mockReturnValue(of(new HttpResponse({ body: { ...examWithoutExercises, id: 1 } }))); + const updateSpy = jest.spyOn(examManagementService, 'update').mockReturnValue( + of( + new HttpResponse({ + body: { + ...examWithoutExercises, + id: 1, + }, + }), + ), + ); // trigger save component.save(); @@ -255,39 +246,42 @@ describe('Exam Update Component', () => { })); it('should calculate the working time for real exams correctly', () => { + fixture.detectChanges(); + examWithoutExercises.testExam = false; examWithoutExercises.startDate = undefined; examWithoutExercises.endDate = dayjs().add(2, 'hours'); - fixture.detectChanges(); + component.updateExamWorkingTime(); // Without a valid startDate, the workingTime should be 0 // examWithoutExercises.workingTime is stored in seconds expect(examWithoutExercises.workingTime).toBe(0); // the component returns the workingTime in Minutes - expect(component.calculateWorkingTime).toBe(0); + expect(component.workingTimeInMinutes).toBe(0); examWithoutExercises.startDate = dayjs().add(0, 'hours'); examWithoutExercises.endDate = dayjs().add(2, 'hours'); - fixture.detectChanges(); + component.updateExamWorkingTime(); expect(examWithoutExercises.workingTime).toBe(7200); - expect(component.calculateWorkingTime).toBe(120); + expect(component.workingTimeInMinutes).toBe(120); examWithoutExercises.startDate = dayjs().add(0, 'hours'); examWithoutExercises.endDate = undefined; - fixture.detectChanges(); + component.updateExamWorkingTime(); // Without an endDate, the working time should be 0; expect(examWithoutExercises.workingTime).toBe(0); - expect(component.calculateWorkingTime).toBe(0); + expect(component.workingTimeInMinutes).toBe(0); }); it('should not calculate the working time for test exams', () => { + fixture.detectChanges(); examWithoutExercises.testExam = true; examWithoutExercises.workingTime = 3600; examWithoutExercises.startDate = dayjs().add(0, 'hours'); examWithoutExercises.endDate = dayjs().add(12, 'hours'); - fixture.detectChanges(); + component.updateExamWorkingTime(); expect(examWithoutExercises.workingTime).toBe(3600); - expect(component.calculateWorkingTime).toBe(60); + expect(component.workingTimeInMinutes).toBe(60); }); it('validates the working time for test exams correctly', () => { @@ -356,7 +350,16 @@ describe('Exam Update Component', () => { examWithoutExercises.id = undefined; fixture.detectChanges(); - const createSpy = jest.spyOn(examManagementService, 'create').mockReturnValue(of(new HttpResponse({ body: { ...examWithoutExercises, id: 1 } }))); + const createSpy = jest.spyOn(examManagementService, 'create').mockReturnValue( + of( + new HttpResponse({ + body: { + ...examWithoutExercises, + id: 1, + }, + }), + ), + ); // trigger save component.save(); @@ -389,7 +392,7 @@ describe('Exam Update Component', () => { component.course = course; component.exam = examWithoutExercises; examWithoutExercises.id = 1; - component.previousState(); + component.resetToPreviousState(); expect(spy).toHaveBeenCalledOnce(); expect(spy).toHaveBeenCalledWith(['course-management', course.id!.toString(), 'exams'], examWithoutExercises.id!.toString()); }); @@ -476,7 +479,15 @@ describe('Exam Update Component', () => { examForImport.course = course2; examForImport.numberOfExamUsers = 1; examForImport.exerciseGroups = [exerciseGroup1]; - examForImport.examUsers = [{ didCheckImage: false, didCheckLogin: false, didCheckName: false, didCheckRegistrationNumber: false, ...new User(5) }]; + examForImport.examUsers = [ + { + didCheckImage: false, + didCheckLogin: false, + didCheckName: false, + didCheckRegistrationNumber: false, + ...new User(5), + }, + ]; examForImport.studentExams = [new StudentExam()]; beforeEach(() => { @@ -515,32 +526,12 @@ describe('Exam Update Component', () => { { provide: ActivatedRoute, useValue: { - data: { - subscribe: (fn: (value: Params) => void) => - fn({ - exam: examForImport, - }), - }, - snapshot: { - paramMap: convertToParamMap({ - courseId: '1', - examId: '3', - }), - }, - url: of([{ path: 'import' } as UrlSegment]), + data: of({ exam: examForImport, course }), + params: of({ examId: '3', courseId: '1' }), + url: of([{ path: 'import' }] as UrlSegment[]), }, }, MockProvider(AlertService), - MockProvider(CourseManagementService, { - find: () => { - return of( - new HttpResponse({ - body: course, - status: 200, - }), - ); - }, - }), MockProvider(GradingSystemService, { findGradingScaleForExam: () => { return of( @@ -554,6 +545,7 @@ describe('Exam Update Component', () => { ], }).compileComponents(); + router = TestBed.inject(Router); fixture = TestBed.createComponent(ExamUpdateComponent); component = fixture.componentInstance; examManagementService = fixture.debugElement.injector.get(ExamManagementService); @@ -594,7 +586,11 @@ describe('Exam Update Component', () => { expect(component.exam.studentExams).toBeUndefined(); }); - it('should perform input of an examWithoutExercises with exercises successfully', () => { + it('should perform import of an examWithoutExercises with exercises successfully', () => { + const expectedExam = prepareExamForImport(examForImport); + expectedExam.course = course; + const alertSpy = jest.spyOn(alertService, 'error'); + const navigateSpy = jest.spyOn(router, 'navigate'); const importSpy = jest.spyOn(examManagementService, 'import').mockReturnValue( of( new HttpResponse({ @@ -603,11 +599,14 @@ describe('Exam Update Component', () => { }), ), ); - const alertSpy = jest.spyOn(alertService, 'error'); + fixture.detectChanges(); component.save(); + expect(importSpy).toHaveBeenCalledOnce(); - expect(importSpy).toHaveBeenCalledWith(1, examForImport); + expect(importSpy).toHaveBeenCalledWith(1, expectedExam); + expect(navigateSpy).toHaveBeenCalledOnce(); + expect(navigateSpy).toHaveBeenCalledWith(['course-management', course.id, 'exams', examForImport.id]); expect(alertSpy).not.toHaveBeenCalled(); }); @@ -646,8 +645,15 @@ describe('Exam Update Component', () => { it.each(['duplicatedProgrammingExerciseShortName', 'duplicatedProgrammingExerciseTitle', 'invalidKey'])( 'should perform import of examWithoutExercises AND correctly process conflict exception from server', (errorKey) => { + const expectedExam = prepareExamForImport(examForImport); + expectedExam.course = course; + const preCheckError = new HttpErrorResponse({ - error: { errorKey: errorKey, numberOfInvalidProgrammingExercises: 2, params: { exerciseGroups: [exerciseGroup1] } }, + error: { + errorKey: errorKey, + numberOfInvalidProgrammingExercises: 2, + params: { exerciseGroups: [exerciseGroup1] }, + }, status: 400, }); const importSpy = jest.spyOn(examManagementService, 'import').mockReturnValue(throwError(() => preCheckError)); @@ -656,7 +662,7 @@ describe('Exam Update Component', () => { fixture.detectChanges(); component.save(); - expect(importSpy).toHaveBeenCalledWith(1, examForImport); + expect(importSpy).toHaveBeenCalledWith(1, expectedExam); if (errorKey == 'invalidKey') { expect(alertSpy).toHaveBeenCalledWith('artemisApp.examManagement.exerciseGroup.importModal.invalidKey', { number: 2 }); } else { @@ -666,6 +672,9 @@ describe('Exam Update Component', () => { ); it('should perform input of exercise groups AND correctly process arbitrary exception from server', () => { + const expectedExam = prepareExamForImport(examForImport); + expectedExam.course = course; + const error = new HttpErrorResponse({ status: 400, }); @@ -675,7 +684,7 @@ describe('Exam Update Component', () => { fixture.detectChanges(); component.save(); expect(importSpy).toHaveBeenCalledOnce(); - expect(importSpy).toHaveBeenCalledWith(1, examForImport); + expect(importSpy).toHaveBeenCalledWith(1, expectedExam); expect(alertSpy).toHaveBeenCalledOnce(); }); }); diff --git a/src/test/javascript/spec/component/exam/shared/events/exam-live-event.component.spec.ts b/src/test/javascript/spec/component/exam/shared/events/exam-live-event.component.spec.ts index 86b1fcf29f83..27ce3c15be42 100644 --- a/src/test/javascript/spec/component/exam/shared/events/exam-live-event.component.spec.ts +++ b/src/test/javascript/spec/component/exam/shared/events/exam-live-event.component.spec.ts @@ -9,6 +9,7 @@ import { MockTranslateService } from '../../../../helpers/mocks/service/mock-tra import { TranslateService } from '@ngx-translate/core'; import { HtmlForMarkdownPipe } from 'app/shared/pipes/html-for-markdown.pipe'; import { ArtemisDurationFromSecondsPipe } from 'app/shared/pipes/artemis-duration-from-seconds.pipe'; +import { WorkingTimeChangeComponent } from 'app/exam/shared/working-time-change/working-time-change.component'; describe('ExamLiveEventComponent', () => { let component: ExamLiveEventComponent; @@ -16,7 +17,7 @@ describe('ExamLiveEventComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ExamLiveEventComponent, ArtemisTranslatePipe, ArtemisDatePipe, HtmlForMarkdownPipe, ArtemisDurationFromSecondsPipe], + declarations: [ExamLiveEventComponent, WorkingTimeChangeComponent, ArtemisTranslatePipe, ArtemisDatePipe, HtmlForMarkdownPipe, ArtemisDurationFromSecondsPipe], imports: [FontAwesomeModule], providers: [{ provide: TranslateService, useClass: MockTranslateService }], }).compileComponents(); @@ -62,8 +63,8 @@ describe('ExamLiveEventComponent', () => { fixture.detectChanges(); - const previousTimeElement = fixture.debugElement.query(By.css('.previous > .time')).nativeElement; - const newTimeElement = fixture.debugElement.query(By.css('.new > .time')).nativeElement; + const previousTimeElement = fixture.debugElement.query(By.css('[data-testid="old-time"]')).nativeElement; + const newTimeElement = fixture.debugElement.query(By.css('[data-testid="new-time"]')).nativeElement; const titleElement = fixture.debugElement.query(By.css('.wt-title')).nativeElement; expect(previousTimeElement.textContent).toContain('5min'); diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-instructor-trigger-build-button.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-instructor-trigger-build-button.component.spec.ts index f2a888d281fc..f488e31968f6 100644 --- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-instructor-trigger-build-button.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-instructor-trigger-build-button.component.spec.ts @@ -11,7 +11,7 @@ import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { ProgrammingExerciseInstructorTriggerBuildButtonComponent } from 'app/exercises/programming/shared/actions/programming-exercise-instructor-trigger-build-button.component'; import { MockNgbModalService } from '../../helpers/mocks/service/mock-ngb-modal.service'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; -import { ConfirmAutofocusModalComponent } from 'app/shared/components/confirm-autofocus-button.component'; +import { ConfirmAutofocusModalComponent } from 'app/shared/components/confirm-autofocus-modal.component'; import { of } from 'rxjs'; import { ParticipationType } from 'app/entities/participation/participation.model'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; diff --git a/src/test/javascript/spec/component/shared/date-time-picker.component.spec.ts b/src/test/javascript/spec/component/shared/date-time-picker.component.spec.ts index e2220d7505a5..46d0a9fc5a91 100644 --- a/src/test/javascript/spec/component/shared/date-time-picker.component.spec.ts +++ b/src/test/javascript/spec/component/shared/date-time-picker.component.spec.ts @@ -36,13 +36,13 @@ describe('FormDateTimePickerComponent', () => { describe('test date conversion', () => { let convertedDate: Date | null; it('should convert the dayjs if it is not undefined', () => { - convertedDate = component.convert(normalDate); + convertedDate = component.convertToDate(normalDate); expect(convertedDate).toEqual(normalDateAsDateObject); }); it('should return null if dayjs is undefined', () => { - convertedDate = component.convert(); + convertedDate = component.convertToDate(); expect(convertedDate).toBeNull(); }); @@ -52,7 +52,7 @@ describe('FormDateTimePickerComponent', () => { expect(unconvertedDate.isValid()).toBeFalse(); - convertedDate = component.convert(unconvertedDate); + convertedDate = component.convertToDate(unconvertedDate); expect(convertedDate).toBeNull(); }); @@ -73,16 +73,19 @@ describe('FormDateTimePickerComponent', () => { }); it('should register callback function', () => { - const testCallBackFunction = (date: dayjs.Dayjs) => 'I am a test callbackFunction: ' + date.toDate(); + const onChangeSpy = jest.fn(); + component.registerOnChange(onChangeSpy); - component.registerOnChange(testCallBackFunction); + (component as any).onChange?.(normalDate); - expect(component._onChange(normalDate)).toBe(testCallBackFunction(normalDate)); + expect(onChangeSpy).toHaveBeenCalledOnce(); + expect(onChangeSpy).toHaveBeenCalledWith(normalDate); }); it('should update field', () => { + const onChangeSpy = jest.fn(); + component.registerOnChange(onChangeSpy); const valueChangedStub = jest.spyOn(component, 'valueChanged').mockImplementation(); - const onChangeSpy = jest.spyOn(component, '_onChange'); const newDate = normalDate.add(2, 'days'); component.value = normalDate; diff --git a/src/test/javascript/spec/component/text-exercise/example-text-submission.component.spec.ts b/src/test/javascript/spec/component/text-exercise/example-text-submission.component.spec.ts index b3189e54388e..355bed4320fa 100644 --- a/src/test/javascript/spec/component/text-exercise/example-text-submission.component.spec.ts +++ b/src/test/javascript/spec/component/text-exercise/example-text-submission.component.spec.ts @@ -31,7 +31,8 @@ import { TextBlockRef } from 'app/entities/text-block-ref.model'; import { UnreferencedFeedbackComponent } from 'app/exercises/shared/unreferenced-feedback/unreferenced-feedback.component'; import { AlertService } from 'app/core/util/alert.service'; import { DebugElement } from '@angular/core'; -import { ConfirmAutofocusButtonComponent, ConfirmAutofocusModalComponent } from 'app/shared/components/confirm-autofocus-button.component'; +import { ConfirmAutofocusModalComponent } from 'app/shared/components/confirm-autofocus-modal.component'; +import { ConfirmAutofocusButtonComponent } from 'app/shared/components/confirm-autofocus-button.component'; describe('ExampleTextSubmissionComponent', () => { let fixture: ComponentFixture; @@ -109,7 +110,10 @@ describe('ExampleTextSubmissionComponent', () => { it('should fetch example submission with result for existing example submission and switch to edit state', async () => { // GIVEN // @ts-ignore - activatedRouteSnapshot.paramMap.params = { exerciseId: EXERCISE_ID, exampleSubmissionId: EXAMPLE_SUBMISSION_ID }; + activatedRouteSnapshot.paramMap.params = { + exerciseId: EXERCISE_ID, + exampleSubmissionId: EXAMPLE_SUBMISSION_ID, + }; jest.spyOn(exerciseService, 'find').mockReturnValue(httpResponse(exercise)); jest.spyOn(exampleSubmissionService, 'get').mockReturnValue(httpResponse(exampleSubmission)); jest.spyOn(assessmentsService, 'getExampleResult').mockReturnValue(of(result)); @@ -127,7 +131,10 @@ describe('ExampleTextSubmissionComponent', () => { it('should mark text blocks not included in the example submission correctly', async () => { // GIVEN // @ts-ignore - activatedRouteSnapshot.paramMap.params = { exerciseId: EXERCISE_ID, exampleSubmissionId: EXAMPLE_SUBMISSION_ID }; + activatedRouteSnapshot.paramMap.params = { + exerciseId: EXERCISE_ID, + exampleSubmissionId: EXAMPLE_SUBMISSION_ID, + }; // @ts-ignore activatedRouteSnapshot.queryParamMap.params = { toComplete: true }; jest.spyOn(exerciseService, 'find').mockReturnValue(httpResponse(exercise)); @@ -209,7 +216,10 @@ describe('ExampleTextSubmissionComponent', () => { jest.spyOn(exampleSubmissionService, 'get').mockReturnValue(httpResponse(exampleSubmission)); // @ts-ignore - activatedRouteSnapshot.paramMap.params = { exerciseId: EXERCISE_ID, exampleSubmissionId: EXAMPLE_SUBMISSION_ID }; + activatedRouteSnapshot.paramMap.params = { + exerciseId: EXERCISE_ID, + exampleSubmissionId: EXAMPLE_SUBMISSION_ID, + }; await comp.ngOnInit(); comp.exercise = exercise; @@ -227,7 +237,10 @@ describe('ExampleTextSubmissionComponent', () => { it('should save assessment', async () => { // GIVEN // @ts-ignore - activatedRouteSnapshot.paramMap.params = { exerciseId: EXERCISE_ID, exampleSubmissionId: EXAMPLE_SUBMISSION_ID }; + activatedRouteSnapshot.paramMap.params = { + exerciseId: EXERCISE_ID, + exampleSubmissionId: EXAMPLE_SUBMISSION_ID, + }; await comp.ngOnInit(); comp.exercise = exercise; @@ -312,7 +325,10 @@ describe('ExampleTextSubmissionComponent', () => { it('should verify correct tutorial submission', async () => { // GIVEN // @ts-ignore - activatedRouteSnapshot.paramMap.params = { exerciseId: EXERCISE_ID, exampleSubmissionId: EXAMPLE_SUBMISSION_ID }; + activatedRouteSnapshot.paramMap.params = { + exerciseId: EXERCISE_ID, + exampleSubmissionId: EXAMPLE_SUBMISSION_ID, + }; // @ts-ignore activatedRouteSnapshot.queryParamMap.params = { toComplete: true }; jest.spyOn(exerciseService, 'find').mockReturnValue(httpResponse(exercise));