Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Exam mode: Add save exercise button to exercises #9569

Merged
merged 22 commits into from
Nov 16, 2024
Merged

Exam mode: Add save exercise button to exercises #9569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
3b30ed8
add save exercise button
edkaya Oct 8, 2024
ab40f4d
Add save button component
edkaya Oct 9, 2024
4020da7
Remove unused icon
edkaya Oct 9, 2024
81c10f2
force sync in modeling exercise
edkaya Oct 10, 2024
e4ba765
use new input output signals
edkaya Oct 15, 2024
503f027
Merge branch 'develop' into chore/exam-mode/add-save-button
edkaya Oct 16, 2024
7639823
Add sync input, add comments
edkaya Oct 23, 2024
a3ccb12
Add button to tests
edkaya Oct 23, 2024
6346a13
Fix e2e exam test
edkaya Oct 24, 2024
e081979
Add translation to the button, remove margins
edkaya Oct 24, 2024
07f3af6
Use upper case
edkaya Oct 24, 2024
a18c304
Merge branch 'develop' into chore/exam-mode/add-save-button
edkaya Oct 24, 2024
8bf0bb7
avoid non-null assertions, make icons protected
edkaya Oct 24, 2024
49a4628
split if statements
edkaya Oct 24, 2024
1f76446
Integrate feedback
edkaya Oct 25, 2024
3c76256
Fix client tests
edkaya Oct 25, 2024
29f8203
Fix e2e test
edkaya Oct 25, 2024
44221f9
increase coverage
edkaya Oct 25, 2024
7819c04
Merge branch 'develop' into chore/exam-mode/add-save-button
edkaya Oct 26, 2024
6722606
increase test coverage
edkaya Oct 26, 2024
f588a00
add triggersave test to modeling test
edkaya Oct 26, 2024
396f4b8
Merge branch 'develop' into chore/exam-mode/add-save-button
edkaya Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 28 additions & 10 deletions src/main/webapp/app/exam/participate/exam-participation.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,22 +56,40 @@
<div [hidden]="i !== activePageIndex" [id]="'exercise-' + exercise.id">
@switch (exercise.type) {
@case (QUIZ) {
<jhi-quiz-submission-exam
[quizConfiguration]="exercise"
[studentSubmission]="exercise.studentParticipations[0].submissions![0]"
/>
@if (exercise.studentParticipations[0].submissions) {
krusche marked this conversation as resolved.
Show resolved Hide resolved
<jhi-quiz-submission-exam
[quizConfiguration]="exercise"
[studentSubmission]="exercise.studentParticipations[0].submissions[0]"
(saveCurrentExercise)="triggerSave(false)"
/>
}
}
@case (FILEUPLOAD) {
<jhi-file-upload-submission-exam
[exercise]="exercise"
[studentSubmission]="exercise.studentParticipations[0].submissions![0]"
/>
@if (exercise.studentParticipations[0].submissions) {
<jhi-file-upload-submission-exam
[exercise]="exercise"
[studentSubmission]="exercise.studentParticipations[0].submissions[0]"
/>
}
}
@case (TEXT) {
<jhi-text-editor-exam [exercise]="exercise" [studentSubmission]="exercise.studentParticipations[0].submissions![0]" />
@if (exercise.studentParticipations[0].submissions) {
<jhi-text-editor-exam
[exercise]="exercise"
[studentSubmission]="exercise.studentParticipations[0].submissions[0]"
(saveCurrentExercise)="triggerSave(false)"
/>
}
}
@case (MODELING) {
<jhi-modeling-submission-exam [exercise]="exercise" [studentSubmission]="exercise.studentParticipations[0].submissions![0]" />
@if (exercise.studentParticipations[0].submissions) {
<jhi-modeling-submission-exam
[exercise]="exercise"
[studentSubmission]="exercise.studentParticipations[0].submissions[0]"
[isSubmissionSynced]="exercise.studentParticipations[0].submissions[0].isSynced"
(saveCurrentExercise)="triggerSave(false)"
/>
}
}
@case (PROGRAMMING) {
<jhi-programming-submission-exam
Expand Down
2 changes: 2 additions & 0 deletions src/main/webapp/app/exam/participate/exercises/exam-submission-components.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { ArtemisCodeEditorModule } from 'app/exercises/programming/shared/code-e
import { ArtemisFullscreenModule } from 'app/shared/fullscreen/fullscreen.module';
import { ArtemisModelingEditorModule } from 'app/exercises/modeling/shared/modeling-editor.module';
import { ArtemisProgrammingSubmissionPolicyStatusModule } from 'app/exercises/programming/participate/programming-submission-policy-status.module';
import { ExerciseSaveButtonComponent } from './exercise-save-button/exercise-save-button.component';

@NgModule({
declarations: [
Expand All @@ -42,6 +43,7 @@ import { ArtemisProgrammingSubmissionPolicyStatusModule } from 'app/exercises/pr
ArtemisModelingEditorModule,
ArtemisProgrammingSubmissionPolicyStatusModule,
ExamExerciseUpdateHighlighterModule,
ExerciseSaveButtonComponent,
edkaya marked this conversation as resolved.
Show resolved Hide resolved
],
exports: [FileUploadExamSubmissionComponent, QuizExamSubmissionComponent, ProgrammingExamSubmissionComponent, TextExamSubmissionComponent, ModelingExamSubmissionComponent],
})
Expand Down
8 changes: 8 additions & 0 deletions ...p/app/exam/participate/exercises/exercise-save-button/exercise-save-button.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<button id="save-exam" type="submit" [disabled]="submission()?.isSynced" class="btn btn-primary" (click)="onSave()">
krusche marked this conversation as resolved.
Show resolved Hide resolved
<fa-icon class="saved" [fixedWidth]="true" [icon]="submission()?.submitted && submission()?.isSynced ? facSaveSuccess : faFloppyDisk"> </fa-icon>
<span
class="d-none d-sm-inline"
[jhiTranslate]="submission()?.submitted && submission()?.isSynced ? 'artemisApp.examParticipation.exerciseSaved' : 'artemisApp.examParticipation.saveExercise'"
>
</span>
</button>
3 changes: 3 additions & 0 deletions ...p/app/exam/participate/exercises/exercise-save-button/exercise-save-button.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.saved {
--fa-secondary-opacity: 1;
}
25 changes: 25 additions & 0 deletions ...app/app/exam/participate/exercises/exercise-save-button/exercise-save-button.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { Component, input, output } from '@angular/core';
import { FaIconComponent } from '@fortawesome/angular-fontawesome';
import { faFloppyDisk } from '@fortawesome/free-solid-svg-icons';
import { facSaveSuccess } from '../../../../../content/icons/icons';
import { Submission } from 'app/entities/submission.model';
import { TranslateDirective } from 'app/shared/language/translate.directive';

edkaya marked this conversation as resolved.
Show resolved Hide resolved
@Component({
selector: 'jhi-exercise-save-button',
templateUrl: './exercise-save-button.component.html',
styleUrls: ['./exercise-save-button.component.scss'],
standalone: true,
imports: [FaIconComponent, TranslateDirective],
})
export class ExerciseSaveButtonComponent {
protected readonly faFloppyDisk = faFloppyDisk;
protected readonly facSaveSuccess = facSaveSuccess;

submission = input<Submission>();
save = output<void>();

onSave() {
this.save.emit();
}
}
16 changes: 8 additions & 8 deletions ...app/app/exam/participate/exercises/file-upload/file-upload-exam-submission.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ <h3 class="text-align-left fw-normal">
<span>
{{ exercise.exerciseGroup?.title }}
</span>
<!-- prettier-ignore -->
<span left-header>&nbsp;({{ exercise.maxPoints }} {{ 'artemisApp.examParticipation.points' | artemisTranslate }}@if (exercise.bonusPoints) {
<span
>, {{ exercise.bonusPoints }} {{ 'artemisApp.examParticipation.bonus' | artemisTranslate }}</span>
}) @if (exercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY) {
<jhi-included-in-score-badge
[includedInOverallScore]="exercise.includedInOverallScore" />
}</span>
<span
[jhiTranslate]="exercise.bonusPoints ? 'artemisApp.examParticipation.bonus' : 'artemisApp.examParticipation.points'"
[translateValues]="{ points: exercise.maxPoints, bonusPoints: exercise.bonusPoints }"
>
</span>
@if (exercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY) {
<jhi-included-in-score-badge [includedInOverallScore]="exercise.includedInOverallScore" />
}
</h3>
<hr />
<jhi-resizeable-container [examTimeline]="examTimeline">
Expand Down
29 changes: 16 additions & 13 deletions ...in/webapp/app/exam/participate/exercises/modeling/modeling-exam-submission.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
@if (exercise) {
<h3 class="text-align-left fw-normal">
<span>
{{ exercise.exerciseGroup?.title }}
</span>
<!-- prettier-ignore -->
<span left-header>&nbsp;({{ exercise.maxPoints }} {{ 'artemisApp.examParticipation.points' | artemisTranslate }}@if (exercise.bonusPoints) {
<div class="d-flex justify-content-between align-items-center">
<h3 class="text-align-left fw-normal mb-0">
<span>
{{ exercise.exerciseGroup?.title }}
</span>
<span
>, {{ exercise.bonusPoints }} {{ 'artemisApp.examParticipation.bonus' | artemisTranslate }}</span>
}) @if (exercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY) {
<jhi-included-in-score-badge
[includedInOverallScore]="exercise.includedInOverallScore" />
}</span>
</h3>
[jhiTranslate]="exercise.bonusPoints ? 'artemisApp.examParticipation.bonus' : 'artemisApp.examParticipation.points'"
[translateValues]="{ points: exercise.maxPoints, bonusPoints: exercise.bonusPoints }"
>
</span>
@if (exercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY) {
<jhi-included-in-score-badge [includedInOverallScore]="exercise.includedInOverallScore" />
}
</h3>
<jhi-exercise-save-button [submission]="studentSubmission" (save)="notifyTriggerSave()" />
</div>
<hr />

<jhi-resizeable-container class="col-12" [examTimeline]="examTimeline">
Expand All @@ -38,7 +41,7 @@ <h3 class="text-align-left fw-normal">
</div>
<!--endregion-->
<!--region Right Panel-->
<fa-icon right-header [icon]="farListAlt" />&nbsp;
<fa-icon right-header [icon]="faListAlt" />&nbsp;
<span right-header jhiTranslate="artemisApp.modelingSubmission.problemStatement"></span>
<!-- problem statement update & difference highlighter -->
<ng-container right-body>
Expand Down
16 changes: 14 additions & 2 deletions ...main/webapp/app/exam/participate/exercises/modeling/modeling-exam-submission.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit, ViewChild } from '@angular/core';
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit, ViewChild, input, output } from '@angular/core';
import { UMLModel } from '@ls1intum/apollon';
import dayjs from 'dayjs/esm';
import { ModelingSubmission } from 'app/entities/modeling-submission.model';
Expand Down Expand Up @@ -34,12 +34,17 @@ export class ModelingExamSubmissionComponent extends ExamSubmissionComponent imp
exercise: ModelingExercise;
umlModel: UMLModel; // input model for Apollon+

// explicitly needed to track if submission.isSynced is changed, otherwise component
// does not update the state due to onPush strategy
isSubmissionSynced = input<boolean>();
saveCurrentExercise = output<void>();
edkaya marked this conversation as resolved.
Show resolved Hide resolved

explanationText: string; // current explanation text

readonly IncludedInOverallScore = IncludedInOverallScore;

// Icons
farListAlt = faListAlt;
protected readonly faListAlt = faListAlt;

constructor(changeDetectorReference: ChangeDetectorRef) {
super(changeDetectorReference);
Expand Down Expand Up @@ -154,4 +159,11 @@ export class ModelingExamSubmissionComponent extends ExamSubmissionComponent imp
this.changeDetectorReference.detectChanges();
}
}

