diff --git a/src/main/webapp/app/core/legal/data-export/confirmation/data-export-confirmation-dialog.component.html b/src/main/webapp/app/core/legal/data-export/confirmation/data-export-confirmation-dialog.component.html index 96bf4f64e6e8..d836bb47a149 100644 --- a/src/main/webapp/app/core/legal/data-export/confirmation/data-export-confirmation-dialog.component.html +++ b/src/main/webapp/app/core/legal/data-export/confirmation/data-export-confirmation-dialog.component.html @@ -20,13 +20,16 @@

/> - + -
- - -
+
@@ -29,8 +28,8 @@

confirmationText="artemisApp.examManagement.editWorkingTime.typeNameToConfirm" [entityName]="exam.title!" [disabled]="isLoading" - [(ngModel)]="confirmEntityName" name="confirmEntityName" + ngModel /> @@ -42,8 +41,8 @@

id="confirm" type="submit" class="btn btn-warning" - [style.cursor]="editForm.invalid || isLoading || !isWorkingTimeValid() ? 'not-allowed' : 'pointer'" - [disabled]="editForm.invalid || isLoading || !isWorkingTimeValid()" + [style.cursor]="editForm.invalid || isLoading || !isWorkingTimeChangeValid ? 'not-allowed' : 'pointer'" + [disabled]="editForm.invalid || isLoading || !isWorkingTimeChangeValid" >      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 277be237f86d..6f32cc9a35d4 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 @@ -22,8 +22,6 @@ export class ExamEditWorkingTimeDialogComponent { faSpinner = faSpinner; faCheck = faCheck; - confirmEntityName: string; - workingTimeSeconds = 0; get oldWorkingTime() { @@ -44,7 +42,7 @@ export class ExamEditWorkingTimeDialogComponent { } confirmUpdateWorkingTime(): void { - if (!this.isWorkingTimeValid()) return; + if (!this.isWorkingTimeChangeValid) return; this.isLoading = true; this.examManagementService.updateWorkingTime(this.exam.course!.id!, this.exam.id!, this.workingTimeSeconds).subscribe({ next: (res: HttpResponse) => { @@ -59,7 +57,7 @@ export class ExamEditWorkingTimeDialogComponent { }); } - isWorkingTimeValid(): boolean { + get isWorkingTimeChangeValid(): boolean { return Math.abs(this.workingTimeSeconds) !== 0; } } diff --git a/src/main/webapp/app/exam/manage/student-exams/student-exam-detail.component.html b/src/main/webapp/app/exam/manage/student-exams/student-exam-detail.component.html index 1c9967bd449a..9f90954137fa 100644 --- a/src/main/webapp/app/exam/manage/student-exams/student-exam-detail.component.html +++ b/src/main/webapp/app/exam/manage/student-exams/student-exam-detail.component.html @@ -39,78 +39,25 @@
Student
-
Working time
+
Working time
-
-
- - - - - - - -
-
- - - -
-
+ -

+

{{ 'artemisApp.studentExamDetail.endOfIndividualWorkingTime' | artemisTranslate }} {{ individualEndDate | artemisDate: 'long-date' }} - {{ individualEndDate | artemisDate: 'time' : true }}

- @@ -140,7 +87,7 @@
Participati {{ studentExam.submissionDate | artemisDate: 'long' : true }}
  • - {{ getGradeExplanation() | artemisTranslate }}: + {{ gradeExplanation | artemisTranslate }}: {{ grade }}
  • @@ -154,7 +101,7 @@
    Participati
    @@ -163,7 +110,7 @@
    Participati type="button" *ngIf="course?.isAtLeastInstructor" (click)="openConfirmationModal(toggleSubmitPopUp)" - [disabled]="!isExamOver() || isSaving" + [disabled]="!isExamOver || isSaving" id="adjust-submitted-state-button" > @@ -205,6 +152,10 @@

    +
    Student Summary
    @@ -268,74 +219,72 @@
    Sessions
    -
    Exercises
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - ID - - Type - - Title - - Your points - - Achievable points - - Achievable bonus points - - Reviewer - - Has Complaint - - Action -
    - Overall Points - - {{ achievedTotalPoints }} - - {{ maxTotalPoints }} - - {{ bonusTotalPoints }} -
    -
    +
    Exercises
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + ID + + Type + + Title + + Your points + + Achievable points + + Achievable bonus points + + Reviewer + + Has Complaint + + Action +
    + Overall Points + + {{ achievedTotalPoints }} + + {{ maxTotalPoints }} + + {{ bonusTotalPoints }} +
    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 c841e01841d8..32cba7073ac4 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 @@ -1,35 +1,26 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { StudentExam } from 'app/entities/student-exam.model'; import { StudentExamService } from 'app/exam/manage/student-exams/student-exam.service'; import { Course } from 'app/entities/course.model'; import { User } from 'app/core/user/user.model'; -import { ArtemisDurationFromSecondsPipe } from 'app/shared/pipes/artemis-duration-from-seconds.pipe'; import { AlertService } from 'app/core/util/alert.service'; -import { round } from 'app/shared/util/utils'; import dayjs from 'dayjs/esm'; 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 { 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'; - -type WorkingTimeFormValues = { - hours: number; - minutes: number; - seconds: number; - percent: number; -}; +import { combineLatest, takeWhile } from 'rxjs'; @Component({ selector: 'jhi-student-exam-detail', templateUrl: './student-exam-detail.component.html', styleUrls: ['./student-exam-detail.component.scss'], - providers: [ArtemisDurationFromSecondsPipe], }) -export class StudentExamDetailComponent implements OnInit { +export class StudentExamDetailComponent implements OnInit, OnDestroy { + examId: number; courseId: number; studentExam: StudentExam; achievedPointsPerExercise: { [exerciseId: number]: number }; @@ -43,37 +34,22 @@ export class StudentExamDetailComponent implements OnInit { bonusTotalPoints = 0; isSaving = false; - examId: number; - gradingScaleExists = false; grade?: string; gradeAfterBonus?: string; isBonus = false; passed = false; - workingTimeFormValues: WorkingTimeFormValues = { - hours: 0, - minutes: 0, - seconds: 0, - percent: 0, - }; - - lastSavedWorkingTime: WorkingTimeFormValues = { - hours: 0, - minutes: 0, - seconds: 0, - percent: 0, - }; - - individualEndDate: dayjs.Dayjs | undefined; - // Icons faSave = faSave; + workingTimeSeconds = 0; + + private componentActive = true; + constructor( private route: ActivatedRoute, private studentExamService: StudentExamService, - private artemisDurationFromSecondsPipe: ArtemisDurationFromSecondsPipe, private alertService: AlertService, private modalService: NgbModal, ) {} @@ -82,31 +58,19 @@ export class StudentExamDetailComponent implements OnInit { * Initialize the courseId and studentExam */ ngOnInit(): void { - this.isTestRun = this.route.snapshot.url[1]?.toString() === 'test-runs'; - this.loadStudentExam(); - } - - /** - * Load the course and the student exam - */ - loadStudentExam() { - this.courseId = Number(this.route.snapshot.paramMap.get('courseId')); - this.examId = Number(this.route.snapshot.paramMap.get('examId')); - this.route.data.subscribe(({ studentExam }) => this.setStudentExamWithGrade(studentExam)); - this.isTestExam = this.studentExam.exam!.testExam!; + combineLatest([this.route.data, this.route.params, this.route.url]) + .pipe(takeWhile(() => this.componentActive)) + .subscribe(([data, params, url]) => { + this.examId = params.examId; + this.courseId = params.courseId; + this.setStudentExamWithGrade(data.studentExam); + this.isTestExam = data.studentExam.exam.testExam; + this.isTestRun = url[1]?.toString() === 'test-runs'; + }); } - /** - * Sets grade related information if a grading scale exists for the exam - */ - setExamGrade(studentExamWithGrade: StudentExamWithGradeDTO) { - if (studentExamWithGrade?.studentResult?.overallGrade != undefined) { - this.gradingScaleExists = true; - this.grade = studentExamWithGrade.studentResult.overallGrade; - this.gradeAfterBonus = studentExamWithGrade.studentResult.gradeWithBonus?.finalGrade?.toString(); - this.passed = !!studentExamWithGrade.studentResult.hasPassed; - this.isBonus = studentExamWithGrade.gradeType === GradeType.BONUS; - } + ngOnDestroy(): void { + this.componentActive = false; } /** @@ -114,8 +78,7 @@ export class StudentExamDetailComponent implements OnInit { */ saveWorkingTime() { this.isSavingWorkingTime = true; - const seconds = this.getWorkingTimeSeconds(this.workingTimeFormValues); - this.studentExamService.updateWorkingTime(this.courseId, this.studentExam.exam!.id!, this.studentExam.id!, seconds).subscribe({ + this.studentExamService.updateWorkingTime(this.courseId, this.studentExam.exam!.id!, this.studentExam.id!, this.workingTimeSeconds).subscribe({ next: (res) => { if (res.body) { this.setStudentExam(res.body); @@ -140,26 +103,37 @@ export class StudentExamDetailComponent implements OnInit { throw new Error('studentExamWithGrade.studentExam is undefined'); } - this.studentExam = studentExamWithGrade.studentExam; - if (this.studentExam.examSessions) { + const studentExam = studentExamWithGrade.studentExam; + + if (studentExam.examSessions) { // show the oldest session first (sessions are created sequentially so we can sort after id) - this.studentExam.examSessions.sort((s1, s2) => s1.id! - s2.id!); + studentExam.examSessions.sort((s1, s2) => s1.id! - s2.id!); } - this.achievedPointsPerExercise = studentExamWithGrade.achievedPointsPerExercise; - this.initWorkingTimeForm(); + this.setStudentExam(studentExam); + + this.achievedPointsPerExercise = studentExamWithGrade.achievedPointsPerExercise; this.maxTotalPoints = studentExamWithGrade.maxPoints ?? 0; this.achievedTotalPoints = studentExamWithGrade.studentResult.overallPointsAchieved ?? 0; this.bonusTotalPoints = studentExamWithGrade.maxBonusPoints ?? 0; - this.student = studentExamWithGrade.studentExam.user!; - this.course = studentExamWithGrade.studentExam.exam!.course!; - - studentExamWithGrade.studentExam.exercises!.forEach((exercise) => this.initExercise(exercise)); this.setExamGrade(studentExamWithGrade); } + /** + * Sets grade related information if a grading scale exists for the exam + */ + setExamGrade(studentExamWithGrade: StudentExamWithGradeDTO) { + if (studentExamWithGrade?.studentResult?.overallGrade != undefined) { + this.gradingScaleExists = true; + this.grade = studentExamWithGrade.studentResult.overallGrade; + this.gradeAfterBonus = studentExamWithGrade.studentResult.gradeWithBonus?.finalGrade?.toString(); + this.passed = !!studentExamWithGrade.studentResult.hasPassed; + this.isBonus = studentExamWithGrade.gradeType === GradeType.BONUS; + } + } + /** * Sets the student exam, initialised the component which allows changing the working time and sets the score of the student. * @param studentExam @@ -167,18 +141,18 @@ export class StudentExamDetailComponent implements OnInit { private setStudentExam(studentExam: StudentExam) { this.studentExam = studentExam; - this.initWorkingTimeForm(); + this.student = studentExam.user!; + this.course = studentExam.exam!.course!; - this.student = this.studentExam.user!; - this.course = this.studentExam.exam!.course!; + this.workingTimeSeconds = studentExam.workingTime ?? 0; - studentExam.exercises!.forEach((exercise) => this.initExercise(exercise)); + studentExam.exercises?.forEach((exercise) => this.initExercise(exercise)); } /** * Gets the correct explanation label for the grade depending on whether it is a bonus or it has bonus. */ - getGradeExplanation() { + get gradeExplanation() { if (this.isBonus) { return 'artemisApp.studentExams.bonus'; } else if (this.gradeAfterBonus != undefined) { @@ -201,82 +175,23 @@ export class StudentExamDetailComponent implements OnInit { } } - /** - * Updates the form values based on the working time of the student exam. - */ - private initWorkingTimeForm() { - this.setWorkingTimeDuration(this.studentExam.workingTime!); - this.updateVariablesDependingOnWorkingTimeForm(); - - this.lastSavedWorkingTime = { ...this.workingTimeFormValues }; - } - - /** - * Updates the working time duration values of the form whenever the percent value has been changed by the user. - */ - updateWorkingTimeDuration() { - const regularWorkingTime = examWorkingTime(this.studentExam.exam)!; - const seconds = round(regularWorkingTime * (1.0 + this.workingTimeFormValues.percent / 100), 0); - this.setWorkingTimeDuration(seconds); - } - - /** - * Updates the hours, minutes, and seconds values of the form. - * @param seconds the total number of seconds of working time. - */ - private setWorkingTimeDuration(seconds: number) { - const workingTime = this.artemisDurationFromSecondsPipe.secondsToDuration(seconds); - this.workingTimeFormValues.hours = workingTime.days * 24 + workingTime.hours; - this.workingTimeFormValues.minutes = workingTime.minutes; - this.workingTimeFormValues.seconds = workingTime.seconds; - - this.updateIndividualEndDate(); - } - - updateVariablesDependingOnWorkingTimeForm() { - this.updateWorkingTimePercent(); - this.updateIndividualEndDate(); - } - - /** - * Uses the current durations saved in the form to update the extension percent value. - */ - updateWorkingTimePercent() { - this.workingTimeFormValues.percent = getRelativeWorkingTimeExtension(this.studentExam.exam!, this.getWorkingTimeSeconds(this.workingTimeFormValues)); - } - - updateIndividualEndDate() { - this.individualEndDate = dayjs(this.studentExam.exam!.startDate).add(this.getWorkingTimeSeconds(this.workingTimeFormValues), 'seconds'); - } - - /** - * Calculates how many seconds the currently set working time has in total. - */ - private getWorkingTimeSeconds(workingTimeFormValues: WorkingTimeFormValues): number { - const duration = { - days: 0, - hours: workingTimeFormValues.hours, - minutes: workingTimeFormValues.minutes, - seconds: workingTimeFormValues.seconds, - }; - return this.artemisDurationFromSecondsPipe.durationToSeconds(duration); - } - /** * Checks if the user should be able to edit the inputs. */ - isFormDisabled(): boolean { + get isWorkingTimeFormDisabled(): boolean { return this.isSavingWorkingTime || (this.isTestRun && !!this.studentExam.submitted) || !this.studentExam.exam; } + get individualEndDate(): dayjs.Dayjs | undefined { + return dayjs(this.studentExam.exam!.startDate).add(this.workingTimeSeconds, 'seconds'); + } + /** * Checks if the exam is over considering the individual working time of the student and the grace period */ - isExamOver(): boolean { + get isExamOver(): boolean { if (this.studentExam.exam) { - const individualExamEndDate = dayjs(this.studentExam.exam.startDate) - .add(this.getWorkingTimeSeconds(this.lastSavedWorkingTime), 'seconds') - .add(this.studentExam.exam.gracePeriod!, 'seconds'); + const individualExamEndDate = dayjs(this.studentExam.exam.startDate).add(this.studentExam.workingTime!, 'seconds').add(this.studentExam.exam.gracePeriod!, 'seconds'); return individualExamEndDate.isBefore(dayjs()); } diff --git a/src/main/webapp/app/exam/manage/test-runs/create-test-run-modal.component.html b/src/main/webapp/app/exam/manage/test-runs/create-test-run-modal.component.html index 5bf94f176b8e..3dbe720fe0f9 100644 --- a/src/main/webapp/app/exam/manage/test-runs/create-test-run-modal.component.html +++ b/src/main/webapp/app/exam/manage/test-runs/create-test-run-modal.component.html @@ -9,9 +9,9 @@

    Set the working time:

    - + : - +
    • diff --git a/src/main/webapp/app/exam/shared/working-time-control/working-time-control.component.html b/src/main/webapp/app/exam/shared/working-time-control/working-time-control.component.html index 1737b3143dc0..fd3daf4dcd2b 100644 --- a/src/main/webapp/app/exam/shared/working-time-control/working-time-control.component.html +++ b/src/main/webapp/app/exam/shared/working-time-control/working-time-control.component.html @@ -1,12 +1,12 @@
    - +
    - + - + - +
    -
    - +
    +
    - +
    diff --git a/src/main/webapp/app/exam/shared/working-time-control/working-time-control.component.ts b/src/main/webapp/app/exam/shared/working-time-control/working-time-control.component.ts index 93f577b6b4cd..a343ac1c2743 100644 --- a/src/main/webapp/app/exam/shared/working-time-control/working-time-control.component.ts +++ b/src/main/webapp/app/exam/shared/working-time-control/working-time-control.component.ts @@ -2,9 +2,9 @@ import { Component, Input } from '@angular/core'; import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; import { Exam } from 'app/entities/exam.model'; -import { examWorkingTime, getRelativeWorkingTimeExtension } from 'app/exam/participate/exam.utils'; -import { ArtemisDurationFromSecondsPipe } from 'app/shared/pipes/artemis-duration-from-seconds.pipe'; import { round } from 'app/shared/util/utils'; +import { ArtemisDurationFromSecondsPipe } from 'app/shared/pipes/artemis-duration-from-seconds.pipe'; +import { getRelativeWorkingTimeExtension } from 'app/exam/participate/exam.utils'; @Component({ selector: 'jhi-working-time-control', @@ -23,12 +23,14 @@ export class WorkingTimeControlComponent implements ControlValueAccessor { // Control disabled state @Input() disabled = false; @Input() allowNegative = false; - @Input() showRelative = false; + // Whether the percentage-based working time extension control should be shown + @Input() relative = false; + + // Labels for the working time duration inputs @Input() durationLabelText?: string; @Input() relativeLabelText?: string; - // The exam for which the working time should be updated @Input() set exam(exam: Exam | undefined) { this.currentExam = exam; @@ -39,10 +41,9 @@ export class WorkingTimeControlComponent implements ControlValueAccessor { return this.currentExam; } + // The exam for which the working time should be updated + // Used to calculate the relative working time extension private currentExam?: Exam; - private touched = false; - private onTouched = () => {}; - private onChange: (_: number) => void = () => {}; workingTime = { hours: 0, @@ -51,6 +52,10 @@ export class WorkingTimeControlComponent implements ControlValueAccessor { percent: 0, }; + private touched = false; + private onTouched = () => {}; + private onChange: (_: number) => void = () => {}; + constructor(private artemisDurationFromSecondsPipe: ArtemisDurationFromSecondsPipe) {} /** @@ -58,10 +63,9 @@ export class WorkingTimeControlComponent implements ControlValueAccessor { * the value of the form control changes. * @param seconds */ - writeValue(seconds: number) { - if (seconds) { - this.setWorkingTimeDuration(seconds); - this.updateWorkingTimePercentFromDuration(); + writeValue(seconds: number | undefined | null) { + if (typeof seconds === 'number') { + this.workingTimeSeconds = seconds; } } @@ -84,14 +88,31 @@ export class WorkingTimeControlComponent implements ControlValueAccessor { } } + set workingTimeSeconds(seconds: number) { + this.setWorkingTimeDuration(seconds); + this.updateWorkingTimePercentFromDuration(); + } + + /** + * The seconds of the current working time duration. + */ + get workingTimeSeconds(): number { + return this.artemisDurationFromSecondsPipe.durationToSeconds({ + days: 0, + hours: this.workingTime.hours, + minutes: this.workingTime.minutes, + seconds: this.workingTime.seconds, + }); + } + /** * Updates the controls based on the working time of the student exam. */ private initWorkingTimeFromCurrentExam() { if (this.exam) { - this.setWorkingTimeDuration(examWorkingTime(this.exam)!); + // this.setWorkingTimeDuration(examWorkingTime(this.exam)!); this.updateWorkingTimePercentFromDuration(); - this.onChange(this.getWorkingTimeSeconds()); + this.emitWorkingTimeChange(); } } @@ -102,7 +123,7 @@ export class WorkingTimeControlComponent implements ControlValueAccessor { onPercentChanged() { this.markAsTouched(); this.updateWorkingTimeDurationFromPercent(); - this.onChange(this.getWorkingTimeSeconds()); + this.emitWorkingTimeChange(); } /** @@ -112,20 +133,22 @@ export class WorkingTimeControlComponent implements ControlValueAccessor { onDurationChanged() { this.markAsTouched(); this.updateWorkingTimePercentFromDuration(); - this.onChange(this.getWorkingTimeSeconds()); + this.emitWorkingTimeChange(); } /** * Updates the working time percent value of the control based on the current working time duration. + * @private */ private updateWorkingTimePercentFromDuration() { if (this.exam) { - this.workingTime.percent = getRelativeWorkingTimeExtension(this.exam, this.getWorkingTimeSeconds()); + this.workingTime.percent = getRelativeWorkingTimeExtension(this.exam, this.workingTimeSeconds); } } /** * Updates the working time duration values of the control based on the current working time percent. + * @private */ private updateWorkingTimeDurationFromPercent() { if (this.exam) { @@ -139,6 +162,7 @@ export class WorkingTimeControlComponent implements ControlValueAccessor { * Sets the working time duration values of the respective controls by * converting the given seconds into hours, minutes and seconds. * @param seconds the total number of seconds of working time. + * @private */ private setWorkingTimeDuration(seconds: number) { const workingTime = this.artemisDurationFromSecondsPipe.secondsToDuration(seconds); @@ -148,14 +172,10 @@ export class WorkingTimeControlComponent implements ControlValueAccessor { } /** - * Returns the seconds of the current working time duration. + * Calls the onChange callback with the current working time in seconds. + * @private */ - private getWorkingTimeSeconds(): number { - return this.artemisDurationFromSecondsPipe.durationToSeconds({ - days: 0, - hours: this.workingTime.hours, - minutes: this.workingTime.minutes, - seconds: this.workingTime.seconds, - }); + private emitWorkingTimeChange() { + this.onChange(this.workingTimeSeconds); } } diff --git a/src/main/webapp/app/shared/components/reset-repo-button/reset-repo-button.component.html b/src/main/webapp/app/shared/components/reset-repo-button/reset-repo-button.component.html index b51e7dc3ce44..6c3c4bcabec0 100644 --- a/src/main/webapp/app/shared/components/reset-repo-button/reset-repo-button.component.html +++ b/src/main/webapp/app/shared/components/reset-repo-button/reset-repo-button.component.html @@ -29,21 +29,25 @@
    {{ 'artemisApp.exerciseActions.resetRepository.title' + (practiceParticipati > Are you sure you want to delete?

    -
    - - -
    + + +
    -
    -
    - - -
    +