Skip to content

CSCEXAM-1267 Enable adding registry info for rejected assessments #1305

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

Merged
lupari merged 1 commit into from
Dec 30, 2025
+4 −7
Merged

CSCEXAM-1267 Enable adding registry info for rejected assessments #1305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 2 additions & 5 deletions app/controllers/assessment/ReviewController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,17 +297,14 @@ public Result updateAssessmentInfo(Long id, Http.Request request) {
.fetch("parent.creator")
.where()
.idEq(id)
.in("state", Exam.State.GRADED_LOGGED, Exam.State.ARCHIVED)
.in("state", Exam.State.GRADED_LOGGED, Exam.State.ARCHIVED, Exam.State.REJECTED)
.findOneOrEmpty();
if (option.isEmpty()) {
return notFound("i18n_exam_not_found");
}
Exam exam = option.get();
User user = request.attrs().get(Attrs.AUTHENTICATED_USER);
if (
!exam.hasState(Exam.State.GRADED_LOGGED, Exam.State.ARCHIVED) ||
isDisallowedToModify(exam, user, exam.getState())
) {
if (isDisallowedToModify(exam, user, exam.getState())) {
return forbidden("You are not allowed to modify this object");
}
exam.setAssessmentInfo(info);
Expand Down
2 changes: 1 addition & 1 deletion ui/src/app/review/assessment/assessment.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ export class AssessmentService {
};

saveAssessmentInfo$ = (exam: Exam): Observable<void> => {
if (exam.state === 'GRADED_LOGGED' || exam.state === 'ARCHIVED') {
if (exam.state === 'GRADED_LOGGED' || exam.state === 'ARCHIVED' || exam.state === 'REJECTED') {
return this.http
.put<void>(`/app/review/${exam.id}/info`, { assessmentInfo: exam.assessmentInfo })
.pipe(tap(() => this.toast.info(this.translate.instant('i18n_saved'))));
Expand Down
2 changes: 1 addition & 1 deletion ui/src/assets/i18n/fi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,7 @@
"i18n_add_question_owner": "Lisää kysymyksille omistajia",
"i18n_question_owner_added": "Omistaja lisätty",
"i18n_error_drop_disabled_lottery_on": "Kysymyksen lisääminen ei ole sallittu aihealueeseen, jossa on kysymysten arvonta käytössä.",
"i18n_no_grading": "Suoritusta ei arvioinda",
"i18n_no_grading": "Suoritusta ei arvioida",
"i18n_confirm_archiving_without_grade": "Lukitse suoritus ilman kokonaisarviointia (vain pisteet). Toimenpidettä ei voi perua.",
"i18n_no_grading_description": "Suoritusta ei loppuarvioitu EXAM-sovelluksessa",
"i18n_question_already_in_section": "Kysymys on jo lisätty tähän aihealueeseen",
Expand Down
Loading