/**
* Trigger save action in exam participation component
*/
notifyTriggerSave() {
this.saveCurrentExercise.emit();
}
edkaya marked this conversation as resolved.
Show resolved Hide resolved
}
16 changes: 8 additions & 8 deletions ...app/app/exam/participate/exercises/programming/programming-exam-submission.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ <h3 class="text-align-left fw-normal">
<span>
{{ exercise.exerciseGroup?.title }}
</span>
<!-- prettier-ignore -->
<span left-header>&nbsp;({{ exercise.maxPoints }} {{ 'artemisApp.examParticipation.points' | artemisTranslate }}@if (exercise.bonusPoints) {
<span
>, {{ exercise.bonusPoints }} {{ 'artemisApp.examParticipation.bonus' | artemisTranslate }}</span>
}) @if (exercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY) {
<jhi-included-in-score-badge
[includedInOverallScore]="exercise.includedInOverallScore" />
}</span>
<span
[jhiTranslate]="exercise.bonusPoints ? 'artemisApp.examParticipation.bonus' : 'artemisApp.examParticipation.points'"
[translateValues]="{ points: exercise.maxPoints, bonusPoints: exercise.bonusPoints }"
>
</span>
@if (exercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY) {
<jhi-included-in-score-badge [includedInOverallScore]="exercise.includedInOverallScore" />
}
</h3>
<hr />
<!-- ngIf online-code-editor -->
Expand Down
17 changes: 9 additions & 8 deletions src/main/webapp/app/exam/participate/exercises/quiz/quiz-exam-submission.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<h3 class="text-align-left fw-normal">
<span>
{{ quizConfiguration.exerciseGroup?.title }}
</span>
<span
>({{ quizConfiguration.maxPoints }} {{ 'artemisApp.examParticipation.points' | artemisTranslate }})
<div class="d-flex justify-content-between align-items-center">
<h3 class="text-align-left fw-normal mb-0">
<span>
{{ quizConfiguration.exerciseGroup?.title }}
</span>
<span jhiTranslate="artemisApp.examParticipation.points" [translateValues]="{ points: quizConfiguration.maxPoints }"></span>
@if (quizConfiguration.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY) {
<jhi-included-in-score-badge [includedInOverallScore]="quizConfiguration.includedInOverallScore" />
}
</span>
</h3>
</h3>
<jhi-exercise-save-button [submission]="studentSubmission" (save)="notifyTriggerSave()" />
</div>
<hr />

