From 1b0ee488f72f86e157799af07740bdd33cf9b3de Mon Sep 17 00:00:00 2001 From: Matti Lupari Date: Thu, 11 Jan 2024 14:53:02 +0200 Subject: [PATCH] CSCEXAM-000 Take new control flow syntax in use --- .../api/CollaborativeAttachmentInterface.java | 8 +- .../impl/CollaborationController.java | 12 +- .../transfer/impl/DataTransferController.java | 8 +- .../impl/ExternalAttachmentLoaderImpl.java | 13 +- app/impl/AutoEvaluationHandlerImpl.java | 2 +- app/models/questions/Question.java | 18 +- app/models/sections/ExamSectionQuestion.java | 2 +- app/repository/EnrolmentRepository.java | 12 +- ui/package.json | 4 +- .../categories/enrolments-report.component.ts | 25 +- .../categories/exams-report.component.ts | 41 +- .../categories/rooms-report.component.ts | 25 +- .../categories/students-report.component.ts | 19 +- .../categories/teachers-report.component.ts | 25 +- .../reports/reports.component.ts | 45 +- .../settings/settings.component.html | 301 +++--- .../settings/settings.component.ts | 10 +- .../categories/exam-statistics.component.ts | 65 +- .../categories/room-statistics.component.ts | 28 +- .../statistics/statistics.component.html | 60 +- .../statistics/statistics.component.ts | 4 +- .../administrative/users/users.component.html | 398 ++++---- .../administrative/users/users.component.ts | 4 +- ui/src/app/app.component.ts | 26 +- .../calendar/booking-calendar.component.ts | 23 +- ui/src/app/calendar/calendar.component.html | 61 +- ui/src/app/calendar/calendar.component.ts | 3 +- .../calendar/helpers/exam-info.component.ts | 37 +- .../helpers/optional-sections.component.ts | 114 ++- .../helpers/organisation-picker.component.ts | 43 +- .../helpers/selected-room.component.ts | 85 +- .../helpers/slot-picker.component.html | 153 ++- .../calendar/helpers/slot-picker.component.ts | 4 +- .../exam-list-category.component.html | 205 ++-- .../exam-list-category.component.ts | 4 +- .../teacher/teacher-dashboard.component.html | 8 +- .../teacher/teacher-dashboard.component.ts | 8 +- .../teacher/teacher-dashboard.service.ts | 6 +- .../student/student-dashboard.component.html | 22 +- .../student/student-dashboard.component.ts | 4 +- .../student/student-dashboard.service.ts | 5 +- .../active/active-enrolment.component.html | 599 ++++++------ .../active/active-enrolment.component.ts | 10 +- ...lect-examination-event-dialog.component.ts | 38 +- .../active-enrolment-menu.component.html | 167 ++-- .../active-enrolment-menu.component.ts | 3 +- .../exam-enrolment-details.component.html | 76 +- .../exams/exam-enrolment-details.component.ts | 3 +- .../exams/exam-enrolments.component.ts | 40 +- ...aborative-exam-participations.component.ts | 4 +- .../exam-answers-dialog.component.html | 300 +++--- .../finished/exam-answers-dialog.component.ts | 4 +- .../finished/exam-feedback.component.html | 320 ++++--- .../finished/exam-feedback.component.ts | 4 +- .../exam-participation.component.html | 120 ++- .../finished/exam-participation.component.ts | 3 +- .../exam-participations.component.html | 52 +- .../finished/exam-participations.component.ts | 5 +- .../collaborative-exam-search.component.ts | 26 +- .../search/exam-search-result.component.ts | 86 +- .../enrolment/search/exam-search.component.ts | 87 +- .../waiting-room/waiting-room.component.html | 203 ++-- .../waiting-room/waiting-room.component.ts | 3 +- .../wrong-location.component.html | 138 +-- .../wrong-location.component.ts | 4 +- .../wrong-location/wrong-location.service.ts | 5 +- .../collaborative-exam-listing.component.html | 94 +- .../collaborative-exam-listing.component.ts | 4 +- .../collaborative-exam.service.ts | 5 +- .../assessment/auto-evaluation.component.html | 168 ++-- .../assessment/auto-evaluation.component.ts | 9 +- .../assessment/exam-assessment.component.html | 82 +- .../assessment/exam-assessment.component.ts | 4 +- .../exam-feedback-config.component.html | 102 +- .../exam-feedback-config.component.ts | 4 +- .../basic/basic-exam-info.component.html | 156 +-- .../editor/basic/basic-exam-info.component.ts | 3 +- .../exam-inspector-picker.component.html | 30 +- .../basic/exam-inspector-picker.component.ts | 9 +- .../basic/exam-owner-picker.component.html | 32 +- .../basic/exam-owner-picker.component.ts | 10 +- .../editor/basic/software-picker.component.ts | 42 +- .../common/course-picker.component.html | 30 +- .../editor/common/course-picker.component.ts | 4 +- .../examination-type-picker.component.ts | 59 +- .../common/language-picker.component.ts | 25 +- .../creation/course-selection.component.html | 206 ++-- .../creation/course-selection.component.ts | 3 +- .../editor/creation/new-exam.component.html | 97 +- .../editor/creation/new-exam.component.ts | 9 +- .../examination-event-dialog.component.html | 67 +- .../examination-event-dialog.component.ts | 4 +- .../examination-event-search.component.html | 232 ++--- .../examination-event-search.component.ts | 4 +- .../app/exam/editor/exam-tabs.component.html | 38 +- ui/src/app/exam/editor/exam-tabs.component.ts | 14 +- ...llaborative-exam-owner-picker.component.ts | 46 +- .../exam-participant-picker.component.ts | 56 +- .../exam-pre-participant-picker.component.ts | 56 +- .../exam-publication.component.html | 456 ++++----- .../publication/exam-publication.component.ts | 4 +- .../organisation-picker.component.ts | 84 +- .../publication-dialog.component.ts | 19 +- .../publication-error-dialog.component.ts | 10 +- .../exam-material-picker.component.html | 30 +- .../exam-material-picker.component.ts | 10 +- .../sections/exam-material.component.html | 32 +- .../sections/exam-material.component.ts | 6 +- .../sections/section-question.component.html | 247 ++--- .../sections/section-question.component.ts | 4 +- .../editor/sections/section.component.html | 220 +++-- .../exam/editor/sections/section.component.ts | 4 +- .../editor/sections/sections.component.html | 92 +- .../editor/sections/sections.component.ts | 4 +- .../app/exam/listing/exam-list.component.html | 162 ++-- .../app/exam/listing/exam-list.component.ts | 4 +- .../app/exam/printout/printout.component.html | 169 ++-- .../app/exam/printout/printout.component.ts | 13 +- .../app/exam/printout/printouts.component.ts | 49 +- .../clock/examination-clock.component.ts | 39 +- .../examination/examination.component.html | 62 +- .../app/examination/examination.component.ts | 3 +- .../header/examination-header.component.ts | 24 +- .../answer-instructions.component.ts | 24 +- .../logout/examination-logout.component.ts | 8 +- .../examination-navigation.component.ts | 45 +- .../examination-toolbar.component.html | 121 +-- .../examination-toolbar.component.ts | 4 +- .../examination-cloze-test.component.ts | 26 +- .../examination-essay-question.component.html | 120 +-- .../examination-essay-question.component.ts | 4 +- ...ination-multi-choice-question.component.ts | 53 +- .../examination-question.component.html | 192 ++-- .../examination-question.component.ts | 5 +- ...eighted-multi-choice-question.component.ts | 28 +- .../section/examination-section.component.ts | 81 +- .../accessibility-picker.component.ts | 29 +- .../accessibility.component.html | 77 +- .../accessibility/accessibility.component.ts | 4 +- .../app/facility/address/address.component.ts | 6 +- ui/src/app/facility/facility.component.html | 16 +- ui/src/app/facility/facility.component.ts | 3 +- .../facility/machines/machine.component.html | 214 ++--- .../facility/machines/machine.component.ts | 4 +- .../facility/machines/machines.component.html | 71 +- .../facility/machines/machines.component.ts | 10 +- .../rooms/availability.component.html | 102 +- .../facility/rooms/availability.component.ts | 10 +- .../rooms/room-mass-edit.component.ts | 72 +- ui/src/app/facility/rooms/room.component.html | 480 +++++----- ui/src/app/facility/rooms/room.component.ts | 3 +- .../app/facility/rooms/rooms.component.html | 364 ++++--- ui/src/app/facility/rooms/rooms.component.ts | 4 +- .../exception-delete-dialog.component.ts | 22 +- .../schedule/exception-dialog.component.html | 815 ++++++++-------- .../schedule/exception-dialog.component.ts | 13 +- .../facility/schedule/exceptions.component.ts | 70 +- .../schedule/opening-hours.component.ts | 123 +-- .../schedule/starting-time.component.ts | 23 +- ui/src/app/interceptors/error-interceptor.ts | 5 +- .../language-inspections.component.ts | 31 +- .../reviewed-inspections.component.html | 200 ++-- .../listing/reviewed-inspections.component.ts | 4 +- .../unfinished-inspections.component.html | 172 ++-- .../unfinished-inspections.component.ts | 4 +- .../maturity-reporting.component.html | 105 ++- .../reporting/maturity-reporting.component.ts | 4 +- .../app/navigation/navigation.component.html | 256 ++--- ui/src/app/navigation/navigation.component.ts | 4 +- ui/src/app/navigation/navigation.service.ts | 6 +- .../basequestion/claim-choice.component.ts | 95 +- .../question/basequestion/essay.component.ts | 14 +- .../multiple-choice-option.component.ts | 18 +- .../basequestion/multiple-choice.component.ts | 122 +-- .../basequestion/question-body.component.html | 48 +- .../basequestion/question-body.component.ts | 6 +- .../basequestion/question.component.html | 35 +- .../basequestion/question.component.ts | 4 +- ...ighted-multiple-choice-option.component.ts | 5 +- .../exam-question-editor.component.ts | 17 +- .../examquestion/exam-question.component.html | 891 +++++++++--------- .../examquestion/exam-question.component.ts | 4 +- .../library-transfer-dialog.component.html | 17 +- .../library-transfer-dialog.component.ts | 4 +- .../app/question/library/library.component.ts | 19 +- .../results/library-results.component.html | 284 +++--- .../results/library-results.component.ts | 4 +- .../search/library-search.component.html | 141 ++- .../search/library-search.component.ts | 14 +- .../question-preview-dialog.component.ts | 25 +- .../app/question/tags/tag-picker.component.ts | 37 +- .../remove-reservation-dialog.component.ts | 6 +- .../reservation-details.component.html | 324 ++++--- .../reservation-details.component.ts | 4 +- ui/src/app/reservation/reservation.service.ts | 4 +- .../reservation/reservations.component.html | 162 ++-- .../app/reservation/reservations.component.ts | 11 +- .../assessment/assessment.component.html | 241 ++--- .../review/assessment/assessment.component.ts | 4 +- .../assessment/feedback/feedback.component.ts | 24 +- .../feedback/statement.component.ts | 28 +- .../general/general-info.component.html | 161 ++-- .../general/general-info.component.ts | 17 +- .../assessment/general/no-show.component.ts | 2 +- .../general/participation.component.ts | 20 +- .../assessment/grading/grading.component.html | 112 ++- .../assessment/grading/grading.component.ts | 4 +- .../grading/inspection.component.ts | 63 +- .../assessment/grading/toolbar.component.ts | 36 +- .../maturity/grading.component.html | 111 ++- .../assessment/maturity/grading.component.ts | 4 +- .../maturity/inspection-comments.component.ts | 41 +- .../assessment/maturity/toolbar.component.ts | 126 +-- .../print/printed-assessment.component.html | 456 +++++---- .../print/printed-assessment.component.ts | 4 +- .../print/printed-cloze-test.component.ts | 4 +- .../print/printed-essay.component.ts | 4 +- .../print/printed-multi-choice.component.ts | 4 +- .../print/printed-section.component.ts | 39 +- .../print/templates/cloze-test.component.html | 30 +- .../print/templates/essay.component.html | 78 +- .../templates/multi-choice.component.html | 157 +-- .../claim-choice-answer.component.ts | 56 +- .../questions/cloze-test.component.html | 120 ++- .../questions/cloze-test.component.ts | 12 +- .../questions/essay-question.component.html | 242 +++-- .../questions/essay-question.component.ts | 3 +- .../multi-choice-answer.component.ts | 118 +-- .../multi-choice-question.component.html | 211 +++-- .../multi-choice-question.component.ts | 3 +- .../weighted-multi-choice-answer.component.ts | 106 ++- .../sections/section.component.html | 185 ++-- .../assessment/sections/section.component.ts | 18 +- .../categories/archived.component.html | 318 ++++--- .../listing/categories/archived.component.ts | 4 +- .../categories/graded-logged.component.html | 542 ++++++----- .../categories/graded-logged.component.ts | 4 +- .../listing/categories/graded.component.html | 532 ++++++----- .../listing/categories/graded.component.ts | 4 +- .../in-language-inspection.component.html | 372 ++++---- .../in-language-inspection.component.ts | 4 +- .../categories/in-progress.component.html | 439 +++++---- .../categories/in-progress.component.ts | 4 +- .../categories/rejected.component.html | 348 +++---- .../listing/categories/rejected.component.ts | 4 +- .../listing/dialogs/aborted.component.html | 251 ++--- .../listing/dialogs/aborted.component.ts | 4 +- .../dialogs/archive-download.component.ts | 6 +- .../listing/dialogs/feedback.component.ts | 29 +- .../listing/dialogs/no-shows.component.html | 165 ++-- .../listing/dialogs/no-shows.component.ts | 9 +- .../review/listing/review-list.component.html | 106 ++- .../review/listing/review-list.component.ts | 4 +- .../app/review/listing/review-list.service.ts | 6 +- .../listing/speed-review.component.html | 358 +++---- .../review/listing/speed-review.component.ts | 4 +- .../summary/exam-summary.component.html | 82 +- .../listing/summary/exam-summary.component.ts | 4 +- .../listing/summary/exam-summary.service.ts | 41 +- .../assessment/essay-answer.component.html | 245 ++--- .../assessment/essay-answer.component.ts | 9 +- .../assessment/essay-answers.component.ts | 44 +- .../question-assessment.component.html | 114 ++- .../question-assessment.component.ts | 3 +- .../flow/question-flow-category.component.ts | 50 +- .../questions/flow/question-flow.component.ts | 41 +- .../listing/question-review.component.ts | 109 ++- .../listing/question-reviews.component.ts | 102 +- .../app/session/eula/eula-dialog.component.ts | 5 +- .../role/role-picker-dialog.component.ts | 21 +- .../shared/attachment/attachment.service.ts | 4 +- .../dialogs/attachment-picker.component.ts | 19 +- .../app/shared/date/date-picker.component.ts | 5 +- ui/src/app/shared/file/file.service.ts | 6 +- .../miscellaneous/common-exam.service.ts | 5 +- .../miscellaneous/course-code.component.ts | 9 +- .../shared/paginator/paginator.component.ts | 17 +- .../select/dropdown-select.component.ts | 61 +- .../app/shared/user/teacher-list.component.ts | 10 +- ui/src/app/software/software.component.html | 72 +- ui/src/app/software/software.component.ts | 10 +- 281 files changed, 11552 insertions(+), 9940 deletions(-) diff --git a/app/controllers/iop/collaboration/api/CollaborativeAttachmentInterface.java b/app/controllers/iop/collaboration/api/CollaborativeAttachmentInterface.java index 5e85d4fcb4..0d4324f748 100644 --- a/app/controllers/iop/collaboration/api/CollaborativeAttachmentInterface.java +++ b/app/controllers/iop/collaboration/api/CollaborativeAttachmentInterface.java @@ -102,12 +102,8 @@ default Either, LanguageInspection> findLanguageInspecti Http.MultipartFormData.FilePart file ) { Source> source = FileIO.fromPath(file.getRef().path()); - Http.MultipartFormData.FilePart>> filePart = new Http.MultipartFormData.FilePart<>( - "file", - file.getFilename(), - file.getContentType(), - source - ); + Http.MultipartFormData.FilePart>> filePart = + new Http.MultipartFormData.FilePart<>("file", file.getFilename(), file.getContentType(), source); return Source.from(Set.of(filePart)); } diff --git a/app/controllers/iop/collaboration/impl/CollaborationController.java b/app/controllers/iop/collaboration/impl/CollaborationController.java index 70de3e81d7..627d6ad814 100644 --- a/app/controllers/iop/collaboration/impl/CollaborationController.java +++ b/app/controllers/iop/collaboration/impl/CollaborationController.java @@ -142,30 +142,26 @@ boolean isAuthorizedToView(Exam exam, User user, String homeOrg) { } return ( user.getLoginRole() == Role.Name.ADMIN || - ( - exam + (exam .getExamOwners() .stream() .anyMatch(u -> u.getEmail().equalsIgnoreCase(user.getEmail()) || u.getEmail().equalsIgnoreCase(user.getEppn()) ) && - exam.hasState(Exam.State.PRE_PUBLISHED, Exam.State.PUBLISHED) - ) + exam.hasState(Exam.State.PRE_PUBLISHED, Exam.State.PUBLISHED)) ); } boolean isUnauthorizedToAssess(Exam exam, User user) { return ( user.getLoginRole() != Role.Name.ADMIN && - ( - exam + (exam .getExamOwners() .stream() .noneMatch(u -> u.getEmail().equalsIgnoreCase(user.getEmail()) || u.getEmail().equalsIgnoreCase(user.getEppn()) ) || - !exam.hasState(Exam.State.REVIEW, Exam.State.REVIEW_STARTED, Exam.State.GRADED) - ) + !exam.hasState(Exam.State.REVIEW, Exam.State.REVIEW_STARTED, Exam.State.GRADED)) ); } diff --git a/app/controllers/iop/transfer/impl/DataTransferController.java b/app/controllers/iop/transfer/impl/DataTransferController.java index f0d18f7223..9f6bfa2eb9 100644 --- a/app/controllers/iop/transfer/impl/DataTransferController.java +++ b/app/controllers/iop/transfer/impl/DataTransferController.java @@ -203,12 +203,8 @@ public CompletionStage exportData(Http.Request request) throws IOExcepti Attachment attachment ) { Source> source = FileIO.fromPath(Path.of(attachment.getFilePath())); - Http.MultipartFormData.FilePart>> filePart = new Http.MultipartFormData.FilePart<>( - "file", - attachment.getFileName(), - attachment.getMimeType(), - source - ); + Http.MultipartFormData.FilePart>> filePart = + new Http.MultipartFormData.FilePart<>("file", attachment.getFileName(), attachment.getMimeType(), source); return Source.from(Set.of(filePart)); } diff --git a/app/controllers/iop/transfer/impl/ExternalAttachmentLoaderImpl.java b/app/controllers/iop/transfer/impl/ExternalAttachmentLoaderImpl.java index d3c001655a..1f93dc91d4 100644 --- a/app/controllers/iop/transfer/impl/ExternalAttachmentLoaderImpl.java +++ b/app/controllers/iop/transfer/impl/ExternalAttachmentLoaderImpl.java @@ -136,12 +136,13 @@ public CompletableFuture createExternalAttachment(Attachment attachment) { return; } final Source> source = FileIO.fromPath(file.toPath()); - final Http.MultipartFormData.FilePart>> filePart = new Http.MultipartFormData.FilePart<>( - "file", - attachment.getFileName(), - attachment.getMimeType(), - source - ); + final Http.MultipartFormData.FilePart>> filePart = + new Http.MultipartFormData.FilePart<>( + "file", + attachment.getFileName(), + attachment.getMimeType(), + source + ); Http.MultipartFormData.DataPart dp = new Http.MultipartFormData.DataPart("key", "value"); updateRequest diff --git a/app/impl/AutoEvaluationHandlerImpl.java b/app/impl/AutoEvaluationHandlerImpl.java index cd1cc85acf..5117677bb4 100644 --- a/app/impl/AutoEvaluationHandlerImpl.java +++ b/app/impl/AutoEvaluationHandlerImpl.java @@ -107,7 +107,7 @@ private Optional resolveScale(Exam exam) { private Grade getGradeBasedOnScore(Exam exam) { Double totalScore = exam.getTotalScore(); Double maxScore = exam.getMaxScore(); - Double percentage = maxScore == 0 ? 0 : totalScore * 100 / maxScore; + Double percentage = maxScore == 0 ? 0 : (totalScore * 100) / maxScore; List gradeEvaluations = new ArrayList<>(exam.getAutoEvaluationConfig().getGradeEvaluations()); gradeEvaluations.sort(Comparator.comparingInt(GradeEvaluation::getPercentage)); Grade grade = null; diff --git a/app/models/questions/Question.java b/app/models/questions/Question.java index 70acdfa528..142c40e801 100644 --- a/app/models/questions/Question.java +++ b/app/models/questions/Question.java @@ -316,21 +316,15 @@ private boolean getClaimChoiceOptionsValidationResult(ArrayNode options) { } return ( - ( - type == MultipleChoiceOption.ClaimChoiceOptionType.CorrectOption && + (type == MultipleChoiceOption.ClaimChoiceOptionType.CorrectOption && defaultScore > 0 && - !option.isEmpty() - ) || - ( - type == MultipleChoiceOption.ClaimChoiceOptionType.IncorrectOption && + !option.isEmpty()) || + (type == MultipleChoiceOption.ClaimChoiceOptionType.IncorrectOption && defaultScore <= 0 && - !option.isEmpty() - ) || - ( - type == MultipleChoiceOption.ClaimChoiceOptionType.SkipOption && + !option.isEmpty()) || + (type == MultipleChoiceOption.ClaimChoiceOptionType.SkipOption && defaultScore == 0 && - !option.isEmpty() - ) + !option.isEmpty()) ); }) .map(n -> diff --git a/app/models/sections/ExamSectionQuestion.java b/app/models/sections/ExamSectionQuestion.java index 1fa58fb186..2fef1a045a 100644 --- a/app/models/sections/ExamSectionQuestion.java +++ b/app/models/sections/ExamSectionQuestion.java @@ -402,7 +402,7 @@ public Double getAssessedScore() { return 0.0; } DecimalFormat df = new DecimalFormat("#.##", new DecimalFormatSymbols(Locale.US)); - double value = correct * maxScore / (correct + incorrect); + double value = (correct * maxScore) / (correct + incorrect); return Double.valueOf(df.format(value)); } case ClaimChoiceQuestion -> { diff --git a/app/repository/EnrolmentRepository.java b/app/repository/EnrolmentRepository.java index f6f5f8b5d0..c8b282a1cd 100644 --- a/app/repository/EnrolmentRepository.java +++ b/app/repository/EnrolmentRepository.java @@ -317,16 +317,12 @@ private boolean isInsideBounds(ExamEnrolment ee, int minutesToFuture) { ? ee.getExaminationEventConfiguration().getExaminationEvent() : null; return ( - ( - reservation != null && + (reservation != null && reservation.getStartAt().isBefore(latest) && - reservation.getEndAt().isAfter(earliest) - ) || - ( - event != null && + reservation.getEndAt().isAfter(earliest)) || + (event != null && event.getStart().isBefore(latest) && - event.getStart().plusMinutes(ee.getExam().getDuration()).isAfter(earliest) - ) + event.getStart().plusMinutes(ee.getExam().getDuration()).isAfter(earliest)) ); } diff --git a/ui/package.json b/ui/package.json index a3793dbfab..7bbd778293 100644 --- a/ui/package.json +++ b/ui/package.json @@ -89,10 +89,10 @@ "prettier --write" ], "../app/**/*.java": [ - "prettier --write --print-width=120 --tab-width=4" + "prettier --write --plugin=prettier-plugin-java --print-width=120 --tab-width=4" ], "../test/**/*.java": [ - "prettier --write --print-width=120 --tab-width=4" + "prettier --write --plugin=prettier-plugin-java --print-width=120 --tab-width=4" ], "src/app/**/*.ts": [ "eslint --fix" diff --git a/ui/src/app/administrative/reports/categories/enrolments-report.component.ts b/ui/src/app/administrative/reports/categories/enrolments-report.component.ts index 8b88705764..9d96c5b623 100644 --- a/ui/src/app/administrative/reports/categories/enrolments-report.component.ts +++ b/ui/src/app/administrative/reports/categories/enrolments-report.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgIf } from '@angular/common'; + import { Component, Input } from '@angular/core'; import { NgbPopover } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; @@ -30,13 +30,14 @@ import { DropdownSelectComponent, Option } from '../../../shared/select/dropdown
- + @if (examNames) { + + }
@@ -57,13 +58,17 @@ import { DropdownSelectComponent, Option } from '../../../shared/select/dropdown `, selector: 'xm-enrolments-report', standalone: true, - imports: [NgIf, DropdownSelectComponent, NgbPopover, TranslateModule], + imports: [DropdownSelectComponent, NgbPopover, TranslateModule], }) export class EnrolmentsReportComponent { @Input() examNames: Option[] = []; enrolment?: number; - constructor(private translate: TranslateService, private toast: ToastrService, private files: FileService) {} + constructor( + private translate: TranslateService, + private toast: ToastrService, + private files: FileService, + ) {} getExamEnrolments = () => { if (this.enrolment) { diff --git a/ui/src/app/administrative/reports/categories/exams-report.component.ts b/ui/src/app/administrative/reports/categories/exams-report.component.ts index c73adba9d5..8bfa8fbb7d 100644 --- a/ui/src/app/administrative/reports/categories/exams-report.component.ts +++ b/ui/src/app/administrative/reports/categories/exams-report.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgIf } from '@angular/common'; + import { Component, Input } from '@angular/core'; import { NgbPopover } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; @@ -25,20 +25,25 @@ import { DropdownSelectComponent, Option } from '../../../shared/select/dropdown

{{ 'i18n_get_all_info_from_exam' | translate }} - {{ 'i18n_excel_file' | translate }} - {{ 'i18n_json_file' | translate }} + @if (fileType === 'xlsx') { + {{ 'i18n_excel_file' | translate }} + } + @if (fileType === 'json') { + {{ 'i18n_json_file' | translate }} + }