<div class="w-auto m-0 pb-5">
Expand Down
11 changes: 10 additions & 1 deletion src/main/webapp/app/exam/participate/exercises/quiz/quiz-exam-submission.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ChangeDetectorRef, Component, Input, OnInit, QueryList, ViewChildren } from '@angular/core';
import { ChangeDetectorRef, Component, Input, OnInit, QueryList, ViewChildren, output } from '@angular/core';
edkaya marked this conversation as resolved.
Show resolved Hide resolved
import { Exercise, ExerciseType, IncludedInOverallScore } from 'app/entities/exercise.model';
import { AbstractQuizSubmission } from 'app/entities/quiz/abstract-quiz-exam-submission.model';
import { AnswerOption } from 'app/entities/quiz/answer-option.model';
Expand Down Expand Up @@ -53,6 +53,8 @@ export class QuizExamSubmissionComponent extends ExamSubmissionComponent impleme
@Input() examTimeline = false;
@Input() quizConfiguration: QuizConfiguration;

saveCurrentExercise = output<void>();
edkaya marked this conversation as resolved.
Show resolved Hide resolved

selectedAnswerOptions = new Map<number, AnswerOption[]>();
dragAndDropMappings = new Map<number, DragAndDropMapping[]>();
shortAnswerSubmittedTexts = new Map<number, ShortAnswerSubmittedText[]>();
Expand Down Expand Up @@ -285,4 +287,11 @@ export class QuizExamSubmissionComponent extends ExamSubmissionComponent impleme
this.submissionVersion = submissionVersion;
this.updateViewFromSubmissionVersion();
}

/**
* Trigger save action in exam participation component
*/
notifyTriggerSave() {
this.saveCurrentExercise.emit();
}
}
29 changes: 16 additions & 13 deletions src/main/webapp/app/exam/participate/exercises/text/text-exam-submission.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
@if (exercise) {
<h3 class="text-align-left fw-normal">
<span>
{{ exercise.exerciseGroup?.title }}
</span>
<!-- prettier-ignore -->
<span left-header>&nbsp;({{ exercise.maxPoints }} {{ 'artemisApp.examParticipation.points' | artemisTranslate }}@if (exercise.bonusPoints) {
<div class="d-flex justify-content-between align-items-center">
<h3 class="text-align-left fw-normal mb-0">
<span>
{{ exercise.exerciseGroup?.title }}
</span>
<span
>, {{ exercise.bonusPoints }} {{ 'artemisApp.examParticipation.bonus' | artemisTranslate }}</span>
}) @if (exercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY) {
<jhi-included-in-score-badge
[includedInOverallScore]="exercise.includedInOverallScore" />
}</span>
</h3>
[jhiTranslate]="exercise.bonusPoints ? 'artemisApp.examParticipation.bonus' : 'artemisApp.examParticipation.points'"
[translateValues]="{ points: exercise.maxPoints, bonusPoints: exercise.bonusPoints }"
>
</span>
@if (exercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY) {
<jhi-included-in-score-badge [includedInOverallScore]="exercise.includedInOverallScore" />
}
</h3>
<jhi-exercise-save-button [submission]="studentSubmission" (save)="notifyTriggerSave()" />
</div>
<hr />
<!--resizable container-->
<jhi-resizeable-container class="col-12" [examTimeline]="examTimeline">
Expand Down Expand Up @@ -40,7 +43,7 @@ <h3 class="text-align-left fw-normal">
</div>
<!--endregion-->
<!--region Right Panel-->
<fa-icon right-header [icon]="farListAlt" />&nbsp;
<fa-icon right-header [icon]="faListAlt" />&nbsp;
<span right-header jhiTranslate="artemisApp.exercise.problemStatement"></span>
<!-- problem statement update & difference highlighter -->
<ng-container right-body>
Expand Down
15 changes: 12 additions & 3 deletions src/main/webapp/app/exam/participate/exercises/text/text-exam-submission.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { ChangeDetectorRef, Component, Input, OnInit } from '@angular/core';
import { ChangeDetectorRef, Component, Input, OnInit, output } from '@angular/core';
import { TextEditorService } from 'app/exercises/text/participate/text-editor.service';
import { Subject } from 'rxjs';
import { TextSubmission } from 'app/entities/text/text-submission.model';
import { StringCountService } from 'app/exercises/text/participate/string-count.service';
import { Exercise, ExerciseType, IncludedInOverallScore } from 'app/entities/exercise.model';
import { ExamSubmissionComponent } from 'app/exam/participate/exercises/exam-submission.component';
import { Submission } from 'app/entities/submission.model';
import { faListAlt } from '@fortawesome/free-regular-svg-icons';
import { faListAlt } from '@fortawesome/free-solid-svg-icons';
import { MAX_SUBMISSION_TEXT_LENGTH } from 'app/shared/constants/input.constants';
import { SubmissionVersion } from 'app/entities/submission-version.model';
import { htmlForMarkdown } from 'app/shared/util/markdown.conversion.util';
Expand All @@ -26,6 +26,8 @@ export class TextExamSubmissionComponent extends ExamSubmissionComponent impleme
@Input()
exercise: Exercise;

saveCurrentExercise = output<void>();

readonly IncludedInOverallScore = IncludedInOverallScore;
readonly maxCharacterCount = MAX_SUBMISSION_TEXT_LENGTH;

Expand All @@ -35,7 +37,7 @@ export class TextExamSubmissionComponent extends ExamSubmissionComponent impleme
private textEditorInput = new Subject<string>();

edkaya marked this conversation as resolved.
Show resolved Hide resolved
// Icons
farListAlt = faListAlt;
protected readonly faListAlt = faListAlt;

constructor(
private textService: TextEditorService,
Expand Down Expand Up @@ -121,4 +123,11 @@ export class TextExamSubmissionComponent extends ExamSubmissionComponent impleme
this.submissionVersion = submissionVersion;
this.updateViewFromSubmissionVersion();
}

/**
* Trigger save action in exam participation component
*/
notifyTriggerSave() {
this.saveCurrentExercise.emit();
}
}
Loading
Loading