- + @if (examNames) { + + }
@@ -51,8 +56,12 @@ import { DropdownSelectComponent, Option } from '../../../shared/select/dropdown popoverTitle="{{ 'i18n_instructions' | translate }}" ngbPopover="{{ 'i18n_download' | translate }}" > - - + @if (fileType === 'xlsx') { + + } + @if (fileType === 'json') { + + }
@@ -60,7 +69,7 @@ import { DropdownSelectComponent, Option } from '../../../shared/select/dropdown `, selector: 'xm-exams-report', standalone: true, - imports: [NgIf, DropdownSelectComponent, NgbPopover, TranslateModule], + imports: [DropdownSelectComponent, NgbPopover, TranslateModule], }) export class ExamsReportComponent { @Input() examNames: Option[] = []; @@ -68,7 +77,11 @@ export class ExamsReportComponent { exam?: number; - constructor(private translate: TranslateService, private toast: ToastrService, private files: FileService) {} + constructor( + private translate: TranslateService, + private toast: ToastrService, + private files: FileService, + ) {} examSelected = (event?: Option) => (this.exam = event?.id); diff --git a/ui/src/app/administrative/reports/categories/rooms-report.component.ts b/ui/src/app/administrative/reports/categories/rooms-report.component.ts index 60b3156083..dfc1906669 100644 --- a/ui/src/app/administrative/reports/categories/rooms-report.component.ts +++ b/ui/src/app/administrative/reports/categories/rooms-report.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgIf } from '@angular/common'; + import { Component, Input } from '@angular/core'; import { NgbPopover } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; @@ -33,13 +33,14 @@ import { DropdownSelectComponent, Option } from '../../../shared/select/dropdown
- + @if (rooms) { + + }
@@ -72,7 +73,7 @@ import { DropdownSelectComponent, Option } from '../../../shared/select/dropdown `, selector: 'xm-rooms-report', standalone: true, - imports: [NgIf, DropdownSelectComponent, DatePickerComponent, NgbPopover, TranslateModule], + imports: [DropdownSelectComponent, DatePickerComponent, NgbPopover, TranslateModule], }) export class RoomsReportComponent { @Input() rooms: Option[] = []; @@ -81,7 +82,11 @@ export class RoomsReportComponent { startDate: Date | null = null; endDate: Date | null = null; - constructor(private translate: TranslateService, private toast: ToastrService, private files: FileService) {} + constructor( + private translate: TranslateService, + private toast: ToastrService, + private files: FileService, + ) {} roomSelected = (event?: Option) => { this.room = event?.id; diff --git a/ui/src/app/administrative/reports/categories/students-report.component.ts b/ui/src/app/administrative/reports/categories/students-report.component.ts index 25bcb85a94..f30f75c086 100644 --- a/ui/src/app/administrative/reports/categories/students-report.component.ts +++ b/ui/src/app/administrative/reports/categories/students-report.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { DatePipe, NgIf } from '@angular/common'; +import { DatePipe } from '@angular/common'; import { Component, Input } from '@angular/core'; import { NgbPopover } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; @@ -33,13 +33,14 @@ import { DropdownSelectComponent, Option } from '../../../shared/select/dropdown
- + @if (students) { + + }
@@ -72,7 +73,7 @@ import { DropdownSelectComponent, Option } from '../../../shared/select/dropdown `, selector: 'xm-students-report', standalone: true, - imports: [NgIf, DropdownSelectComponent, DatePickerComponent, NgbPopover, TranslateModule], + imports: [DropdownSelectComponent, DatePickerComponent, NgbPopover, TranslateModule], }) export class StudentsReportComponent { @Input() students: Option[] = []; diff --git a/ui/src/app/administrative/reports/categories/teachers-report.component.ts b/ui/src/app/administrative/reports/categories/teachers-report.component.ts index 3372b96f9d..bb677ecaf4 100644 --- a/ui/src/app/administrative/reports/categories/teachers-report.component.ts +++ b/ui/src/app/administrative/reports/categories/teachers-report.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgIf } from '@angular/common'; + import { Component, Input } from '@angular/core'; import { NgbPopover } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; @@ -33,13 +33,14 @@ import { DropdownSelectComponent, Option } from '../../../shared/select/dropdown
- + @if (teachers) { + + }
@@ -72,7 +73,7 @@ import { DropdownSelectComponent, Option } from '../../../shared/select/dropdown `, selector: 'xm-teachers-report', standalone: true, - imports: [NgIf, DropdownSelectComponent, DatePickerComponent, NgbPopover, TranslateModule], + imports: [DropdownSelectComponent, DatePickerComponent, NgbPopover, TranslateModule], }) export class TeachersReportComponent { @Input() teachers: Option[] = []; @@ -80,7 +81,11 @@ export class TeachersReportComponent { answerStartDate: Date | null = null; answerEndDate: Date | null = null; - constructor(private translate: TranslateService, private toast: ToastrService, private files: FileService) {} + constructor( + private translate: TranslateService, + private toast: ToastrService, + private files: FileService, + ) {} getTeacherExamsByDate = () => { const f = format(this.answerStartDate || new Date(), 'dd.MM.yyyy'); diff --git a/ui/src/app/administrative/reports/reports.component.ts b/ui/src/app/administrative/reports/reports.component.ts index 53f4a9322c..732866e24f 100644 --- a/ui/src/app/administrative/reports/reports.component.ts +++ b/ui/src/app/administrative/reports/reports.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgIf } from '@angular/common'; + import type { OnInit } from '@angular/core'; import { Component } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; @@ -42,28 +42,37 @@ import { ReportsService, UserRole } from './reports.service';
-
-
- -
-
- -
-
- -
+ @if (rooms) { +
+ } + @if (examNames) { +
+ +
+ } + @if (students) { +
+ +
+ } + @if (examNames) { +
+ +
+ }
-
- -
+ @if (teachers) { +
+ +
+ }
`, standalone: true, imports: [ - NgIf, RoomsReportComponent, ExamsReportComponent, StudentsReportComponent, @@ -81,7 +90,11 @@ export class ReportsComponent implements OnInit { teachers: Option[] = []; students: Option[] = []; - constructor(private Users: UserService, private Reports: ReportsService, private Room: RoomService) {} + constructor( + private Users: UserService, + private Reports: ReportsService, + private Room: RoomService, + ) {} ngOnInit() { this.Room.getRooms$().subscribe((resp) => { diff --git a/ui/src/app/administrative/settings/settings.component.html b/ui/src/app/administrative/settings/settings.component.html index 5843aba41a..6638c533e9 100644 --- a/ui/src/app/administrative/settings/settings.component.html +++ b/ui/src/app/administrative/settings/settings.component.html @@ -5,20 +5,22 @@
-
-
- - + @if (config) { +
+
+ + +
-
+ }
-
-
- - + @if (config) { +
+
+ + +
-
+ }
-
-
- - + @if (config) { +
+
+ + +
-
+ }
-
- - - - - - - - - - - - - - - - - - - - - -
{{ 'i18n_rank' | translate }}{{ 'i18n_exam' | translate }}{{ 'i18n_amount_exams' | translate }}
{{ getRank(i, exams) }}.{{ exam.name }}{{ exam.participations }}
- {{ 'i18n_total' | translate }} - - {{ totalExams() }} -
-
+ @if (exams.length > 0) { +
+ + + + + + + + + + @for (exam of exams; track exam; let i = $index) { + + + + + + } + + + + + + + +
{{ 'i18n_rank' | translate }}{{ 'i18n_exam' | translate }}{{ 'i18n_amount_exams' | translate }}
{{ getRank(i, exams) }}.{{ exam.name }}{{ exam.participations }}
+ {{ 'i18n_total' | translate }} + + @if (exams) { + {{ totalExams() }} + } +
+
+ }
`, selector: 'xm-exam-statistics', standalone: true, - imports: [NgIf, NgFor, TranslateModule], + imports: [TranslateModule], }) export class ExamStatisticsComponent implements OnInit { @Input() queryParams: QueryParams = {}; diff --git a/ui/src/app/administrative/statistics/categories/room-statistics.component.ts b/ui/src/app/administrative/statistics/categories/room-statistics.component.ts index c7fda7dc77..b4aacb940a 100644 --- a/ui/src/app/administrative/statistics/categories/room-statistics.component.ts +++ b/ui/src/app/administrative/statistics/categories/room-statistics.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { DatePipe, NgFor } from '@angular/common'; +import { DatePipe } from '@angular/common'; import { Component, Input } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; import type { ExamParticipation } from '../../../exam/exam.model'; @@ -34,23 +34,31 @@ import { StatisticsService } from '../statistics.service'; {{ 'i18n_year' | translate }} {{ 'i18n_month' | translate }} - {{ room.split('___')[1] }} + @for (room of rooms; track room) { + {{ room.split('___')[1] }} + } {{ 'i18n_total' | translate }} - - {{ month | date : 'yyyy' }} - {{ month | date : 'M' }} - {{ totalParticipations(month, room) }} - {{ totalParticipations(month) }} - + @for (month of months; track month) { + + {{ month | date: 'yyyy' }} + {{ month | date: 'M' }} + @for (room of rooms; track room) { + {{ totalParticipations(month, room) }} + } + {{ totalParticipations(month) }} + + } {{ 'i18n_total' | translate }} - {{ totalParticipations(undefined, room) }} + @for (room of rooms; track room) { + {{ totalParticipations(undefined, room) }} + } {{ totalParticipations() }} @@ -62,7 +70,7 @@ import { StatisticsService } from '../statistics.service'; `, selector: 'xm-room-statistics', standalone: true, - imports: [NgFor, DatePipe, TranslateModule], + imports: [DatePipe, TranslateModule], }) export class RoomStatisticsComponent { @Input() queryParams: QueryParams = {}; diff --git a/ui/src/app/administrative/statistics/statistics.component.html b/ui/src/app/administrative/statistics/statistics.component.html index 94cf515eb6..417b6df6f1 100644 --- a/ui/src/app/administrative/statistics/statistics.component.html +++ b/ui/src/app/administrative/statistics/statistics.component.html @@ -78,41 +78,51 @@

{{ 'i18n_department' | translate }}

- + @for (department of filteredDepartments; track department) { + + }
  • - - - + @for (department of departments; track department) { + @if (department.filtered) { + + } + }
- - - - + @if (view === 'ROOMS') { + + } + @if (view === 'RESERVATIONS') { + + } + @if (view === 'RESPONSES') { + + } + @if (view === 'EXAMS') { + + }
diff --git a/ui/src/app/administrative/statistics/statistics.component.ts b/ui/src/app/administrative/statistics/statistics.component.ts index ef3bdf9df3..6668af489f 100644 --- a/ui/src/app/administrative/statistics/statistics.component.ts +++ b/ui/src/app/administrative/statistics/statistics.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgClass, NgFor, NgIf } from '@angular/common'; +import { NgClass } from '@angular/common'; import type { OnInit } from '@angular/core'; import { Component } from '@angular/core'; import { FormsModule } from '@angular/forms'; @@ -60,10 +60,8 @@ enum Tab { NgbDropdownToggle, NgbDropdownMenu, FormsModule, - NgFor, NgbDropdownItem, NgClass, - NgIf, RoomStatisticsComponent, ReservationStatisticsComponent, ResponseStatisticsComponent, diff --git a/ui/src/app/administrative/users/users.component.html b/ui/src/app/administrative/users/users.component.html index f5b83d9e18..1d7ba4d6c8 100644 --- a/ui/src/app/administrative/users/users.component.html +++ b/ui/src/app/administrative/users/users.component.html @@ -40,19 +40,20 @@ {{ 'i18n_filter_by_role' | translate }} 
- + @for (role of roles; track role) { + + }
@@ -68,19 +69,20 @@ {{ 'i18n_filter_by_permission' | translate }} 
- + @for (permission of permissions; track permission) { + + }
@@ -109,183 +111,201 @@ - - {{ user.lastName }} - {{ user.firstName }} - - {{ user.email }} - - {{ user.userIdentifier }} - {{ user.employeeNumber }} - {{ user.lastLogin | date : 'dd.MM.yyyy HH:mm:ss' }} - - - - - -
- - -
-
{{ 'i18n_add' | translate }}
+ @for ( + user of filteredUsers | slice: currentPage * pageSize : currentPage * pageSize + pageSize; + track user + ) { + + {{ user.lastName }} + {{ user.firstName }} + + {{ user.email }} + + {{ user.userIdentifier }} + {{ user.employeeNumber }} + {{ user.lastLogin | date: 'dd.MM.yyyy HH:mm:ss' }} + + @if (hasRole(user, 'ADMIN')) { + + } + @if (hasRole(user, 'TEACHER')) { + + } + @if (hasRole(user, 'STUDENT')) { + + } +
+ -
- - - - - -
- - - - -
- - - + + + @if (hasPermission(user, 'CAN_INSPECT_LANGUAGE')) { + + } +
+ -
- - - - - -
- - + @if (user.removablePermissions.length > 0) { + + } + +
+ + + } -
- -
+ @if (filteredUsers && filteredUsers.length > pageSize) { +
+ +
+ }
diff --git a/ui/src/app/administrative/users/users.component.ts b/ui/src/app/administrative/users/users.component.ts index 01acdca83e..d810f1479a 100644 --- a/ui/src/app/administrative/users/users.component.ts +++ b/ui/src/app/administrative/users/users.component.ts @@ -1,4 +1,4 @@ -import { DatePipe, NgClass, NgFor, NgIf, SlicePipe } from '@angular/common'; +import { DatePipe, NgClass, SlicePipe } from '@angular/common'; import type { OnInit } from '@angular/core'; import { Component, OnDestroy } from '@angular/core'; import { FormsModule } from '@angular/forms'; @@ -49,10 +49,8 @@ interface UserWithOptions extends User { NgbDropdown, NgbDropdownToggle, NgbDropdownMenu, - NgFor, NgbDropdownItem, NgClass, - NgIf, PaginatorComponent, SlicePipe, DatePipe, diff --git a/ui/src/app/app.component.ts b/ui/src/app/app.component.ts index 49fe6c7bcd..6eaff5a555 100644 --- a/ui/src/app/app.component.ts +++ b/ui/src/app/app.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgClass, NgIf, registerLocaleData } from '@angular/common'; +import { NgClass, registerLocaleData } from '@angular/common'; import localeEn from '@angular/common/locales/en'; import localeFi from '@angular/common/locales/fi'; import localeSv from '@angular/common/locales/sv'; @@ -29,18 +29,22 @@ import { SessionService } from './session/session.service'; @Component({ selector: 'xm-app', template: ` -
- -
-
- -
- -
-
+ @if (!user && devLoginRequired) { +
+ +
+ } + @if (user) { +
+ +
+ +
+
+ } `, standalone: true, - imports: [NgIf, DevLoginComponent, NavigationComponent, NgClass, RouterOutlet], + imports: [DevLoginComponent, NavigationComponent, NgClass, RouterOutlet], }) export class AppComponent implements OnInit, OnDestroy { user?: User; diff --git a/ui/src/app/calendar/booking-calendar.component.ts b/ui/src/app/calendar/booking-calendar.component.ts index 6f84b88edf..8d3efb4229 100644 --- a/ui/src/app/calendar/booking-calendar.component.ts +++ b/ui/src/app/calendar/booking-calendar.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgIf } from '@angular/common'; + import { AfterViewInit, ChangeDetectionStrategy, @@ -41,16 +41,20 @@ import { CalendarService } from './calendar.service'; selector: 'xm-booking-calendar', changeDetection: ChangeDetectionStrategy.OnPush, template: ` -
-
-
- + @if (visible) { +
+
+ @if (visible) { +
+ +
+ }
-
+ } `, standalone: true, - imports: [NgIf, FullCalendarModule], + imports: [FullCalendarModule], }) export class BookingCalendarComponent implements OnInit, OnChanges, AfterViewInit { @Output() eventSelected = new EventEmitter(); @@ -70,7 +74,10 @@ export class BookingCalendarComponent implements OnInit, OnChanges, AfterViewIni calendarOptions: CalendarOptions; - constructor(private translate: TranslateService, private Calendar: CalendarService) { + constructor( + private translate: TranslateService, + private Calendar: CalendarService, + ) { this.calendarOptions = { plugins: [luxon2Plugin, timeGridPlugin], initialView: 'timeGridWeek', diff --git a/ui/src/app/calendar/calendar.component.html b/ui/src/app/calendar/calendar.component.html index afc3e01009..f689de85fd 100644 --- a/ui/src/app/calendar/calendar.component.html +++ b/ui/src/app/calendar/calendar.component.html @@ -7,28 +7,33 @@

{{ 'i18n_calendar' | translate }}

- - -
- -
+ [reservationWindowSize]="reservationWindowSize" + [collaborative]="isCollaborative" + > + } + + @if (examInfo && hasOptionalSections()) { +
+ +
+ } -
- -
+ @if (isInteroperable && isExternal) { +
+ +
+ }
{{ 'i18n_course_name' | translate }}:
-
- - {{ examInfo.course.name }} -
+ @if (examInfo.course) { +
+ @if (examInfo) { + + } + {{ examInfo.course.name }} +
+ }
{{ 'i18n_exam_validity' | translate }}:
- {{ examInfo.periodStart | date : 'dd.MM.yyyy' }} - - {{ examInfo.periodEnd | date : 'dd.MM.yyyy' }} + {{ examInfo.periodStart | date: 'dd.MM.yyyy' }} - + {{ examInfo.periodEnd | date: 'dd.MM.yyyy' }}
diff --git a/ui/src/app/calendar/calendar.component.ts b/ui/src/app/calendar/calendar.component.ts index 17f0bfd47c..ae410fbd6f 100644 --- a/ui/src/app/calendar/calendar.component.ts +++ b/ui/src/app/calendar/calendar.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { DatePipe, NgClass, NgIf } from '@angular/common'; +import { DatePipe, NgClass } from '@angular/common'; import type { OnInit } from '@angular/core'; import { Component } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; @@ -40,7 +40,6 @@ import { SlotPickerComponent } from './helpers/slot-picker.component'; imports: [ HistoryBackComponent, AutoFocusDirective, - NgIf, CalendarExamInfoComponent, OptionalSectionsComponent, OrganisationPickerComponent, diff --git a/ui/src/app/calendar/helpers/exam-info.component.ts b/ui/src/app/calendar/helpers/exam-info.component.ts index 9d1a9c8dd5..c69b33ff9e 100644 --- a/ui/src/app/calendar/helpers/exam-info.component.ts +++ b/ui/src/app/calendar/helpers/exam-info.component.ts @@ -1,4 +1,4 @@ -import { DatePipe, NgIf } from '@angular/common'; +import { DatePipe } from '@angular/common'; import { Component, Input, OnInit } from '@angular/core'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { DateTime } from 'luxon'; @@ -24,7 +24,9 @@ import type { ExamInfo } from '../calendar.service';
{{ examInfo.name }} - ({{ 'i18n_anonymous_review' | translate }}) + @if (examInfo.anonymous) { + ({{ 'i18n_anonymous_review' | translate }}) + }
@@ -33,10 +35,12 @@ import type { ExamInfo } from '../calendar.service';
{{ 'i18n_course_name' | translate }}:
-
- - {{ examInfo.course.name }} -
+ @if (!collaborative) { +
+ + {{ examInfo.course.name }} +
+ }
@@ -44,8 +48,8 @@ import type { ExamInfo } from '../calendar.service'; {{ 'i18n_exam_validity' | translate }}:
- {{ examInfo.periodStart | date : 'dd.MM.yyyy' }} - - {{ examInfo.periodEnd | date : 'dd.MM.yyyy' }} + {{ examInfo.periodStart | date: 'dd.MM.yyyy' }} - + {{ examInfo.periodEnd | date: 'dd.MM.yyyy' }}
@@ -67,17 +71,19 @@ import type { ExamInfo } from '../calendar.service';
- - - {{ getReservationWindowDescription() }} - + @if (showReservationWindowInfo()) { + + + {{ getReservationWindowDescription() }} + + }
`, standalone: true, - imports: [NgIf, CourseCodeComponent, MathJaxDirective, DatePipe, TranslateModule], + imports: [CourseCodeComponent, MathJaxDirective, DatePipe, TranslateModule], }) export class CalendarExamInfoComponent implements OnInit { @Input() examInfo!: ExamInfo; @@ -86,7 +92,10 @@ export class CalendarExamInfoComponent implements OnInit { reservationWindowEndDate = new Date(); - constructor(private translate: TranslateService, private DateTimeService: DateTimeService) {} + constructor( + private translate: TranslateService, + private DateTimeService: DateTimeService, + ) {} ngOnInit() { this.reservationWindowEndDate = DateTime.fromJSDate(this.reservationWindowEndDate) diff --git a/ui/src/app/calendar/helpers/optional-sections.component.ts b/ui/src/app/calendar/helpers/optional-sections.component.ts index c7f4d70c63..924f6ca4cd 100644 --- a/ui/src/app/calendar/helpers/optional-sections.component.ts +++ b/ui/src/app/calendar/helpers/optional-sections.component.ts @@ -1,4 +1,4 @@ -import { NgClass, NgFor, NgIf, UpperCasePipe } from '@angular/common'; +import { NgClass, UpperCasePipe } from '@angular/common'; import { Component, EventEmitter, Input, Output } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; @@ -11,69 +11,83 @@ import type { ExamInfo } from '../calendar.service';

2. {{ 'i18n_exam_materials' | translate }}

- - - + @if (sectionSelectionOk()) { + + + + }
-
-
-
-
-
- {{ 'i18n_exam_section' | translate }}: {{ section.name }} -
-
-
- {{ 'i18n_optional_section' | translate | uppercase }} + @for (section of examInfo.examSections; track section) { +
+
+
+
+
+ {{ 'i18n_exam_section' | translate }}: {{ section.name }} +
+
+ @if (section.optional) { +
+ {{ 'i18n_optional_section' | translate | uppercase }} +
+ }
-
-
-
-
-
- {{ section.description }} -
-
-
- - +
+
+
+
+ {{ section.description }} +
+
+ @if (section.optional) { +
+ + +
+ }
+ @if (section.examMaterials.length > 0) { +
+
+ {{ 'i18n_exam_materials' | translate }} +
+
+ } + @for (material of section.examMaterials; track material) { +
+ + {{ 'i18n_name' | translate | uppercase }}: {{ material.name }} + @if (material.author) { + {{ 'i18n_author' | translate | uppercase }}: {{ material.author }} + } + @if (material.isbn) { + ISBN: {{ material.isbn }} + } + +
+ }
-
-
- {{ 'i18n_exam_materials' | translate }} -
-
-
- - {{ 'i18n_name' | translate | uppercase }}: {{ material.name }} - - {{ 'i18n_author' | translate | uppercase }}: {{ material.author }} - - ISBN: {{ material.isbn }} - -
-
+ }
`, standalone: true, - imports: [NgClass, NgIf, NgFor, FormsModule, UpperCasePipe, TranslateModule], + imports: [NgClass, FormsModule, UpperCasePipe, TranslateModule], }) export class OptionalSectionsComponent { @Input() examInfo!: ExamInfo; diff --git a/ui/src/app/calendar/helpers/organisation-picker.component.ts b/ui/src/app/calendar/helpers/organisation-picker.component.ts index 1e1d8aa2ce..9307e1207a 100644 --- a/ui/src/app/calendar/helpers/organisation-picker.component.ts +++ b/ui/src/app/calendar/helpers/organisation-picker.component.ts @@ -1,4 +1,4 @@ -import { NgClass, NgFor, NgIf } from '@angular/common'; +import { NgClass } from '@angular/common'; import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { NgbDropdown, NgbDropdownItem, NgbDropdownMenu, NgbDropdownToggle } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; @@ -17,9 +17,11 @@ import { CalendarService } from '../calendar.service'; - - - + @if (selectedOrganisation) { + + + + }
@@ -39,15 +41,16 @@ import { CalendarService } from '../calendar.service'; {{ 'i18n_faculty_name' | translate }} 
@@ -62,18 +65,20 @@ import { CalendarService } from '../calendar.service';
-
-
-
- {{ selectedOrganisation?.name }} ({{ selectedOrganisation?.code }}) + @if (selectedOrganisation) { +
+
+
+ {{ selectedOrganisation?.name }} ({{ selectedOrganisation?.code }}) +
-
+ }
`, standalone: true, - imports: [NgClass, NgIf, NgbDropdown, NgbDropdownToggle, NgbDropdownMenu, NgFor, NgbDropdownItem, TranslateModule], + imports: [NgClass, NgbDropdown, NgbDropdownToggle, NgbDropdownMenu, NgbDropdownItem, TranslateModule], }) export class OrganisationPickerComponent implements OnInit { @Input() sequenceNumber = 0; diff --git a/ui/src/app/calendar/helpers/selected-room.component.ts b/ui/src/app/calendar/helpers/selected-room.component.ts index 71da906582..88c6c7b2d0 100644 --- a/ui/src/app/calendar/helpers/selected-room.component.ts +++ b/ui/src/app/calendar/helpers/selected-room.component.ts @@ -1,4 +1,4 @@ -import { DatePipe, NgClass, NgFor, NgIf, UpperCasePipe } from '@angular/common'; +import { DatePipe, NgClass, UpperCasePipe } from '@angular/common'; import { Component, Input, OnChanges, OnInit } from '@angular/core'; import { NgbPopover } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; @@ -29,46 +29,60 @@ import { CalendarService } from '../calendar.service';
-
-
{{ oh.name | uppercase }}
-
{{ oh.periodText }}
-
+ @for (oh of openingHours; track oh) { +
+
{{ oh.name | uppercase }}
+
{{ oh.periodText }}
+
+ }
-
-
{{ 'i18n_maintenance_periods' | translate }}:
-
-
- {{ period.startsAt | date : 'dd.MM.yyyy HH:mm' }} - {{ period.endsAt | date : 'dd.MM.yyyy HH:mm' }} - {{ period.description }} + @if (maintenancePeriods.length > 0) { +
+
{{ 'i18n_maintenance_periods' | translate }}:
+
+ @for (period of maintenancePeriods | orderBy: 'startsAt'; track period) { +
+ {{ period.startsAt | date: 'dd.MM.yyyy HH:mm' }} - + {{ period.endsAt | date: 'dd.MM.yyyy HH:mm' }} + {{ period.description }} +
+ }
-
-
-
{{ 'i18n_exception_datetimes' | translate }}:
-
-
- {{ eh.start }} - {{ eh.end }} + } + @if (exceptionHours.length > 0) { +
+
{{ 'i18n_exception_datetimes' | translate }}:
+
+ @for (eh of exceptionHours; track eh) { +
+ {{ eh.start }} - {{ eh.end }} +
+ }
-
-
-
{{ 'i18n_instructions' | translate }}:
-
{{ getRoomInstructions() }}
-
-
-
{{ 'i18n_room_accessibility' | translate }}:
-
{{ getRoomAccessibility() }}
-
+ } + @if (getRoomInstructions()) { +
+
{{ 'i18n_instructions' | translate }}:
+
{{ getRoomInstructions() }}
+
+ } + @if (getRoomAccessibility()) { +
+
{{ 'i18n_room_accessibility' | translate }}:
+
{{ getRoomAccessibility() }}
+
+ } `, standalone: true, - imports: [NgFor, NgIf, NgClass, NgbPopover, UpperCasePipe, DatePipe, TranslateModule, OrderByPipe], + imports: [NgClass, NgbPopover, UpperCasePipe, DatePipe, TranslateModule, OrderByPipe], }) export class SelectedRoomComponent implements OnInit, OnChanges { @Input() room!: ExamRoom; @@ -78,7 +92,10 @@ export class SelectedRoomComponent implements OnInit, OnChanges { openingHours: OpeningHours[] = []; exceptionHours: (ExceptionWorkingHours & { start: string; end: string; description: string })[] = []; - constructor(private translate: TranslateService, private Calendar: CalendarService) {} + constructor( + private translate: TranslateService, + private Calendar: CalendarService, + ) {} ngOnInit() { this.translate.onLangChange.subscribe(() => { diff --git a/ui/src/app/calendar/helpers/slot-picker.component.html b/ui/src/app/calendar/helpers/slot-picker.component.html index b475a8c38e..2959bd6e27 100644 --- a/ui/src/app/calendar/helpers/slot-picker.component.html +++ b/ui/src/app/calendar/helpers/slot-picker.component.html @@ -5,9 +5,11 @@

{{ sequenceNumber }}. {{ 'i18n_calendar_phase_2' | translate }}

- - - + @if (selectedRoom) { + + + + }
@@ -15,30 +17,27 @@

{{ sequenceNumber }}. {{ 'i18n_calendar_phase_2
- - - {{ 'i18n_calendar_room_accessibility_info' | translate }} - + @if (!disabled) { + + } + @if (disabled) { + + {{ 'i18n_calendar_room_accessibility_info' | translate }} + + }
@@ -49,17 +48,19 @@

{{ sequenceNumber }}. {{ 'i18n_calendar_phase_2

- - - {{ accessibility.name }} - + @for (accessibility of accessibilities; track accessibility) { + + + {{ accessibility.name }} + + }
@@ -81,51 +82,49 @@

{{ sequenceNumber }}. {{ 'i18n_calendar_phase_2

- + @if (isInteroperable && !isExternal) { + + }
-
-
- + @if (selectedRoom) { +
+
+ +
-
-
-
- - + } + @if (selectedRoom) { +
+
+ + +
-
+ }
diff --git a/ui/src/app/calendar/helpers/slot-picker.component.ts b/ui/src/app/calendar/helpers/slot-picker.component.ts index e7c741f864..00b1eccc4a 100644 --- a/ui/src/app/calendar/helpers/slot-picker.component.ts +++ b/ui/src/app/calendar/helpers/slot-picker.component.ts @@ -1,4 +1,4 @@ -import { NgClass, NgFor, NgIf } from '@angular/common'; +import { NgClass } from '@angular/common'; import { HttpParams } from '@angular/common/http'; import type { SimpleChanges } from '@angular/core'; import { Component, EventEmitter, Input, OnChanges, OnInit, Output, ViewEncapsulation } from '@angular/core'; @@ -33,9 +33,7 @@ type AvailableSlot = Slot & { availableMachines: number }; standalone: true, imports: [ NgClass, - NgIf, NgbCollapse, - NgFor, NgbDropdown, NgbDropdownToggle, NgbDropdownMenu, diff --git a/ui/src/app/dashboard/staff/teacher/categories/exam-list-category.component.html b/ui/src/app/dashboard/staff/teacher/categories/exam-list-category.component.html index 5ccdb65d3e..f591b0c19b 100644 --- a/ui/src/app/dashboard/staff/teacher/categories/exam-list-category.component.html +++ b/ui/src/app/dashboard/staff/teacher/categories/exam-list-category.component.html @@ -56,15 +56,17 @@ > - - - + @for (column of extraData; track column) { + + + + } - - - {{ exam.name }} - {{ exam.name }} - - - {{ 'i18n_no_name' | translate }} - {{ 'i18n_no_name' | translate }} - - - - - - {{ getExecutionTypeTranslation(exam) }} - - - - {{ exam.periodStart | date : 'dd.MM.yyyy' }} - - {{ exam.periodEnd | date : 'dd.MM.yyyy' }} - - - - - - {{ exam[column.property] }} - {{ exam[column.property] }} - -
–
- - - - - - - - - - - - - - - - - - - {{ 'i18n_exam_no_result' | translate }} - - + @for (exam of items | orderBy: sorting.predicate : sorting.reverse; track exam) { + + @if (exam.name) { + + @if (isOwner(exam)) { + {{ exam.name }} + } + @if (!isOwner(exam)) { + {{ exam.name }} + } + + } + @if (!exam.name) { + + @if (isOwner(exam)) { + {{ 'i18n_no_name' | translate }} + } + @if (!isOwner(exam)) { + {{ 'i18n_no_name' | translate }} + } + + } + + @if (exam.course) { + + } + + + {{ getExecutionTypeTranslation(exam) }} + + + @if (exam.periodStart && exam.periodEnd) { + + {{ exam.periodStart | date: 'dd.MM.yyyy' }} - + {{ exam.periodEnd | date: 'dd.MM.yyyy' }} + + } + + @for (column of extraData; track column) { + + + @if ( + (!column.checkOwnership || isOwner(exam)) && + exam.executionType.type !== 'PRINTOUT' + ) { + {{ exam[column.property] }} + } + @if ( + !isOwner(exam) && + column.checkOwnership && + exam.executionType.type !== 'PRINTOUT' + ) { + {{ exam[column.property] }} + } + + @if (exam.executionType.type === 'PRINTOUT') { +
–
+ } + + } + + + + + @if (isOwner(exam)) { + + + + } + + + + + + + + } + @if (items?.length === 0) { + + + {{ 'i18n_exam_no_result' | translate }} + + + }
diff --git a/ui/src/app/dashboard/staff/teacher/categories/exam-list-category.component.ts b/ui/src/app/dashboard/staff/teacher/categories/exam-list-category.component.ts index ef27b633bd..f591304860 100644 --- a/ui/src/app/dashboard/staff/teacher/categories/exam-list-category.component.ts +++ b/ui/src/app/dashboard/staff/teacher/categories/exam-list-category.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { DatePipe, NgFor, NgIf } from '@angular/common'; +import { DatePipe } from '@angular/common'; import type { OnInit } from '@angular/core'; import { Component, EventEmitter, Input, OnDestroy, Output } from '@angular/core'; import { FormsModule } from '@angular/forms'; @@ -47,8 +47,6 @@ export interface ExtraData { imports: [ FormsModule, TableSortComponent, - NgFor, - NgIf, RouterLink, CourseCodeComponent, TeacherListComponent, diff --git a/ui/src/app/dashboard/staff/teacher/teacher-dashboard.component.html b/ui/src/app/dashboard/staff/teacher/teacher-dashboard.component.html index 78fdecd9e5..853a188e50 100644 --- a/ui/src/app/dashboard/staff/teacher/teacher-dashboard.component.html +++ b/ui/src/app/dashboard/staff/teacher/teacher-dashboard.component.html @@ -32,9 +32,11 @@
  • {{ 'i18n_active_exams_title' | translate }}
    -
    - {{ filteredActive.length }} -
    + @if (activeExams) { +
    + {{ filteredActive.length }} +
    + }     => forkJoin([this.Exam.listExecutionTypes$(), this.http.get('/app/reviewerexams')]).pipe( diff --git a/ui/src/app/dashboard/student/student-dashboard.component.html b/ui/src/app/dashboard/student/student-dashboard.component.html index 16ad1044ba..338a2e544c 100644 --- a/ui/src/app/dashboard/student/student-dashboard.component.html +++ b/ui/src/app/dashboard/student/student-dashboard.component.html @@ -9,14 +9,18 @@

    {{ 'i18n_user_enrolled_exams_title' | translate

    • -
    - -
    -
    - -   - {{ 'i18n_no_enrolments' | translate }} - -
    + @for (enrolment of userEnrolments | orderBy: 'startAtAggregate'; track enrolment) { +
    + +
    + } + @if (userEnrolments?.length === 0) { +
    + +   + {{ 'i18n_no_enrolments' | translate }} + +
    + }
    diff --git a/ui/src/app/dashboard/student/student-dashboard.component.ts b/ui/src/app/dashboard/student/student-dashboard.component.ts index eebcd4d313..fcc0bf3283 100644 --- a/ui/src/app/dashboard/student/student-dashboard.component.ts +++ b/ui/src/app/dashboard/student/student-dashboard.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgFor, NgIf } from '@angular/common'; + import type { OnInit } from '@angular/core'; import { Component } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; @@ -25,7 +25,7 @@ import { StudentDashboardService } from './student-dashboard.service'; selector: 'xm-student-dashboard', templateUrl: './student-dashboard.component.html', standalone: true, - imports: [NgFor, ActiveEnrolmentComponent, NgIf, TranslateModule, OrderByPipe], + imports: [ActiveEnrolmentComponent, TranslateModule, OrderByPipe], }) export class StudentDashboardComponent implements OnInit { userEnrolments: DashboardEnrolment[] = []; diff --git a/ui/src/app/dashboard/student/student-dashboard.service.ts b/ui/src/app/dashboard/student/student-dashboard.service.ts index ab6bc837d5..af6bf4bc39 100644 --- a/ui/src/app/dashboard/student/student-dashboard.service.ts +++ b/ui/src/app/dashboard/student/student-dashboard.service.ts @@ -34,7 +34,10 @@ export interface DashboardEnrolment extends ExamEnrolment { @Injectable({ providedIn: 'root' }) export class StudentDashboardService { - constructor(private http: HttpClient, private DateTime: DateTimeService) {} + constructor( + private http: HttpClient, + private DateTime: DateTimeService, + ) {} listEnrolments = (): Observable => this.http.get('/app/student/enrolments').pipe( diff --git a/ui/src/app/enrolment/active/active-enrolment.component.html b/ui/src/app/enrolment/active/active-enrolment.component.html index 70d6d6ab08..e772c95f88 100644 --- a/ui/src/app/enrolment/active/active-enrolment.component.html +++ b/ui/src/app/enrolment/active/active-enrolment.component.html @@ -1,71 +1,81 @@
    -
    -
    - {{ enrolment.reservation!.startAt | date : 'dd' }} - {{ - enrolment.reservation!.startAt | date : 'MMM' | slice : 0 : 3 | uppercase - }} -
    -
    - {{ enrolment.examinationEventConfiguration!.examinationEvent.start | date : 'dd' }} - {{ - enrolment.examinationEventConfiguration!.examinationEvent.start - | date : 'MMM' - | slice : 0 : 3 - | uppercase - }} + @if (enrolment.reservation || enrolment.examinationEventConfiguration) { +
    + @if (enrolment.reservation) { +
    + {{ enrolment.reservation!.startAt | date: 'dd' }} + {{ + enrolment.reservation!.startAt | date: 'MMM' | slice: 0 : 3 | uppercase + }} +
    + } + @if (enrolment.examinationEventConfiguration) { +
    + {{ enrolment.examinationEventConfiguration!.examinationEvent.start | date: 'dd' }} + {{ + enrolment.examinationEventConfiguration!.examinationEvent.start + | date: 'MMM' + | slice: 0 : 3 + | uppercase + }} +
    + }
    -
    + }
    -

    - - {{ enrolment.exam.name }} - -

    -

    - {{ enrolment.collaborativeExam.name }} -

    + @if (enrolment.exam) { +

    + + {{ enrolment.exam.name }} + +

    + } + @if (enrolment.collaborativeExam) { +

    + {{ enrolment.collaborativeExam.name }} +

    + } - ({{ 'i18n_anonymous_review' | translate }}) - ({{ 'i18n_examination_type_seb' | translate }}) - ({{ 'i18n_examination_type_home_exam' | translate }}) + @if (enrolment.exam?.anonymous || enrolment.collaborativeExam?.anonymous) { + ({{ 'i18n_anonymous_review' | translate }}) + } + @if (enrolment.exam && enrolment.exam.implementation === 'CLIENT_AUTH') { + ({{ 'i18n_examination_type_seb' | translate }}) + } + @if (enrolment.exam && enrolment.exam.implementation === 'WHATEVER') { + ({{ 'i18n_examination_type_home_exam' | translate }}) + }
    - {{ 'i18n_state_ready' | translate }} - {{ 'i18n_state_needs_reservation_title' | translate }} - - {{ 'i18n_state_started' | translate }} - + @if ( + (enrolment.exam?.state === 'PUBLISHED' || + enrolment.collaborativeExam?.state === 'PUBLISHED') && + (enrolment.reservation || enrolment.examinationEventConfiguration) + ) { + {{ 'i18n_state_ready' | translate }} + } + @if ( + enrolment.exam?.state === 'PUBLISHED' && + !enrolment.reservation && + !enrolment.examinationEventConfiguration + ) { + {{ + 'i18n_state_needs_reservation_title' | translate + }} + } + @if (enrolment.exam?.state === 'STUDENT_STARTED') { + + {{ 'i18n_state_started' | translate }} + + }
    @@ -79,235 +89,268 @@

    -
    {{ 'i18n_course_name' | translate }}:
    + @if (enrolment.exam) { +
    {{ 'i18n_course_name' | translate }}:
    + } -
    - - - - {{ enrolment.exam.course.name }} -
    -
    -
    -
    {{ 'i18n_teachers' | translate }}:
    -
    - -
    - + @if (enrolment.exam && enrolment.exam.course) { +
    + + + + {{ enrolment.exam.course.name }} +
    + }
    -
    -
    -
    {{ 'i18n_exam_validity' | translate }}:
    -
    - {{ enrolment.exam?.periodStart || enrolment.collaborativeExam.periodStart | date : 'dd.MM.yyyy' }} - – - {{ enrolment.exam?.periodEnd || enrolment.collaborativeExam.periodEnd | date : 'dd.MM.yyyy' }} -
    + @if (enrolment.exam) { +
    {{ 'i18n_teachers' | translate }}:
    + } + @if (enrolment.exam) { +
    + +
    + } + @if (enrolment.exam) { + + }
    -
    + @if (!enrolment.reservation) {
    -
    {{ 'i18n_exam_room' | translate }}:
    -
    - {{ enrolment.reservation.machine.name }}  |  {{ - enrolment.reservation.machine.room.name - }} - ({{ enrolment.reservation.machine.room.roomCode }}) -
    -
    - - {{ 'i18n_faculty_name' | translate | uppercase }}: - {{ enrolment.reservation.externalReservation.orgName }} ({{ - enrolment.reservation.externalReservation.orgCode - }})
    -     - {{ 'i18n_room_campus' | translate | uppercase }}: - {{ enrolment.reservation.externalReservation.campus }}
    - {{ 'i18n_room_building_name' | translate | uppercase }}: - {{ enrolment.reservation.externalReservation.buildingName }}
    - {{ 'i18n_exam_room' | translate | uppercase }}: - {{ enrolment.reservation.externalReservation.roomName }} - ({{ enrolment.reservation.externalReservation.roomCode }})
    - {{ 'i18n_exam_machine' | translate | uppercase }}: - {{ enrolment.reservation.externalReservation.machineName }}
    - {{ enrolment.reservation.externalReservation.mailAddress.street }}, - {{ enrolment.reservation.externalReservation.mailAddress.zip }}  - {{ enrolment.reservation.externalReservation.mailAddress.city | uppercase }} -
    - -
    -
    -
    {{ 'i18n_reservation' | translate }}:
    -
    - {{ enrolment.reservation.startAt | applyDst | date : 'dd.MM.yyyy' }} - {{ enrolment.occasion?.startAt }} – {{ enrolment.occasion?.endAt }} ({{ enrolment.occasion?.tz }}) +
    +
    {{ 'i18n_exam_validity' | translate }}:
    +
    + {{ enrolment.exam?.periodStart || enrolment.collaborativeExam.periodStart | date: 'dd.MM.yyyy' }} + – + {{ enrolment.exam?.periodEnd || enrolment.collaborativeExam.periodEnd | date: 'dd.MM.yyyy' }} +
    -
    -
    - + } + @if (enrolment.reservation) { +
    +
    +
    {{ 'i18n_exam_room' | translate }}:
    + @if (enrolment.reservation.machine) { +
    + {{ enrolment.reservation.machine.name }}  |  {{ + enrolment.reservation.machine.room.name + }} + ({{ enrolment.reservation.machine.room.roomCode }}) +
    + } + @if (enrolment.reservation.externalReservation) { +
    + @if (enrolment.reservation.externalReservation.orgName) { + + {{ 'i18n_faculty_name' | translate | uppercase }}: + {{ enrolment.reservation.externalReservation.orgName }} ({{ + enrolment.reservation.externalReservation.orgCode + }})
    +     + } + {{ 'i18n_room_campus' | translate | uppercase }}: + {{ enrolment.reservation.externalReservation.campus }}
    + {{ 'i18n_room_building_name' | translate | uppercase }}: + {{ enrolment.reservation.externalReservation.buildingName }}
    + {{ 'i18n_exam_room' | translate | uppercase }}: + {{ enrolment.reservation.externalReservation.roomName }} + ({{ enrolment.reservation.externalReservation.roomCode }})
    + {{ 'i18n_exam_machine' | translate | uppercase }}: + {{ enrolment.reservation.externalReservation.machineName }}
    + {{ enrolment.reservation.externalReservation.mailAddress.street }}, + {{ enrolment.reservation.externalReservation.mailAddress.zip }}  + {{ enrolment.reservation.externalReservation.mailAddress.city | uppercase }} +
    + } +
    +
    +
    {{ 'i18n_reservation' | translate }}:
    +
    + {{ enrolment.reservation.startAt | applyDst | date: 'dd.MM.yyyy' }} + {{ enrolment.occasion?.startAt }} – {{ enrolment.occasion?.endAt }} ({{ + enrolment.occasion?.tz + }}) +
    -
    - {{ getRoomInstruction() }} +
    +
    + +
    +
    + {{ getRoomInstruction() }} +
    -
    -
    -
    - {{ 'i18n_canceled' | translate }} -
    -
    -
    + } + @if (!enrolment.reservation && enrolment.reservationCanceled) {
    -
    {{ 'i18n_examination_event' | translate }}:
    -
    - {{ enrolment.examinationEventConfiguration?.examinationEvent?.start | date : 'dd.MM.yyyy HH:mm zzzz' }} -
    + @if (enrolment.reservationCanceled) { +
    + {{ 'i18n_canceled' | translate }} +
    + }
    -
    - -
    -
    -
    -
    {{ 'i18n_instructions' | translate }}:
    + } + @if (enrolment.exam && enrolment.examinationEventConfiguration && enrolment.exam.implementation !== 'AQUARIUM') { +
    +
    +
    {{ 'i18n_examination_event' | translate }}:
    - - {{ enrolment.examinationEventConfiguration.examinationEvent.description }} - + {{ + enrolment.examinationEventConfiguration?.examinationEvent?.start | date: 'dd.MM.yyyy HH:mm zzzz' + }}
    -
    + } -
    -
    -
    -
    {{ 'i18n_seb_file' | translate }}:
    -
    - - - + @if (enrolment.exam && enrolment.examinationEventConfiguration && enrolment.exam.implementation !== 'AQUARIUM') { +
    +
    +
    +
    {{ 'i18n_instructions' | translate }}:
    +
    + + {{ enrolment.examinationEventConfiguration.examinationEvent.description }} + +
    -
    -
    -
    - -
    -
    -
    -
    -
    - {{ 'i18n_exam_section' | translate }} - ({{ 'i18n_required' | translate | lowercase }}): - {{ section.name }} -
    -
    -
    -
    - {{ section.description }} -
    -
    -
    -
    -
    -
    -
    - {{ 'i18n_exam_section' | translate }} - ({{ 'i18n_optional' | translate | lowercase }}): +
    +
    +
    {{ 'i18n_seb_file' | translate }}:
    +
    + +
    -
    -
    -
    - {{ section.description }} -
    + {{ 'i18n_download' | translate }} + +
    -
    -
    -
    - {{ 'i18n_exam_materials' | translate }} +
    +
    +
    + } + @if (enrolment.reservation && enrolment.optionalSections.length > 0) { +
    +
    + + @if (enrolment.reservation && enrolment.optionalSections.length > 0) { +
    + @for (section of enrolment.exam.examSections; track section) { +
    + @if (section.optional === false) { +
    +
    +
    + {{ 'i18n_exam_section' | translate }} + ({{ 'i18n_required' | translate | lowercase }}): + {{ section.name }} +
    +
    +
    +
    + {{ section.description }} +
    +
    +
    + }
    -
    -
    -
    - - {{ 'i18n_name' | translate | uppercase }}: {{ material.name }} - - {{ 'i18n_author' | translate | uppercase }}: {{ material.author }} - - ISBN: {{ material.isbn }} - + } + @for (section of enrolment.optionalSections; track section) { +
    +
    +
    + {{ 'i18n_exam_section' | translate }} + ({{ 'i18n_optional' | translate | lowercase }}): + {{ section.name }} +
    +
    +
    +
    + {{ section.description }} +
    +
    + @if (section.examMaterials.length > 0) { +
    +
    +
    + {{ 'i18n_exam_materials' | translate }} +
    +
    + @for (material of section.examMaterials; track material) { +
    +
    + + {{ 'i18n_name' | translate | uppercase }}: {{ material.name }} + @if (material.author) { + + {{ 'i18n_author' | translate | uppercase }}: + {{ material.author }} + + } + @if (material.isbn) { + ISBN: {{ material.isbn }} + } + +
    +
    + } +
    + }
    -
    + }
    -
    + }
    -
    + }
    -
    - -
    -
    - -
    + @if (!enrolment.reservation && (enrolment.exam?.implementation === 'AQUARIUM' || enrolment.collaborativeExam)) { +
    + +
    + } + @if ( + !enrolment.examinationEventConfiguration && + enrolment.exam?.implementation !== 'AQUARIUM' && + hasUpcomingAlternativeEvents() + ) { +
    + +
    + }
    diff --git a/ui/src/app/enrolment/active/active-enrolment.component.ts b/ui/src/app/enrolment/active/active-enrolment.component.ts index 5c6567f340..175b191873 100644 --- a/ui/src/app/enrolment/active/active-enrolment.component.ts +++ b/ui/src/app/enrolment/active/active-enrolment.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { DatePipe, LowerCasePipe, NgFor, NgIf, SlicePipe, UpperCasePipe } from '@angular/common'; +import { DatePipe, LowerCasePipe, SlicePipe, UpperCasePipe } from '@angular/common'; import { Component, EventEmitter, Input, Output } from '@angular/core'; import { RouterLink } from '@angular/router'; import { NgbCollapse } from '@ng-bootstrap/ng-bootstrap'; @@ -32,13 +32,11 @@ import { ActiveEnrolmentMenuComponent } from './helpers/active-enrolment-menu.co templateUrl: './active-enrolment.component.html', standalone: true, imports: [ - NgIf, RouterLink, ActiveEnrolmentMenuComponent, CourseCodeComponent, TeacherListComponent, NgbCollapse, - NgFor, MathJaxDirective, UpperCasePipe, LowerCasePipe, @@ -56,7 +54,11 @@ export class ActiveEnrolmentComponent { showInstructions = false; showMaterials = false; - constructor(private translate: TranslateService, private Enrolment: EnrolmentService, private Files: FileService) {} + constructor( + private translate: TranslateService, + private Enrolment: EnrolmentService, + private Files: FileService, + ) {} hasUpcomingAlternativeEvents = () => this.Enrolment.hasUpcomingAlternativeEvents(this.enrolment); diff --git a/ui/src/app/enrolment/active/dialogs/select-examination-event-dialog.component.ts b/ui/src/app/enrolment/active/dialogs/select-examination-event-dialog.component.ts index 80bc583453..6159fb3fd7 100644 --- a/ui/src/app/enrolment/active/dialogs/select-examination-event-dialog.component.ts +++ b/ui/src/app/enrolment/active/dialogs/select-examination-event-dialog.component.ts @@ -13,7 +13,7 @@ * See the Licence for the specific language governing permissions and limitations under the Licence. * */ -import { DatePipe, NgFor } from '@angular/common'; +import { DatePipe } from '@angular/common'; import type { OnInit } from '@angular/core'; import { Component, Input } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; @@ -24,7 +24,7 @@ import type { Exam, ExaminationEventConfiguration } from '../../../exam/exam.mod @Component({ selector: 'xm-select-examination-event-dialog', standalone: true, - imports: [TranslateModule, DatePipe, NgFor], + imports: [TranslateModule, DatePipe], template: ` diff --git a/ui/src/app/enrolment/active/helpers/active-enrolment-menu.component.ts b/ui/src/app/enrolment/active/helpers/active-enrolment-menu.component.ts index 6b7a0d99ff..cc18592019 100644 --- a/ui/src/app/enrolment/active/helpers/active-enrolment-menu.component.ts +++ b/ui/src/app/enrolment/active/helpers/active-enrolment-menu.component.ts @@ -1,4 +1,3 @@ -import { NgIf } from '@angular/common'; import { Component, EventEmitter, Input, Output } from '@angular/core'; import { RouterLink } from '@angular/router'; import { NgbDropdown, NgbDropdownItem, NgbDropdownMenu, NgbDropdownToggle } from '@ng-bootstrap/ng-bootstrap'; @@ -14,7 +13,7 @@ import { EnrolmentService } from '../../enrolment.service'; selector: 'xm-active-enrolment-menu', templateUrl: './active-enrolment-menu.component.html', standalone: true, - imports: [NgbDropdown, NgbDropdownToggle, NgbDropdownMenu, NgIf, NgbDropdownItem, RouterLink, TranslateModule], + imports: [NgbDropdown, NgbDropdownToggle, NgbDropdownMenu, NgbDropdownItem, RouterLink, TranslateModule], }) export class ActiveEnrolmentMenuComponent { @Input() enrolment!: ExamEnrolment; diff --git a/ui/src/app/enrolment/exams/exam-enrolment-details.component.html b/ui/src/app/enrolment/exams/exam-enrolment-details.component.html index b4a38317a2..d54079a278 100644 --- a/ui/src/app/enrolment/exams/exam-enrolment-details.component.html +++ b/ui/src/app/enrolment/exams/exam-enrolment-details.component.html @@ -12,39 +12,49 @@

    {{ exam.name }}

    {{ exam.name }}

    - - {{ 'i18n_state_needs_reservation_title' | translate }} - - - {{ 'i18n_state_ready' | translate }} - + @if (!exam.reservationMade && exam.alreadyEnrolled && !exam.noTrialsLeft) { + + {{ 'i18n_state_needs_reservation_title' | translate }} + + } + @if (exam.reservationMade) { + + {{ 'i18n_state_ready' | translate }} + + }
    -
    -
    - -
    - {{ 'i18n_exam_period_over' | translate }} + @if (!exam.alreadyEnrolled && !exam.noTrialsLeft) { +
    +
    + + @if (getExpiration()) { +
    + {{ 'i18n_exam_period_over' | translate }} +
    + }
    -
    -
    - {{ 'i18n_enrolled_to_exam' | translate }} -
    + } + @if (exam.alreadyEnrolled && exam.reservationMade) { +
    + {{ 'i18n_enrolled_to_exam' | translate }} +
    + }
    {{ 'i18n_course_name' | translate }}:
    - {{ exam.course?.name }} + @if (exam.course) { + + } + {{ exam.course?.name }}
    {{ 'i18n_teachers' | translate }}:
    @@ -55,7 +65,7 @@

    {{ exam.name }}

    {{ 'i18n_start_time' | translate }}:
    - {{ exam.periodStart | date : 'dd.MM.yyyy' }} - {{ exam.periodEnd | date : 'dd.MM.yyyy' }} + {{ exam.periodStart | date: 'dd.MM.yyyy' }} - {{ exam.periodEnd | date: 'dd.MM.yyyy' }}
    {{ 'i18n_exam_language' | translate }}:
    @@ -108,11 +118,13 @@

    {{ exam.name }}

    -
    -
    - + @if (!exam.reservationMade && exam.alreadyEnrolled && !exam.noTrialsLeft) { +
    +
    + +
    -
    + }
    diff --git a/ui/src/app/enrolment/exams/exam-enrolment-details.component.ts b/ui/src/app/enrolment/exams/exam-enrolment-details.component.ts index c353881b67..7871838861 100644 --- a/ui/src/app/enrolment/exams/exam-enrolment-details.component.ts +++ b/ui/src/app/enrolment/exams/exam-enrolment-details.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { DatePipe, NgIf } from '@angular/common'; +import { DatePipe } from '@angular/common'; import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; @@ -31,7 +31,6 @@ import { EnrolmentService } from '../enrolment.service'; standalone: true, imports: [ HistoryBackComponent, - NgIf, CourseCodeComponent, TeacherListComponent, MathJaxDirective, diff --git a/ui/src/app/enrolment/exams/exam-enrolments.component.ts b/ui/src/app/enrolment/exams/exam-enrolments.component.ts index 83f72a482a..af3d8e9e45 100644 --- a/ui/src/app/enrolment/exams/exam-enrolments.component.ts +++ b/ui/src/app/enrolment/exams/exam-enrolments.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgFor, NgIf } from '@angular/common'; + import type { OnInit } from '@angular/core'; import { Component } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; @@ -28,28 +28,36 @@ import { EnrolmentDetailsComponent } from './exam-enrolment-details.component'; selector: 'xm-exam-enrolments', template: `
    -
    -
    -

    {{ 'i18n_no_trials_left' | translate }}

    -
    -
    - -
    -
    -
    -

    {{ 'i18n_student_exams' | translate }}

    + @if (exam?.noTrialsLeft) { +
    +
    +

    {{ 'i18n_no_trials_left' | translate }}

    -
    -
    - + } + @if (exam) { + + } + @if (exams.length > 0) { +
    +
    +
    +

    {{ 'i18n_student_exams' | translate }}

    +
    + @for (exam of exams; track exam) { +
    +
    + +
    +
    + }
    -
    + }
    `, standalone: true, - imports: [NgIf, EnrolmentDetailsComponent, NgFor, ExamSearchResultComponent, TranslateModule], + imports: [EnrolmentDetailsComponent, ExamSearchResultComponent, TranslateModule], }) export class ExamEnrolmentsComponent implements OnInit { exam!: EnrolmentInfo; diff --git a/ui/src/app/enrolment/finished/collaborative-exam-participations.component.ts b/ui/src/app/enrolment/finished/collaborative-exam-participations.component.ts index 8e554e2f38..73e905d973 100644 --- a/ui/src/app/enrolment/finished/collaborative-exam-participations.component.ts +++ b/ui/src/app/enrolment/finished/collaborative-exam-participations.component.ts @@ -13,7 +13,7 @@ * See the Licence for the specific language governing permissions and limitations under the Licence. * */ -import { NgFor, NgIf, SlicePipe } from '@angular/common'; +import { SlicePipe } from '@angular/common'; import type { OnInit } from '@angular/core'; import { AfterViewInit, ChangeDetectorRef, Component } from '@angular/core'; import { FormsModule } from '@angular/forms'; @@ -38,9 +38,7 @@ import { ExamParticipationComponent } from './exam-participation.component'; NgbDropdownToggle, NgbDropdownMenu, NgbDropdownItem, - NgFor, ExamParticipationComponent, - NgIf, PaginatorComponent, SlicePipe, TranslateModule, diff --git a/ui/src/app/enrolment/finished/exam-answers-dialog.component.html b/ui/src/app/enrolment/finished/exam-answers-dialog.component.html index 95a811ceb7..4c1962ad95 100644 --- a/ui/src/app/enrolment/finished/exam-answers-dialog.component.html +++ b/ui/src/app/enrolment/finished/exam-answers-dialog.component.html @@ -4,7 +4,9 @@
    @@ -26,136 +28,162 @@

    {{ 'i18n_exam_duration' | translate }}:

    - {{ participationDuration | date : 'HH:mm:ss' : 'UTC' }} + {{ participationDuration | date: 'HH:mm:ss' : 'UTC' }}
    -
    -
    - {{ 'i18n_exam_instruction' | translate }}: + @if (exam.instruction) { +
    +
    + {{ 'i18n_exam_instruction' | translate }}: +
    -
    -
    -
    -
    + } + @if (exam.instruction) { +
    +
    +
    + } -
    -
    -

    -
    - {{ 'i18n_exam_section' | translate }}: {{ section.name }} -
    -

    -
    -
    -
    - {{ 'i18n_question' | translate }}: -
    -
    -
    -
    - -
    -
    -
    - {{ 'i18n_exam_answer' | translate }}: -
    -
    -
    -
    -
    - {{ 'i18n_answer_attachment' | translate }}: -
    -
    - - {{ esq.essayAnswer?.attachment?.fileName }} - -
    + @for (section of exam.examSections; track section) { +
    +
    +

    +
    + {{ 'i18n_exam_section' | translate }}: {{ section.name }}
    -
    -
    - {{ 'i18n_answer_length' | translate }}: -
    -
    - {{ countWords(esq) }} {{ 'i18n_words' | translate }}, - {{ 'i18n_approximately' | translate }} {{ countCharacters(esq) }} - {{ 'i18n_characters' | translate }} -
    -
    -
    -
    - {{ 'i18n_essay_length_recommendation' | translate }}: -
    -
    - {{ esq.expectedWordCount }} ({{ 'i18n_approximately' | translate }} - {{ (esq.expectedWordCount || 0) * 8 }} - {{ 'i18n_characters' | translate }}) -
    -
    -
    -
    - {{ 'i18n_comments' | translate }}: -
    -
    - {{ 'i18n_word_points' | translate }}:   - {{ esq.essayAnswer?.evaluatedScore }} / {{ esq.maxScore }} +

    + @for (esq of section.sectionQuestions; track esq) { +
    +
    +
    + {{ 'i18n_question' | translate }}: +
    + @if (esq.question.type !== 'ClozeTestQuestion') { +
    + } + @if (esq.question.type === 'ClozeTestQuestion') { +
    + }
    -
    -
    - {{ 'i18n_approved' | translate | uppercase }} + + @if (esq.question.type === 'EssayQuestion') { +
    +
    +
    + {{ 'i18n_exam_answer' | translate }}: +
    +
    +
    + @if (esq.essayAnswer?.attachment) { +
    +
    + {{ 'i18n_answer_attachment' | translate }}: +
    +
    + + {{ esq.essayAnswer?.attachment?.fileName }} + +
    +
    + } +
    +
    + {{ 'i18n_answer_length' | translate }}: +
    +
    + {{ countWords(esq) }} {{ 'i18n_words' | translate }}, + {{ 'i18n_approximately' | translate }} {{ countCharacters(esq) }} + {{ 'i18n_characters' | translate }} +
    +
    + @if (esq.expectedWordCount) { +
    +
    + {{ 'i18n_essay_length_recommendation' | translate }}: +
    +
    + {{ esq.expectedWordCount }} ({{ 'i18n_approximately' | translate }} + {{ (esq.expectedWordCount || 0) * 8 }} + {{ 'i18n_characters' | translate }}) +
    +
    + } +
    +
    + {{ 'i18n_comments' | translate }}: +
    + @if (esq.evaluationType === 'Points') { +
    + {{ 'i18n_word_points' | translate }}:   + {{ esq.essayAnswer?.evaluatedScore }} / {{ esq.maxScore }} +
    + } + @if (esq.evaluationType === 'Selection') { +
    + @if (esq.essayAnswer?.evaluatedScore === 1) { +
    + {{ 'i18n_approved' | translate | uppercase }} +
    + } + @if (esq.essayAnswer?.evaluatedScore !== 1) { +
    + {{ 'i18n_rejected' | translate | uppercase }} +
    + } +
    + } +
    -
    - {{ 'i18n_rejected' | translate | uppercase }} + } + + + @if (isMultiChoice(esq)) { +
    +
    +
    + {{ 'i18n_exam_answer' | translate }}: +
    +
    + @for (option of getAnsweredOptions(esq); track option) { +
    +
    +
    + } +
    +
    +
    +
    + {{ 'i18n_comments' | translate }}: +
    +
    + {{ esq.derivedAssessedScore }} / {{ esq.derivedMaxScore }} +
    +
    -
    -
    -
    - - - -
    -
    -
    - {{ 'i18n_exam_answer' | translate }}: -
    -
    -
    -
    + } + + @if (esq.question.type === 'ClozeTestQuestion') { +
    +
    +
    + {{ 'i18n_comments' | translate }}: +
    +
    + {{ esq.derivedAssessedScore }} / {{ esq.derivedMaxScore }} +
    +
    -
    -
    -
    -
    - {{ 'i18n_comments' | translate }}: -
    -
    {{ esq.derivedAssessedScore }} / {{ esq.derivedMaxScore }}
    -
    -
    - -
    -
    -
    - {{ 'i18n_comments' | translate }}: -
    -
    {{ esq.derivedAssessedScore }} / {{ esq.derivedMaxScore }}
    + }
    -
    + }
    -
    + }

    {{ 'i18n_exam_review_settings' | translate }}

    @@ -163,9 +191,11 @@

    {{ 'i18n_exam_review_settings' | translate }}

    {{ 'i18n_exam_grade' | translate }}:
    -
    - {{ getGradeName(exam.grade.name) }} -
    + @if (exam.grade) { +
    + {{ getGradeName(exam.grade.name) }} +
    + }
    @@ -173,18 +203,22 @@

    {{ 'i18n_exam_review_settings' | translate }}

    {{ exam.totalScore }} / {{ exam.maxScore }}
    -
    -
    - {{ 'i18n_teachers_comment' | translate }}: + @if (exam.examFeedback?.comment) { +
    +
    + {{ 'i18n_teachers_comment' | translate }}: +
    +
    -
    -
    -
    -
    - {{ 'i18n_exam_credit' | translate }} (op): + } + @if (exam.course?.credits) { +
    +
    + {{ 'i18n_exam_credit' | translate }} (op): +
    +
    {{ exam.course?.credits }}
    -
    {{ exam.course?.credits }}
    -
    + }
    + @if (assessment.examFeedback?.attachment) { +
    +
    +
    +
    {{ 'i18n_feedback_attachment' | translate }}:
    +
    + +
    +
     
    +
     
    -
     
    -
     
    -
    + } -
    -
    -
    -
    {{ 'i18n_language_inspections' | translate }}:
    -
    - {{ assessment.grade?.displayName }} + @if (assessment.languageInspection) { +
    +
    +
    +
    {{ 'i18n_language_inspections' | translate }}:
    +
    + {{ assessment.grade?.displayName }} +
    -
    + } -
    -
    -
    -
    {{ 'i18n_inspector_statement' | translate }}:
    -
    -
    -
    + @if (assessment.languageInspection) { +
    +
    +
    +
    {{ 'i18n_inspector_statement' | translate }}:
    +
    +
    +
    +
    -
    + } -
    -
    -
    -
    {{ 'i18n_statement_attachment' | translate }}:
    -
    - + @if (assessment.languageInspection?.statement?.attachment) { +
    +
    +
    +
    {{ 'i18n_statement_attachment' | translate }}:
    +
    + +
    +
     
    +
     
    -
     
    -
     
    -
    + } -
    -
    -
    -
    - - {{ 'i18n_additional_info_for_student' | translate }}: -
    -
    - {{ assessment.assessmentInfo }} -
    -
    -
    -
    -
    -
    + @if (assessment.assessmentInfo) { +
    - {{ 'i18n_examination_answer' | translate }} +
    +
    + + {{ 'i18n_additional_info_for_student' | translate }}: +
    +
    + {{ assessment.assessmentInfo }} +
    +
    -
    -
    - + } + @if (!collaborative && assessment.state === 'GRADED_LOGGED' && !assessment.gradeless) { +
    +
    +
    + {{ 'i18n_examination_answer' | translate }} +
    -
    - {{ 'i18n_not_available' | translate }} +
    + @if (assessmentWithAnswers) { +
    + +
    + } + @if (!assessmentWithAnswers) { +
    + {{ 'i18n_not_available' | translate }} +
    + }
    -
    + } -
    -
    -
    -
    - {{ 'i18n_student_score_report' | translate }} + @if ( + !collaborative && + assessment.executionType.type !== 'MATURITY' && + assessment.state === 'GRADED_LOGGED' && + !assessment.gradeless + ) { +
    +
    +
    +
    + {{ 'i18n_student_score_report' | translate }} +
    -
    -
    -
    - +
    +
    + +
    -
    + }
    diff --git a/ui/src/app/enrolment/finished/exam-feedback.component.ts b/ui/src/app/enrolment/finished/exam-feedback.component.ts index 0c65ed18b0..a3bc9e35e2 100644 --- a/ui/src/app/enrolment/finished/exam-feedback.component.ts +++ b/ui/src/app/enrolment/finished/exam-feedback.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { DatePipe, NgClass, NgIf } from '@angular/common'; +import { DatePipe, NgClass } from '@angular/common'; import { HttpClient } from '@angular/common/http'; import { Component, Input, OnInit } from '@angular/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; @@ -28,7 +28,7 @@ import { ExamAnswersDialogComponent } from './exam-answers-dialog.component'; selector: 'xm-exam-feedback', templateUrl: './exam-feedback.component.html', standalone: true, - imports: [NgIf, NgClass, DatePipe, TranslateModule], + imports: [NgClass, DatePipe, TranslateModule], }) export class ExamFeedbackComponent implements OnInit { @Input() assessment!: ReviewedExam; diff --git a/ui/src/app/enrolment/finished/exam-participation.component.html b/ui/src/app/enrolment/finished/exam-participation.component.html index 766f24b7fd..f0ce6e4747 100644 --- a/ui/src/app/enrolment/finished/exam-participation.component.html +++ b/ui/src/app/enrolment/finished/exam-participation.component.html @@ -7,35 +7,43 @@

    - #{{ participation.exam.id }} + @if (!participation.exam.anonymous) { + #{{ participation.exam.id }} + } {{ participation.exam.name }} - ({{ 'i18n_anonymous_review' | translate }}) + @if (participation.exam.anonymous) { + ({{ 'i18n_anonymous_review' | translate }}) + }

    -
    -
    -
    -
    {{ 'i18n_course_name' | translate }}:
    -
    - - {{ participation.exam.course?.name }} -
    -
    {{ 'i18n_teachers' | translate }}:
    -
    -
    - + @if (!collaborative) { +
    +
    +
    +
    {{ 'i18n_course_name' | translate }}:
    + @if (participation.exam.course) { +
    + + {{ participation.exam.course?.name }} +
    + } +
    {{ 'i18n_teachers' | translate }}:
    +
    +
    + +
    -
    + }
    {{ 'i18n_exam_endtime' | translate }}:
    - {{ participation.ended | applyDst | date : 'dd.MM.yyyy' }} + {{ participation.ended | applyDst | date: 'dd.MM.yyyy' }}
     
     
    @@ -43,49 +51,57 @@

    -
    -
    -
    -
    - + @if (reviewedExam) { +
    +
    +
    +
    + +
    -
    -
    -
    - - + } + @if (reviewedExam) { +
    +
    + + +
    -
    + }
    -
    -
    -
    {{ 'i18n_no_show' | translate }}
    + @if (participation.noShow) { +
    +
    +
    {{ 'i18n_no_show' | translate }}
    +
    -
    -
    -
    -
    {{ 'i18n_no_comments' | translate }}
    + } + @if (!participation.noShow && !reviewedExam) { +
    +
    +
    {{ 'i18n_no_comments' | translate }}
    +
    -
    + }
    diff --git a/ui/src/app/enrolment/finished/exam-participation.component.ts b/ui/src/app/enrolment/finished/exam-participation.component.ts index b405845de1..07f1017a28 100644 --- a/ui/src/app/enrolment/finished/exam-participation.component.ts +++ b/ui/src/app/enrolment/finished/exam-participation.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { DatePipe, NgClass, NgIf } from '@angular/common'; +import { DatePipe, NgClass } from '@angular/common'; import type { OnInit } from '@angular/core'; import { Component, Input, OnDestroy } from '@angular/core'; import { NgbCollapse } from '@ng-bootstrap/ng-bootstrap'; @@ -43,7 +43,6 @@ type Scores = { standalone: true, imports: [ NgClass, - NgIf, CourseCodeComponent, TeacherListComponent, NgbCollapse, diff --git a/ui/src/app/enrolment/finished/exam-participations.component.html b/ui/src/app/enrolment/finished/exam-participations.component.html index 58d0abaf1c..bd7fa6b02e 100644 --- a/ui/src/app/enrolment/finished/exam-participations.component.html +++ b/ui/src/app/enrolment/finished/exam-participations.component.html @@ -73,31 +73,35 @@

    -
    -
    - + @for ( + participation of participations + | orderBy: filter.ordering : filter.reverse + | slice: currentPage * pageSize : currentPage * pageSize + pageSize; + track participation + ) { +
    +
    + +
    -
    + } -
    -
    - - + @if (participations) { +
    + @if (participations.length > pageSize) { +
    + + +
    + }
    -
    + }
    diff --git a/ui/src/app/enrolment/finished/exam-participations.component.ts b/ui/src/app/enrolment/finished/exam-participations.component.ts index 7e45675cb3..8d5b5ea488 100644 --- a/ui/src/app/enrolment/finished/exam-participations.component.ts +++ b/ui/src/app/enrolment/finished/exam-participations.component.ts @@ -57,7 +57,10 @@ export class ExamParticipationsComponent implements OnInit, OnDestroy { filterChanged: Subject = new Subject(); ngUnsubscribe = new Subject(); - constructor(private toast: ToastrService, private Enrolment: EnrolmentService) { + constructor( + private toast: ToastrService, + private Enrolment: EnrolmentService, + ) { this.filterChanged .pipe(debounceTime(500), distinctUntilChanged(), takeUntil(this.ngUnsubscribe)) .subscribe(this._search); diff --git a/ui/src/app/enrolment/search/collaborative-exam-search.component.ts b/ui/src/app/enrolment/search/collaborative-exam-search.component.ts index f465a405a1..39284e3031 100644 --- a/ui/src/app/enrolment/search/collaborative-exam-search.component.ts +++ b/ui/src/app/enrolment/search/collaborative-exam-search.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgFor, NgIf } from '@angular/common'; + import type { OnInit } from '@angular/core'; import { Component, OnDestroy } from '@angular/core'; import { FormsModule } from '@angular/forms'; @@ -54,11 +54,13 @@ import { ExamSearchResultComponent } from './exam-search-result.component';
    -
    - {{ 'i18n_student_exam_search_result' | translate }} {{ exams.length }} - {{ 'i18n_student_exam_search_result_continues' | translate }} - "{{ filter.text }}" -
    + @if (exams.length > 0 && filter.text.length > 2) { +
    + {{ 'i18n_student_exam_search_result' | translate }} {{ exams.length }} + {{ 'i18n_student_exam_search_result_continues' | translate }} + "{{ filter.text }}" +
    + }
    `, +
    `, standalone: true, - imports: [FormsModule, NgIf, NgFor, ExamSearchResultComponent, TranslateModule], + imports: [FormsModule, ExamSearchResultComponent, TranslateModule], }) export class CollaborativeExamSearchComponent implements OnInit, OnDestroy { exams: CollaborativeExamInfo[] = []; diff --git a/ui/src/app/enrolment/search/exam-search-result.component.ts b/ui/src/app/enrolment/search/exam-search-result.component.ts index 1daa8a1af4..a47748884f 100644 --- a/ui/src/app/enrolment/search/exam-search-result.component.ts +++ b/ui/src/app/enrolment/search/exam-search-result.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { DatePipe, NgClass, NgIf } from '@angular/common'; +import { DatePipe, NgClass } from '@angular/common'; import { Component, Input } from '@angular/core'; import { Router, RouterLink } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; @@ -31,29 +31,34 @@ import { EnrolmentService } from '../enrolment.service';

    - - {{ exam.name }} - - {{ exam.name }} + @if (!collaborative) { + + {{ exam.name }} + + } + @if (collaborative) { + {{ exam.name }} + }

    - - {{ 'i18n_state_needs_reservation_title' | translate }} - + @if (exam.alreadyEnrolled && !exam.reservationMade) { + + {{ 'i18n_state_needs_reservation_title' | translate }} + + }
    {{ 'i18n_course_name' | translate }}: -
    - {{ exam.course.name }} -
    + @if (!collaborative && exam.course) { +
    {{ exam.course.name }}
    + }
    {{ 'i18n_teachers' | translate }}: @@ -66,8 +71,7 @@ import { EnrolmentService } from '../enrolment.service';
    {{ 'i18n_exam_validity' | translate }}: {{ exam.periodStart | date : 'dd.MM.yyyy' }} – - {{ exam.periodEnd | date : 'dd.MM.yyyy' }}{{ exam.periodStart | date: 'dd.MM.yyyy' }} – {{ exam.periodEnd | date: 'dd.MM.yyyy' }}
    @@ -79,31 +83,28 @@ import { EnrolmentService } from '../enrolment.service';
    - - - {{ 'i18n_enrolled_to_exam' | translate }} + @if (!exam.alreadyEnrolled) { + + } + @if (exam.alreadyEnrolled && !exam.reservationMade) { + + } + @if (exam.alreadyEnrolled && exam.reservationMade) { + {{ 'i18n_enrolled_to_exam' | translate }} + }
    -
    `, +
    `, standalone: true, - imports: [NgClass, NgIf, RouterLink, CourseCodeComponent, TeacherListComponent, DatePipe, TranslateModule], + imports: [NgClass, RouterLink, CourseCodeComponent, TeacherListComponent, DatePipe, TranslateModule], }) export class ExamSearchResultComponent { @Input() exam!: EnrolmentInfo | CollaborativeExamInfo; @@ -111,7 +112,10 @@ export class ExamSearchResultComponent { enrolling = false; // DO WE NEED THIS? - constructor(private router: Router, private Enrolment: EnrolmentService) {} + constructor( + private router: Router, + private Enrolment: EnrolmentService, + ) {} enrollForExam = () => { if (this.enrolling) { diff --git a/ui/src/app/enrolment/search/exam-search.component.ts b/ui/src/app/enrolment/search/exam-search.component.ts index 29a71539b5..f68b8d9af3 100644 --- a/ui/src/app/enrolment/search/exam-search.component.ts +++ b/ui/src/app/enrolment/search/exam-search.component.ts @@ -13,7 +13,7 @@ * See the Licence for the specific language governing permissions and limitations under the Licence. */ import { animate, query, stagger, style, transition, trigger } from '@angular/animations'; -import { NgFor, NgIf } from '@angular/common'; + import type { OnInit } from '@angular/core'; import { Component, OnDestroy } from '@angular/core'; import { FormsModule } from '@angular/forms'; @@ -40,51 +40,61 @@ import { ExamSearchService } from './exam-search.service';   - - {{ 'i18n_exam_search_description' | translate }} - - {{ 'i18n_search_restricted' | translate }} + @if (permissionCheck.active === false) { + + {{ 'i18n_exam_search_description' | translate }} + + } + @if (permissionCheck.active === true) { + {{ 'i18n_search_restricted' | translate }} + }
    -
    -
    -
    - - -
    + } -
    -
    - {{ 'i18n_student_exam_search_result' | translate }} {{ exams.length }} - {{ 'i18n_student_exam_search_result_continues' | translate }} - "{{ filter.text }}" + @if (exams.length > 0) { +
    +
    + {{ 'i18n_student_exam_search_result' | translate }} {{ exams.length }} + {{ 'i18n_student_exam_search_result_continues' | translate }} + "{{ filter.text }}" +
    -
    + }
    -
    - -
    + @for (exam of exams; track exam) { +
    + +
    + }
    -
    `, +
    `, animations: [ trigger('listAnimation', [ transition('* <=> *', [ @@ -98,7 +108,7 @@ import { ExamSearchService } from './exam-search.service'; ]), ], standalone: true, - imports: [NgIf, FormsModule, AutoFocusDirective, NgFor, ExamSearchResultComponent, TranslateModule], + imports: [FormsModule, AutoFocusDirective, ExamSearchResultComponent, TranslateModule], }) export class ExamSearchComponent implements OnInit, OnDestroy { exams: EnrolmentInfo[] = []; @@ -107,7 +117,10 @@ export class ExamSearchComponent implements OnInit, OnDestroy { filter = { text: '' }; permissionCheck = { active: false }; - constructor(private toast: ToastrService, private Search: ExamSearchService) { + constructor( + private toast: ToastrService, + private Search: ExamSearchService, + ) { this.filterChanged .pipe(debounceTime(500), distinctUntilChanged(), takeUntil(this.ngUnsubscribe)) .subscribe((txt) => { diff --git a/ui/src/app/enrolment/waiting-room/waiting-room.component.html b/ui/src/app/enrolment/waiting-room/waiting-room.component.html index 2cbf3b7a0a..be79b3f99a 100644 --- a/ui/src/app/enrolment/waiting-room/waiting-room.component.html +++ b/ui/src/app/enrolment/waiting-room/waiting-room.component.html @@ -13,97 +13,124 @@

    -
    -
    -
    -
    - -
    - {{ enrolment.reservation.startAt | date : 'dd' }} - {{ - enrolment.reservation.startAt | date : 'MMM' | slice : 0 : 3 | uppercase - }} -
    -
    - {{ enrolment.examinationEventConfiguration?.examinationEvent?.start | date : 'dd' }} - {{ - enrolment.examinationEventConfiguration?.examinationEvent?.start - | date : 'MMM' - | slice : 0 : 3 - | uppercase - }} -
    - - -
    - {{ enrolment?.exam?.name }} - ({{ 'i18n_anonymous_review' | translate }}) -
    - {{ 'i18n_state_ready' | translate }} +@if (isUpcoming) { +
    +
    +
    +
    + + @if (enrolment?.reservation) { +
    + {{ enrolment.reservation.startAt | date: 'dd' }} + {{ + enrolment.reservation.startAt | date: 'MMM' | slice: 0 : 3 | uppercase + }} +
    + } + @if (enrolment?.examinationEventConfiguration) { +
    + {{ enrolment.examinationEventConfiguration?.examinationEvent?.start | date: 'dd' }} + {{ + enrolment.examinationEventConfiguration?.examinationEvent?.start + | date: 'MMM' + | slice: 0 : 3 + | uppercase + }} +
    + } + +
    + {{ enrolment?.exam?.name }} + @if (enrolment?.exam?.anonymous) { + ({{ 'i18n_anonymous_review' | translate }}) + } +
    + {{ 'i18n_state_ready' | translate }} +
    -
    -
    -
    {{ 'i18n_course_name' | translate }}:
    -
    - - {{ enrolment?.exam?.course?.name }} -
    -
    -
    -
    {{ 'i18n_teachers' | translate }}:
    -
    -
    - +
    +
    {{ 'i18n_course_name' | translate }}:
    + @if (enrolment && enrolment.exam.course) { +
    + + {{ enrolment?.exam?.course?.name }} +
    + } +
    +
    +
    {{ 'i18n_teachers' | translate }}:
    +
    +
    + @if (enrolment) { + + } +
    -
    -
    -
    {{ 'i18n_exam_room' | translate }}:
    -
    - {{ enrolment.reservation.machine.name }}   |    - {{ enrolment.reservation.machine.room.name }} - ({{ enrolment.reservation.machine.room.roomCode }}) -
    -
    -
    -
    {{ 'i18n_reservation' | translate }}:
    -
    - {{ enrolment.reservation.startAt | applyDst | date : 'dd.MM.yyyy' }} - {{ enrolment.reservation.occasion.startAt }} - - {{ enrolment.reservation.occasion.endAt }} -
    -
    -
    -
    {{ 'i18n_examination_event' | translate }}:
    -
    - {{ enrolment.examinationEventConfiguration?.examinationEvent?.description }} -
    -
    {{ 'i18n_begin' | translate }}:
    -
    - {{ enrolment.examinationEventConfiguration?.examinationEvent?.start | date : 'dd.MM.yyyy HH:mm' }} -
    -
    {{ 'i18n_exam_duration' | translate }}:
    -
    - {{ enrolment.exam.duration }} {{ 'i18n_minutes' | translate }} -
    -
    -
    -
    - {{ 'i18n_room_guidance' | translate }}: -
    -
    -
    -
    {{ roomInstructions }}
    -
    - -
    -
    - {{ 'i18n_view_instructions' | translate }}: -
    -
    -
    -
    + @if (enrolment?.reservation) { +
    +
    {{ 'i18n_exam_room' | translate }}:
    +
    + {{ enrolment.reservation.machine.name }}   |    + {{ enrolment.reservation.machine.room.name }} + ({{ enrolment.reservation.machine.room.roomCode }}) +
    +
    +
    +
    {{ 'i18n_reservation' | translate }}:
    +
    + {{ enrolment.reservation.startAt | applyDst | date: 'dd.MM.yyyy' }} + {{ enrolment.reservation.occasion.startAt }} + - {{ enrolment.reservation.occasion.endAt }} +
    +
    + } + @if (enrolment?.examinationEventConfiguration) { +
    +
    {{ 'i18n_examination_event' | translate }}:
    +
    + {{ enrolment.examinationEventConfiguration?.examinationEvent?.description }} +
    +
    {{ 'i18n_begin' | translate }}:
    +
    + {{ + enrolment.examinationEventConfiguration?.examinationEvent?.start | date: 'dd.MM.yyyy HH:mm' + }} +
    +
    {{ 'i18n_exam_duration' | translate }}:
    +
    + {{ enrolment.exam.duration }} {{ 'i18n_minutes' | translate }} +
    +
    + } + @if (roomInstructions) { +
    +
    + {{ 'i18n_room_guidance' | translate }}: +
    +
    + } + @if (roomInstructions) { +
    +
    {{ roomInstructions }}
    +
    + } + @if (enrolment?.exam?.enrollInstruction) { +
    +
    + {{ 'i18n_view_instructions' | translate }}: +
    +
    + } + @if (enrolment?.exam?.enrollInstruction) { +
    +
    +
    + }
    -
    +} diff --git a/ui/src/app/enrolment/waiting-room/waiting-room.component.ts b/ui/src/app/enrolment/waiting-room/waiting-room.component.ts index 0d91f54430..f3c2ba8b81 100644 --- a/ui/src/app/enrolment/waiting-room/waiting-room.component.ts +++ b/ui/src/app/enrolment/waiting-room/waiting-room.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { DatePipe, NgIf, SlicePipe, UpperCasePipe } from '@angular/common'; +import { DatePipe, SlicePipe, UpperCasePipe } from '@angular/common'; import { HttpClient } from '@angular/common/http'; import type { OnDestroy, OnInit } from '@angular/core'; import { Component } from '@angular/core'; @@ -39,7 +39,6 @@ type WaitingEnrolment = Omit & { templateUrl: './waiting-room.component.html', standalone: true, imports: [ - NgIf, CourseCodeComponent, TeacherListComponent, MathJaxDirective, diff --git a/ui/src/app/enrolment/wrong-location/wrong-location.component.html b/ui/src/app/enrolment/wrong-location/wrong-location.component.html index 742ea7d4cc..d44fc36457 100644 --- a/ui/src/app/enrolment/wrong-location/wrong-location.component.html +++ b/ui/src/app/enrolment/wrong-location/wrong-location.component.html @@ -1,73 +1,81 @@ -
    -
    -
    -

    {{ 'i18n_logged_on_wrong_machine' | translate }}

    - {{ 'i18n_current_wrong_machine_title' | translate }}: {{ currentMachine.name }}
    - {{ 'i18n_reserved_machine' | translate }}: {{ reservation.machine.name }} +@if (currentMachine && enrolment) { +
    +
    +
    +

    {{ 'i18n_logged_on_wrong_machine' | translate }}

    + {{ 'i18n_current_wrong_machine_title' | translate }}: {{ currentMachine.name }}
    + {{ 'i18n_reserved_machine' | translate }}: {{ reservation.machine.name }} +
    -
    -
    -
    {{ 'i18n_current_wrong_room_title' | translate }}:
    -
    - {{ currentMachine.room.name }} ({{ currentMachine.room.buildingName }}) + @if (cause === 'room') { +
    +
    {{ 'i18n_current_wrong_room_title' | translate }}:
    +
    + {{ currentMachine.room.name }} ({{ currentMachine.room.buildingName }}) +
    +
    + } + @if (cause === 'room') { +
    +
    {{ 'i18n_reserved_room' | translate }}:
    +
    + {{ reservation.machine.room.name }} ({{ reservation.machine.room.roomCode }}) +
    +
    + } +
    +
    + {{ 'i18n_reserved_exam' | translate }}:  {{ enrolment.exam.name }} - + @if (enrolment.exam.course) { + + } + +
    -
    -
    -
    {{ 'i18n_reserved_room' | translate }}:
    -
    - {{ reservation.machine.room.name }} ({{ reservation.machine.room.roomCode }}) +
    +
    {{ 'i18n_course_name' | translate }}:
    + {{ enrolment.exam.course?.name }}
    -
    - -
    -
    - {{ 'i18n_reserved_exam' | translate }}:  {{ enrolment.exam.name }} - - - +
    +
    {{ 'i18n_exam_duration' | translate }}:
    + {{ printExamDuration() }}
    -
    - -
    -
    {{ 'i18n_course_name' | translate }}:
    - {{ enrolment.exam.course?.name }} -
    -
    -
    {{ 'i18n_exam_duration' | translate }}:
    - {{ printExamDuration() }} -
    -
    -
    {{ 'i18n_exam_room' | translate }}:
    - {{ reservation.machine.name }}   |    {{ reservation.machine.room.name }}({{ - reservation.machine.room.roomCode - }}) -
    -
    -
    {{ 'i18n_reservation_time' | translate }}:
    - {{ reservation.startAt | date : 'dd.MM.yyyy' }} {{ occasion.startAt }} - {{ occasion.endAt }} ({{ - reservation.machine.room.localTimezone - }}) - -
    -
    -
    {{ 'i18n_instructions' | translate }}:
    -
    - {{ 'i18n_view' | translate }} +
    +
    {{ 'i18n_exam_room' | translate }}:
    + {{ reservation.machine.name }}   |    + {{ reservation.machine.room.name }}({{ reservation.machine.room.roomCode }})
    -
    -
    -
    {{ 'i18n_teachers' | translate }}:
    -
    - +
    +
    {{ 'i18n_reservation_time' | translate }}:
    + {{ reservation.startAt | date: 'dd.MM.yyyy' }} {{ occasion.startAt }} - {{ occasion.endAt }} ({{ + reservation.machine.room.localTimezone + }}) +
    -
    - -
    -
    - {{ 'i18n_logout_and_login_elsewhere' | translate }} + @if (enrolment.exam.enrollInstruction) { +
    +
    {{ 'i18n_instructions' | translate }}:
    +
    + {{ 'i18n_view' | translate }} +
    +
    + } +
    +
    {{ 'i18n_teachers' | translate }}:
    +
    + @if (enrolment.exam) { + + } +
    +
    +
    +
    + {{ 'i18n_logout_and_login_elsewhere' | translate }} +
    -
    +} diff --git a/ui/src/app/enrolment/wrong-location/wrong-location.component.ts b/ui/src/app/enrolment/wrong-location/wrong-location.component.ts index 53ecaad581..c6fa202cb3 100644 --- a/ui/src/app/enrolment/wrong-location/wrong-location.component.ts +++ b/ui/src/app/enrolment/wrong-location/wrong-location.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { DatePipe, NgIf } from '@angular/common'; +import { DatePipe } from '@angular/common'; import { HttpClient } from '@angular/common/http'; import type { OnInit } from '@angular/core'; import { Component } from '@angular/core'; @@ -31,7 +31,7 @@ import { EnrolmentService } from '../enrolment.service'; selector: 'xm-wrong-location', templateUrl: './wrong-location.component.html', standalone: true, - imports: [NgIf, CourseCodeComponent, TeacherListComponent, DatePipe, TranslateModule], + imports: [CourseCodeComponent, TeacherListComponent, DatePipe, TranslateModule], }) export class WrongLocationComponent implements OnInit { cause = ''; diff --git a/ui/src/app/enrolment/wrong-location/wrong-location.service.ts b/ui/src/app/enrolment/wrong-location/wrong-location.service.ts index b3fa14b752..817edf5133 100644 --- a/ui/src/app/enrolment/wrong-location/wrong-location.service.ts +++ b/ui/src/app/enrolment/wrong-location/wrong-location.service.ts @@ -20,7 +20,10 @@ import { ToastrService } from 'ngx-toastr'; @Injectable({ providedIn: 'root' }) export class WrongLocationService { - constructor(private translate: TranslateService, private toast: ToastrService) {} + constructor( + private translate: TranslateService, + private toast: ToastrService, + ) {} display = (data: string[]) => { const [campus, building, room, machine, start, zone] = data; diff --git a/ui/src/app/exam/collaborative/collaborative-exam-listing.component.html b/ui/src/app/exam/collaborative/collaborative-exam-listing.component.html index e0afb448e7..428489e574 100644 --- a/ui/src/app/exam/collaborative/collaborative-exam-listing.component.html +++ b/ui/src/app/exam/collaborative/collaborative-exam-listing.component.html @@ -5,13 +5,15 @@
    -
    -
    - - {{ 'i18n_toolbar_new_exam' | translate }} - + @if (user.isAdmin) { +
    +
    + + {{ 'i18n_toolbar_new_exam' | translate }} + +
    -
    + }
    @@ -116,41 +118,53 @@ - - - + + + @if (exam.name) { + {{ exam.name }} + } + @if (!exam.name) { + + {{ 'i18n_no_name' | translate | uppercase }} + + } + + + - {{ exam.name }} - - {{ 'i18n_no_name' | translate | uppercase }} - - - - - {{ getStateTranslation(exam) }} - - -

    {{ o.email }}

    - - - - {{ exam.periodStart | date : 'dd.MM.yyyy' }} - - - - - {{ exam.periodEnd | date : 'dd.MM.yyyy' }} - - - + {{ getStateTranslation(exam) }} + + + @for (o of exam.examOwners; track o) { +

    {{ o.email }}

    + } + + + @if (exam.periodStart) { + + {{ exam.periodStart | date: 'dd.MM.yyyy' }} + + } + + + @if (exam.periodEnd) { + + {{ exam.periodEnd | date: 'dd.MM.yyyy' }} + + } + + + }
    diff --git a/ui/src/app/exam/collaborative/collaborative-exam-listing.component.ts b/ui/src/app/exam/collaborative/collaborative-exam-listing.component.ts index 64cd108b55..bfbc8a7635 100644 --- a/ui/src/app/exam/collaborative/collaborative-exam-listing.component.ts +++ b/ui/src/app/exam/collaborative/collaborative-exam-listing.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { DatePipe, NgClass, NgFor, NgIf, UpperCasePipe } from '@angular/common'; +import { DatePipe, NgClass, UpperCasePipe } from '@angular/common'; import type { OnInit } from '@angular/core'; import { Component, OnDestroy } from '@angular/core'; import { Router, RouterLink } from '@angular/router'; @@ -47,14 +47,12 @@ interface ListedCollaborativeExam extends CollaborativeExam { templateUrl: './collaborative-exam-listing.component.html', standalone: true, imports: [ - NgIf, NgbNav, NgbNavItem, NgbNavItemRole, NgbNavLink, NgbPopover, TableSortComponent, - NgFor, RouterLink, NgClass, UpperCasePipe, diff --git a/ui/src/app/exam/collaborative/collaborative-exam.service.ts b/ui/src/app/exam/collaborative/collaborative-exam.service.ts index d02c1069d1..7c342e4e1b 100644 --- a/ui/src/app/exam/collaborative/collaborative-exam.service.ts +++ b/ui/src/app/exam/collaborative/collaborative-exam.service.ts @@ -31,7 +31,10 @@ export type CollaborativeParticipation = Omit & { exa export class CollaborativeExamService { exams: CollaborativeExam[] = []; - constructor(private http: HttpClient, private Session: SessionService) {} + constructor( + private http: HttpClient, + private Session: SessionService, + ) {} listExams$ = (): Observable => { const path = this.Session.getUser().isStudent ? '/app/iop/enrolments' : '/app/iop/exams'; diff --git a/ui/src/app/exam/editor/assessment/auto-evaluation.component.html b/ui/src/app/exam/editor/assessment/auto-evaluation.component.html index 25aeb88f95..b146ce36fa 100644 --- a/ui/src/app/exam/editor/assessment/auto-evaluation.component.html +++ b/ui/src/app/exam/editor/assessment/auto-evaluation.component.html @@ -3,16 +3,24 @@
    {{ 'i18n_exam_autoevaluation' | translate }} - ({{ 'i18n_in_use' | translate }}) - ({{ 'i18n_not_in_use' | translate }}) + @if (autoevaluation.enabled) { + ({{ 'i18n_in_use' | translate }}) + } + @if (!autoevaluation.enabled) { + ({{ 'i18n_not_in_use' | translate }}) + } - - + @if (!autoevaluationDisplay.visible) { + + } + @if (autoevaluationDisplay.visible) { + + }
    @@ -25,22 +33,16 @@ {{ 'i18n_autoevaluation_instructions' | translate }}
    - - {{ 'i18n_use' | translate }} - - {{ 'i18n_do_not_use' | translate }} + @if (!autoevaluation.enabled) { + + {{ 'i18n_use' | translate }} + } + @if (autoevaluation.enabled) { + + {{ 'i18n_do_not_use' | translate }} + }
    @@ -62,33 +64,37 @@ class="col-md-12 pt-2" [ngStyle]="gradesForm?.invalid ? { border: 'red 1px solid' } : { border: 'white 1px solid' }" > -
    -
    -
    -
    - {{ getGradeDisplayName(ge.grade) }} -
    -
    - - % + @if (config) { + + @for (ge of config.gradeEvaluations | orderBy: 'grade.name'; track ge) { +
    +
    +
    + {{ getGradeDisplayName(ge.grade) }} +
    +
    + + % +
    +
    + {{ calculatePointLimit(ge) }} +
    +
    -
    - {{ calculatePointLimit(ge) }} -
    -
    -
    - + } + + }
    @@ -106,16 +112,13 @@ {{ selectedReleaseType()?.translation || '' | translate }} 
    @@ -123,32 +126,37 @@
    -
    -
    - + @if (selectedReleaseType()?.name === 'GIVEN_DATE') { +
    +
    + +
    -
    -
    -
    -
    {{ 'i18n_autoevaluation_release_after_days' | translate }}:
    - + } + @if (selectedReleaseType()?.name === 'GIVEN_AMOUNT_DAYS') { +
    +
    +
    {{ 'i18n_autoevaluation_release_after_days' | translate }}:
    + @if (config) { + + } +
    -
    + }
    diff --git a/ui/src/app/exam/editor/assessment/auto-evaluation.component.ts b/ui/src/app/exam/editor/assessment/auto-evaluation.component.ts index 1eb291f70a..fb310f715e 100644 --- a/ui/src/app/exam/editor/assessment/auto-evaluation.component.ts +++ b/ui/src/app/exam/editor/assessment/auto-evaluation.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgClass, NgFor, NgIf, NgStyle } from '@angular/common'; +import { NgClass, NgStyle } from '@angular/common'; import type { OnChanges, OnInit, SimpleChanges } from '@angular/core'; import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core'; import { FormsModule, NgForm } from '@angular/forms'; @@ -44,13 +44,11 @@ type AutoEvaluationConfigurationTemplate = { templateUrl: './auto-evaluation.component.html', standalone: true, imports: [ - NgIf, NgbPopover, NgbCollapse, NgStyle, FormsModule, UniqueValuesValidatorDirective, - NgFor, NgbDropdown, NgbDropdownToggle, NgbDropdownMenu, @@ -72,7 +70,10 @@ export class AutoEvaluationComponent implements OnInit, OnChanges { config?: AutoEvaluationConfig; autoevaluationDisplay: { visible: boolean }; - constructor(private Exam: ExamService, private CommonExam: CommonExamService) { + constructor( + private Exam: ExamService, + private CommonExam: CommonExamService, + ) { this.autoevaluation = { enabled: false, releaseTypes: [ diff --git a/ui/src/app/exam/editor/assessment/exam-assessment.component.html b/ui/src/app/exam/editor/assessment/exam-assessment.component.html index 3d2989ff96..4a96ca4f64 100644 --- a/ui/src/app/exam/editor/assessment/exam-assessment.component.html +++ b/ui/src/app/exam/editor/assessment/exam-assessment.component.html @@ -32,16 +32,18 @@
    - -   - + @for (examType of examTypes; track examType) { + +   + + }
    @@ -66,39 +68,45 @@
    - -   - {{ gradeScale.name }}  + }
    -
    - - -
    -
    - -
    + @if (canBeAutoEvaluated()) { +
    + + +
    + } + @if (!collaborative && exam.executionType?.type !== 'MATURITY') { +
    + +
    + }
    diff --git a/ui/src/app/exam/editor/assessment/exam-assessment.component.ts b/ui/src/app/exam/editor/assessment/exam-assessment.component.ts index 701eb9cd6f..018008acaf 100644 --- a/ui/src/app/exam/editor/assessment/exam-assessment.component.ts +++ b/ui/src/app/exam/editor/assessment/exam-assessment.component.ts @@ -1,4 +1,4 @@ -import { NgClass, NgFor, NgIf } from '@angular/common'; +import { NgClass } from '@angular/common'; import { HttpClient } from '@angular/common/http'; import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; @@ -30,7 +30,7 @@ import { ExamFeedbackConfigComponent } from './exam-feedback-config.component'; selector: 'xm-exam-assessment', templateUrl: './exam-assessment.component.html', standalone: true, - imports: [NgbPopover, NgFor, NgClass, NgIf, AutoEvaluationComponent, ExamFeedbackConfigComponent, TranslateModule], + imports: [NgbPopover, NgClass, AutoEvaluationComponent, ExamFeedbackConfigComponent, TranslateModule], }) export class ExamAssessmentComponent implements OnInit, OnDestroy { exam!: Exam; diff --git a/ui/src/app/exam/editor/assessment/exam-feedback-config.component.html b/ui/src/app/exam/editor/assessment/exam-feedback-config.component.html index b665f1ec43..383b43e426 100644 --- a/ui/src/app/exam/editor/assessment/exam-feedback-config.component.html +++ b/ui/src/app/exam/editor/assessment/exam-feedback-config.component.html @@ -3,26 +3,32 @@
    {{ 'i18n_exam_feedback_config' | translate }} - ({{ 'i18n_in_use' | translate }}) - ({{ 'i18n_not_in_use' | translate }}) + @if (examFeedbackConfig.enabled) { + ({{ 'i18n_in_use' | translate }}) + } + @if (!examFeedbackConfig.enabled) { + ({{ 'i18n_not_in_use' | translate }}) + } - - + @if (!examFeedbackConfigDisplay.visible) { + + } + @if (examFeedbackConfigDisplay.visible) { + + }
    @@ -35,24 +41,26 @@ {{ 'i18n_exam_feedback_config_instructions' | translate }}
    - - {{ 'i18n_use' | translate }} - - {{ 'i18n_do_not_use' | translate }} + @if (!examFeedbackConfig.enabled) { + + {{ 'i18n_use' | translate }} + } + @if (examFeedbackConfig.enabled) { + + {{ 'i18n_do_not_use' | translate }} + }
    @@ -65,26 +73,24 @@ {{ selectedReleaseType()?.translation || '' | translate }} 
    - + @if (selectedReleaseType()?.name === 'GIVEN_DATE') { + + }
    diff --git a/ui/src/app/exam/editor/assessment/exam-feedback-config.component.ts b/ui/src/app/exam/editor/assessment/exam-feedback-config.component.ts index 645cd90ce3..c49b680373 100644 --- a/ui/src/app/exam/editor/assessment/exam-feedback-config.component.ts +++ b/ui/src/app/exam/editor/assessment/exam-feedback-config.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgClass, NgFor, NgIf } from '@angular/common'; +import { NgClass } from '@angular/common'; import type { OnInit } from '@angular/core'; import { Component, EventEmitter, Input, Output } from '@angular/core'; import { @@ -40,14 +40,12 @@ type ExamFeedbackConfigTemplate = { styleUrls: ['./exam-feedback-config.component.css'], standalone: true, imports: [ - NgIf, NgbPopover, NgbCollapse, NgClass, NgbDropdown, NgbDropdownToggle, NgbDropdownMenu, - NgFor, NgbDropdownItem, DatePickerComponent, TranslateModule, diff --git a/ui/src/app/exam/editor/basic/basic-exam-info.component.html b/ui/src/app/exam/editor/basic/basic-exam-info.component.html index 5588ea206f..f13179166f 100644 --- a/ui/src/app/exam/editor/basic/basic-exam-info.component.html +++ b/ui/src/app/exam/editor/basic/basic-exam-info.component.html @@ -1,15 +1,19 @@
    -
    -
    {{ 'i18n_course_info' | translate }}
    -
    + @if (!collaborative) { +
    +
    {{ 'i18n_course_info' | translate }}
    +
    + }
    - + @if (!collaborative) { + + }
    @@ -82,14 +86,16 @@
    -
    -
    -
    -
    {{ 'i18n_examination_type' | translate }}
    -
    {{ getExaminationTypeName() | translate }}
    + @if (byodExaminationSupported) { +
    +
    +
    +
    {{ 'i18n_examination_type' | translate }}
    +
    {{ getExaminationTypeName() | translate }}
    +
    -
    + }
    @@ -132,7 +138,9 @@
    - + @if (!collaborative) { + + }
    @@ -168,11 +176,9 @@
    - - + @if (exam.executionType.type !== 'MATURITY' && !collaborative) { + + }
    @@ -186,46 +192,56 @@
    - + @if (exam && !collaborative) { + + } -
    -
    -
    -
    - {{ 'i18n_exam_attachment' | translate }} - - - -
    -
    - -
    - - {{ exam.attachment?.fileName }} - - + @if (exam.implementation !== 'CLIENT_AUTH') { +
    +
    +
    +
    + {{ 'i18n_exam_attachment' | translate }} + - + +
    +
    + + @if (exam.attachment) { +
    + + {{ exam.attachment?.fileName }} + + + + +
    + }
    -
    + }
    @@ -271,24 +287,28 @@
    -
    - {{ 'i18n_enroll_instruction' | translate }} - - - -
    + @if (exam.executionType.type !== 'PRINTOUT') { +
    + {{ 'i18n_enroll_instruction' | translate }} + + + +
    + } -
    - {{ 'i18n_allowed_tools' | translate }} -
    + @if (exam.executionType.type === 'PRINTOUT') { +
    + {{ 'i18n_allowed_tools' | translate }} +
    + }
    -
    - {{ 'i18n_exam_remove' | translate }} -
    + @if (showDelete()) { +
    + {{ 'i18n_exam_remove' | translate }} +
    + }
    diff --git a/ui/src/app/exam/editor/basic/basic-exam-info.component.ts b/ui/src/app/exam/editor/basic/basic-exam-info.component.ts index 4ddb732ec0..2809df7c36 100644 --- a/ui/src/app/exam/editor/basic/basic-exam-info.component.ts +++ b/ui/src/app/exam/editor/basic/basic-exam-info.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgClass, NgIf } from '@angular/common'; +import { NgClass } from '@angular/common'; import { HttpClient } from '@angular/common/http'; import type { OnDestroy, OnInit } from '@angular/core'; import { Component } from '@angular/core'; @@ -41,7 +41,6 @@ import { SoftwareSelectorComponent } from './software-picker.component'; templateUrl: './basic-exam-info.component.html', standalone: true, imports: [ - NgIf, ExamCourseComponent, NgbPopover, FormsModule, diff --git a/ui/src/app/exam/editor/basic/exam-inspector-picker.component.html b/ui/src/app/exam/editor/basic/exam-inspector-picker.component.html index 36836e382f..57a89ddc36 100644 --- a/ui/src/app/exam/editor/basic/exam-inspector-picker.component.html +++ b/ui/src/app/exam/editor/basic/exam-inspector-picker.component.html @@ -57,20 +57,22 @@
      -
    • - {{ inspection.user.firstName }} {{ inspection.user.lastName }} ({{ inspection.user.email }}) - -
      • + @for (inspection of examInspections; track inspection) { +
    • + {{ inspection.user.firstName }} {{ inspection.user.lastName }} ({{ inspection.user.email }}) + +
      • + }
    diff --git a/ui/src/app/exam/editor/basic/exam-inspector-picker.component.ts b/ui/src/app/exam/editor/basic/exam-inspector-picker.component.ts index ba0ceab5b9..3ed022eb41 100644 --- a/ui/src/app/exam/editor/basic/exam-inspector-picker.component.ts +++ b/ui/src/app/exam/editor/basic/exam-inspector-picker.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgFor } from '@angular/common'; + import { HttpClient } from '@angular/common/http'; import type { OnInit } from '@angular/core'; import { Component, Input } from '@angular/core'; @@ -30,7 +30,7 @@ import type { Exam, ExamInspection } from '../../exam.model'; selector: 'xm-exam-inspector-picker', templateUrl: './exam-inspector-picker.component.html', standalone: true, - imports: [NgbPopover, FormsModule, NgbTypeahead, NgFor, TranslateModule], + imports: [NgbPopover, FormsModule, NgbTypeahead, TranslateModule], }) export class ExamInspectorSelectorComponent implements OnInit { @Input() exam!: Exam; @@ -43,7 +43,10 @@ export class ExamInspectorSelectorComponent implements OnInit { email?: string; }; - constructor(private http: HttpClient, private toast: ToastrService) { + constructor( + private http: HttpClient, + private toast: ToastrService, + ) { this.newInspector = {}; } diff --git a/ui/src/app/exam/editor/basic/exam-owner-picker.component.html b/ui/src/app/exam/editor/basic/exam-owner-picker.component.html index 88cc5be7d6..0171e0d17a 100644 --- a/ui/src/app/exam/editor/basic/exam-owner-picker.component.html +++ b/ui/src/app/exam/editor/basic/exam-owner-picker.component.html @@ -37,21 +37,23 @@
      -
    • - {{ user.firstName }} {{ user.lastName }} ({{ user.email }}) - -
      • + @for (user of examOwners; track user) { +
    • + {{ user.firstName }} {{ user.lastName }} ({{ user.email }}) + +
      • + }
    diff --git a/ui/src/app/exam/editor/basic/exam-owner-picker.component.ts b/ui/src/app/exam/editor/basic/exam-owner-picker.component.ts index cb7bb172cc..ecbd5590d6 100644 --- a/ui/src/app/exam/editor/basic/exam-owner-picker.component.ts +++ b/ui/src/app/exam/editor/basic/exam-owner-picker.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgFor } from '@angular/common'; + import { HttpClient } from '@angular/common/http'; import type { OnInit } from '@angular/core'; import { Component, Input } from '@angular/core'; @@ -30,7 +30,7 @@ import type { Exam } from '../../exam.model'; selector: 'xm-exam-owner-picker', templateUrl: './exam-owner-picker.component.html', standalone: true, - imports: [NgbPopover, FormsModule, NgbTypeahead, NgFor, TranslateModule], + imports: [NgbPopover, FormsModule, NgbTypeahead, TranslateModule], }) export class ExamOwnerSelectorComponent implements OnInit { @Input() exam!: Exam; @@ -43,7 +43,11 @@ export class ExamOwnerSelectorComponent implements OnInit { email?: string; }; - constructor(private http: HttpClient, private translate: TranslateService, private toast: ToastrService) { + constructor( + private http: HttpClient, + private translate: TranslateService, + private toast: ToastrService, + ) { this.newOwner = {}; } diff --git a/ui/src/app/exam/editor/basic/software-picker.component.ts b/ui/src/app/exam/editor/basic/software-picker.component.ts index e984e3e83e..9298adcfd6 100644 --- a/ui/src/app/exam/editor/basic/software-picker.component.ts +++ b/ui/src/app/exam/editor/basic/software-picker.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgClass, NgFor } from '@angular/common'; +import { NgClass } from '@angular/common'; import { HttpClient } from '@angular/common/http'; import type { OnInit } from '@angular/core'; import { Component, Input } from '@angular/core'; @@ -58,40 +58,36 @@ import type { Exam, Software } from '../../exam.model'; {{ selectedSoftware() }} 
    - + @for (sw of software; track sw) { + + }
    -
    `, +
    `, standalone: true, - imports: [ - NgbPopover, - NgbDropdown, - NgbDropdownToggle, - NgbDropdownMenu, - NgFor, - NgbDropdownItem, - NgClass, - TranslateModule, - ], + imports: [NgbPopover, NgbDropdown, NgbDropdownToggle, NgbDropdownMenu, NgbDropdownItem, NgClass, TranslateModule], }) export class SoftwareSelectorComponent implements OnInit { @Input() exam!: Exam; software: Software[] = []; - constructor(private http: HttpClient, private translate: TranslateService, private toast: ToastrService) {} + constructor( + private http: HttpClient, + private translate: TranslateService, + private toast: ToastrService, + ) {} ngOnInit() { this.exam.softwares ||= []; diff --git a/ui/src/app/exam/editor/common/course-picker.component.html b/ui/src/app/exam/editor/common/course-picker.component.html index c610f78a6d..ee575b858a 100644 --- a/ui/src/app/exam/editor/common/course-picker.component.html +++ b/ui/src/app/exam/editor/common/course-picker.component.html @@ -21,13 +21,14 @@

    {{ r.name }}

    - + @if (!loader.code.isOn) { + + } @@ -55,13 +56,14 @@

    {{ r.code }}

    - + @if (!loader.name.isOn) { + + } diff --git a/ui/src/app/exam/editor/common/course-picker.component.ts b/ui/src/app/exam/editor/common/course-picker.component.ts index 2c46445378..8531e584b1 100644 --- a/ui/src/app/exam/editor/common/course-picker.component.ts +++ b/ui/src/app/exam/editor/common/course-picker.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgIf } from '@angular/common'; + import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { NgbHighlight, NgbPopover, NgbTypeahead, NgbTypeaheadSelectItemEvent } from '@ng-bootstrap/ng-bootstrap'; @@ -29,7 +29,7 @@ import { CoursePickerService } from './course-picker.service'; selector: 'xm-course-picker', templateUrl: './course-picker.component.html', standalone: true, - imports: [FormsModule, NgbTypeahead, NgbHighlight, NgIf, NgbPopover, TranslateModule], + imports: [FormsModule, NgbTypeahead, NgbHighlight, NgbPopover, TranslateModule], }) export class CoursePickerComponent implements OnInit { @Input() course?: Course; diff --git a/ui/src/app/exam/editor/common/examination-type-picker.component.ts b/ui/src/app/exam/editor/common/examination-type-picker.component.ts index a27c1298b3..e01c87936f 100644 --- a/ui/src/app/exam/editor/common/examination-type-picker.component.ts +++ b/ui/src/app/exam/editor/common/examination-type-picker.component.ts @@ -1,4 +1,4 @@ -import { NgClass, NgFor, NgIf } from '@angular/common'; +import { NgClass } from '@angular/common'; import { HttpClient } from '@angular/common/http'; import { Component, OnInit, ViewChild } from '@angular/core'; import { NgbAccordionDirective, NgbAccordionItem, NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; @@ -10,7 +10,7 @@ export type ExamConfig = { type: string; name: string; examinationTypes: { type: @Component({ selector: 'xm-examination-type-selector', standalone: true, - imports: [TranslateModule, NgbAccordionDirective, NgbAccordionItem, NgFor, NgIf, NgClass], + imports: [TranslateModule, NgbAccordionDirective, NgbAccordionItem, NgClass], template: ` `, standalone: true, - imports: [NgbDropdown, NgbDropdownToggle, NgbDropdownMenu, NgFor, NgbDropdownItem, NgClass], + imports: [NgbDropdown, NgbDropdownToggle, NgbDropdownMenu, NgbDropdownItem, NgClass], }) export class LanguageSelectorComponent implements OnInit { @Input() exam!: Exam; diff --git a/ui/src/app/exam/editor/creation/course-selection.component.html b/ui/src/app/exam/editor/creation/course-selection.component.html index 2ddfaf5cfd..8575c2ccc8 100644 --- a/ui/src/app/exam/editor/creation/course-selection.component.html +++ b/ui/src/app/exam/editor/creation/course-selection.component.html @@ -1,115 +1,119 @@ -
    -
    -
    -
    - -
    -
    {{ 'i18n_toolbar_new_exam' | translate }}
    +@if (exam) { +
    +
    +
    +
    + +
    +
    {{ 'i18n_toolbar_new_exam' | translate }}
    +
    -
    -
    -
    -
    -
    -
    {{ 'i18n_exam_title' | translate }}
    -
    -
    -
    -
    - {{ 'i18n_new_exam_type' | translate }} - - - -
    -
    - {{ getExecutionTypeTranslation() | translate }} +
    +
    +
    +
    +
    {{ 'i18n_exam_title' | translate }}
    +
    -
    -
    -
    - +
    +
    + {{ 'i18n_new_exam_type' | translate }} + + + +
    +
    + {{ getExecutionTypeTranslation() | translate }} +
    -
    -
    -
    -
    {{ 'i18n_exam_title' | translate }}
    +
    +
    + +
    -
    -
    -
    -
    - - - - -
    +
    +
    +
    {{ 'i18n_exam_title' | translate }}
    +
    -
    -
    - -
    -
    - - {{ 'i18n_button_cancel' | translate }} - +
    +
    +
    + + + + @if (exam) { + + } +
    -
    -
    - +
    + +
    +
    + + {{ 'i18n_button_cancel' | translate }} + +
    +
    +
    +
    + +
    -
    +} diff --git a/ui/src/app/exam/editor/creation/course-selection.component.ts b/ui/src/app/exam/editor/creation/course-selection.component.ts index 4c4d88fdc4..4fb65941bb 100644 --- a/ui/src/app/exam/editor/creation/course-selection.component.ts +++ b/ui/src/app/exam/editor/creation/course-selection.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgIf } from '@angular/common'; + import { HttpClient } from '@angular/common/http'; import type { OnInit } from '@angular/core'; import { Component } from '@angular/core'; @@ -33,7 +33,6 @@ import { LanguageSelectorComponent } from '../common/language-picker.component'; templateUrl: './course-selection.component.html', standalone: true, imports: [ - NgIf, HistoryBackComponent, NgbPopover, ExamCourseComponent, diff --git a/ui/src/app/exam/editor/creation/new-exam.component.html b/ui/src/app/exam/editor/creation/new-exam.component.html index 3c04df628b..372d4637a3 100644 --- a/ui/src/app/exam/editor/creation/new-exam.component.html +++ b/ui/src/app/exam/editor/creation/new-exam.component.html @@ -43,61 +43,66 @@ required > - + @for (type of executionTypes; track type) { + + }
    -
    -
    + + @if (sebExaminationSupported) { + + } + @if (homeExaminationSupported) { + + } + +
    + }
    -
    -
    - + @if (homeExaminationSupported || sebExaminationSupported) { +
    +
    + +
    -
    + }
    diff --git a/ui/src/app/exam/editor/creation/new-exam.component.ts b/ui/src/app/exam/editor/creation/new-exam.component.ts index dd950a81ee..4bb1bf0dfc 100644 --- a/ui/src/app/exam/editor/creation/new-exam.component.ts +++ b/ui/src/app/exam/editor/creation/new-exam.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgFor, NgIf } from '@angular/common'; + import { HttpClient } from '@angular/common/http'; import type { OnInit } from '@angular/core'; import { Component } from '@angular/core'; @@ -27,7 +27,7 @@ import { ExamService } from '../../exam.service'; selector: 'xm-new-exam', templateUrl: './new-exam.component.html', standalone: true, - imports: [HistoryBackComponent, FormsModule, NgbPopover, NgFor, NgIf, TranslateModule], + imports: [HistoryBackComponent, FormsModule, NgbPopover, TranslateModule], }) export class NewExamComponent implements OnInit { executionTypes: (ExamExecutionType & { name: string })[] = []; @@ -36,7 +36,10 @@ export class NewExamComponent implements OnInit { homeExaminationSupported = false; sebExaminationSupported = false; - constructor(private http: HttpClient, private Exam: ExamService) {} + constructor( + private http: HttpClient, + private Exam: ExamService, + ) {} ngOnInit() { this.Exam.listExecutionTypes$().subscribe((types) => { diff --git a/ui/src/app/exam/editor/events/examination-event-dialog.component.html b/ui/src/app/exam/editor/events/examination-event-dialog.component.html index c4d66d9364..7aa8287869 100644 --- a/ui/src/app/exam/editor/events/examination-event-dialog.component.html +++ b/ui/src/app/exam/editor/events/examination-event-dialog.component.html @@ -2,21 +2,32 @@

    - {{ 'i18n_add_examination_event' | translate }} - {{ 'i18n_update_examination_event' | translate }} + @if (!config) { + {{ 'i18n_add_examination_event' | translate }} + } + @if (config) { + {{ 'i18n_update_examination_event' | translate }} + }

    -
    - {{ 'i18n_enrolments_exist_for_examination_event' | translate }} -
    -
    - {{ 'i18n_maintenance_periods' | translate }} -
    - {{ period.startsAt | date : 'dd.MM.yyyy HH:mm' }} - {{ period.endsAt | date : 'dd.MM.yyyy HH:mm' }} - {{ period.description }} + @if (hasEnrolments) { +
    + {{ 'i18n_enrolments_exist_for_examination_event' | translate }}
    -
    + } + @if (maintenancePeriods.length > 0) { +
    + {{ 'i18n_maintenance_periods' | translate }} + @for (period of maintenancePeriods | orderBy: 'startsAt'; track period) { +
    + {{ period.startsAt | date: 'dd.MM.yyyy HH:mm' }} - + {{ period.endsAt | date: 'dd.MM.yyyy HH:mm' }} + {{ period.description }} +
    + } +
    + } [(ngModel)]="capacity" />
    -
    - -
    - -
    - + @if (requiresPassword) { +
    + +
    + +
    + +
    -
    + }
    diff --git a/ui/src/app/exam/editor/events/examination-event-dialog.component.ts b/ui/src/app/exam/editor/events/examination-event-dialog.component.ts index ce6ea3d906..d1f1ad429c 100644 --- a/ui/src/app/exam/editor/events/examination-event-dialog.component.ts +++ b/ui/src/app/exam/editor/events/examination-event-dialog.component.ts @@ -13,7 +13,7 @@ * See the Licence for the specific language governing permissions and limitations under the Licence. * */ -import { DatePipe, NgClass, NgFor, NgIf } from '@angular/common'; +import { DatePipe, NgClass } from '@angular/common'; import type { OnInit } from '@angular/core'; import { Component, Input } from '@angular/core'; import { FormsModule } from '@angular/forms'; @@ -29,7 +29,7 @@ import { ExamService } from '../../exam.service'; @Component({ selector: 'xm-examination-event-dialog', standalone: true, - imports: [NgClass, NgIf, NgFor, FormsModule, DatePipe, TranslateModule, DateTimePickerComponent, OrderByPipe], + imports: [NgClass, FormsModule, DatePipe, TranslateModule, DateTimePickerComponent, OrderByPipe], templateUrl: './examination-event-dialog.component.html', }) export class ExaminationEventDialogComponent implements OnInit { diff --git a/ui/src/app/exam/editor/events/examination-event-search.component.html b/ui/src/app/exam/editor/events/examination-event-search.component.html index 43b22527e8..90fa1499dc 100644 --- a/ui/src/app/exam/editor/events/examination-event-search.component.html +++ b/ui/src/app/exam/editor/events/examination-event-search.component.html @@ -55,115 +55,127 @@
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - -
    - - - - {{ event.exam.name }} - - - {{ - event.exam?.creator?.firstName && event.exam?.creator?.lastName - ? event.exam?.creator?.firstName + ' ' + event.exam?.creator?.lastName - : '–' - }} - - {{ event.examinationEvent?.start | date : 'dd.MM.yyyy HH:mm' }} - - {{ getEventEndTime(event.examinationEvent?.start, event.exam?.duration) | date : 'HH:mm' }} - - {{ event.examEnrolments?.length }} - - -
    + @if (events.length > 0) { +
    +
    + + + + + + + + + + + + + @for (event of events | orderBy: sorting.predicate : sorting.reverse; track event) { + + + + + + + + + + + + + + + } + +
    + + + + + + + + + + + + + + + + + +
    + @if (event.exam.course) { + + } + + + {{ event.exam.name }} + + + {{ + event.exam?.creator?.firstName && event.exam?.creator?.lastName + ? event.exam?.creator?.firstName + ' ' + event.exam?.creator?.lastName + : '–' + }} + + {{ event.examinationEvent?.start | date: 'dd.MM.yyyy HH:mm' }} - + {{ + getEventEndTime(event.examinationEvent?.start, event.exam?.duration) + | date: 'HH:mm' + }} + + {{ event.examEnrolments?.length }} + + @if (isActive(event)) { + + } +
    +
    -
    -
    - {{ 'i18n_exam_no_result' | translate }} -
    + } + @if (events.length <= 0) { +
    + {{ 'i18n_exam_no_result' | translate }} +
    + }
    diff --git a/ui/src/app/exam/editor/events/examination-event-search.component.ts b/ui/src/app/exam/editor/events/examination-event-search.component.ts index 7f12807f13..49a9fff264 100644 --- a/ui/src/app/exam/editor/events/examination-event-search.component.ts +++ b/ui/src/app/exam/editor/events/examination-event-search.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { DatePipe, NgFor, NgIf } from '@angular/common'; +import { DatePipe } from '@angular/common'; import { HttpClient } from '@angular/common/http'; import type { OnInit } from '@angular/core'; import { Component } from '@angular/core'; @@ -38,9 +38,7 @@ import { ExaminationEventConfiguration } from '../../exam.model'; DatePickerComponent, FormsModule, NgbPopover, - NgIf, TableSortComponent, - NgFor, CourseCodeComponent, RouterLink, DatePipe, diff --git a/ui/src/app/exam/editor/exam-tabs.component.html b/ui/src/app/exam/editor/exam-tabs.component.html index 396fad905a..2ef978f8dd 100644 --- a/ui/src/app/exam/editor/exam-tabs.component.html +++ b/ui/src/app/exam/editor/exam-tabs.component.html @@ -1,9 +1,11 @@
    -
    -
    - {{ 'i18n_collaborative_exams' | translate }} + @if (collaborative) { +
    +
    + {{ 'i18n_collaborative_exams' | translate }} +
    -
    + }
    @@ -12,7 +14,9 @@
    {{ examInfo.title || 'loading' }}
    - {{ 'i18n_' + exam.state | lowercase | translate }} + @if (exam?.state) { + {{ 'i18n_' + exam.state | lowercase | translate }} + }
    @@ -39,20 +43,16 @@
  • {{ 'i18n_exam_responses' | translate }}
    • -
  • - {{ 'i18n_question_review' | translate }} -
    • -
  • - {{ 'i18n_exam_summary_tab' | translate }} -
    • + @if (exam && !collaborative && !user.isAdmin) { +
  • + {{ 'i18n_question_review' | translate }} +
    • + } + @if (exam && !collaborative) { +
  • + {{ 'i18n_exam_summary_tab' | translate }} +
    • + }
    diff --git a/ui/src/app/exam/editor/exam-tabs.component.ts b/ui/src/app/exam/editor/exam-tabs.component.ts index aca77c6974..8287eec3a2 100644 --- a/ui/src/app/exam/editor/exam-tabs.component.ts +++ b/ui/src/app/exam/editor/exam-tabs.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { LowerCasePipe, NgIf } from '@angular/common'; +import { LowerCasePipe } from '@angular/common'; import type { OnDestroy, OnInit } from '@angular/core'; import { ChangeDetectorRef, Component } from '@angular/core'; import { ActivatedRoute, Router, RouterLink, RouterOutlet } from '@angular/router'; @@ -31,17 +31,7 @@ import { ExamTabService } from './exam-tabs.service'; selector: 'xm-exam-tabs', templateUrl: './exam-tabs.component.html', standalone: true, - imports: [ - NgIf, - RouterLink, - NgbNav, - NgbNavItem, - NgbNavItemRole, - NgbNavLink, - RouterOutlet, - LowerCasePipe, - TranslateModule, - ], + imports: [RouterLink, NgbNav, NgbNavItem, NgbNavItemRole, NgbNavLink, RouterOutlet, LowerCasePipe, TranslateModule], }) export class ExamTabsComponent implements OnInit, OnDestroy { exam!: Exam; diff --git a/ui/src/app/exam/editor/publication/collaborative-exam-owner-picker.component.ts b/ui/src/app/exam/editor/publication/collaborative-exam-owner-picker.component.ts index dbec974e83..a334046098 100644 --- a/ui/src/app/exam/editor/publication/collaborative-exam-owner-picker.component.ts +++ b/ui/src/app/exam/editor/publication/collaborative-exam-owner-picker.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgFor } from '@angular/common'; + import { HttpClient } from '@angular/common/http'; import { Component, Input } from '@angular/core'; import { FormsModule } from '@angular/forms'; @@ -65,27 +65,29 @@ import type { Exam } from '../../exam.model';
      -
    • - {{ owner.email }} - -
      • + @for (owner of exam.examOwners; track owner) { +
    • + {{ owner.email }} + +
      • + }
    -
    `, +
    `, standalone: true, - imports: [NgbPopover, FormsModule, NgFor, TranslateModule], + imports: [NgbPopover, FormsModule, TranslateModule], }) export class CollaborativeExamOwnerSelectorComponent { @Input() exam!: Exam; @@ -93,7 +95,11 @@ export class CollaborativeExamOwnerSelectorComponent { user: User; newOwner: { email: string | undefined } = { email: undefined }; - constructor(private http: HttpClient, private toast: ToastrService, private Session: SessionService) { + constructor( + private http: HttpClient, + private toast: ToastrService, + private Session: SessionService, + ) { this.user = this.Session.getUser(); } diff --git a/ui/src/app/exam/editor/publication/exam-participant-picker.component.ts b/ui/src/app/exam/editor/publication/exam-participant-picker.component.ts index 4ce1958afb..edd34f2ef7 100644 --- a/ui/src/app/exam/editor/publication/exam-participant-picker.component.ts +++ b/ui/src/app/exam/editor/publication/exam-participant-picker.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgFor, NgIf } from '@angular/common'; + import { HttpClient } from '@angular/common/http'; import type { OnInit } from '@angular/core'; import { Component, Input } from '@angular/core'; @@ -52,33 +52,41 @@ import type { Exam, ExamParticipation } from '../../exam.model';
      -
    • - {{ renderParticipantLabel(enrolment) }} - ({{ enrolment.user.userIdentifier }}) - -
      • + @for (enrolment of exam.examEnrolments; track enrolment) { +
    • + {{ renderParticipantLabel(enrolment) }} + @if (enrolment.user?.userIdentifier) { + ({{ enrolment.user.userIdentifier }}) + } + +
      • + } -
    • - {{ participant.firstName }} {{ participant.lastName }} - ({{ participant.userIdentifier }}) -
      • + @for (participant of participants; track participant) { +
    • + {{ participant.firstName }} {{ participant.lastName }} + @if (participant.userIdentifier) { + ({{ participant.userIdentifier }}) + } +
      • + }
    -
    `, +
    `, standalone: true, - imports: [FormsModule, NgbTypeahead, NgFor, NgIf, TranslateModule], + imports: [FormsModule, NgbTypeahead, TranslateModule], }) export class ExamParticipantSelectorComponent implements OnInit { @Input() exam!: Exam; diff --git a/ui/src/app/exam/editor/publication/exam-pre-participant-picker.component.ts b/ui/src/app/exam/editor/publication/exam-pre-participant-picker.component.ts index e0ae8e5a9b..5b2b4ef28f 100644 --- a/ui/src/app/exam/editor/publication/exam-pre-participant-picker.component.ts +++ b/ui/src/app/exam/editor/publication/exam-pre-participant-picker.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgFor, NgIf } from '@angular/common'; + import { HttpClient } from '@angular/common/http'; import { Component, Input, OnInit } from '@angular/core'; import { FormsModule } from '@angular/forms'; @@ -50,33 +50,41 @@ import type { Exam, ExamParticipation } from '../../exam.model';
      -
    • - {{ renderParticipantLabel(enrolment) }} - ({{ enrolment.user.userIdentifier }}) - -
      • + @for (enrolment of exam.examEnrolments; track enrolment) { +
    • + {{ renderParticipantLabel(enrolment) }} + @if (enrolment.user?.userIdentifier) { + ({{ enrolment.user.userIdentifier }}) + } + +
      • + } -
    • - {{ participant.firstName }} {{ participant.lastName }} - ({{ participant.userIdentifier }}) -
      • + @for (participant of participants; track participant) { +
    • + {{ participant.firstName }} {{ participant.lastName }} + @if (participant.userIdentifier) { + ({{ participant.userIdentifier }}) + } +
      • + }
    -
    `, +
    `, standalone: true, - imports: [FormsModule, NgFor, NgIf, TranslateModule], + imports: [FormsModule, TranslateModule], }) export class ExamPreParticipantSelectorComponent implements OnInit { @Input() exam!: Exam; diff --git a/ui/src/app/exam/editor/publication/exam-publication.component.html b/ui/src/app/exam/editor/publication/exam-publication.component.html index ec27960e35..c5f8f19de2 100644 --- a/ui/src/app/exam/editor/publication/exam-publication.component.html +++ b/ui/src/app/exam/editor/publication/exam-publication.component.html @@ -17,20 +17,22 @@
      -
    • - {{ ed.date | date : 'dd.MM.yyyy' }} - -
      • + @for (ed of exam.examinationDates | orderBy: 'date'; track ed) { +
    • + {{ ed.date | date: 'dd.MM.yyyy' }} + +
      • + }
    @@ -83,58 +85,58 @@
    -
    -
    - {{ 'i18n_examination_events' | translate }} - - - -
    -
    - -
    -
    -
      -
    • +
      + {{ 'i18n_examination_events' | translate }} + - - {{ config.examinationEvent.start | date : 'dd.MM.yyyy HH:mm' - }} - - - - - - - -
      • -
    + + +
    +
    + +
    +
    +
      + @for (config of sortByString(exam.examinationEventConfigurations); track config) { +
    • + + {{ config.examinationEvent.start | date: 'dd.MM.yyyy HH:mm' + }} + + @if (config.examEnrolments.length === 0) { + + + } + @if (config.examEnrolments.length > 0) { + + + + } +
      • + } +
    +
    -
    + }
    @@ -153,68 +155,73 @@
    - - - - - -
    -
    -
    - - -
    -
    - - + @for (duration of examDurations; track duration) { + + + + } + @if (exam.implementation === 'WHATEVER' || exam.implementation === 'CLIENT_AUTH') { + + + @if (this.showCustomTimeField) { +
    +
    +
    + + +
    +
    + + +
    + +
    +
    + {{ 'i18n_between' | translate }}: {{ toHoursAndMinutes(minDuration) }} - + {{ toHoursAndMinutes(maxDuration) }} +
    - -
    -
    - {{ 'i18n_between' | translate }}: {{ toHoursAndMinutes(minDuration) }} - - {{ toHoursAndMinutes(maxDuration) }} -
    -
    - + } + + }
    {{ 'i18n_saved' | translate }} {{ ('i18n_exam_duration' | translate).toLowerCase() }}: {{ toHoursAndMinutes(exam.duration) }} @@ -245,118 +252,115 @@
    - -   - - - - - ({{ 'i18n_private_exam_trial_count_description' | translate }}) + @for (x of range(1, 5); track x) { + +   + + } + @if (exam.executionType.type === 'PUBLIC') { + + } + @if (exam.executionType.type === 'PRIVATE') { + + } + @if (exam.executionType.type === 'PRIVATE') { + ({{ 'i18n_private_exam_trial_count_description' | translate }}) + }
    -
    -
    - {{ 'i18n_exam_add_participants_title' | translate }} -
    -
    - - + @if (!collaborative) { +
    +
    + {{ 'i18n_exam_add_participants_title' | translate }} +
    +
    + + +
    -
    + } - + @if (exam.executionType.type !== 'PUBLIC' && !collaborative && visibleParticipantSelector === 'participant') { + + } - + @if ( + exam.executionType.type !== 'PUBLIC' && !collaborative && visibleParticipantSelector === 'pre-participant' + ) { + + } - - + @if (collaborative) { + + } - + @if (collaborative) { + + } -
    -
    -
    - {{ 'i18n_enrolment_url' | translate }} - - - + @if (exam.executionType.type === 'PUBLIC' && !collaborative) { +
    +
    +
    + {{ 'i18n_enrolment_url' | translate }} + + + +
    -
    -
    -
    - - {{ hostName }}/enrolments/{{ exam.id }}?code={{ exam.course?.code }} - + } + @if (exam.executionType.type === 'PUBLIC' && !collaborative) { +
    +
    + + {{ hostName }}/enrolments/{{ exam.id }}?code={{ exam.course?.code }} + +
    -
    + }
    @@ -373,11 +377,13 @@ class="review-attachment-button exam-questions-buttons marl10" > - {{ 'i18n_save_and_publish' | translate }} - {{ - 'i18n_save_and_pre_publish' | translate - }} + @if (!isDraftCollaborativeExam()) { + {{ 'i18n_save_and_publish' | translate }} + } + @if (isDraftCollaborativeExam()) { + {{ 'i18n_save_and_pre_publish' | translate }} + } +
      -
    • - -
      • + @for (org of organisations; track org) { +
    • + +
      • + }
    -
    -
    -
      -
    • - {{ org.name }} ({{ org.code }}) - -
      • -
    + @if (selectedOrganisations.length > 0) { +
    +
    +
      + @for (org of selectedOrganisations; track org) { +
    • + {{ org.name }} ({{ org.code }}) + +
      • + } +
    +
    -
    `, + }`, standalone: true, - imports: [ - NgbPopover, - NgbDropdown, - NgbDropdownToggle, - NgbDropdownMenu, - NgFor, - NgbDropdownItem, - NgIf, - TranslateModule, - ], + imports: [NgbPopover, NgbDropdown, NgbDropdownToggle, NgbDropdownMenu, NgbDropdownItem, TranslateModule], }) export class OrganisationSelectorComponent implements OnInit { @Input() exam!: Exam; @@ -116,7 +113,10 @@ export class OrganisationSelectorComponent implements OnInit { organisations: Organisation[] = []; selectedOrganisations: Organisation[] = []; - constructor(private http: HttpClient, private Exam: ExamService) {} + constructor( + private http: HttpClient, + private Exam: ExamService, + ) {} ngOnInit() { this.http.get('/app/iop/organisations').subscribe((resp) => { diff --git a/ui/src/app/exam/editor/publication/publication-dialog.component.ts b/ui/src/app/exam/editor/publication/publication-dialog.component.ts index a73d3a7c78..59b6506774 100644 --- a/ui/src/app/exam/editor/publication/publication-dialog.component.ts +++ b/ui/src/app/exam/editor/publication/publication-dialog.component.ts @@ -13,7 +13,7 @@ * See the Licence for the specific language governing permissions and limitations under the Licence. * */ -import { NgIf } from '@angular/common'; + import { Component, Input } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; @@ -22,7 +22,7 @@ import type { Exam } from '../../exam.model'; @Component({ selector: 'xm-publication-dialog', standalone: true, - imports: [TranslateModule, NgIf], + imports: [TranslateModule], template: ` `, +
    `, }) export class PublicationDialogComponent { @Input() exam!: Exam; @Input() prePublication = false; - constructor(public activeModal: NgbActiveModal, private translate: TranslateService) {} + constructor( + public activeModal: NgbActiveModal, + private translate: TranslateService, + ) {} getConfirmationText = () => { let confirmation = this.prePublication diff --git a/ui/src/app/exam/editor/publication/publication-error-dialog.component.ts b/ui/src/app/exam/editor/publication/publication-error-dialog.component.ts index 48c14160c4..d77c1c8631 100644 --- a/ui/src/app/exam/editor/publication/publication-error-dialog.component.ts +++ b/ui/src/app/exam/editor/publication/publication-error-dialog.component.ts @@ -13,7 +13,7 @@ * See the Licence for the specific language governing permissions and limitations under the Licence. * */ -import { NgFor } from '@angular/common'; + import { Component, Input } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; @@ -21,14 +21,16 @@ import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'xm-publication-error-dialog', standalone: true, - imports: [TranslateModule, NgFor], + imports: [TranslateModule], template: ` `, +
    `, }) export class PublicationErrorDialogComponent { @Input() errors: string[] = []; diff --git a/ui/src/app/exam/editor/sections/exam-material-picker.component.html b/ui/src/app/exam/editor/sections/exam-material-picker.component.html index 0ee9730169..0a26f65666 100644 --- a/ui/src/app/exam/editor/sections/exam-material-picker.component.html +++ b/ui/src/app/exam/editor/sections/exam-material-picker.component.html @@ -37,20 +37,22 @@
      -
    • - {{ material.name }} - -
      • + @for (material of section.examMaterials; track material) { +
    • + {{ material.name }} + +
      • + }
    diff --git a/ui/src/app/exam/editor/sections/exam-material-picker.component.ts b/ui/src/app/exam/editor/sections/exam-material-picker.component.ts index ddc60f5e07..8ed96e6d1e 100644 --- a/ui/src/app/exam/editor/sections/exam-material-picker.component.ts +++ b/ui/src/app/exam/editor/sections/exam-material-picker.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgFor } from '@angular/common'; + import { HttpClient } from '@angular/common/http'; import type { OnChanges, SimpleChanges } from '@angular/core'; import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; @@ -29,7 +29,7 @@ import { ExamMaterialComponent } from './exam-material.component'; selector: 'xm-exam-material-selector', templateUrl: './exam-material-picker.component.html', standalone: true, - imports: [NgbPopover, FormsModule, NgbTypeahead, NgFor, TranslateModule], + imports: [NgbPopover, FormsModule, NgbTypeahead, TranslateModule], }) export class ExamMaterialSelectorComponent implements OnInit, OnChanges { @Input() section!: ExamSection; @@ -40,7 +40,11 @@ export class ExamMaterialSelectorComponent implements OnInit, OnChanges { selectedMaterial?: ExamMaterial; filter = ''; - constructor(private http: HttpClient, private modal: NgbModal, private toast: ToastrService) {} + constructor( + private http: HttpClient, + private modal: NgbModal, + private toast: ToastrService, + ) {} ngOnInit() { this.filterOutExisting(); diff --git a/ui/src/app/exam/editor/sections/exam-material.component.html b/ui/src/app/exam/editor/sections/exam-material.component.html index 120a937799..e14476a423 100644 --- a/ui/src/app/exam/editor/sections/exam-material.component.html +++ b/ui/src/app/exam/editor/sections/exam-material.component.html @@ -33,21 +33,23 @@

    {{ 'i18n_modify_materials' | translate }}

    - - {{ material.name }} - {{ material.author }} - {{ material.isbn }} - - - - - + @for (material of filteredMaterials; track material) { + + {{ material.name }} + {{ material.author }} + {{ material.isbn }} + + + + + + }
    diff --git a/ui/src/app/exam/editor/sections/exam-material.component.ts b/ui/src/app/exam/editor/sections/exam-material.component.ts index f478173ada..f9864422c1 100644 --- a/ui/src/app/exam/editor/sections/exam-material.component.ts +++ b/ui/src/app/exam/editor/sections/exam-material.component.ts @@ -29,7 +29,11 @@ export class ExamMaterialComponent implements OnInit { filter = ''; materialsChanged = false; - constructor(private activeModal: NgbActiveModal, private http: HttpClient, private toast: ToastrService) {} + constructor( + private activeModal: NgbActiveModal, + private http: HttpClient, + private toast: ToastrService, + ) {} ngOnInit() { this.http diff --git a/ui/src/app/exam/editor/sections/section-question.component.html b/ui/src/app/exam/editor/sections/section-question.component.html index ee06487c01..385fac4e3e 100644 --- a/ui/src/app/exam/editor/sections/section-question.component.html +++ b/ui/src/app/exam/editor/sections/section-question.component.html @@ -3,39 +3,40 @@ #{{ sectionQuestion.question.id }} - - 0 / {{ sectionQuestion.maxScore }} {{ 'i18n_unit_points' | translate }} - - - {{ 'i18n_evaluation_select' | translate }} - - - 0 / {{ calculateWeightedMaxPoints() }} {{ 'i18n_unit_points' | translate }} - - - {{ getMinimumOptionScore() }} / {{ getCorrectClaimChoiceOptionScore() }} - {{ 'i18n_unit_points' | translate }} - - - - - - + @if ( + sectionQuestion.evaluationType === 'Points' || + sectionQuestion.question.type === 'ClozeTestQuestion' || + sectionQuestion.question.type === 'MultipleChoiceQuestion' + ) { + 0 / {{ sectionQuestion.maxScore }} {{ 'i18n_unit_points' | translate }} + } + @if (sectionQuestion.evaluationType === 'Selection') { + + {{ 'i18n_evaluation_select' | translate }} + + } + @if (sectionQuestion.question.type === 'WeightedMultipleChoiceQuestion') { + 0 / {{ calculateWeightedMaxPoints() }} {{ 'i18n_unit_points' | translate }} + } + @if (sectionQuestion.question.type === 'ClaimChoiceQuestion') { + + {{ getMinimumOptionScore() }} / {{ getCorrectClaimChoiceOptionScore() }} + {{ 'i18n_unit_points' | translate }} + + } + @if (sectionQuestion.question.attachment?.id || sectionQuestion.question.attachment?.externalId) { + + + + + + }
    - + @if (sectionQuestion.answerInstructions || sectionQuestion.options.length > 0) { + + }
    - - - {{ sectionQuestion.answerInstructions }} + @if (sectionQuestion.answerInstructions && sectionQuestion.answerInstructions.length > 0) { + + } + @if (sectionQuestion.answerInstructions && sectionQuestion.answerInstructions.length > 0) { + {{ sectionQuestion.answerInstructions }} + }
      -
    • - - - {{ option.option.option }} -
      • -
    • - - - {{ option.option.option }} - {{ option.score }} {{ 'i18n_unit_points' | translate }} -
      • -
    • - - - - {{ option.option.option }} - {{ option.score }} {{ 'i18n_unit_points' | translate }} + @if (option.option.correctOption) { + + } + @if (!option.option.correctOption) { + + } + {{ option.option.option }} +
      • + } + @for (option of sectionQuestion.options; track option) { +
    • -
      • + @if (option.score >= 0) { + + } + @if (option.score < 0) { + + } + {{ option.option.option }} + {{ option.score }} {{ 'i18n_unit_points' | translate }} + + } + @for (option of sectionQuestion.options | orderBy: 'option.id'; track option) { +
    • + @if (determineClaimOptionType(option) === 'CorrectOption') { + + } + @if (determineClaimOptionType(option) === 'IncorrectOption') { + + } + @if (determineClaimOptionType(option) === 'SkipOption') { + + } + {{ option.option.option }} + {{ option.score }} {{ 'i18n_unit_points' | translate }} +
      • + }
    diff --git a/ui/src/app/exam/editor/sections/section-question.component.ts b/ui/src/app/exam/editor/sections/section-question.component.ts index 84f3fe5c57..c3829706cf 100644 --- a/ui/src/app/exam/editor/sections/section-question.component.ts +++ b/ui/src/app/exam/editor/sections/section-question.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgFor, NgIf } from '@angular/common'; + import { HttpClient } from '@angular/common/http'; import { Component, EventEmitter, Input, Output } from '@angular/core'; import { @@ -44,7 +44,6 @@ import type { ExamSection, ExamSectionQuestion, ExamSectionQuestionOption, Quest templateUrl: './section-question.component.html', standalone: true, imports: [ - NgIf, NgbPopover, NgbDropdown, NgbDropdownToggle, @@ -52,7 +51,6 @@ import type { ExamSection, ExamSectionQuestion, ExamSectionQuestionOption, Quest NgbDropdownItem, MathJaxDirective, NgbCollapse, - NgFor, TranslateModule, OrderByPipe, ], diff --git a/ui/src/app/exam/editor/sections/section.component.html b/ui/src/app/exam/editor/sections/section.component.html index 1da175f5d3..be8b5009e7 100644 --- a/ui/src/app/exam/editor/sections/section.component.html +++ b/ui/src/app/exam/editor/sections/section.component.html @@ -89,29 +89,31 @@ -
    - - -
    + (changed)="materialsChanged($event)"> + @if (!collaborative && canBeOptional) { +
    + + +
    + }
    - {{ - 'i18n_error_lottery_points_not_match' | translate - }} + @if (!questionPointsMatch()) { + {{ + 'i18n_error_lottery_points_not_match' | translate + }} + }
    -
    -
    - -
    -
    - + @if (section.lotteryOn) { +
    +
    + +
    +
    + +
    -
    + }
    -
    -
    - {{ 'i18n_section_max_score' | translate }}: {{ getSectionTotalScore() }} -
    -
    -
    -
    - {{ 'i18n_evaluation_select' | translate }} - - - + @if (getSectionTotalScore() > 0) { +
    +
    + {{ 'i18n_section_max_score' | translate }}: {{ getSectionTotalScore() }} +
    -
    - {{ getAmountOfSelectionEvaluatedQuestions() }} + } + @if (getAmountOfSelectionEvaluatedQuestions() > 0) { +
    +
    + {{ 'i18n_evaluation_select' | translate }} + + + +
    +
    + {{ getAmountOfSelectionEvaluatedQuestions() }} +
    -
    + }
    @@ -203,18 +213,20 @@ triggers="mouseenter:mouseleave" (click)="section.expanded = !section.expanded; expandSection()" > - - + @if (!section.expanded) { + + } + @if (section.expanded) { + + }
    @@ -223,29 +235,33 @@
    -
    -
    -
    - - -
    + @for (sectionQuestion of section.sectionQuestions; track sectionQuestion) { +
    +
    +
    + + +
    + }
    -
    - -  {{ 'i18n_add_from_library' | translate }} - -
    + @if (!collaborative) { +
    + +  {{ 'i18n_add_from_library' | translate }} + +
    + }
    diff --git a/ui/src/app/exam/editor/sections/section.component.ts b/ui/src/app/exam/editor/sections/section.component.ts index 542b8b1246..9f1dc6bc4a 100644 --- a/ui/src/app/exam/editor/sections/section.component.ts +++ b/ui/src/app/exam/editor/sections/section.component.ts @@ -20,7 +20,7 @@ import { CdkDropList, moveItemInArray, } from '@angular/cdk/drag-drop'; -import { NgFor, NgIf } from '@angular/common'; + import { HttpClient } from '@angular/common/http'; import { Component, EventEmitter, Input, Output, ViewEncapsulation } from '@angular/core'; import { FormsModule } from '@angular/forms'; @@ -56,10 +56,8 @@ import { SectionQuestionComponent } from './section-question.component'; NgbDropdownMenu, NgbDropdownItem, FormsModule, - NgIf, NgbCollapse, CdkDropList, - NgFor, CdkDrag, CdkDragPlaceholder, CdkDragPreview, diff --git a/ui/src/app/exam/editor/sections/sections.component.html b/ui/src/app/exam/editor/sections/sections.component.html index d2d67a84eb..c8ed0f5747 100644 --- a/ui/src/app/exam/editor/sections/sections.component.html +++ b/ui/src/app/exam/editor/sections/sections.component.html @@ -1,21 +1,23 @@ -
    -
    -
    -
    - -
    -
    - {{ 'i18n_upcoming_reservations_exist' | translate }} +@if (exam.hasEnrolmentsInEffect) { +
    +
    +
    +
    + +
    +
    + {{ 'i18n_upcoming_reservations_exist' | translate }} +
    -
    +}
    -
    -
    -
    #{{ i }} {{ section.name }}
    -
    - - - + @for (section of exam.examSections | orderBy: 'sequenceNumber'; track section; let i = $index) { +
    +
    +
    #{{ i }} {{ section.name }}
    +
    + + + +
    -
    + }
    @@ -91,11 +91,13 @@

    {{ calculateExamMaxScore() }}

    -
    - - {{ 'i18n_exam_remove' | translate }} - -
    + @if (showDelete()) { +
    + + {{ 'i18n_exam_remove' | translate }} + +
    + }
    diff --git a/ui/src/app/exam/editor/sections/sections.component.ts b/ui/src/app/exam/editor/sections/sections.component.ts index 62e70e7edf..2ef673b479 100644 --- a/ui/src/app/exam/editor/sections/sections.component.ts +++ b/ui/src/app/exam/editor/sections/sections.component.ts @@ -21,7 +21,7 @@ import { CdkDropList, moveItemInArray, } from '@angular/cdk/drag-drop'; -import { NgFor, NgIf } from '@angular/common'; + import { HttpClient } from '@angular/common/http'; import type { OnChanges, SimpleChanges } from '@angular/core'; import { Component, OnInit } from '@angular/core'; @@ -42,9 +42,7 @@ import { SectionComponent } from './section.component'; templateUrl: './sections.component.html', standalone: true, imports: [ - NgIf, CdkDropList, - NgFor, CdkDrag, CdkDragPlaceholder, CdkDragPreview, diff --git a/ui/src/app/exam/listing/exam-list.component.html b/ui/src/app/exam/listing/exam-list.component.html index ad5d9666fc..eb4d04a10b 100644 --- a/ui/src/app/exam/listing/exam-list.component.html +++ b/ui/src/app/exam/listing/exam-list.component.html @@ -70,14 +70,16 @@
    -
    -
    - + @if (loader.loading) { +
    +
    + +
    -
    + }
    @@ -144,77 +146,91 @@ - - - - {{ exam.name }} - {{ 'i18n_no_name' | translate }} - - - - {{ getExecutionTypeTranslation(exam) | translate | uppercase }} - - - - - - - {{ exam.periodStart | date : 'dd.MM.yyyy' }} - - - - - {{ exam.periodEnd | date : 'dd.MM.yyyy' }} - - - - - - - - - - - - - - + @for ( + exam of filterByStateAndExpiration(views[activeId].view, views[activeId].showExpired) + | orderBy: examsPredicate : reverse; + track exam + ) { + + + @if (exam.course) { + + } + + + @if (exam.name) { + {{ exam.name }} + } + @if (!exam.name) { + {{ 'i18n_no_name' | translate }} + + } + + + {{ getExecutionTypeTranslation(exam) | translate | uppercase }} + + + + + + @if (exam.periodStart) { + + {{ exam.periodStart | date: 'dd.MM.yyyy' }} + + } + + + @if (exam.periodEnd) { + + {{ exam.periodEnd | date: 'dd.MM.yyyy' }} + + } + + + + + + + + + + + + + + }
    -
    -
    - {{ 'i18n_published_exams' | translate }}: - {{ 'i18n_published_exams_info_main' | translate }} - {{ 'i18n_published_exams_info_other' | translate }} + @if (views[activeId].view === 'PUBLISHED' && !views[activeId].showExpired) { +
    +
    + {{ 'i18n_published_exams' | translate }}: + {{ 'i18n_published_exams_info_main' | translate }} + {{ 'i18n_published_exams_info_other' | translate }} +
    -
    -
    -
    - {{ 'i18n_saved_exams' | translate }}: - {{ 'i18n_saved_exams_info_main' | translate }} {{ 'i18n_saved_exams_info_other' | translate }} + } + @if (views[activeId].view === 'SAVED') { +
    +
    + {{ 'i18n_saved_exams' | translate }}: + {{ 'i18n_saved_exams_info_main' | translate }} + {{ 'i18n_saved_exams_info_other' | translate }} +
    -
    + }
    diff --git a/ui/src/app/exam/listing/exam-list.component.ts b/ui/src/app/exam/listing/exam-list.component.ts index f346f64e7b..794684080d 100644 --- a/ui/src/app/exam/listing/exam-list.component.ts +++ b/ui/src/app/exam/listing/exam-list.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { DatePipe, NgFor, NgIf, UpperCasePipe } from '@angular/common'; +import { DatePipe, UpperCasePipe } from '@angular/common'; import { HttpClient } from '@angular/common/http'; import { Component, OnDestroy, OnInit } from '@angular/core'; import { Router, RouterLink } from '@angular/router'; @@ -42,9 +42,7 @@ type ExamListExam = Exam & { expired: boolean; ownerAggregate: string }; NgbNavItemRole, NgbNavLink, NgbPopover, - NgIf, TableSortComponent, - NgFor, CourseCodeComponent, RouterLink, TeacherListComponent, diff --git a/ui/src/app/exam/printout/printout.component.html b/ui/src/app/exam/printout/printout.component.html index d3e891c7ee..adfcea2705 100644 --- a/ui/src/app/exam/printout/printout.component.html +++ b/ui/src/app/exam/printout/printout.component.html @@ -1,14 +1,18 @@
    -
    -  {{ 'i18n_print_attachment_reminder' | translate }} -
    + @if (exam.attachment) { +
    +  {{ 'i18n_print_attachment_reminder' | translate }} +
    + }     - + @if (exam.attachment) { + + }
    @@ -25,7 +29,11 @@

    TENTTI – TENTAMEN – EXAM

    >Opintojakson koodi ja nimi / Studieperiodens kod och namn / The code and the name of the course:
    -

    +

    + @if (exam.course) { + + } +

    {{ exam.course?.name }}

    @@ -41,9 +49,9 @@

    {{ exam.name }}

    >Tentin päivämäärät / Tentamensdatum / Examination dates:   - - {{ ed.date | date : 'dd.MM.yyyy' }}  - + @for (ed of exam.examinationDates | orderBy: 'date'; track ed) { + {{ ed.date | date: 'dd.MM.yyyy' }}  + } Tentin kesto / Tentamens längd / Exam duration: {{ @@ -77,9 +85,11 @@

    {{ exam.name }}

    Tenttiin vastaaminen / Svara på tentamen / Answer exam questions:
    - + @for (l of exam.examLanguages | orderBy: 'ord'; track l) { + + }

    Suomenkielisessä tutkinto-ohjelmassa olevalla opiskelijalla on oikeus käyttää @@ -109,65 +119,90 @@

    {{ exam.name }}

    KYSYMYKSET – FRÅGOR – QUESTIONS

    -
    -
    - Ohjeet / Anvisning / Instructions: -
    -
    -
    -
    -
    -
    + @if (exam.instruction) { +
    -

    {{ es.name }}

    + Ohjeet / Anvisning / Instructions: +
    +
    -
    -
    - {{ es.description }} + } + @for (es of exam.examSections | orderBy: 'sequenceNumber'; track es) { +
    +
    +
    +

    {{ es.name }}

    +
    -
    -
    - {{ esq.sequenceNumber + 1 }}. {{ getQuestionTypeName(esq) }} - {{ esq.derivedMaxScore }} pistettä / poäng / points - Ohjeet / Anvisning / Instructions:
    - {{ esq.answerInstructions }} -     - - - -
    -
    - -
    -
    - -
    -
    - + @if (es.description) { +
    +
    + {{ es.description }}
    - + } + @for (esq of es.sectionQuestions | orderBy: 'sequenceNumber'; track esq) { +
    + {{ esq.sequenceNumber + 1 }}. {{ getQuestionTypeName(esq) }} + {{ esq.derivedMaxScore }} pistettä / poäng / points + @if (esq.answerInstructions.length > 0) { + Ohjeet / Anvisning / Instructions:
    + {{ esq.answerInstructions }} +     + } + @if (esq.question.type !== 'ClozeTestQuestion') { + + } + @if (esq.question.type === 'ClozeTestQuestion') { + + } + @if ( + esq.question.type === 'MultipleChoiceQuestion' || + esq.question.type === 'WeightedMultipleChoiceQuestion' || + esq.question.type === 'ClaimChoiceQuestion' + ) { + + @for (o of esq.options; track o) { +
    + @if (esq.question.type === 'WeightedMultipleChoiceQuestion') { +
    + +
    + } + @if (esq.question.type === 'MultipleChoiceQuestion') { +
    + +
    + } + @if (esq.question.type === 'ClaimChoiceQuestion') { +
    + +
    + } +
    + } +     + } +
    + }
    -
    + }
    diff --git a/ui/src/app/exam/printout/printout.component.ts b/ui/src/app/exam/printout/printout.component.ts index 85bcde1b8f..ba2066d234 100644 --- a/ui/src/app/exam/printout/printout.component.ts +++ b/ui/src/app/exam/printout/printout.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { DatePipe, NgFor, NgIf } from '@angular/common'; +import { DatePipe } from '@angular/common'; import { HttpClient } from '@angular/common/http'; import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; @@ -31,16 +31,7 @@ type Printout = Omit & { examLanguages: (ExamLanguage & { selector: 'xm-printout', templateUrl: './printout.component.html', standalone: true, - imports: [ - NgIf, - CourseCodeComponent, - NgFor, - TeacherListComponent, - MathJaxDirective, - DatePipe, - TranslateModule, - OrderByPipe, - ], + imports: [CourseCodeComponent, TeacherListComponent, MathJaxDirective, DatePipe, TranslateModule, OrderByPipe], }) export class PrintoutComponent implements OnInit { exam!: Printout; diff --git a/ui/src/app/exam/printout/printouts.component.ts b/ui/src/app/exam/printout/printouts.component.ts index 13bd5f07c3..c3de4f1805 100644 --- a/ui/src/app/exam/printout/printouts.component.ts +++ b/ui/src/app/exam/printout/printouts.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgFor, NgIf } from '@angular/common'; + import { HttpClient } from '@angular/common/http'; import { Component, OnInit } from '@angular/core'; import { RouterLink } from '@angular/router'; @@ -77,36 +77,33 @@ import type { Exam } from '../exam.model'; - - {{ exam.examinationDatesAggregate }} - - - {{ exam.name }} - - - - - + @for (exam of printouts | orderBy: predicate : reverse; track exam) { + + {{ exam.examinationDatesAggregate }} + + @if (exam.course) { + + } + + + {{ exam.name }} + + + + + + }
    -
    `, +
    `, standalone: true, - imports: [ - TableSortComponent, - NgFor, - NgIf, - CourseCodeComponent, - RouterLink, - TeacherListComponent, - TranslateModule, - OrderByPipe, - ], + imports: [TableSortComponent, CourseCodeComponent, RouterLink, TeacherListComponent, TranslateModule, OrderByPipe], }) export class PrintoutListingComponent implements OnInit { printouts: (Exam & { examinationDatesAggregate: string })[] = []; diff --git a/ui/src/app/examination/clock/examination-clock.component.ts b/ui/src/app/examination/clock/examination-clock.component.ts index edea412e3c..a2865d6e80 100644 --- a/ui/src/app/examination/clock/examination-clock.component.ts +++ b/ui/src/app/examination/clock/examination-clock.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgClass, NgIf } from '@angular/common'; +import { NgClass } from '@angular/common'; import { HttpClient } from '@angular/common/http'; import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; @@ -23,21 +23,26 @@ import { TranslateModule } from '@ngx-translate/core';
    -
    - {{ 'i18n_exam_time_left' | translate }}: -
    -
    - {{ 'i18n_clock_hidden' | translate }} -
    + @if (showRemainingTime) { +
    + {{ 'i18n_exam_time_left' | translate }}: +
    + } + @if (!showRemainingTime) { +
    + {{ 'i18n_clock_hidden' | translate }} +
    + }
    - {{ formatRemainingTime() }} + @if (showRemainingTime) { + {{ formatRemainingTime() }} + }
    -
    `, +
    `, standalone: true, - imports: [NgIf, NgClass, TranslateModule], + imports: [NgClass, TranslateModule], }) export class ExaminationClockComponent implements OnInit, OnDestroy { @Input() examHash = ''; diff --git a/ui/src/app/examination/examination.component.html b/ui/src/app/examination/examination.component.html index 7999165f7e..2b689bd012 100644 --- a/ui/src/app/examination/examination.component.html +++ b/ui/src/app/examination/examination.component.html @@ -1,47 +1,53 @@
    - - + @if (exam) { + + }
    - - + @if (activeSection) { + + + } - + @if (!activeSection && exam) { + + } - - + @if (exam) { + + + }
    - - + @if (exam) { + + + }
    diff --git a/ui/src/app/examination/examination.component.ts b/ui/src/app/examination/examination.component.ts index 9f311bcd04..ab2c6a459c 100644 --- a/ui/src/app/examination/examination.component.ts +++ b/ui/src/app/examination/examination.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgIf } from '@angular/common'; + import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { of } from 'rxjs'; @@ -32,7 +32,6 @@ import { ExaminationSectionComponent } from './section/examination-section.compo templateUrl: './examination.component.html', standalone: true, imports: [ - NgIf, ExaminationHeaderComponent, ExaminationSectionComponent, AnswerInstructionsComponent, diff --git a/ui/src/app/examination/header/examination-header.component.ts b/ui/src/app/examination/header/examination-header.component.ts index 9eccdd0535..e6c9a76117 100644 --- a/ui/src/app/examination/header/examination-header.component.ts +++ b/ui/src/app/examination/header/examination-header.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgIf } from '@angular/common'; + import { Component, EventEmitter, Input, Output } from '@angular/core'; import { SessionService } from '../../session/session.service'; import { CourseCodeComponent } from '../../shared/miscellaneous/course-code.component'; @@ -34,7 +34,9 @@ import type { Examination } from '../examination.model';
    {{ exam.course?.name }} - + @if (exam.course) { + + }
    @@ -42,18 +44,22 @@ import type { Examination } from '../examination.model';
    - - + @if (!isPreview) { + + }
    - - + @if (!isPreview) { + + }

    {{ exam.course?.name }} - + @if (exam.course) { + + }

    @@ -73,9 +79,9 @@ import type { Examination } from '../examination.model';
    -
    `, +
    `, standalone: true, - imports: [NgIf, CourseCodeComponent, ExaminationClockComponent], + imports: [CourseCodeComponent, ExaminationClockComponent], }) export class ExaminationHeaderComponent { @Input() exam!: Examination; diff --git a/ui/src/app/examination/instructions/answer-instructions.component.ts b/ui/src/app/examination/instructions/answer-instructions.component.ts index 23eb4540e5..42bf99d732 100644 --- a/ui/src/app/examination/instructions/answer-instructions.component.ts +++ b/ui/src/app/examination/instructions/answer-instructions.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgIf } from '@angular/common'; + import { Component, Input } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; import { DateTimeService } from '../../shared/date/date.service'; @@ -33,14 +33,18 @@ import type { Examination } from '../examination.model';
    -
    -
    {{ 'i18n_course_name' | translate }}:
    -
    {{ exam.course.name }}
    -
    -
    -
    {{ 'i18n_course_code' | translate }}:
    -
    -
    + @if (exam.course) { +
    +
    {{ 'i18n_course_name' | translate }}:
    +
    {{ exam.course.name }}
    +
    + } + @if (exam.course) { +
    +
    {{ 'i18n_course_code' | translate }}:
    +
    +
    + }
    {{ 'i18n_exam_name' | translate }}:
    {{ exam.name }}
    @@ -57,7 +61,7 @@ import type { Examination } from '../examination.model';
    `, standalone: true, - imports: [NgIf, CourseCodeComponent, MathJaxDirective, TranslateModule], + imports: [CourseCodeComponent, MathJaxDirective, TranslateModule], }) export class AnswerInstructionsComponent { @Input() exam!: Examination; diff --git a/ui/src/app/examination/logout/examination-logout.component.ts b/ui/src/app/examination/logout/examination-logout.component.ts index 631c9e8dbe..3a1d360ad8 100644 --- a/ui/src/app/examination/logout/examination-logout.component.ts +++ b/ui/src/app/examination/logout/examination-logout.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgIf } from '@angular/common'; + import { HttpClient } from '@angular/common/http'; import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; @@ -29,13 +29,15 @@ import { ExaminationStatusService } from '../examination-status.service';

    - {{ 'i18n_quit_seb' | translate }} + @if (quitLink) { + {{ 'i18n_quit_seb' | translate }} + }

    `, standalone: true, - imports: [NgIf, TranslateModule], + imports: [TranslateModule], }) export class ExaminationLogoutComponent implements OnInit { quitLinkEnabled = false; diff --git a/ui/src/app/examination/navigation/examination-navigation.component.ts b/ui/src/app/examination/navigation/examination-navigation.component.ts index 64bb3f2569..9893df0636 100644 --- a/ui/src/app/examination/navigation/examination-navigation.component.ts +++ b/ui/src/app/examination/navigation/examination-navigation.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgIf } from '@angular/common'; + import type { SimpleChanges } from '@angular/core'; import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; @@ -24,26 +24,35 @@ import type { Examination, ExaminationSection, NavigationPage } from '../examina
    - + @if (prev.valid) { + + } - + @if (next.valid) { + + } -
    `, +
    `, standalone: true, - imports: [NgIf, TranslateModule], + imports: [TranslateModule], }) export class ExaminationNavigationComponent implements OnInit, OnChanges { @Input() exam!: Examination; diff --git a/ui/src/app/examination/navigation/examination-toolbar.component.html b/ui/src/app/examination/navigation/examination-toolbar.component.html index 3a508a69d8..78289db6fc 100644 --- a/ui/src/app/examination/navigation/examination-toolbar.component.html +++ b/ui/src/app/examination/navigation/examination-toolbar.component.html @@ -39,11 +39,13 @@
    -
    -
    -
    {{ exam.course.name }}
    +@if (exam.course) { +
    +
    +
    {{ exam.course.name }}
    +
    -
    +}
    @@ -60,7 +62,7 @@ />
    - {{ exam.attachment?.fileName | uppercase | slice : 0 : 50 }} + {{ exam.attachment?.fileName | uppercase | slice: 0 : 50 }}
    @@ -86,63 +88,62 @@ -
  • -
    -
    - {{ 'i18n_all_questions_answered' | translate }} + @for (section of exam.examSections | orderBy: 'sequenceNumber'; track section; let i = $index) { +
  • +
    + @if (getQuestionAmount(section, 'answered') === getQuestionAmount(section, 'total')) { +
    + {{ 'i18n_all_questions_answered' | translate }} +
    + } + @if (getQuestionAmount(section, 'answered') !== getQuestionAmount(section, 'total')) { +
    + {{ 'i18n_unanswered_questions_remain' | translate }} +
    + }
    -
    - {{ 'i18n_unanswered_questions_remain' | translate }} +
    + + {{ i + 1 }}. {{ section.name }} +
    -
    -
    - - {{ i + 1 }}. {{ section.name }} - -
    -
    - - {{ 'i18n_number_of_answered_questions' | translate }} - {{ getQuestionAmount(section, 'answered') }} - / - {{ getQuestionAmount(section, 'total') }} - - - -
    -
    • +
    + + {{ 'i18n_number_of_answered_questions' | translate }} + {{ getQuestionAmount(section, 'answered') }} + / + {{ getQuestionAmount(section, 'total') }} + + + +
    + + }
    diff --git a/ui/src/app/examination/navigation/examination-toolbar.component.ts b/ui/src/app/examination/navigation/examination-toolbar.component.ts index 65e40568ce..5843cce30e 100644 --- a/ui/src/app/examination/navigation/examination-toolbar.component.ts +++ b/ui/src/app/examination/navigation/examination-toolbar.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgClass, NgFor, NgIf, SlicePipe, UpperCasePipe } from '@angular/common'; +import { NgClass, SlicePipe, UpperCasePipe } from '@angular/common'; import { HttpClient } from '@angular/common/http'; import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; @@ -34,7 +34,7 @@ import { ExaminationService } from '../examination.service'; selector: 'xm-examination-toolbar', templateUrl: './examination-toolbar.component.html', standalone: true, - imports: [NgIf, NgClass, NgFor, NgbPopover, UpperCasePipe, SlicePipe, TranslateModule, OrderByPipe], + imports: [NgClass, NgbPopover, UpperCasePipe, SlicePipe, TranslateModule, OrderByPipe], }) export class ExaminationToolbarComponent implements OnInit { @Input() exam!: Examination; diff --git a/ui/src/app/examination/question/examination-cloze-test.component.ts b/ui/src/app/examination/question/examination-cloze-test.component.ts index 8ad27843b5..a23cb855df 100644 --- a/ui/src/app/examination/question/examination-cloze-test.component.ts +++ b/ui/src/app/examination/question/examination-cloze-test.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { DatePipe, NgIf } from '@angular/common'; +import { DatePipe } from '@angular/common'; import { Component, Input } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; import type { ExaminationQuestion } from '../examination.model'; @@ -20,14 +20,20 @@ import { ExaminationService } from '../examination.service'; @Component({ selector: 'xm-examination-cloze-test', - template: `
    -
    - - {{ 'i18n_autosaved' | translate }}: {{ sq.autosaved | date : 'HH:mm' }} - -   + template: `@if (!isPreview) { +
    +
    + @if (sq.autosaved) { + + {{ 'i18n_autosaved' | translate }}: {{ sq.autosaved | date: 'HH:mm' }} + + } + @if (!sq.autosaved) { +   + } +
    -
    + }
    {{ sq.derivedMaxScore }} {{ 'i18n_unit_points' | translate }}
    @@ -37,9 +43,9 @@ import { ExaminationService } from '../examination.service'; {{ 'i18n_save' | translate }}
    -
    `, +
    `, standalone: true, - imports: [NgIf, DatePipe, TranslateModule], + imports: [DatePipe, TranslateModule], }) export class ExaminationClozeTestComponent { @Input() sq!: ExaminationQuestion; diff --git a/ui/src/app/examination/question/examination-essay-question.component.html b/ui/src/app/examination/question/examination-essay-question.component.html index 7153a4b2fc..57646dc11f 100644 --- a/ui/src/app/examination/question/examination-essay-question.component.html +++ b/ui/src/app/examination/question/examination-essay-question.component.html @@ -8,47 +8,55 @@
    -
    -
    - +@if (sq.essayAnswer) { +
    +
    + +
    -
    -
    -
    - - {{ 'i18n_autosaved' | translate }}: {{ sq.autosaved | date : 'HH:mm' }} - +} +@if (sq.autosaved) { +
    +
    + + {{ 'i18n_autosaved' | translate }}: {{ sq.autosaved | date: 'HH:mm' }} + +
    -
    +}
    - - {{ 'i18n_evaluation_select' | translate }} - - - {{ sq.derivedMaxScore }} {{ 'i18n_unit_points' | translate }} - -
    -
    - - {{ sq.essayAnswer?.attachment?.fileName | uppercase }} - - + @if (sq.evaluationType === 'Selection') { + + {{ 'i18n_evaluation_select' | translate }} + + } + @if (sq.evaluationType !== 'Selection') { + {{ sq.derivedMaxScore }} {{ 'i18n_unit_points' | translate }} + }
    + @if (exam?.implementation !== 'CLIENT_AUTH' && sq.essayAnswer?.attachment?.fileName) { +
    + + {{ sq.essayAnswer?.attachment?.fileName | uppercase }} + + +
    + }
    @@ -56,25 +64,29 @@ {{ 'i18n_save' | translate }}
    -
    -
    -
    - {{ 'i18n_no_attachment' | translate }} + @if (exam?.implementation !== 'CLIENT_AUTH' && sq.essayAnswer) { +
    +
    + @if (!sq.essayAnswer.attachment?.fileName) { +
    + {{ 'i18n_no_attachment' | translate }} +
    + } +
    -
    -
    + }
    diff --git a/ui/src/app/examination/question/examination-essay-question.component.ts b/ui/src/app/examination/question/examination-essay-question.component.ts index 0d10db46eb..3cc6d7e89d 100644 --- a/ui/src/app/examination/question/examination-essay-question.component.ts +++ b/ui/src/app/examination/question/examination-essay-question.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { DatePipe, NgIf, UpperCasePipe } from '@angular/common'; +import { DatePipe, UpperCasePipe } from '@angular/common'; import { Component, Input, OnInit } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; @@ -28,7 +28,7 @@ import { ExaminationService } from '../examination.service'; selector: 'xm-examination-essay-question', templateUrl: './examination-essay-question.component.html', standalone: true, - imports: [NgIf, CKEditorComponent, FormsModule, UpperCasePipe, DatePipe, TranslateModule], + imports: [CKEditorComponent, FormsModule, UpperCasePipe, DatePipe, TranslateModule], }) export class ExaminationEssayQuestionComponent implements OnInit { @Input() sq!: Omit & { essayAnswer: EssayAnswer }; diff --git a/ui/src/app/examination/question/examination-multi-choice-question.component.ts b/ui/src/app/examination/question/examination-multi-choice-question.component.ts index a824ab6043..43fabffd80 100644 --- a/ui/src/app/examination/question/examination-multi-choice-question.component.ts +++ b/ui/src/app/examination/question/examination-multi-choice-question.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgFor, NgIf } from '@angular/common'; + import { Component, Input, OnInit } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; @@ -25,35 +25,36 @@ import { ExaminationService } from '../examination.service';
    answer options for multiple choice question -
    - -
    + @for (sqo of sq.options; track sqo) { +
    + +
    + }
    -
    - {{ sq.derivedMaxScore }} {{ 'i18n_unit_points' | translate }} -
    -
    - {{ 'i18n_max_points' | translate }} {{ sq.derivedMaxScore }} {{ 'i18n_min_points' | translate }} - {{ sq.derivedMinScore }} -
    + @if (sq.question.type !== 'ClaimChoiceQuestion') { +
    {{ sq.derivedMaxScore }} {{ 'i18n_unit_points' | translate }}
    + } + @if (sq.question.type === 'ClaimChoiceQuestion' && sq.derivedMinScore !== null) { +
    + {{ 'i18n_max_points' | translate }} {{ sq.derivedMaxScore }} {{ 'i18n_min_points' | translate }} + {{ sq.derivedMinScore }} +
    + } `, standalone: true, - imports: [NgFor, FormsModule, NgIf, TranslateModule], + imports: [FormsModule, TranslateModule], }) export class ExaminationMultiChoiceComponent implements OnInit { @Input() sq!: ExaminationQuestion; diff --git a/ui/src/app/examination/question/examination-question.component.html b/ui/src/app/examination/question/examination-question.component.html index d1d47becbf..8ca1d5a813 100644 --- a/ui/src/app/examination/question/examination-question.component.html +++ b/ui/src/app/examination/question/examination-question.component.html @@ -3,32 +3,43 @@
    -
    - -
    -
    - -
    + @if (isAnswered()) { +
    + +
    + } + @if (!isAnswered()) { +
    + +
    + }
    -
    -
    -
    -
    -
    -
    - + @if (sq.question.type !== 'ClozeTestQuestion') { +
    + @if (expanded) { +
    + } + @if (!expanded) { +
    + }
    -
    + } + @if (sq.question.type === 'ClozeTestQuestion') { +
    +
    + +
    +
    + }
    @@ -44,81 +55,86 @@
    -
    -
    -

    - - {{ 'i18n_instructions' | translate }}: {{ sq.answerInstructions }} -

    + @if (sq.answerInstructions && expanded) { +
    +
    +

    + + {{ 'i18n_instructions' | translate }}: {{ sq.answerInstructions }} +

    +
    -
    + } -
    -
    - - {{ 'i18n_download_section_question_attachment' | translate }} - -
    {{ sq.question.attachment?.fileName | uppercase }}
    + @if (sq.question.attachment && expanded) { +
    +
    + + {{ 'i18n_download_section_question_attachment' | translate }} + +
    {{ sq.question.attachment?.fileName | uppercase }}
    +
    -
    + }
    -
    - -
    - - - - - - - - - - - - - - + @if (expanded) { +
    + +
    + @switch (sq.question.type) { + @case ('EssayQuestion') { + + + } + @case ('ClozeTestQuestion') { + + + } + @case ('MultipleChoiceQuestion') { + + + } + @case ('ClaimChoiceQuestion') { + + + } + @case ('WeightedMultipleChoiceQuestion') { + + + } + } +
    -
    + }
    diff --git a/ui/src/app/examination/question/examination-question.component.ts b/ui/src/app/examination/question/examination-question.component.ts index 4633bbb538..6d14d7e9b2 100644 --- a/ui/src/app/examination/question/examination-question.component.ts +++ b/ui/src/app/examination/question/examination-question.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgClass, NgIf, NgSwitch, NgSwitchCase, SlicePipe, UpperCasePipe } from '@angular/common'; +import { NgClass, SlicePipe, UpperCasePipe } from '@angular/common'; import type { AfterViewInit } from '@angular/core'; import { ChangeDetectorRef, Component, Input, OnInit } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; @@ -35,11 +35,8 @@ type ClozeTestAnswer = { [key: string]: string }; standalone: true, imports: [ NgClass, - NgIf, MathJaxDirective, DynamicClozeTestComponent, - NgSwitch, - NgSwitchCase, ExaminationEssayQuestionComponent, ExaminationClozeTestComponent, ExaminationMultiChoiceComponent, diff --git a/ui/src/app/examination/question/examination-weighted-multi-choice-question.component.ts b/ui/src/app/examination/question/examination-weighted-multi-choice-question.component.ts index c81a84c37e..b69e16df45 100644 --- a/ui/src/app/examination/question/examination-weighted-multi-choice-question.component.ts +++ b/ui/src/app/examination/question/examination-weighted-multi-choice-question.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgFor } from '@angular/common'; + import { Component, Input, OnInit } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; @@ -25,24 +25,26 @@ import { ExaminationService } from '../examination.service';
    answer options for multiple choice question -
    - -
    + @for (sqo of sq.options; track sqo) { +
    + +
    + }
    {{ sq.derivedMaxScore }} {{ 'i18n_unit_points' | translate }}
    `, standalone: true, - imports: [NgFor, FormsModule, TranslateModule], + imports: [FormsModule, TranslateModule], }) export class ExaminationWeightedMultiChoiceComponent implements OnInit { @Input() sq!: ExaminationQuestion; diff --git a/ui/src/app/examination/section/examination-section.component.ts b/ui/src/app/examination/section/examination-section.component.ts index 232498173e..6fb33a03eb 100644 --- a/ui/src/app/examination/section/examination-section.component.ts +++ b/ui/src/app/examination/section/examination-section.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgFor, NgIf } from '@angular/common'; + import { Component, Input, OnDestroy, OnInit } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; import { OrderByPipe } from '../../shared/sorting/order-by.pipe'; @@ -32,49 +32,64 @@ import { ExaminationQuestionComponent } from '../question/examination-question.c id="examination-section" > {{ index ? index + '. ' : '' }}{{ section.name }} - - ({{ 'i18n_lottery_questions' | translate }}) - + @if (isPreview && section.lotteryOn) { + + ({{ 'i18n_lottery_questions' | translate }}) + + }
    -
    - {{ 'i18n_section_max_score' | translate }}:   {{ getSectionMaxScore() }} -
    -
    - {{ 'i18n_word_passed_max' | translate }}:   - {{ getAmountOfSelectionEvaluatedQuestions() }} -
    + @if (getSectionMaxScore() > 0) { +
    + {{ 'i18n_section_max_score' | translate }}:   {{ getSectionMaxScore() }} +
    + } + @if (getAmountOfSelectionEvaluatedQuestions() > 0) { +
    + {{ 'i18n_word_passed_max' | translate }}:   + {{ getAmountOfSelectionEvaluatedQuestions() }} +
    + }
    -
    - - {{ section.description }} -
    + @if (section.description && section.description.length > 0) { +
    + + {{ section.description }} +
    + }
    -
    -
    - - {{ material.name }} - ({{ material.author }}) - - [ISBN: {{ material.isbn }}] - + @for (material of section.examMaterials; track material) { +
    +
    + + {{ material.name }} + @if (material.author) { + ({{ material.author }}) + } + @if (material.isbn) { + + [ISBN: {{ material.isbn }}] + + } +
    -
    - + } + @for (sq of section.sectionQuestions | orderBy: 'sequenceNumber'; track sq) { + + }
    -
    `, +
    `, standalone: true, - imports: [NgIf, NgFor, ExaminationQuestionComponent, TranslateModule, OrderByPipe], + imports: [ExaminationQuestionComponent, TranslateModule, OrderByPipe], }) export class ExaminationSectionComponent implements OnInit, OnDestroy { @Input() exam!: Examination; diff --git a/ui/src/app/facility/accessibility/accessibility-picker.component.ts b/ui/src/app/facility/accessibility/accessibility-picker.component.ts index cc93b8a54f..0230c25e43 100644 --- a/ui/src/app/facility/accessibility/accessibility-picker.component.ts +++ b/ui/src/app/facility/accessibility/accessibility-picker.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgClass, NgFor } from '@angular/common'; +import { NgClass } from '@angular/common'; import type { OnInit } from '@angular/core'; import { Component, Input } from '@angular/core'; import { NgbDropdown, NgbDropdownItem, NgbDropdownMenu, NgbDropdownToggle } from '@ng-bootstrap/ng-bootstrap'; @@ -42,23 +42,24 @@ import { AccessibilityService } from './accessibility.service'; role="menu" aria-labelledby="dropDownMenu1" > - + @for (ac of accessibilities; track ac) { + + }
    -
    `, +
    `, standalone: true, - imports: [NgbDropdown, NgbDropdownToggle, NgbDropdownMenu, NgFor, NgbDropdownItem, NgClass, TranslateModule], + imports: [NgbDropdown, NgbDropdownToggle, NgbDropdownMenu, NgbDropdownItem, NgClass, TranslateModule], }) export class AccessibilitySelectorComponent implements OnInit { @Input() room!: ExamRoom; diff --git a/ui/src/app/facility/accessibility/accessibility.component.html b/ui/src/app/facility/accessibility/accessibility.component.html index 7a39be0098..fd522e0d32 100644 --- a/ui/src/app/facility/accessibility/accessibility.component.html +++ b/ui/src/app/facility/accessibility/accessibility.component.html @@ -32,43 +32,48 @@

    {{ 'i18n_room_accessibility_info' | translate }}

    - - -
    - {{ accessibility.name }} -
    -
    -
    -
    - - {{ 'i18n_add' | translate }} + @for (accessibility of accessibilities; track accessibility) { + + +
    + {{ accessibility.name }} +
    + @if (accessibility.showName) { +
    + +
    + + {{ 'i18n_add' | translate }} +
    +
    - -
    - - - - - - - - - - - - + } + + + + + + + + + + + + + }
    diff --git a/ui/src/app/facility/accessibility/accessibility.component.ts b/ui/src/app/facility/accessibility/accessibility.component.ts index 359c57e28e..321c800fe8 100644 --- a/ui/src/app/facility/accessibility/accessibility.component.ts +++ b/ui/src/app/facility/accessibility/accessibility.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgFor, NgIf } from '@angular/common'; + import type { OnInit } from '@angular/core'; import { Component } from '@angular/core'; import { FormsModule } from '@angular/forms'; @@ -25,7 +25,7 @@ import { AccessibilityService } from './accessibility.service'; templateUrl: './accessibility.component.html', selector: 'xm-accessibility', standalone: true, - imports: [FormsModule, NgFor, NgIf, TranslateModule], + imports: [FormsModule, TranslateModule], }) export class AccessibilityComponent implements OnInit { newItem: { name: string } = { name: '' }; diff --git a/ui/src/app/facility/address/address.component.ts b/ui/src/app/facility/address/address.component.ts index 8d5bff794e..fffba69601 100644 --- a/ui/src/app/facility/address/address.component.ts +++ b/ui/src/app/facility/address/address.component.ts @@ -100,7 +100,11 @@ export class AddressComponent { @Input() address!: Address; @ViewChild('addressForm', { static: false }) addressForm?: NgForm; - constructor(private room: RoomService, private toast: ToastrService, private translate: TranslateService) {} + constructor( + private room: RoomService, + private toast: ToastrService, + private translate: TranslateService, + ) {} validateAndUpdateAddress = () => { if (this.addressForm?.valid) { diff --git a/ui/src/app/facility/facility.component.html b/ui/src/app/facility/facility.component.html index 83eebeeebd..185ef997fb 100644 --- a/ui/src/app/facility/facility.component.html +++ b/ui/src/app/facility/facility.component.html @@ -18,14 +18,16 @@
    -
    -
    - {{ period.startsAt | date : 'dd.MM.yyyy HH:mm' }} - {{ period.endsAt | date : 'dd.MM.yyyy HH:mm' }} - {{ period.description }} - - + @for (period of maintenancePeriods | orderBy: 'startsAt'; track period) { +
    +
    + {{ period.startsAt | date: 'dd.MM.yyyy HH:mm' }} - {{ period.endsAt | date: 'dd.MM.yyyy HH:mm' }} + {{ period.description }} + + +
    -
    + }
      diff --git a/ui/src/app/facility/facility.component.ts b/ui/src/app/facility/facility.component.ts index 5ccae4126f..77f0acb88f 100644 --- a/ui/src/app/facility/facility.component.ts +++ b/ui/src/app/facility/facility.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { DatePipe, NgFor } from '@angular/common'; +import { DatePipe } from '@angular/common'; import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { @@ -42,7 +42,6 @@ import { MaintenancePeriodDialogComponent } from './schedule/maintenance-period- selector: 'xm-facility', standalone: true, imports: [ - NgFor, NgbNav, NgbNavItem, NgbNavItemRole, diff --git a/ui/src/app/facility/machines/machine.component.html b/ui/src/app/facility/machines/machine.component.html index 4dc72f871d..c000e3da45 100644 --- a/ui/src/app/facility/machines/machine.component.html +++ b/ui/src/app/facility/machines/machine.component.html @@ -3,125 +3,127 @@ {{ 'i18n_exam_machine' | translate }}
    -
    -
    -
    -
    - {{ 'i18n_machine_name' | translate }} -
    -
    - +@if (machine) { + +
    +
    +
    + {{ 'i18n_machine_name' | translate }} +
    +
    + +
    -
    - -
    -
    -
    - -
    -
    - {{ 'i18n_machine_accessibility' | translate }} -
    -
    - +
    +
    +
    + +
    +
    + {{ 'i18n_machine_accessibility' | translate }} +
    +
    + +
    -
    - - -
    -
    -
    {{ 'i18n_machine_other_identifier' | translate }}
    -
    - + +
    +
    +
    {{ 'i18n_machine_other_identifier' | translate }}
    +
    + +
    -
    - -
    -
    {{ 'i18n_machine_surveillance_camera' | translate }}
    -
    - +
    +
    {{ 'i18n_machine_surveillance_camera' | translate }}
    +
    + +
    -
    - -
    - -
    -
    {{ 'i18n_machine_video_recordings' | translate }}
    -
    - + +
    + +
    +
    {{ 'i18n_machine_video_recordings' | translate }}
    +
    + +
    +
    +
    +
    {{ 'i18n_machine_ip_address' | translate }}
    +
    + +
    -
    -
    {{ 'i18n_machine_ip_address' | translate }}
    -
    - + +
    +
    +
    {{ 'i18n_machine_softwares' | translate }}
    +
    + @for (software of software; track software) { + + } +
    -
    - - -
    -
    -
    {{ 'i18n_machine_softwares' | translate }}
    -
    -
    - - -
    -
    -
    - -
    -
    - {{ 'i18n_reason' | translate }} +
    +
    +
    -
    -
    - -
    -
    - -
    -
    - + +} diff --git a/ui/src/app/facility/machines/machine.component.ts b/ui/src/app/facility/machines/machine.component.ts index 623e96e7ee..3320435a31 100644 --- a/ui/src/app/facility/machines/machine.component.ts +++ b/ui/src/app/facility/machines/machine.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgClass, NgFor, NgIf } from '@angular/common'; +import { NgClass } from '@angular/common'; import type { OnInit } from '@angular/core'; import { Component } from '@angular/core'; import { FormsModule } from '@angular/forms'; @@ -32,7 +32,7 @@ interface SoftwareWithClass extends Software { templateUrl: './machine.component.html', selector: 'xm-machine', standalone: true, - imports: [NgIf, FormsModule, NgFor, NgClass, TranslateModule], + imports: [FormsModule, NgClass, TranslateModule], }) export class MachineComponent implements OnInit { machine!: ExamMachine; diff --git a/ui/src/app/facility/machines/machines.component.html b/ui/src/app/facility/machines/machines.component.html index 81b417658a..81dc55a516 100644 --- a/ui/src/app/facility/machines/machines.component.html +++ b/ui/src/app/facility/machines/machines.component.html @@ -49,37 +49,46 @@ - - - - {{ !machine.name ? ('i18n_no_name' | translate) : machine.name }} - - - {{ machine.otherIdentifier }} - {{ machine.accessibilityInfo }} - -
      -
    • - - {{ software.name }}, - -
      • -
    - - - {{ - 'i18n_status_inactive' | translate - }} - {{ - 'i18n_status_active' | translate - }} - {{ machine.statusComment }} - - + @for (machine of sortAlphabeticalMachineList(room.examMachines); track machine) { + + + + {{ !machine.name ? ('i18n_no_name' | translate) : machine.name }} + + + {{ machine.otherIdentifier }} + {{ machine.accessibilityInfo }} + +
      + @for (software of machine.softwareInfo; track software; let l = $last) { +
    • + @if (software.status !== 'DISABLED') { + + {{ software.name }} + @if (!l) { + , + } + + } +
      • + } +
    + + + @if (machine.outOfService) { + {{ 'i18n_status_inactive' | translate }} + } + @if (!machine.outOfService) { + {{ 'i18n_status_active' | translate }} + } + {{ machine.statusComment }} + + + }
    diff --git a/ui/src/app/facility/machines/machines.component.ts b/ui/src/app/facility/machines/machines.component.ts index dc9c6162b7..61136f4900 100644 --- a/ui/src/app/facility/machines/machines.component.ts +++ b/ui/src/app/facility/machines/machines.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgClass, NgFor, NgIf } from '@angular/common'; +import { NgClass } from '@angular/common'; import { HttpClient } from '@angular/common/http'; import type { OnInit } from '@angular/core'; import { Component, Input } from '@angular/core'; @@ -26,14 +26,18 @@ import type { ExamMachine, ExamRoom } from '../../reservation/reservation.model' templateUrl: './machines.component.html', selector: 'xm-machines', standalone: true, - imports: [NgbPopover, NgFor, NgClass, RouterLink, NgIf, TranslateModule], + imports: [NgbPopover, NgClass, RouterLink, TranslateModule], }) export class MachineListComponent implements OnInit { @Input() room!: ExamRoom; showMachines = false; - constructor(private http: HttpClient, private translate: TranslateService, private toast: ToastrService) {} + constructor( + private http: HttpClient, + private translate: TranslateService, + private toast: ToastrService, + ) {} ngOnInit() { this.showMachines = false; diff --git a/ui/src/app/facility/rooms/availability.component.html b/ui/src/app/facility/rooms/availability.component.html index e723840d75..574edc3b37 100644 --- a/ui/src/app/facility/rooms/availability.component.html +++ b/ui/src/app/facility/rooms/availability.component.html @@ -1,61 +1,73 @@
    -
    - {{ room.name }}  - ({{ room.localTimezone }}) - {{ room.mailAddress.street }} {{ room.mailAddress.zip }} {{ room.mailAddress.city }} - - -
    + @if (room) { +
    + {{ room.name }}  + ({{ room.localTimezone }}) + {{ room.mailAddress.street }} {{ room.mailAddress.zip }} {{ room.mailAddress.city }} + + +
    + } -
    -
    {{ 'i18n_room_default_working_hours' | translate }}
    -
    -
    {{ oh.name }}: {{ oh.periodText }}
    + @if (room) { +
    +
    {{ 'i18n_room_default_working_hours' | translate }}
    +
    + @for (oh of openingHours; track oh) { +
    {{ oh.name }}: {{ oh.periodText }}
    + } +
    -
    + } -
    -
    {{ 'i18n_exception_datetimes' | translate }}:
    - -
    -
    - - {{ eh.start }} - {{ eh.end }} - ({{ eh.description | translate }}) - - - + @if (exceptionHours && exceptionHours.length > 0) { +
    +
    {{ 'i18n_exception_datetimes' | translate }}:
    + +
    + @for (eh of !oldExceptionsHidden ? exceptionHours : newExceptions; track eh) { +
    + + {{ eh.start }} - {{ eh.end }} + ({{ eh.description | translate }}) + @if (isInFuture(eh.startDate)) { + + } + @if (isNow(eh.startDate, eh.endDate)) { + + } + +
    + }
    -
    + } -
    + @if (room) { +
    + }
    - + @if (room) { + + }
    diff --git a/ui/src/app/facility/rooms/availability.component.ts b/ui/src/app/facility/rooms/availability.component.ts index 776b219b28..20972e2156 100644 --- a/ui/src/app/facility/rooms/availability.component.ts +++ b/ui/src/app/facility/rooms/availability.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgClass, NgFor, NgIf } from '@angular/common'; +import { NgClass } from '@angular/common'; import type { OnInit } from '@angular/core'; import { Component, Input } from '@angular/core'; import { EventInput } from '@fullcalendar/core'; @@ -37,7 +37,7 @@ import { RoomService } from './room.service'; `, ], standalone: true, - imports: [NgIf, NgFor, NgClass, BookingCalendarComponent, TranslateModule], + imports: [NgClass, BookingCalendarComponent, TranslateModule], }) export class AvailabilityComponent implements OnInit { @Input() room!: ExamRoom; @@ -46,7 +46,11 @@ export class AvailabilityComponent implements OnInit { newExceptions: (ExceptionWorkingHours & { start: string; end: string; description: string })[] = []; oldExceptionsHidden = true; - constructor(private toast: ToastrService, private roomService: RoomService, private calendar: CalendarService) {} + constructor( + private toast: ToastrService, + private roomService: RoomService, + private calendar: CalendarService, + ) {} ngOnInit() { if (!this.room) { diff --git a/ui/src/app/facility/rooms/room-mass-edit.component.ts b/ui/src/app/facility/rooms/room-mass-edit.component.ts index d8fd2df6a3..fcddd28c40 100644 --- a/ui/src/app/facility/rooms/room-mass-edit.component.ts +++ b/ui/src/app/facility/rooms/room-mass-edit.component.ts @@ -13,7 +13,7 @@ * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgClass, NgFor, NgIf } from '@angular/common'; +import { NgClass } from '@angular/common'; import type { OnChanges, OnInit, SimpleChanges } from '@angular/core'; import { Component, EventEmitter, Output } from '@angular/core'; import { FormsModule } from '@angular/forms'; @@ -84,39 +84,43 @@ type SelectableRoom = ExamRoom & { selected: boolean; showBreaks: boolean };
    -
    -
    -
    -
    - - - + @for (room of selectableRooms; track room) { +
    +
    +
    +
    + + + +
    -
    -
    -
    - +
    + @if (room.showBreaks) { +
    + +
    + }
    -
    + }
    @@ -130,7 +134,7 @@ type SelectableRoom = ExamRoom & { selected: boolean; showBreaks: boolean };
    `, standalone: true, - imports: [FormsModule, NgbPopover, NgClass, NgFor, NgIf, ExceptionListComponent, TranslateModule], + imports: [FormsModule, NgbPopover, NgClass, ExceptionListComponent, TranslateModule], }) export class MultiRoomComponent implements OnInit, OnChanges { @Output() selected = new EventEmitter(); @@ -141,7 +145,11 @@ export class MultiRoomComponent implements OnInit, OnChanges { allSelected = false; showBreaks = false; - constructor(private toast: ToastrService, private roomService: RoomService, private translate: TranslateService) {} + constructor( + private toast: ToastrService, + private roomService: RoomService, + private translate: TranslateService, + ) {} ngOnInit() { this.loadRooms(); diff --git a/ui/src/app/facility/rooms/room.component.html b/ui/src/app/facility/rooms/room.component.html index 6c6c191e02..a9873efce9 100644 --- a/ui/src/app/facility/rooms/room.component.html +++ b/ui/src/app/facility/rooms/room.component.html @@ -3,283 +3,277 @@ {{ 'i18n_examination_location' | translate }}
    -
    -
    -
    -
    -
    - - - - {{ room.name || 'i18n_no_name' | translate }} - +@if (room) { +
    +
    +
    + +
    + + + + {{ room.name || 'i18n_no_name' | translate }} + + + + + + + +
    + +
    + +
    +
    - - -     - +
    + +
    +
    +
    {{ 'i18n_room_code' | translate }}
    -
    - -
    -
    - - -
    - -
    -
    -
    {{ 'i18n_room_code' | translate }}
    -
    - - - - + + + + - +
    -
    - -
    -
    {{ 'i18n_room_building_name' | translate }}
    -
    - - - - +
    +
    {{ 'i18n_room_building_name' | translate }}
    +
    + + + + + - +
    -
    - -
    - -
    -
    {{ 'i18n_room_campus' | translate }}
    -
    - - - - +
    + +
    +
    {{ 'i18n_room_campus' | translate }}
    +
    + + + + + - +
    -
    -
    -
    - +
    +
    + +
    + +
    +
    + +
    +
    +
    +
    - +
    -
    - -
    -
    -
    - + + @if (room) { +
    +
    + +
    +
    + } +
    +
    + +

    {{ 'i18n_instructions' | translate }}

    -
    - - -
    -
    - + +
    + @if (room) { + + }
    -
    - -
    -
    - -

    {{ 'i18n_instructions' | translate }}

    -
    -
    - - -
    - -
    - - -
    -
    -
    {{ 'i18n_room_guidance' | translate }}
    -
    - - - - - - + +
    +
    +
    {{ 'i18n_room_guidance' | translate }}
    +
    + + + + + + + - +
    -
    - -
    -
    {{ 'i18n_room_contact_person' | translate }}
    -
    - - - - +
    +
    {{ 'i18n_room_contact_person' | translate }}
    +
    + + + + + - +
    -
    - - -
    -
    -
    {{ 'i18n_room_videorecordings_url' | translate }}
    -
    - - - - + +
    +
    +
    {{ 'i18n_room_videorecordings_url' | translate }}
    +
    + + + + + - +
    -
    -
    -
    - +
    +
    + +
    -
    - - -
    -
    - -

    {{ 'i18n_exam_room_address' | translate }}

    - - + +
    +
    + +

    {{ 'i18n_exam_room_address' | translate }}

    + +
    -
    - - -
    -
    - + +
    +
    + +
    -
    -
    -
    {{ 'i18n_reason' | translate }}
    -
    -
    -
    -
    - - - - +
    +
    {{ 'i18n_reason' | translate }}
    +
    +
    +
    +
    + + + + + - +
    -
    - - -
    -
    - + +
    +
    + +
    -
    +} diff --git a/ui/src/app/facility/rooms/room.component.ts b/ui/src/app/facility/rooms/room.component.ts index 9d7d68c90a..6c810bbbb1 100644 --- a/ui/src/app/facility/rooms/room.component.ts +++ b/ui/src/app/facility/rooms/room.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgIf } from '@angular/common'; + import type { OnInit } from '@angular/core'; import { Component, ViewChild } from '@angular/core'; import { FormsModule, NgForm } from '@angular/forms'; @@ -32,7 +32,6 @@ import { RoomService } from './room.service'; selector: 'xm-room', standalone: true, imports: [ - NgIf, FormsModule, NgbPopover, AvailabilityComponent, diff --git a/ui/src/app/facility/rooms/rooms.component.html b/ui/src/app/facility/rooms/rooms.component.html index 799a831cba..59d3c4d700 100644 --- a/ui/src/app/facility/rooms/rooms.component.html +++ b/ui/src/app/facility/rooms/rooms.component.html @@ -1,212 +1,204 @@
    -
    -
    -

    {{ room.name || 'i18n_no_name' | translate }}

    - - - - - - - -
    -
    -
    - {{ 'i18n_exam_basic_information_tab' | translate }} - - - -
    -
    - {{ room.roomCode }}, {{ room.buildingName }}, {{ room.campus }} - - -
    -
    -
    - -
    -
    -
    - {{ 'i18n_room_code' | translate }}: - {{ room.roomCode }} -
    + @for (room of rooms; track room) { +
    +
    +

    {{ room.name || 'i18n_no_name' | translate }}

    + + + + + + +
    +
    +
    + {{ 'i18n_exam_basic_information_tab' | translate }} + + +
    - -
    -
    - {{ 'i18n_room_accessibility_info' | translate }}: - - {{ info.name }}{{ last ? '' : ', ' }} - -
    +
    + {{ room.roomCode }}, {{ room.buildingName }}, {{ room.campus }} + @if (room.addressVisible) { + + } + @if (!room.addressVisible) { + + }
    - - -
    -
    -
    - {{ 'i18n_room_building_name' | translate }}: - {{ room.buildingName }} +
    + +
    +
    +
    + {{ 'i18n_room_code' | translate }}: + {{ room.roomCode }} +
    -
    - -
    -
    - {{ 'i18n_room_guidance' | translate }}: - {{ room.roomInstruction }} +
    +
    + {{ 'i18n_room_accessibility_info' | translate }}: + @for (info of room.accessibilities; track info; let last = $last) { + {{ info.name }}{{ last ? '' : ', ' }} + } +
    -
    - - -
    -
    -
    - {{ 'i18n_room_campus' | translate }}: - {{ room.campus }} + +
    +
    +
    + {{ 'i18n_room_building_name' | translate }}: + {{ room.buildingName }} +
    -
    - -
    -
    - {{ 'i18n_room_contact_person' | translate }}: - {{ room.contactPerson }} +
    +
    + {{ 'i18n_room_guidance' | translate }}: + {{ room.roomInstruction }} +
    -
    - - -
    -
    -
    - {{ 'i18n_exam_room_address' | translate }}: - {{ room.mailAddress.street }}, {{ room.mailAddress.zip }}, - {{ room.mailAddress.city }} - + +
    +
    +
    + {{ 'i18n_room_campus' | translate }}: + {{ room.campus }} +
    +
    +
    +
    + {{ 'i18n_room_contact_person' | translate }}: + {{ room.contactPerson }} +
    -
    -
    -
    - -
    -
    -
    - {{ 'i18n_openinghours_exception_datetimes' | translate }} -
    -
    - -
    -
    -
    {{ timetable }}
    + +
    +
    +
    + {{ 'i18n_exam_room_address' | translate }}: + {{ room.mailAddress.street }}, {{ room.mailAddress.zip }}, + {{ room.mailAddress.city }} + +
    - -
    - -
    -
    -
    -
    -
    - {{ 'i18n_room_out_of_service' | translate }} -
    -
    - {{ 'i18n_room_in_service' | translate }} -
    -
    - {{ formatDate(exception) }} -
    +
    +
    +
    + {{ 'i18n_openinghours_exception_datetimes' | translate }}
    -
    - -
    - ({{ getFutureExceptionEvent(room.calendarExceptionEvents).length }}) +
    + + @for ( + timetable of getWorkingHoursDisplayFormat(room.defaultWorkingHours); + track timetable + ) { +
    + @if (timetable.length > 0) { +
    + } +
    {{ timetable }}
    +
    + } +     +
    + @if (room.availabilityVisible) { + + } + @if (!room.availabilityVisible) { + + }
    -
    -
    -
    - -
    -
    -
    - -
    -
    - - +
    +
    + @for (exception of getNextExceptionEvent(room.calendarExceptionEvents); track exception) { +
    + @if (exception?.outOfService) { +
    + {{ 'i18n_room_out_of_service' | translate }} +
    + } + @if (!exception?.outOfService) { +
    + {{ 'i18n_room_in_service' | translate }} +
    + } +
    + {{ formatDate(exception) }} +
    +
    + } + @if (getFutureExceptionEvent(room.calendarExceptionEvents).length > 2) { +
    + +
    + ({{ getFutureExceptionEvent(room.calendarExceptionEvents).length }}) +
    +
    + }
    + @if (room.activate) { +
    +
    + @if (room) { + + } +
    +
    +
    + +
    +
    + + +
    +
    +
    + } +
    +
    +
    -
    - -
    -
    -
    + }
    diff --git a/ui/src/app/facility/rooms/rooms.component.ts b/ui/src/app/facility/rooms/rooms.component.ts index ed9687b37f..6dd7916c45 100644 --- a/ui/src/app/facility/rooms/rooms.component.ts +++ b/ui/src/app/facility/rooms/rooms.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgClass, NgFor, NgIf } from '@angular/common'; +import { NgClass } from '@angular/common'; import type { OnInit } from '@angular/core'; import { Component } from '@angular/core'; import { ActivatedRoute, Router, RouterLink } from '@angular/router'; @@ -51,11 +51,9 @@ export interface DefaultWorkingHoursWithEditing extends DefaultWorkingHours { selector: 'xm-rooms', standalone: true, imports: [ - NgFor, NgClass, NgbPopover, RouterLink, - NgIf, OpenHoursComponent, ExceptionListComponent, StartingTimeComponent, diff --git a/ui/src/app/facility/schedule/exception-delete-dialog.component.ts b/ui/src/app/facility/schedule/exception-delete-dialog.component.ts index e8444e6831..af75e00559 100644 --- a/ui/src/app/facility/schedule/exception-delete-dialog.component.ts +++ b/ui/src/app/facility/schedule/exception-delete-dialog.component.ts @@ -13,7 +13,7 @@ * See the Licence for the specific language governing permissions and limitations under the Licence. * */ -import { NgIf } from '@angular/common'; + import { Component, Input } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; @@ -31,12 +31,16 @@ import { ExceptionWorkingHours } from '../../reservation/reservation.model';
    {{ message }}
    -
    - {{ 'i18n_room_out_of_service' | translate }} -
    -
    - {{ 'i18n_room_in_service' | translate }} -
    + @if (exception?.outOfService) { +
    + {{ 'i18n_room_out_of_service' | translate }} +
    + } + @if (!exception?.outOfService) { +
    + {{ 'i18n_room_in_service' | translate }} +
    + }
    @@ -52,9 +56,9 @@ import { ExceptionWorkingHours } from '../../reservation/reservation.model';
    -
    `, +
    `, standalone: true, - imports: [NgIf, TranslateModule], + imports: [TranslateModule], }) export class ExceptionDeleteDialogComponent { @Input() message?: string; diff --git a/ui/src/app/facility/schedule/exception-dialog.component.html b/ui/src/app/facility/schedule/exception-dialog.component.html index e05ec549c4..29ff5faccb 100644 --- a/ui/src/app/facility/schedule/exception-dialog.component.html +++ b/ui/src/app/facility/schedule/exception-dialog.component.html @@ -6,12 +6,16 @@

      {{ 'i18n_exception_time' | tran
    -
    - {{ 'i18n_making_room_available' | translate }} -
    -
    - {{ 'i18n_making_room_out_of_service' | translate }} -
    + @if (!outOfService) { +
    + {{ 'i18n_making_room_available' | translate }} +
    + } + @if (outOfService) { +
    + {{ 'i18n_making_room_out_of_service' | translate }} +
    + }
    -
    -
    {{ 'i18n_repeats_once' | translate }}
    -
    -
    - - - -
    -
    - - - -
    -
    -
    -
    -
    {{ 'i18n_repeats_weekly_or_every_day' | translate }}
    -
    -
    -
    {{ 'i18n_clock' | translate }}:
    - - - - -
    -
    -
    - +
    -
    - +
    -
    {{ 'i18n_period' | translate }}:
    - - - -
    -
    -
    -
    {{ 'i18n_repeats_monthly' | translate }}
    -
    -
    -
    {{ 'i18n_clock' | translate }}:
    - - - - -
    -
    -
    - - - {{ 'i18n_day' | translate }} + } + @if (repeats.toString() === 'DAILY_WEEKLY') { +
    +
    {{ 'i18n_repeats_weekly_or_every_day' | translate }}
    +
    +
    +
    {{ 'i18n_clock' | translate }}:
    + + + +
    -
    - - {{ 'i18n_of_month' | translate }} - +
    +
    -
    +
    +
    + @for (day of selectableWeekDays; track day) { -
    - - - -
    + } +
    +
    {{ 'i18n_period' | translate }}:
    + + + + +
    +
    +
    + } + @if (repeats.toString() === 'MONTHLY') { +
    +
    {{ 'i18n_repeats_monthly' | translate }}
    +
    +
    +
    {{ 'i18n_clock' | translate }}:
    + + + + +
    +
    +
    + + + {{ 'i18n_day' | translate }} +
    +
    + + {{ 'i18n_of_month' | translate }} + + +
    + @for (ord of ordinals; track ord) { + + } +
    +     + -
    - +
    + @for (swd of selectableWeekDays; track swd) { + + } +
    + +
    +
    {{ 'i18n_period' | translate }}:
    + + + +
    -
    {{ 'i18n_period' | translate }}:
    - - - -
    -
    -
    -
    {{ 'i18n_repeats_yearly' | translate }}
    -
    -
    -
    {{ 'i18n_clock' | translate }}:
    - - - - -
    -
    -
    - - - {{ 'i18n_day' | translate }} - {{ 'i18n_of_every' | translate }} - - -
    + /> + {{ 'i18n_day' | translate }} + {{ 'i18n_of_every' | translate }} + -
    -     -
    -
    - - - -
    +
    + @for (swd of selectableMonths; track swd) { + + } +
    + +
    +
    + + -
    -     - - -
    +
    + @for (ord of ordinals; track ord) { + + } +
    + + -
    -     - {{ 'i18n_of_every' | translate }} - - -
    +
    + @for (swd of selectableWeekDays; track swd) { + + } +
    + + {{ 'i18n_of_every' | translate }} + -
    -     +
    + @for (swd of selectableMonths; track swd) { + + } +
    + +
    +
    {{ 'i18n_period' | translate }}:
    + + + +
    -
    {{ 'i18n_period' | translate }}:
    - - - -
    -
    + }
    diff --git a/ui/src/app/facility/schedule/exception-dialog.component.ts b/ui/src/app/facility/schedule/exception-dialog.component.ts index aa7a26382b..ea1fe6adcf 100644 --- a/ui/src/app/facility/schedule/exception-dialog.component.ts +++ b/ui/src/app/facility/schedule/exception-dialog.component.ts @@ -1,4 +1,4 @@ -import { formatDate, NgClass, NgFor, NgIf } from '@angular/common'; +import { formatDate, NgClass } from '@angular/common'; import { Component, Input } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { NgbActiveModal, NgbTimepickerModule } from '@ng-bootstrap/ng-bootstrap'; @@ -22,16 +22,7 @@ enum ORDINAL { @Component({ standalone: true, - imports: [ - FormsModule, - TranslateModule, - NgClass, - NgFor, - NgIf, - DateTimePickerComponent, - DatePickerComponent, - NgbTimepickerModule, - ], + imports: [FormsModule, TranslateModule, NgClass, DateTimePickerComponent, DatePickerComponent, NgbTimepickerModule], templateUrl: './exception-dialog.component.html', }) export class ExceptionDialogComponent { diff --git a/ui/src/app/facility/schedule/exceptions.component.ts b/ui/src/app/facility/schedule/exceptions.component.ts index 5290366080..99df1803c3 100644 --- a/ui/src/app/facility/schedule/exceptions.component.ts +++ b/ui/src/app/facility/schedule/exceptions.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgFor, NgIf } from '@angular/common'; + import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; @@ -27,44 +27,48 @@ import { ExceptionDeleteDialogComponent } from './exception-delete-dialog.compon @Component({ selector: 'xm-exceptions', template: ` -
    -
    - {{ 'i18n_exception_datetimes' | translate }}: -
    -
    -
    -
    {{ 'i18n_exception_datetimes_info' | translate }}
    -
    - -
    -
    - {{ formatDate(exception) }} + @if (!hideTitle) { +
    +
    + {{ 'i18n_exception_datetimes' | translate }}: +
    -
    - {{ !exception.outOfService ? ('i18n_room_in_service' | translate) : '' }} - {{ exception.outOfService ? ('i18n_room_out_of_service' | translate) : '' }} + } + @if (!hideInfo) { +
    +
    {{ 'i18n_exception_datetimes_info' | translate }}
    -
    - {{ 'i18n_exam_remove' | translate }} + } + + @for (exception of orderedExceptions | filterBy: filter; track exception; let i = $index) { +
    +
    + {{ formatDate(exception) }} +
    +
    + {{ !exception.outOfService ? ('i18n_room_in_service' | translate) : '' }} + {{ exception.outOfService ? ('i18n_room_out_of_service' | translate) : '' }} +
    +
    + {{ 'i18n_exam_remove' | translate }} +
    -
    -
    -
    - - + } + @if (!hideButton) { +
    +
    + + +
    -
    + } `, standalone: true, - imports: [NgIf, NgFor, TranslateModule, FilterByPipe], + imports: [TranslateModule, FilterByPipe], }) export class ExceptionListComponent implements OnInit, OnChanges { @Input() exceptions: ExceptionWorkingHours[] = []; diff --git a/ui/src/app/facility/schedule/opening-hours.component.ts b/ui/src/app/facility/schedule/opening-hours.component.ts index 89e9a5be35..762009291d 100644 --- a/ui/src/app/facility/schedule/opening-hours.component.ts +++ b/ui/src/app/facility/schedule/opening-hours.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgFor, NgIf } from '@angular/common'; + import type { OnChanges, OnInit } from '@angular/core'; import { Component, Input } from '@angular/core'; import { FormsModule } from '@angular/forms'; @@ -38,49 +38,60 @@ interface RoomWithAddressVisibility extends ExamRoom { @Component({ selector: 'xm-opening-hours', template: ` -
    -
    {{ dateTime.translateWeekdayName(dwh.weekday, true) }}
    -
    -
    -
    {{ workingHourFormat(dwh.displayStartingTime) }}
    -
    -
    -
    {{ workingHourFormat(dwh.displayEndingTime) }}
    + @for (dwh of orderByWeekday(extendedRoom.extendedDwh); track dwh) { +
    +
    + {{ dateTime.translateWeekdayName(dwh.weekday, true) }}
    -
    - -
    -
    - +
    + @if (!dwh.editing) { +
    +
    {{ workingHourFormat(dwh.displayStartingTime) }}
    +
    -
    +
    {{ workingHourFormat(dwh.displayEndingTime) }}
    +
    + } + @if (dwh.editing) { +
    + +
    -
    + +
    + }
    -
    -
    -
    -
    -
    -
    -
    +
    + @if (!dwh.editing) { +
    + } + @if (dwh.editing) { +
    +
    +
    +
    +
    + }
    -
    + }
    - + @for (weekday of WEEKDAYS; track weekday) { + + }
    @@ -133,16 +145,7 @@ interface RoomWithAddressVisibility extends ExamRoom {
    `, standalone: true, - imports: [ - NgFor, - NgIf, - NgbTimepicker, - FormsModule, - NgbDropdown, - NgbDropdownToggle, - NgbDropdownMenu, - NgbDropdownItem, - ], + imports: [NgbTimepicker, FormsModule, NgbDropdown, NgbDropdownToggle, NgbDropdownMenu, NgbDropdownItem], }) export class OpenHoursComponent implements OnInit, OnChanges { @Input() room!: ExamRoom; diff --git a/ui/src/app/facility/schedule/starting-time.component.ts b/ui/src/app/facility/schedule/starting-time.component.ts index d433e8aaf1..ba6704109d 100644 --- a/ui/src/app/facility/schedule/starting-time.component.ts +++ b/ui/src/app/facility/schedule/starting-time.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgClass, NgFor } from '@angular/common'; +import { NgClass } from '@angular/common'; import type { OnInit } from '@angular/core'; import { Component, Input } from '@angular/core'; import { FormsModule } from '@angular/forms'; @@ -54,14 +54,15 @@ import { RoomService } from '../rooms/room.service';
    - {{ hour.startingHour }} + @for (hour of examStartingHours; track hour) { + {{ hour.startingHour }} + }
    @@ -79,9 +80,9 @@ import { RoomService } from '../rooms/room.service'; 'i18n_add_remove_all' | translate }}
    -
    `, +
    `, standalone: true, - imports: [FormsModule, NgFor, NgClass, TranslateModule], + imports: [FormsModule, NgClass, TranslateModule], }) export class StartingTimeComponent implements OnInit { @Input() roomIds: number[] = []; diff --git a/ui/src/app/interceptors/error-interceptor.ts b/ui/src/app/interceptors/error-interceptor.ts index 9f7488a6f2..b957724f41 100644 --- a/ui/src/app/interceptors/error-interceptor.ts +++ b/ui/src/app/interceptors/error-interceptor.ts @@ -22,7 +22,10 @@ import { catchError } from 'rxjs/operators'; @Injectable({ providedIn: 'root' }) export class ErrorInterceptor implements HttpInterceptor { - constructor(private translate: TranslateService, private toast: ToastrService) {} + constructor( + private translate: TranslateService, + private toast: ToastrService, + ) {} intercept(req: HttpRequest, next: HttpHandler): Observable> { return next.handle(req).pipe( catchError((response: HttpErrorResponse) => { diff --git a/ui/src/app/maturity/language-inspections.component.ts b/ui/src/app/maturity/language-inspections.component.ts index 036866df0f..229686f87b 100644 --- a/ui/src/app/maturity/language-inspections.component.ts +++ b/ui/src/app/maturity/language-inspections.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgIf } from '@angular/common'; + import type { OnInit } from '@angular/core'; import { Component } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; @@ -47,24 +47,26 @@ export interface LanguageInspectionData extends LanguageInspection {
    - - + @if (ongoingInspections) { + + }
    - - + @if (processedInspections) { + + + }
    -
    `, +
    `, standalone: true, - imports: [NgIf, UnfinishedInspectionsComponent, ReviewedInspectionsComponent, TranslateModule], + imports: [UnfinishedInspectionsComponent, ReviewedInspectionsComponent, TranslateModule], }) export class LanguageInspectionsComponent implements OnInit { ongoingInspections: LanguageInspectionData[] = []; @@ -72,7 +74,10 @@ export class LanguageInspectionsComponent implements OnInit { private startDate: Date | null = null; private endDate: Date | null = null; - constructor(private Language: LanguageService, private LanguageInspection: LanguageInspectionService) {} + constructor( + private Language: LanguageService, + private LanguageInspection: LanguageInspectionService, + ) {} ngOnInit() { this.query(); diff --git a/ui/src/app/maturity/listing/reviewed-inspections.component.html b/ui/src/app/maturity/listing/reviewed-inspections.component.html index a3477c3f56..55a2a17529 100644 --- a/ui/src/app/maturity/listing/reviewed-inspections.component.html +++ b/ui/src/app/maturity/listing/reviewed-inspections.component.html @@ -7,20 +7,22 @@ 'i18n_language_inspection_report_link' | translate }} - - - - + @if (inspections.length > 0) { + + + + + }
    @@ -178,88 +180,98 @@ - - - - - - - - {{ inspection.answerLanguage }} - - - - - {{ inspection.exam.name }} - - - - - {{ inspection.ownerAggregate }} - - - {{ inspection.created | date : 'dd.MM.yyyy' }} - - - {{ inspection.studentName }} -  ({{ inspection.exam.creator.userIdentifier }}) - -
    - {{ - inspection.exam.creator.email - }} -     - - - {{ inspection.exam.created | date : 'dd.MM.yyyy' }} - - - {{ inspection.inspectorName }} - -
    - {{ - inspection.modifier.email + @for ( + inspection of filteredInspections + | orderBy: sorting.predicate : sorting.reverse + | slice: currentPage * pageSize : currentPage * pageSize + pageSize; + track inspection + ) { + + + + @if (inspection.exam.course) { + + } + + + + {{ inspection.answerLanguage }} + + + + + {{ inspection.exam.name }} + + + + + {{ inspection.ownerAggregate }} + + + {{ inspection.created | date: 'dd.MM.yyyy' }} + + + {{ inspection.studentName }} + @if (inspection.exam.creator.userIdentifier) { +  ({{ inspection.exam.creator.userIdentifier }}) + } + +
    + {{ + inspection.exam.creator.email + }} +     + + + {{ inspection.exam.created | date: 'dd.MM.yyyy' }} + + @if (inspection.modifier) { + + {{ inspection.inspectorName }} + +
    + {{ + inspection.modifier.email + }} +     + + } + + {{ inspection.finishedAt | date: 'dd.MM.yyyy' }} + + + @if (inspection.approved) { + + {{ 'i18n_approved' | translate }} + + } + @if (!inspection.approved) { + + {{ 'i18n_rejected' | translate }} + + } + + + + {{ + 'i18n_view' | translate }} -     - - - {{ inspection.finishedAt | date : 'dd.MM.yyyy' }} - - - - {{ 'i18n_approved' | translate }} - - - {{ 'i18n_rejected' | translate }} - - - - - {{ - 'i18n_view' | translate - }} - - + + + } - -   - - - - {{ 'i18n_processed_language_inspections_no_results' | translate }} - - + @for (r of [] | pageFill: filteredInspections.length : currentPage : pageSize; track r) { + +   + + } + @if (filteredInspections.length === 0) { + + + {{ 'i18n_processed_language_inspections_no_results' | translate }} + + + }
    diff --git a/ui/src/app/maturity/listing/reviewed-inspections.component.ts b/ui/src/app/maturity/listing/reviewed-inspections.component.ts index 8576d5def6..f26aae41d6 100644 --- a/ui/src/app/maturity/listing/reviewed-inspections.component.ts +++ b/ui/src/app/maturity/listing/reviewed-inspections.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { DatePipe, NgFor, NgIf, SlicePipe } from '@angular/common'; +import { DatePipe, SlicePipe } from '@angular/common'; import type { OnChanges, SimpleChanges } from '@angular/core'; import { Component, EventEmitter, Input, Output } from '@angular/core'; import { FormsModule } from '@angular/forms'; @@ -34,12 +34,10 @@ import { LanguageInspectionService } from '../language-inspections.service'; standalone: true, imports: [ RouterLink, - NgIf, FormsModule, NgbPopover, DatePickerComponent, TableSortComponent, - NgFor, CourseCodeComponent, PaginatorComponent, SlicePipe, diff --git a/ui/src/app/maturity/listing/unfinished-inspections.component.html b/ui/src/app/maturity/listing/unfinished-inspections.component.html index 6b19ea2228..3fc969bc6e 100644 --- a/ui/src/app/maturity/listing/unfinished-inspections.component.html +++ b/ui/src/app/maturity/listing/unfinished-inspections.component.html @@ -3,20 +3,22 @@
    {{ 'i18n_ongoing_language_inspections' | translate }} {{ getInspectionAmounts() }} - - - - + @if (inspections.length > 0) { + + + + + }
    @@ -137,69 +139,85 @@ - - - - - - {{ inspection.answerLanguage }} - - - - {{ inspection.exam.name }} - - - - - {{ inspection.ownerAggregate }} - - - {{ inspection.created | date : 'dd.MM.yyyy' }} - - {{ inspection.studentName }} -  ({{ inspection.exam.creator.userIdentifier }}) - -
    - {{ - inspection.exam.creator.email - }} -     - - {{ inspection.exam.created | date : 'dd.MM.yyyy' }} - - {{ inspection.inspectorName }} - -
    - {{ - inspection.modifier.email - }} -     - - - {{ 'i18n_undefined' | translate }} - - - {{ - 'i18n_view' | translate - }} - - - {{ 'i18n_assign_to_me' | translate }} - - - - {{ 'i18n_assign_to_me' | translate }} - - - - {{ 'i18n_review_no_result' | translate }} - + @for ( + inspection of filteredInspections | orderBy: sorting.predicate : sorting.reverse; + track inspection + ) { + + + @if (inspection.exam.course) { + + } + + + {{ inspection.answerLanguage }} + + + + {{ inspection.exam.name }} + + + + + {{ inspection.ownerAggregate }} + + + {{ inspection.created | date: 'dd.MM.yyyy' }} + + {{ inspection.studentName }} + @if (inspection.exam.creator.userIdentifier) { +  ({{ inspection.exam.creator.userIdentifier }}) + } + +
    + {{ + inspection.exam.creator.email + }} +     + + {{ inspection.exam.created | date: 'dd.MM.yyyy' }} + @if (inspection.modifier) { + + {{ inspection.inspectorName }} + +
    + {{ + inspection.modifier.email + }} +     + + } + @if (!inspection.modifier) { + + {{ 'i18n_undefined' | translate }} + + } + @if (inspection.modifier) { + + {{ + 'i18n_view' | translate + }} + + } + @if (!inspection.modifier && !user.isAdmin) { + + {{ 'i18n_assign_to_me' | translate }} + + + } + @if (!inspection.modifier && user.isAdmin) { + + {{ 'i18n_assign_to_me' | translate }} + + } + + } + @if (filteredInspections.length === 0) { + + {{ 'i18n_review_no_result' | translate }} + + }
    diff --git a/ui/src/app/maturity/listing/unfinished-inspections.component.ts b/ui/src/app/maturity/listing/unfinished-inspections.component.ts index c7984627f6..d2e32e0588 100644 --- a/ui/src/app/maturity/listing/unfinished-inspections.component.ts +++ b/ui/src/app/maturity/listing/unfinished-inspections.component.ts @@ -1,4 +1,4 @@ -import { DatePipe, NgFor, NgIf } from '@angular/common'; +import { DatePipe } from '@angular/common'; import type { OnChanges } from '@angular/core'; import { Component, Input } from '@angular/core'; import { FormsModule } from '@angular/forms'; @@ -33,11 +33,9 @@ import type { LanguageInspection } from '../maturity.model'; templateUrl: './unfinished-inspections.component.html', standalone: true, imports: [ - NgIf, FormsModule, NgbPopover, TableSortComponent, - NgFor, CourseCodeComponent, RouterLink, DatePipe, diff --git a/ui/src/app/maturity/reporting/maturity-reporting.component.html b/ui/src/app/maturity/reporting/maturity-reporting.component.html index 36be23230e..fccb1b1fbb 100644 --- a/ui/src/app/maturity/reporting/maturity-reporting.component.html +++ b/ui/src/app/maturity/reporting/maturity-reporting.component.html @@ -5,7 +5,7 @@ {{ 'i18n_monthly_language_inspection_report' | translate }} - {{ month | date : 'MM/yyyy' }} + {{ month | date: 'MM/yyyy' }}
    {{ 'i18n_print' | translate }}   @@ -70,55 +70,60 @@

    {{ 'i18n_processed_language_inspections' | translate }}

    - - - - - {{ inspection.exam.name }} - - - {{ owner.firstName }} {{ owner.lastName }} - - - {{ inspection.created | date : 'dd.MM.yyyy' }} - - {{ inspection.exam.creator.firstName }} - {{ inspection.exam.creator.lastName }} -  ({{ inspection.exam.creator.userIdentifier }}) -
    {{ - inspection.exam.creator.email - }}     - - {{ inspection.exam.created | date : 'dd.MM.yyyy' }} - - {{ inspection.assignee.firstName }} {{ inspection.assignee.lastName }} -
    {{ - inspection.assignee.email - }}     - - {{ inspection.finishedAt | date : 'dd.MM.yyyy' }} - - {{ - (inspection.approved ? 'i18n_approved' : 'i18n_rejected') | translate - }} - - - {{ - 'i18n_view' | translate - }} - - + @for (inspection of processedInspections | orderBy: 'finishedAt'; track inspection) { + + + @if (inspection.exam.course) { + + } + + {{ inspection.exam.name }} + + @for (owner of inspection.exam.parent?.examOwners; track owner) { + {{ owner.firstName }} {{ owner.lastName }} + } + + {{ inspection.created | date: 'dd.MM.yyyy' }} + + {{ inspection.exam.creator.firstName }} + {{ inspection.exam.creator.lastName }} + @if (inspection.exam.creator.userIdentifier) { +  ({{ inspection.exam.creator.userIdentifier }}) + } +
    {{ + inspection.exam.creator.email + }}     + + {{ inspection.exam.created | date: 'dd.MM.yyyy' }} + @if (inspection.assignee) { + + {{ inspection.assignee.firstName }} {{ inspection.assignee.lastName }} + +
    {{ + inspection.assignee.email + }}     + + } + {{ inspection.finishedAt | date: 'dd.MM.yyyy' }} + + {{ + (inspection.approved ? 'i18n_approved' : 'i18n_rejected') | translate + }} + + + {{ + 'i18n_view' | translate + }} + + + }
    diff --git a/ui/src/app/maturity/reporting/maturity-reporting.component.ts b/ui/src/app/maturity/reporting/maturity-reporting.component.ts index 4223033cb6..822b437389 100644 --- a/ui/src/app/maturity/reporting/maturity-reporting.component.ts +++ b/ui/src/app/maturity/reporting/maturity-reporting.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { DatePipe, NgClass, NgFor, NgIf } from '@angular/common'; +import { DatePipe, NgClass } from '@angular/common'; import type { OnInit } from '@angular/core'; import { Component } from '@angular/core'; import { FormsModule } from '@angular/forms'; @@ -33,8 +33,6 @@ import type { LanguageInspection } from '../maturity.model'; imports: [ FormsModule, DropdownSelectComponent, - NgFor, - NgIf, CourseCodeComponent, NgClass, DatePipe, diff --git a/ui/src/app/navigation/navigation.component.html b/ui/src/app/navigation/navigation.component.html index d2bc2c914f..e1199ba1a2 100644 --- a/ui/src/app/navigation/navigation.component.html +++ b/ui/src/app/navigation/navigation.component.html @@ -1,108 +1,148 @@ - + +} diff --git a/ui/src/app/navigation/navigation.component.ts b/ui/src/app/navigation/navigation.component.ts index d95ca2640f..df287d1b22 100644 --- a/ui/src/app/navigation/navigation.component.ts +++ b/ui/src/app/navigation/navigation.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgFor, NgIf } from '@angular/common'; + import type { OnDestroy, OnInit } from '@angular/core'; import { Component } from '@angular/core'; import { RouterLink, RouterLinkActive } from '@angular/router'; @@ -31,7 +31,7 @@ import { NavigationService } from './navigation.service'; selector: 'xm-navigation', templateUrl: './navigation.component.html', standalone: true, - imports: [NgIf, NgFor, RouterLinkActive, RouterLink, NgbCollapse, TranslateModule], + imports: [RouterLinkActive, RouterLink, NgbCollapse, TranslateModule], }) export class NavigationComponent implements OnInit, OnDestroy { appVersion = ''; diff --git a/ui/src/app/navigation/navigation.service.ts b/ui/src/app/navigation/navigation.service.ts index 3efafcc091..cc2f64f4c2 100644 --- a/ui/src/app/navigation/navigation.service.ts +++ b/ui/src/app/navigation/navigation.service.ts @@ -29,7 +29,11 @@ export interface Link { @Injectable({ providedIn: 'root' }) export class NavigationService { - constructor(private http: HttpClient, private router: Router, private Session: SessionService) {} + constructor( + private http: HttpClient, + private router: Router, + private Session: SessionService, + ) {} getAppVersion$ = () => this.http.get<{ appVersion: string }>('/app/settings/appVersion'); diff --git a/ui/src/app/question/basequestion/claim-choice.component.ts b/ui/src/app/question/basequestion/claim-choice.component.ts index 408d87e654..adba88aca5 100644 --- a/ui/src/app/question/basequestion/claim-choice.component.ts +++ b/ui/src/app/question/basequestion/claim-choice.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgClass, NgFor, NgIf, UpperCasePipe } from '@angular/common'; +import { NgClass, UpperCasePipe } from '@angular/common'; import { Component, Input, OnInit } from '@angular/core'; import { ControlContainer, FormsModule, NgForm } from '@angular/forms'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; @@ -34,10 +34,12 @@ import { QuestionDraft, QuestionService } from '../question.service';
  • {{ 'i18n_claim_choice_skip_option_description' | translate }}

    • -
    - - {{ 'i18n_shared_question_property_info' | translate }} -
    + @if (showWarning) { +
    + + {{ 'i18n_shared_question_property_info' | translate }} +
    + }
    @@ -50,52 +52,52 @@ import { QuestionDraft, QuestionService } from '../question.service';
    -
    -
    - - + @for (opt of question.options; track opt) { +
    +
    + + +
    +
    + {{ returnOptionDescriptionTranslation(opt) | translate }} +
    -
    - {{ returnOptionDescriptionTranslation(opt) | translate }} -
    -
    + }
    -
    - - - {{ 'i18n_claim_choice_missing_options_warning' | translate }} - {{ displayMissingOptions() }} - -
    + @if (missingOptions.length > 0) { +
    + + + {{ 'i18n_claim_choice_missing_options_warning' | translate }} + {{ displayMissingOptions() }} + +
    + }
    `, standalone: true, - imports: [FormsModule, NgIf, NgFor, NgClass, FixedPrecisionValidatorDirective, UpperCasePipe, TranslateModule], + imports: [FormsModule, NgClass, FixedPrecisionValidatorDirective, UpperCasePipe, TranslateModule], }) export class ClaimChoiceEditorComponent implements OnInit { @Input() option!: MultipleChoiceOption; @@ -126,7 +128,10 @@ export class ClaimChoiceEditorComponent implements OnInit { }, }; - constructor(private translate: TranslateService, private Question: QuestionService) {} + constructor( + private translate: TranslateService, + private Question: QuestionService, + ) {} ngOnInit() { const { state, question } = this.question; diff --git a/ui/src/app/question/basequestion/essay.component.ts b/ui/src/app/question/basequestion/essay.component.ts index a03458be89..5e4e4c2d44 100644 --- a/ui/src/app/question/basequestion/essay.component.ts +++ b/ui/src/app/question/basequestion/essay.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgIf } from '@angular/common'; + import { Component, Input, OnInit } from '@angular/core'; import { ControlContainer, FormsModule, NgForm } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; @@ -46,16 +46,18 @@ import { QuestionDraft } from '../question.service'; {{ 'i18n_characters' | translate }}

    -
    - - {{ 'i18n_essay_length_recommendation_bounds' | translate }} -
    + @if (wc.invalid) { +
    + + {{ 'i18n_essay_length_recommendation_bounds' | translate }} +
    + }
    `, standalone: true, - imports: [FormsModule, NgIf, TranslateModule], + imports: [FormsModule, TranslateModule], }) export class EssayEditorComponent implements OnInit { @Input() question!: Question | QuestionDraft; diff --git a/ui/src/app/question/basequestion/multiple-choice-option.component.ts b/ui/src/app/question/basequestion/multiple-choice-option.component.ts index ac40c4c300..e50e8aea83 100644 --- a/ui/src/app/question/basequestion/multiple-choice-option.component.ts +++ b/ui/src/app/question/basequestion/multiple-choice-option.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgClass, NgIf } from '@angular/common'; +import { NgClass } from '@angular/common'; import { Component, Input } from '@angular/core'; import { ControlContainer, FormsModule, NgForm } from '@angular/forms'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; @@ -54,14 +54,16 @@ import { QuestionDraft, QuestionService } from '../question.service'; />
    -
    - -
    + @if (allowRemoval) { +
    + +
    + }
    `, standalone: true, - imports: [FormsModule, NgClass, NgIf, TranslateModule], + imports: [FormsModule, NgClass, TranslateModule], }) export class MultipleChoiceOptionEditorComponent { @Input() option!: MultipleChoiceOption; @@ -69,7 +71,11 @@ export class MultipleChoiceOptionEditorComponent { @Input() question!: Question | QuestionDraft; @Input() allowRemoval = false; - constructor(private translate: TranslateService, private toast: ToastrService, private Question: QuestionService) {} + constructor( + private translate: TranslateService, + private toast: ToastrService, + private Question: QuestionService, + ) {} correctAnswerToggled = () => this.Question.toggleCorrectOption(this.option, this.question.options); diff --git a/ui/src/app/question/basequestion/multiple-choice.component.ts b/ui/src/app/question/basequestion/multiple-choice.component.ts index 38c19b08d8..6a8b5ed0fc 100644 --- a/ui/src/app/question/basequestion/multiple-choice.component.ts +++ b/ui/src/app/question/basequestion/multiple-choice.component.ts @@ -12,7 +12,7 @@ * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the Licence for the specific language governing permissions and limitations under the Licence. */ -import { NgFor, NgIf, UpperCasePipe } from '@angular/common'; +import { UpperCasePipe } from '@angular/common'; import { Component, Input, OnInit } from '@angular/core'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { ToastrService } from 'ngx-toastr'; @@ -24,61 +24,75 @@ import { WeightedMultipleChoiceOptionEditorComponent } from './weighted-multiple @Component({ selector: 'xm-multiple-choice-editor', template: ` -
    -
    - {{ 'i18n_option' | translate }} -
    -
    - - {{ 'i18n_shared_question_property_info' | translate }} -
    -     -
    -
    - {{ 'i18n_word_points' | translate | uppercase }} + @if (question.type === 'WeightedMultipleChoiceQuestion') { +
    +
    + {{ 'i18n_option' | translate }} +
    + @if (showWarning) { +
    + + {{ 'i18n_shared_question_property_info' | translate }} +
    + } +     +
    +
    + {{ 'i18n_word_points' | translate | uppercase }} +
    -
    -
    -
    - {{ 'i18n_option' | translate }} -
    -
    - - {{ 'i18n_shared_question_property_info' | translate }} + } + @if (question.type === 'MultipleChoiceQuestion') { +
    +
    + {{ 'i18n_option' | translate }} +
    + @if (showWarning) { +
    + + {{ 'i18n_shared_question_property_info' | translate }} +
    + } +     +
    +
    +
    + {{ 'i18n_multiplechoice_question_correct' | translate | uppercase }}
    - -
    -
    -
    - {{ 'i18n_multiplechoice_question_correct' | translate | uppercase }}
    -
    -
    -
    - - - + } + @for (option of question.options; track option; let i = $index) { +
    +
    + @if (question.type === 'MultipleChoiceQuestion') { + + + } + @if (question.type === 'WeightedMultipleChoiceQuestion') { + + } +
    -
    -
    -
    - {{ 'i18n_max_score' | translate | uppercase }}: - {{ calculateDefaultMaxPoints() }} + } + @if (question.type === 'WeightedMultipleChoiceQuestion') { +
    +
    + {{ 'i18n_max_score' | translate | uppercase }}: + {{ calculateDefaultMaxPoints() }} +
    -
    + }
    @@ -90,8 +104,6 @@ import { WeightedMultipleChoiceOptionEditorComponent } from './weighted-multiple `, standalone: true, imports: [ - NgIf, - NgFor, MultipleChoiceOptionEditorComponent, WeightedMultipleChoiceOptionEditorComponent, UpperCasePipe, @@ -104,7 +116,11 @@ export class MultipleChoiceEditorComponent implements OnInit { @Input() lotteryOn = false; @Input() allowOptionRemoval = false; - constructor(private translate: TranslateService, private toast: ToastrService, private Question: QuestionService) {} + constructor( + private translate: TranslateService, + private toast: ToastrService, + private Question: QuestionService, + ) {} ngOnInit() { if (this.question.type === 'WeightedMultipleChoiceQuestion') { diff --git a/ui/src/app/question/basequestion/question-body.component.html b/ui/src/app/question/basequestion/question-body.component.html index 4e940a684c..704c13c0dd 100644 --- a/ui/src/app/question/basequestion/question-body.component.html +++ b/ui/src/app/question/basequestion/question-body.component.html @@ -1,10 +1,10 @@