From 215b72f747e78c6d1ee2de1b8b52f4925ff76f89 Mon Sep 17 00:00:00 2001 From: Asli Aykan <56061820+asliayk@users.noreply.github.com> Date: Mon, 26 Aug 2024 11:18:06 +0200 Subject: [PATCH] Development: Replace the old translation feature in the client with the new desired approach (#8803) --- .../lti-configuration.component.html | 14 +- ...ification-management-update.component.html | 2 +- ...tem-notification-management.component.html | 12 +- ...pcoming-exams-and-exercises.component.html | 18 +- .../user-management.component.html | 50 ++-- .../assessment-complaint-alert.component.html | 4 +- .../assessment-warning.component.ts | 4 +- ...tructions-assessment-layout.component.html | 6 +- .../complaints-student-view.component.html | 10 +- .../complaints-for-tutor.component.html | 44 +--- .../form/complaints-form.component.html | 26 +- .../list-of-complaints.component.html | 63 +++-- .../request/complaint-request.component.html | 15 +- .../app/core/about-us/about-us.component.html | 20 +- ...-export-confirmation-dialog.component.html | 2 +- .../data-export/data-export.component.html | 6 +- .../competencies-popover.component.html | 10 +- .../competency-card.component.html | 2 +- .../competency-relation-graph.component.html | 10 +- .../import-all-competencies.component.html | 6 +- ...tency-recommendation-detail.component.html | 8 +- .../course-description-form.component.html | 12 +- .../import/competency-search.component.html | 24 +- .../course-scores.component.html | 12 +- ...sment-dashboard-information.component.html | 32 +-- .../assessment-dashboard.component.html | 28 +-- .../exam-assessment-buttons.component.html | 2 +- .../learning-path-legend.component.html | 20 +- .../learning-path.component.html | 2 +- .../learning-path-management.component.html | 2 +- .../course-lti-configuration.component.html | 34 +-- ...it-course-lti-configuration.component.html | 2 +- ...management-exercises-search.component.html | 28 +-- ...course-management-exercises.component.html | 4 +- .../manage/course-management.component.html | 8 +- .../manage/course-update.component.html | 34 ++- .../course-detail-line-chart.component.html | 21 +- .../course-management-card.component.html | 40 ++-- ...rse-management-exercise-row.component.html | 12 +- ...agement-overview-statistics.component.html | 2 +- ...case-instructor-detail-view.component.html | 20 +- ...arism-cases-instructor-view.component.html | 18 +- ...sm-case-student-detail-view.component.html | 10 +- .../tutorial-group-detail.component.html | 2 +- ...al-group-free-days-overview.component.html | 5 +- .../tutorial-group-session-row.component.html | 4 +- ...torial-group-sessions-table.component.html | 34 +-- .../tutorial-group-row.component.html | 4 +- .../tutorial-groups-table.component.html | 30 +-- .../registered-students.component.html | 11 +- ...-tutorial-group-free-period.component.html | 2 +- ...-tutorial-group-free-period.component.html | 2 +- ...rial-group-free-period-form.component.html | 60 ++--- ...oup-free-period-row-buttons.component.html | 2 +- ...oup-free-periods-management.component.html | 12 +- ...al-group-free-periods-table.component.html | 12 +- ...eate-tutorial-group-session.component.html | 2 +- ...edit-tutorial-group-session.component.html | 2 +- ...tutorial-group-session-form.component.html | 42 +--- .../cancellation-modal.component.html | 24 +- ...l-group-session-row-buttons.component.html | 2 +- ...l-group-sessions-management.component.html | 10 +- .../tutorial-groups-checklist.component.html | 26 +- ...torial-groups-configuration.component.html | 6 +- ...torial-groups-configuration.component.html | 2 +- ...l-groups-configuration-form.component.html | 63 +++-- .../create-tutorial-group.component.html | 2 +- .../edit-tutorial-group.component.html | 2 +- .../schedule-form.component.html | 64 ++--- .../tutorial-group-form.component.html | 92 +++----- .../tutorial-group-row-buttons.component.html | 6 +- ...l-groups-course-information.component.html | 4 +- ...torial-groups-import-button.component.html | 6 +- ...-registration-import-dialog.component.html | 25 +- .../tutorial-groups-management.component.html | 10 +- ...scores-average-scores-graph.component.html | 2 +- .../exam-scores/exam-scores.component.html | 145 +++++------- .../manage/exam-management.component.html | 30 +-- .../exam/manage/exam-status.component.html | 46 ++-- .../exam-checklist.component.html | 172 +++++++------- .../exam-edit-working-time.component.html | 2 +- .../manage/exams/exam-detail.component.html | 22 +- .../exam-import/exam-import.component.html | 8 +- .../exam-mode-picker.component.html | 17 +- .../manage/exams/exam-update.component.html | 14 +- .../exercise-group-update.component.html | 4 +- .../exercise-groups.component.html | 56 +++-- .../student-exams.component.html | 4 +- .../students/exam-students.component.html | 2 +- ...udents-upload-images-dialog.component.html | 2 +- ...m-students-attendance-check.component.html | 18 +- .../plagiarism-cases-overview.component.html | 28 ++- .../suspicious-behavior.component.html | 20 +- ...uspicious-sessions-overview.component.html | 14 +- .../test-run-management.component.html | 6 +- .../exam-participation-cover.component.html | 4 +- .../exam-navigation-bar.component.html | 25 +- .../exam-participation.component.html | 8 +- ...file-upload-exam-submission.component.html | 17 +- .../text/text-exam-submission.component.html | 8 +- .../exam-general-information.component.html | 8 +- .../exam-result-summary.component.html | 8 +- .../quiz-exam-summary.component.html | 4 +- .../events/exam-live-event.component.html | 17 +- .../file-upload-assessment.component.html | 4 +- ...file-upload-exercise-update.component.html | 26 +- .../file-upload-submission.component.html | 4 +- ...example-modeling-submission.component.html | 12 +- .../modeling-exercise-update.component.html | 48 ++-- ...ution-entry-generation-step.component.html | 4 +- .../git-diff-report-modal.component.html | 10 +- ...a-category-distribution-chart.component.ts | 47 ++-- ...est-case-distribution-chart.component.html | 49 ++-- ...-exercise-configure-grading.component.html | 6 +- ...xercise-grading-tasks-table.component.html | 4 +- ...ercise-instruction-analysis.component.html | 4 +- .../task-count-warning.component.html | 2 +- ...programming-exercise-detail.component.html | 2 +- ...rogramming-exercise-grading.component.html | 18 +- ...rogramming-exercise-problem.component.html | 12 +- ...de-editor-student-container.component.html | 20 +- .../programming-submission-policy-status.ts | 20 +- .../status/code-editor-status.component.html | 12 +- ...ise-instruction-step-wizard.component.html | 4 +- ...apollon-diagram-create-form.component.html | 22 +- .../apollon-diagram-detail.component.html | 13 +- .../apollon-diagram-list.component.html | 2 +- ...drag-and-drop-question-edit.component.html | 12 +- ...match-percentage-info-modal.component.html | 10 +- ...ltiple-choice-question-edit.component.html | 6 +- .../quiz-exercise-update.component.html | 12 +- .../quiz/manage/quiz-exercise.component.html | 12 +- .../quiz-scoring-info-modal.component.html | 14 +- ...te-multiple-choice-question.component.html | 6 +- .../quiz-re-evaluate.component.html | 4 +- .../short-answer-question-edit.component.html | 48 ++-- .../drag-and-drop-question.component.html | 20 +- .../multiple-choice-question.component.html | 14 +- ...iple-choice-visual-question.component.html | 4 +- .../short-answer-question.component.html | 8 +- .../assessment-progress-label.component.html | 22 +- ...ercise-assessment-dashboard.component.html | 146 ++++-------- .../difficulty-picker.component.html | 24 +- .../example-solution.component.html | 4 +- .../example-submission-import.component.html | 4 +- .../example-submissions.component.html | 2 +- ...rcise-detail-common-actions.component.html | 2 +- ...-exercise-page-with-details.component.html | 29 +-- .../header-participation-page.component.html | 6 +- .../exercise-hint-expandable.component.html | 4 +- ...xercise-hint-student-dialog.component.html | 9 +- .../exercise-info.component.html | 2 +- .../exercise-scores.component.html | 37 ++- .../exercise-update-warning.component.html | 4 +- .../shared/feedback/feedback.component.html | 32 +-- ...ded-in-overall-score-picker.component.html | 15 +- .../participation.component.html | 8 +- .../exercise-update-plagiarism.component.html | 13 +- .../plagiarism-header.component.html | 10 +- .../plagiarism-inspector.component.html | 16 +- .../plagiarism-run-details.component.html | 42 ++-- .../plagiarism-sidebar.component.html | 8 +- .../split-pane-header.component.html | 2 +- .../text-submission-viewer.component.html | 13 +- .../rating-list/rating-list.component.html | 20 +- .../shared/result/result.component.html | 35 +-- ...rading-instructions-details.component.html | 12 +- .../submission-policy-update.component.ts | 6 +- .../team-participation-table.component.html | 12 +- .../teams-import-dialog.component.html | 36 +-- .../shared/team/teams.component.html | 4 +- .../unreferenced-feedback.component.html | 11 +- .../text-assessment-area.component.html | 13 +- .../example-text-submission.component.html | 22 +- .../text-exercise-update.component.html | 22 +- .../feature-overview.component.html | 4 +- .../grading-system/bonus/bonus.component.html | 34 ++- .../detailed-grading-system.component.html | 24 +- .../grading-key-overview.component.html | 2 +- .../grading-key-table.component.html | 10 +- .../grading-system-info-modal.component.html | 26 +- .../grading-system.component.html | 12 +- .../interval-grading-system.component.html | 14 +- .../guided-tour/guided-tour.component.html | 2 +- .../iris/about-iris/about-iris.component.html | 8 +- .../iris-base-chatbot.component.html | 2 +- ...-common-sub-settings-update.component.html | 20 +- .../shared/iris-enabled.component.html | 10 +- .../lecture-attachments.component.html | 6 +- .../attachment-unit-form.component.html | 30 +-- .../attachment-units.component.html | 8 +- .../create-exercise-unit.component.html | 27 ++- .../lecture-unit-layout.component.html | 2 +- .../lecture-unit-management.component.html | 2 +- .../online-unit-form.component.html | 28 +-- .../text-unit-form.component.html | 12 +- .../video-unit-form.component.html | 34 +-- .../app/lecture/lecture-update.component.html | 14 +- .../webapp/app/lecture/lecture.component.html | 2 +- ...lecture-wizard-competencies.component.html | 12 +- ...course-competencies-details.component.html | 6 +- .../course-competencies.component.html | 10 +- ...nversations-code-of-conduct.component.html | 2 +- .../course-conversations.component.html | 4 +- .../course-wide-search.component.html | 8 +- .../channel-form/channel-form.component.html | 74 +++--- .../channels-create-dialog.component.html | 4 +- .../channel-item/channel-item.component.html | 38 ++- .../channels-overview-dialog.component.html | 12 +- ...conversation-add-users-form.component.html | 24 +- ...nversation-add-users-dialog.component.html | 4 +- .../conversation-detail-dialog.component.html | 41 +++- .../conversation-info.component.html | 32 ++- .../conversation-member-row.component.html | 27 ++- .../conversation-members.component.html | 18 +- .../conversation-settings.component.html | 27 ++- ...generic-confirmation-dialog.component.html | 2 +- ...update-text-property-dialog.component.html | 2 +- .../group-chat-create-dialog.component.html | 12 +- ...e-to-one-chat-create-dialog.component.html | 2 +- .../conversation-header.component.html | 10 +- .../conversation-messages.component.html | 17 +- .../course-dashboard.component.html | 2 +- .../course-exercise-row.component.html | 2 +- .../course-lecture-details.component.html | 30 ++- .../course-lecture-row.component.html | 2 +- .../overview/course-overview.component.html | 4 +- ...course-prerequisites-button.component.html | 4 +- .../course-registration-button.component.html | 4 +- .../course-registration-detail.component.html | 8 +- .../course-prerequisites-modal.component.html | 2 +- .../course-registration.component.html | 8 +- .../course-statistics.component.html | 222 +++++++++--------- .../course-tutorial-group-card.component.html | 11 +- .../course-unenrollment-modal.component.html | 20 +- .../app/overview/courses.component.html | 12 +- .../discussion-section.component.html | 28 +-- .../course-exercise-details.component.html | 10 +- .../problem-statement.component.html | 2 +- .../app/overview/header-course.component.html | 4 +- .../submission-result-status.component.html | 14 +- .../exercise-scores-chart.component.html | 6 +- .../code-button/code-button.component.html | 9 +- .../not-released-tag.component.html | 5 +- .../open-code-editor-button.component.html | 4 +- .../reset-repo-button.component.html | 6 +- .../start-practice-mode-button.component.html | 6 +- .../connection-warning.component.html | 4 +- .../consistency-check.component.html | 2 +- .../course-users-selector.component.html | 12 +- .../tutor-leaderboard.component.html | 18 +- .../date-time-picker.component.html | 2 +- .../exercise-categories.component.html | 2 +- .../layouts/navbar/navbar.component.html | 2 +- ...loading-indicator-container.component.html | 2 +- .../markdown-editor.component.html | 20 +- .../message-inline-input.component.html | 6 +- .../message-reply-inline-input.component.html | 6 +- .../posting-content-part.component.html | 4 +- .../posting-content.component.html | 8 +- .../post-create-edit-modal.component.html | 4 +- .../notification-sidebar.component.html | 24 +- ...icipant-scores-distribution.component.html | 8 +- ...tistics-average-score-graph.component.html | 18 +- ...cs-score-distribution-graph.component.html | 2 +- ...ype-ahead-user-search-field.component.html | 2 +- .../users-import-dialog.component.html | 12 +- .../account-information.component.html | 30 +-- .../notification-settings.component.html | 5 +- .../science-settings.component.html | 8 +- .../user-settings-container.component.html | 30 +-- ...sessment-complaint-alert.component.spec.ts | 9 +- .../code-editor-status.component.spec.ts | 33 ++- .../complaints-for-tutor.component.spec.ts | 11 +- ...res-average-scores-graph.component.spec.ts | 5 +- .../exercise-group-update.component.spec.ts | 5 +- .../exam-navigation-bar.component.spec.ts | 5 +- .../text-exam-submission.component.spec.ts | 2 + .../events/exam-live-event.component.spec.ts | 12 +- .../test-run-management.component.spec.ts | 1 + .../component/exercises/shared/result.spec.ts | 3 +- .../detailed-grading-system.component.spec.ts | 2 + ...versation-add-users-form.component.spec.ts | 5 +- .../course-statistics.component.spec.ts | 18 +- ...ramming-exercise-grading.component.spec.ts | 2 + .../shared/code-button.component.spec.ts | 2 + .../course-users-selector.component.spec.ts | 119 +++++----- .../notification-sidebar.component.spec.ts | 9 +- .../component/shared/result.component.spec.ts | 22 +- .../conversation-options.component.spec.ts | 5 +- ...tics-average-score-graph.component.spec.ts | 5 +- .../text-assessment-area.component.spec.ts | 11 +- ...xt-submission-assessment.component.spec.ts | 4 +- ...urse-tutorial-group-card.component.spec.ts | 17 +- ...ial-group-sessions-table.component.spec.ts | 12 +- .../tutorial-groups-table.component.spec.ts | 3 + ...l-group-free-period-form.component.spec.ts | 11 +- ...-free-periods-management.component.spec.ts | 4 +- ...orial-group-session-form.component.spec.ts | 11 +- ...roups-configuration-form.component.spec.ts | 11 +- ...gistration-import-dialog.component.spec.ts | 5 +- 301 files changed, 2269 insertions(+), 2614 deletions(-) diff --git a/src/main/webapp/app/admin/lti-configuration/lti-configuration.component.html b/src/main/webapp/app/admin/lti-configuration/lti-configuration.component.html index 6e026c952a34..32fb9e3112d8 100644 --- a/src/main/webapp/app/admin/lti-configuration/lti-configuration.component.html +++ b/src/main/webapp/app/admin/lti-configuration/lti-configuration.component.html @@ -8,7 +8,7 @@

-

{{ 'artemisApp.lti.dynamicRegistrationUrl' | artemisTranslate }}

+

@@ -17,7 +17,7 @@

{{ 'artemisApp.lti.dynamicRegistrationUrl' | artemisTran

-

{{ 'artemisApp.lti.configuredPlatforms' | artemisTranslate }}

+

@@ -130,35 +130,35 @@

{{ 'artemisApp.lti.configuredP
- {{ 'artemisApp.lti.deepLinkingUrl' | artemisTranslate }} +
{{ getDeepLinkingUrl() }}
- {{ 'artemisApp.lti.toolUrl' | artemisTranslate }} +
{{ getToolUrl() }}
- {{ 'artemisApp.lti.keysetUrl' | artemisTranslate }} +
{{ getKeysetUrl() }}
- {{ 'artemisApp.lti.initiateLoginUrl' | artemisTranslate }} +
{{ getInitiateLoginUrl() }}
- {{ 'artemisApp.lti.redirectUri' | artemisTranslate }} +
{{ getRedirectUri() }} diff --git a/src/main/webapp/app/admin/system-notification-management/system-notification-management-update.component.html b/src/main/webapp/app/admin/system-notification-management/system-notification-management-update.component.html index 8abce445fd5f..f04719bda98d 100644 --- a/src/main/webapp/app/admin/system-notification-management/system-notification-management-update.component.html +++ b/src/main/webapp/app/admin/system-notification-management/system-notification-management-update.component.html @@ -35,7 +35,7 @@

@if (expireDate?.errors?.expireMustBeAfterNotification) { - {{ 'error.systemNotificationNeedsNotificationBeforeExpiration' | artemisTranslate }} + }

diff --git a/src/main/webapp/app/admin/system-notification-management/system-notification-management.component.html b/src/main/webapp/app/admin/system-notification-management/system-notification-management.component.html index d6b7c7feca64..867f0c697bb2 100644 --- a/src/main/webapp/app/admin/system-notification-management/system-notification-management.component.html +++ b/src/main/webapp/app/admin/system-notification-management/system-notification-management.component.html @@ -30,19 +30,13 @@

@switch (getNotificationState(notification)) { @case (ACTIVE) { - - {{ 'artemisApp.systemNotification.active' | artemisTranslate }} - + } @case (EXPIRED) { - - {{ 'artemisApp.systemNotification.expired' | artemisTranslate }} - + } @case (SCHEDULED) { - - {{ 'artemisApp.systemNotification.scheduled' | artemisTranslate }} - + } } diff --git a/src/main/webapp/app/admin/upcoming-exams-and-exercises/upcoming-exams-and-exercises.component.html b/src/main/webapp/app/admin/upcoming-exams-and-exercises/upcoming-exams-and-exercises.component.html index 1451541419e2..9d928688216a 100644 --- a/src/main/webapp/app/admin/upcoming-exams-and-exercises/upcoming-exams-and-exercises.component.html +++ b/src/main/webapp/app/admin/upcoming-exams-and-exercises/upcoming-exams-and-exercises.component.html @@ -10,16 +10,16 @@

- {{ 'artemisApp.upcomingExamsAndExercises.exercise' | artemisTranslate }} + - {{ 'artemisApp.upcomingExamsAndExercises.course' | artemisTranslate }} + - {{ 'artemisApp.upcomingExamsAndExercises.releaseDate' | artemisTranslate }} + - {{ 'artemisApp.upcomingExamsAndExercises.dueDate' | artemisTranslate }} + @@ -61,19 +61,19 @@

- {{ 'artemisApp.upcomingExamsAndExercises.exam' | artemisTranslate }} + - {{ 'artemisApp.upcomingExamsAndExercises.course' | artemisTranslate }} + - {{ 'artemisApp.examManagement.visibleDate' | artemisTranslate }} + - {{ 'artemisApp.examManagement.startDate' | artemisTranslate }} + - {{ 'artemisApp.examManagement.endDate' | artemisTranslate }} + diff --git a/src/main/webapp/app/admin/user-management/user-management.component.html b/src/main/webapp/app/admin/user-management/user-management.component.html index 1c824ea864d0..60a62a3cd70c 100644 --- a/src/main/webapp/app/admin/user-management/user-management.component.html +++ b/src/main/webapp/app/admin/user-management/user-management.component.html @@ -63,9 +63,11 @@

[ngClass]="{ 'btn-secondary': !filters.numberOfAppliedFilters, 'btn-success': !!filters.numberOfAppliedFilters }" > - {{ - 'artemisApp.userManagement.filter.modal.open' | artemisTranslate: { num: filters.numberOfAppliedFilters } - }} + @@ -227,14 +229,14 @@

-
{{ 'artemisApp.userManagement.filter.modal.title' | artemisTranslate }}
+
-
{{ 'artemisApp.userManagement.filter.authority.title' | artemisTranslate: { num: this.filters.authorityFilter.size } }}
+
@@ -250,9 +252,7 @@
{{ 'artemisApp.userManagement.filter.authority.title' | artemis (click)="selectAllRoles()" [checked]="this.filters.authorityFilter.size === this.authorityFilters.length && !this.filters.noAuthority" /> - +
{{ 'artemisApp.userManagement.filter.authority.title' | artemis (click)="selectEmptyRoles()" [checked]="this.filters.authorityFilter.size === 0 && this.filters.noAuthority" /> - +
@@ -275,9 +273,7 @@
{{ 'artemisApp.userManagement.filter.authority.title' | artemis (click)="deselectAllRoles()" [checked]="this.filters.authorityFilter.size === 0 && !this.filters.noAuthority" /> - +
@@ -304,7 +300,7 @@
{{ 'artemisApp.userManagement.filter.authority.title' | artemis
-
{{ 'artemisApp.userManagement.filter.origin.title' | artemisTranslate: { num: this.filters.originFilter.size } }}
+
@@ -321,16 +317,18 @@
{{ 'artemisApp.userManagement.filter.origin.title' | artemisTra }
  • - +
    • -
    {{ 'artemisApp.userManagement.filter.registrationNumber.title' | artemisTranslate: { num: this.filters.registrationNumberFilter.size } }}
    +
    @@ -360,16 +358,14 @@
    {{ 'artemisApp.userManagement.filter.registrationNumber.title' (click)="this.toggleRegistrationNumberFilter()" [checked]="this.filters.registrationNumberFilter.size === 0" /> - +
    -
    {{ 'artemisApp.userManagement.filter.status.title' | artemisTranslate: { num: this.filters.statusFilter.size } }}
    +
    @@ -386,9 +382,7 @@
    {{ 'artemisApp.userManagement.filter.status.title' | artemisTra }
  • - +
    • @@ -396,9 +390,7 @@
    {{ 'artemisApp.userManagement.filter.status.title' | artemisTra
    - + diff --git a/src/main/webapp/app/assessment/assessment-complaint-alert/assessment-complaint-alert.component.html b/src/main/webapp/app/assessment/assessment-complaint-alert/assessment-complaint-alert.component.html index f9b64a37cc41..5cc591067229 100644 --- a/src/main/webapp/app/assessment/assessment-complaint-alert/assessment-complaint-alert.component.html +++ b/src/main/webapp/app/assessment/assessment-complaint-alert/assessment-complaint-alert.component.html @@ -1,8 +1,8 @@ @if (complaint) { @if (complaint?.complaintType === ComplaintType.COMPLAINT) { -
    {{ 'artemisApp.complaint.hint' | artemisTranslate }}
    +
    } @if (complaint?.complaintType === ComplaintType.MORE_FEEDBACK) { -
    {{ 'artemisApp.moreFeedback.hint' | artemisTranslate }}
    +
    } } diff --git a/src/main/webapp/app/assessment/assessment-warning/assessment-warning.component.ts b/src/main/webapp/app/assessment/assessment-warning/assessment-warning.component.ts index aa21e99239c3..42120b935660 100644 --- a/src/main/webapp/app/assessment/assessment-warning/assessment-warning.component.ts +++ b/src/main/webapp/app/assessment/assessment-warning/assessment-warning.component.ts @@ -17,10 +17,10 @@ import { Submission } from 'app/entities/submission.model';
    @if (isBeforeExerciseDueDate) { - {{ 'artemisApp.assessment.dashboard.warning' | artemisTranslate }} + } @if (!isBeforeExerciseDueDate) { - {{ 'artemisApp.assessment.dashboard.warningIndividual' | artemisTranslate }} + }
    } diff --git a/src/main/webapp/app/assessment/structured-grading-instructions-assessment-layout/structured-grading-instructions-assessment-layout.component.html b/src/main/webapp/app/assessment/structured-grading-instructions-assessment-layout/structured-grading-instructions-assessment-layout.component.html index bd1b68e325b8..a270275fdf7b 100644 --- a/src/main/webapp/app/assessment/structured-grading-instructions-assessment-layout/structured-grading-instructions-assessment-layout.component.html +++ b/src/main/webapp/app/assessment/structured-grading-instructions-assessment-layout/structured-grading-instructions-assessment-layout.component.html @@ -1,17 +1,17 @@ @if (criteria) {
    } @if (allowDrop) {
    - {{ 'artemisApp.exercise.dragDropInstruction' | artemisTranslate }} +
    } @for (criterion of criteria; track criterion; let criterionIndex = $index) { diff --git a/src/main/webapp/app/complaints/complaints-for-students/complaints-student-view.component.html b/src/main/webapp/app/complaints/complaints-for-students/complaints-student-view.component.html index efd1d1c458d1..c59190b2dad7 100644 --- a/src/main/webapp/app/complaints/complaints-for-students/complaints-student-view.component.html +++ b/src/main/webapp/app/complaints/complaints-for-students/complaints-student-view.component.html @@ -30,9 +30,8 @@ ? ('artemisApp.complaint.complaintNotAllowedTooltip' | artemisTranslate) : '' }}" - > - {{ 'artemisApp.complaint.moreInfo' | artemisTranslate }} - + jhiTranslate="artemisApp.complaint.moreInfo" + > } @if (!isExamMode && course?.requestMoreFeedbackEnabled) { + jhiTranslate="artemisApp.moreFeedback.button" + > }
    } diff --git a/src/main/webapp/app/complaints/complaints-for-tutor/complaints-for-tutor.component.html b/src/main/webapp/app/complaints/complaints-for-tutor/complaints-for-tutor.component.html index 0997b352dbbd..97bd1ae26257 100644 --- a/src/main/webapp/app/complaints/complaints-for-tutor/complaints-for-tutor.component.html +++ b/src/main/webapp/app/complaints/complaints-for-tutor/complaints-for-tutor.component.html @@ -1,25 +1,20 @@ @if (isLoading) {
    } @if (!isLoading && complaint) { -

    - {{ complaint.complaintType === ComplaintType.MORE_FEEDBACK ? ('artemisApp.moreFeedback.review' | artemisTranslate) : ('artemisApp.complaint.review' | artemisTranslate) }} -

    +

    } @if (!isLoading && complaint) {
    @if (handled) { -
    - {{ - complaint.complaintType === ComplaintType.MORE_FEEDBACK - ? ('artemisApp.moreFeedback.alreadyHandled' | artemisTranslate) - : ('artemisApp.complaint.complaintAlreadyHandled' | artemisTranslate) - }} -
    +
    }
    @if (showLockDuration) { @@ -35,21 +30,13 @@

    } @if (lockedByCurrentUser) { - + }

    - {{ - complaint.complaintType === ComplaintType.MORE_FEEDBACK - ? ('artemisApp.moreFeedback.title' | artemisTranslate) - : ('artemisApp.complaint.title' | artemisTranslate) - }} - + @if (handled) { @if (complaint?.accepted) { @@ -71,13 +58,9 @@

    @if (handled || isAllowedToRespond) {
    -

    - {{ - complaint.complaintType === ComplaintType.MORE_FEEDBACK - ? ('artemisApp.moreFeedbackResponse.title' | artemisTranslate) - : ('artemisApp.complaintResponse.title' | artemisTranslate) - }} -

    +

    diff --git a/src/main/webapp/app/complaints/list-of-complaints/list-of-complaints.component.html b/src/main/webapp/app/complaints/list-of-complaints/list-of-complaints.component.html index 0651cc2ad7e5..ff642a21befc 100644 --- a/src/main/webapp/app/complaints/list-of-complaints/list-of-complaints.component.html +++ b/src/main/webapp/app/complaints/list-of-complaints/list-of-complaints.component.html @@ -3,10 +3,10 @@

    @if (complaintType === ComplaintType.COMPLAINT) { - {{ 'artemisApp.complaint.listOfComplaints.title' | artemisTranslate }} + } @if (complaintType === ComplaintType.MORE_FEEDBACK) { - {{ 'artemisApp.moreFeedback.list.title' | artemisTranslate }} + }

    @@ -15,16 +15,16 @@

    @if (!allComplaintsForTutorLoaded && complaintType === ComplaintType.COMPLAINT) { - {{ 'artemisApp.complaint.listOfComplaints.loadAllComplaintsExplanation' | artemisTranslate }} + } @if (!allComplaintsForTutorLoaded && complaintType === ComplaintType.MORE_FEEDBACK) { - {{ 'artemisApp.moreFeedback.list.loadAllRequestsExplanation' | artemisTranslate }} + } @if (allComplaintsForTutorLoaded && complaintType === ComplaintType.COMPLAINT) { - {{ 'artemisApp.complaint.listOfComplaints.allComplaintsLoaded' | artemisTranslate }} + } @if (allComplaintsForTutorLoaded && complaintType === ComplaintType.MORE_FEEDBACK) { - {{ 'artemisApp.moreFeedback.list.allRequestsLoaded' | artemisTranslate }} + } @if (!allComplaintsForTutorLoaded) { } @@ -59,13 +59,12 @@

    />

    @@ -80,48 +79,48 @@

    - {{ 'artemisApp.complaint.listOfComplaints.exercise' | artemisTranslate }} + - {{ 'artemisApp.complaint.listOfComplaints.submissionId' | artemisTranslate }} + - {{ 'artemisApp.complaint.listOfComplaints.assessorName' | artemisTranslate }} + @if (course?.isAtLeastInstructor) { - {{ 'artemisApp.complaint.listOfComplaints.studentLogin' | artemisTranslate }} + - {{ 'artemisApp.complaint.listOfComplaints.studentName' | artemisTranslate }} + - {{ 'artemisApp.complaint.listOfComplaints.reviewerName' | artemisTranslate }} + } - {{ 'artemisApp.complaint.listOfComplaints.dateAndTime' | artemisTranslate }} + - {{ 'artemisApp.complaint.listOfComplaints.responseTime' | artemisTranslate }} + - {{ 'artemisApp.complaint.listOfComplaints.status' | artemisTranslate }} + - {{ 'artemisApp.locks.lockStatus' | artemisTranslate }} + - {{ 'artemisApp.complaint.listOfComplaints.actions' | artemisTranslate }} + @@ -166,16 +165,16 @@

    @if (complaint.accepted === undefined) { - {{ 'artemisApp.complaint.listOfComplaints.noReply' | artemisTranslate }} + } @if (complaint.accepted === true && complaintType === ComplaintType.COMPLAINT) { - {{ 'artemisApp.complaint.listOfComplaints.accepted' | artemisTranslate }} + } @if (complaint.accepted === true && complaintType === ComplaintType.MORE_FEEDBACK) { - {{ 'artemisApp.moreFeedback.accepted' | artemisTranslate }} + } @if (complaint.accepted === false) { - {{ 'artemisApp.complaint.listOfComplaints.rejected' | artemisTranslate }} + } @@ -185,10 +184,10 @@

    @@ -199,10 +198,10 @@

    @if (complaintType === ComplaintType.COMPLAINT) { - {{ 'artemisApp.exerciseAssessmentDashboard.noComplaints' | artemisTranslate }} + } @if (complaintType === ComplaintType.MORE_FEEDBACK) { - {{ 'artemisApp.exerciseAssessmentDashboard.noMoreFeedbackRequests' | artemisTranslate }} + }

    diff --git a/src/main/webapp/app/complaints/request/complaint-request.component.html b/src/main/webapp/app/complaints/request/complaint-request.component.html index 5c3b8f448f1c..2f86094c7345 100644 --- a/src/main/webapp/app/complaints/request/complaint-request.component.html +++ b/src/main/webapp/app/complaints/request/complaint-request.component.html @@ -7,18 +7,13 @@ }} {{ complaint.submittedTime | artemisTimeAgo }} @if (complaint.accepted === true) { - - {{ - complaint.complaintType === ComplaintType.COMPLAINT - ? ('artemisApp.complaint.acceptedLong' | artemisTranslate) - : ('artemisApp.moreFeedback.acceptedLong' | artemisTranslate) - }} - + } @if (complaint.accepted === false) { - - {{ 'artemisApp.complaint.rejectedLong' | artemisTranslate }} - + }

    - +
    - +

    [ngModel]="hideOptional" (ngModelChange)="triggerOptionalExercises()" /> - + } @@ -120,33 +116,33 @@

    - {{ 'artemisApp.assessmentDashboard.exerciseType' | artemisTranslate }} + - {{ 'artemisApp.assessmentDashboard.exercise' | artemisTranslate }} + @if (!isTestRun) { - {{ 'artemisApp.assessmentDashboard.yourStatus' | artemisTranslate }} + } - {{ 'artemisApp.assessmentDashboard.exerciseAverageRating' | artemisTranslate }} + @if (!isExamMode) { - {{ 'artemisApp.assessmentDashboard.exerciseDueDate' | artemisTranslate }} + } @if (!isExamMode) { - {{ 'artemisApp.assessmentDashboard.assessmentsDueDate' | artemisTranslate }} + } - {{ 'artemisApp.assessmentDashboard.actions' | artemisTranslate }} + @@ -241,7 +237,7 @@

    @if (course && course.isAtLeastInstructor && tutorIssues.length > 0) {
    -

    {{ 'artemisApp.assessmentDashboard.tutorPerformanceIssues.title' | artemisTranslate }}

    +

    @for (issue of tutorIssues; track issue) {
      @if (issue.averageTutorValue < issue.allowedRange.lowerBound) { @@ -278,10 +274,10 @@

      {{ 'artemisApp.assessmentDashboard.tutorPerformanceIssues.title' | artemisTr }
      @if (!isExamMode) { -

      {{ 'artemisApp.assessmentDashboard.tutorLeaderboard.courseTitle' | artemisTranslate }}

      +

      } @if (isExamMode) { -

      {{ 'artemisApp.assessmentDashboard.tutorLeaderboard.examTitle' | artemisTranslate }}

      +

      }
      diff --git a/src/main/webapp/app/course/dashboards/assessment-dashboard/exam-assessment-buttons/exam-assessment-buttons.component.html b/src/main/webapp/app/course/dashboards/assessment-dashboard/exam-assessment-buttons/exam-assessment-buttons.component.html index 988ad7835bce..1bae6b366f55 100644 --- a/src/main/webapp/app/course/dashboards/assessment-dashboard/exam-assessment-buttons/exam-assessment-buttons.component.html +++ b/src/main/webapp/app/course/dashboards/assessment-dashboard/exam-assessment-buttons/exam-assessment-buttons.component.html @@ -3,7 +3,7 @@ - {{ 'artemisApp.examManagement.gradingSystem' | artemisTranslate }} +

    } @@ -13,9 +11,7 @@
    - - {{ 'artemisApp.learningPath.graph.legend.matchStart.title' | artemisTranslate }} - +
    } @@ -23,9 +19,7 @@
    - - {{ 'artemisApp.learningPath.graph.legend.matchEnd.title' | artemisTranslate }} - +
    } @@ -33,9 +27,7 @@
    - - {{ 'artemisApp.learningPath.graph.legend.learningObject.title' | artemisTranslate }} - +
    } @@ -43,9 +35,7 @@
    - - {{ 'artemisApp.learningPath.graph.legend.completedLearningObject.title' | artemisTranslate }} - +
    } diff --git a/src/main/webapp/app/course/learning-paths/learning-path-graph/learning-path.component.html b/src/main/webapp/app/course/learning-paths/learning-path-graph/learning-path.component.html index 396b2735560b..864bcc2920b0 100644 --- a/src/main/webapp/app/course/learning-paths/learning-path-graph/learning-path.component.html +++ b/src/main/webapp/app/course/learning-paths/learning-path-graph/learning-path.component.html @@ -1,7 +1,7 @@ @if (isLoading) {
    } @else { diff --git a/src/main/webapp/app/course/learning-paths/learning-path-management/learning-path-management.component.html b/src/main/webapp/app/course/learning-paths/learning-path-management/learning-path-management.component.html index 061c611f6b93..c8a10304da15 100644 --- a/src/main/webapp/app/course/learning-paths/learning-path-management/learning-path-management.component.html +++ b/src/main/webapp/app/course/learning-paths/learning-path-management/learning-path-management.component.html @@ -1,7 +1,7 @@ @if (isLoading) {
    } diff --git a/src/main/webapp/app/course/manage/course-lti-configuration/course-lti-configuration.component.html b/src/main/webapp/app/course/manage/course-lti-configuration/course-lti-configuration.component.html index 8c267652beff..b7252be6dc5d 100644 --- a/src/main/webapp/app/course/manage/course-lti-configuration/course-lti-configuration.component.html +++ b/src/main/webapp/app/course/manage/course-lti-configuration/course-lti-configuration.component.html @@ -16,28 +16,28 @@

    New Window
    - {{ 'artemisApp.lti.scored' | artemisTranslate }} +
    True
    - {{ 'artemisApp.lti.requestUsername' | artemisTranslate }} +
    True
    - {{ 'artemisApp.lti.requestEmail' | artemisTranslate }} +
    diff --git a/src/main/webapp/app/course/manage/course-lti-configuration/edit-course-lti-configuration.component.html b/src/main/webapp/app/course/manage/course-lti-configuration/edit-course-lti-configuration.component.html index 85a65e3bf46f..4b6e4c70cea3 100644 --- a/src/main/webapp/app/course/manage/course-lti-configuration/edit-course-lti-configuration.component.html +++ b/src/main/webapp/app/course/manage/course-lti-configuration/edit-course-lti-configuration.component.html @@ -36,7 +36,7 @@
    - {{ 'artemisApp.lti13.externalToolSettings' | artemisTranslate }} +
    diff --git a/src/main/webapp/app/course/manage/course-management-exercises-search.component.html b/src/main/webapp/app/course/manage/course-management-exercises-search.component.html index df388fd7b0af..67fdb931241a 100644 --- a/src/main/webapp/app/course/manage/course-management-exercises-search.component.html +++ b/src/main/webapp/app/course/manage/course-management-exercises-search.component.html @@ -1,12 +1,10 @@
    -
    {{ 'artemisApp.course.exercise.search.cardTitle' | artemisTranslate }}
    +
    - + {{ 'artemisApp.course.exercise.search.cardTitle' | artemisTrans
    - + {{ 'artemisApp.course.exercise.search.cardTitle' | artemisTrans />
    - + (focus)="tzFocus$.next($any($event).target.value)" (click)="tzClick$.next($any($event).target.value)" /> -
    - {{ 'artemisApp.forms.configurationForm.timeZoneInput.explanation' | artemisTranslate }} -
    +
    }
    diff --git a/src/main/webapp/app/course/manage/detail/course-detail-line-chart.component.html b/src/main/webapp/app/course/manage/detail/course-detail-line-chart.component.html index b499fda9b56b..9d379b38622e 100644 --- a/src/main/webapp/app/course/manage/detail/course-detail-line-chart.component.html +++ b/src/main/webapp/app/course/manage/detail/course-detail-line-chart.component.html @@ -1,7 +1,7 @@
    -
    {{ 'artemisApp.courseStatistics.activeStudents' | artemisTranslate }}
    +
    @@ -16,25 +16,24 @@
    {{ 'artemisApp.courseStatistics.activeStudents' | artemisTranslate }}
    [disabled]="!showLifetimeOverview && displayedNumberOfWeeks === 4" (click)="displayPeriodOverview(4)" ngbTooltip="{{ 'artemisApp.courseStatistics.scopeButton.periodTooltip' | artemisTranslate: { amount: 4 } }}" - > - {{ 'artemisApp.courseStatistics.scopeButton.period' | artemisTranslate: { amount: 4 } }} - + jhiTranslate="artemisApp.courseStatistics.scopeButton.period" + [translateValues]="{ amount: 4 }" + > + jhiTranslate="artemisApp.courseStatistics.scopeButton.period" + [translateValues]="{ amount: 8 }" + > + jhiTranslate="artemisApp.courseStatistics.scopeButton.overview" + >
    | } @@ -85,7 +84,7 @@

    } @else { -

    {{ 'artemisApp.course.notStartedYet' | artemisTranslate }}

    +

    {{ course.startDate | artemisDate }}

     } diff --git a/src/main/webapp/app/course/manage/overview/course-management-card.component.html b/src/main/webapp/app/course/manage/overview/course-management-card.component.html index 3619d90a93d8..adf01ba9af77 100644 --- a/src/main/webapp/app/course/manage/overview/course-management-card.component.html +++ b/src/main/webapp/app/course/manage/overview/course-management-card.component.html @@ -40,9 +40,7 @@

    {{ course.title }} ({{ } @if (courseWithUsers.numberOfStudents === undefined) { - - {{ 'artemisApp.course.students' | artemisTranslate }} - + }

    @@ -57,9 +55,7 @@

    {{ course.title }} ({{ } @if (courseWithUsers.numberOfTeachingAssistants === undefined) { - - {{ 'artemisApp.course.tutors' | artemisTranslate }} - + }

    @@ -76,9 +72,7 @@

    {{ course.title }} ({{ } @if (courseWithUsers.numberOfEditors === undefined) { - - {{ 'artemisApp.course.editors' | artemisTranslate }} - + }

    @@ -93,9 +87,7 @@

    {{ course.title }} ({{ } @if (courseWithUsers.numberOfInstructors === undefined) { - - {{ 'artemisApp.course.instructors' | artemisTranslate }} - + }

    @@ -116,7 +108,7 @@

    {{ course.title }} ({{
    - {{ 'artemisApp.course.releasedSoon' | artemisTranslate }} +
    @if (showFutureExercises) {
    @@ -139,7 +131,7 @@

    {{ course.title }} ({{
    - {{ 'artemisApp.course.currentWorking' | artemisTranslate }} +
    @if (showCurrentExercises) {
    @@ -162,7 +154,7 @@

    {{ course.title }} ({{
    - {{ 'artemisApp.course.inAssessment' | artemisTranslate }} +
    @if (showExercisesInAssessment) {
    @@ -185,7 +177,7 @@

    {{ course.title }} ({{
    - {{ 'artemisApp.course.pastExercises' | artemisTranslate: { amount: pastExercises.length, total: pastExerciseCount } }} +
    @if (showPastExercises) {
    @@ -206,7 +198,7 @@

    {{ course.title }} ({{ } @if ((futureExercises?.length || 0) + (currentExercises?.length || 0) + (exercisesInAssessment?.length || 0) + (pastExercises?.length || 0) === 0) {
    -

    {{ 'artemisApp.course.noExercises' | artemisTranslate }}

    +

    }

    @@ -240,7 +232,7 @@

    {{ 'artemisApp.course.noExer id="course-card-open-exams" > - {{ 'entity.action.exams' | artemisTranslate }} + } @if (course.isAtLeastTutor) { @@ -252,7 +244,7 @@

    {{ 'artemisApp.course.noExer id="course-card-open-exercises" > - {{ 'entity.action.exercise' | artemisTranslate }} + } @if (course.isAtLeastEditor) { @@ -263,7 +255,7 @@

    {{ 'artemisApp.course.noExer id="course-card-open-lectures" > - {{ 'entity.action.lecture' | artemisTranslate }} + } @if (course.isAtLeastTutor) { @@ -274,7 +266,7 @@

    {{ 'artemisApp.course.noExer id="course-card-open-open-statistics" > - {{ 'artemisApp.courseStatistics.statistics' | artemisTranslate }} + } @if (isCommunicationEnabled(course) && course.isAtLeastTutor) { @@ -284,7 +276,7 @@

    {{ 'artemisApp.course.noExer [ngbTooltip]="'artemisApp.courseOverview.menu.communication' | artemisTranslate" > - {{ 'artemisApp.metis.communication.label' | artemisTranslate }} + } @if (course.timeZone || course.isAtLeastInstructor) { @@ -332,7 +324,7 @@

    {{ 'artemisApp.course.noExer id="course-card-open-assessment-dashboard" > - {{ 'entity.action.assessmentDashboard' | artemisTranslate }} + } @if (course.isAtLeastInstructor) { @@ -343,7 +335,7 @@

    {{ 'artemisApp.course.noExer id="course-card-open-scores" > - {{ 'entity.action.scores' | artemisTranslate }} + }

    diff --git a/src/main/webapp/app/course/manage/overview/course-management-exercise-row.component.html b/src/main/webapp/app/course/manage/overview/course-management-exercise-row.component.html index f4940c20c0c4..e5f8cdd9dee2 100644 --- a/src/main/webapp/app/course/manage/overview/course-management-exercise-row.component.html +++ b/src/main/webapp/app/course/manage/overview/course-management-exercise-row.component.html @@ -25,7 +25,7 @@
    - {{ 'artemisApp.course.releaseDate' | artemisTranslate }} + @if (!details.releaseDate) {
    @@ -51,7 +51,7 @@
    - {{ 'artemisApp.course.dueDate' | artemisTranslate }} + @if (!details.dueDate) {
    @@ -77,7 +77,7 @@
    - {{ 'artemisApp.course.assessmentDueDate' | artemisTranslate }} + @if (!details.assessmentDueDate) {
    @@ -105,7 +105,7 @@
    @if (statistic && rowType === exerciseRowType.CURRENT) {
    - {{ 'artemisApp.course.participations' | artemisTranslate }} + - {{ 'artemisApp.course.assessmentProgress' | artemisTranslate }} + - {{ 'artemisApp.course.averageScore' | artemisTranslate }} +
    -

    {{ 'artemisApp.courseStatistics.activeStudents' | artemisTranslate }}

    +

    diff --git a/src/main/webapp/app/course/plagiarism-cases/instructor-view/detail-view/plagiarism-case-instructor-detail-view.component.html b/src/main/webapp/app/course/plagiarism-cases/instructor-view/detail-view/plagiarism-case-instructor-detail-view.component.html index d6a8cb3f33ac..a66f7b342595 100644 --- a/src/main/webapp/app/course/plagiarism-cases/instructor-view/detail-view/plagiarism-case-instructor-detail-view.component.html +++ b/src/main/webapp/app/course/plagiarism-cases/instructor-view/detail-view/plagiarism-case-instructor-detail-view.component.html @@ -3,7 +3,7 @@
    -

    {{ 'artemisApp.plagiarism.plagiarismCases.plagiarismCase' | artemisTranslate }}

    +

    @@ -50,28 +50,26 @@

    {{ 'artemisApp.plagiarism.plagiarismCases.plagiarismCase' | artem

    -

    {{ 'artemisApp.plagiarism.plagiarismCases.conversation' | artemisTranslate }}

    +

    @if (posts && posts.length > 0) { } @if ((!posts || posts.length === 0) && createdPost) {
    - +
    }
    -

    {{ 'artemisApp.plagiarism.plagiarismCases.verdict.verdict' | artemisTranslate }}

    -

    {{ 'artemisApp.plagiarism.plagiarismCases.verdict.text' | artemisTranslate }}

    +

    +

    • -

      {{ 'artemisApp.plagiarism.plagiarismCases.verdict.plagiarismDescription' | artemisTranslate }}

      +

      {{ 'artemisApp.plagiarism.plagiarismCases.verdict.verdict' | ar
    • -

      {{ 'artemisApp.plagiarism.plagiarismCases.verdict.pointDeductionDescription' | artemisTranslate }}

      +

      {{ 'artemisApp.plagiarism.plagiarismCases.verdict.verdict' | ar
    • -

      {{ 'artemisApp.plagiarism.plagiarismCases.verdict.warningDescription' | artemisTranslate }}

      +

      @if (form.controls.reason?.invalid && (form.controls.reason?.dirty || (form.controls.reason?.touched && form.controls.reason?.errors?.maxlength))) { -
      - {{ 'artemisApp.forms.tutorialFreePeriodForm.reasonInput.maxLengthValidationError' | artemisTranslate: { max: '256' } }} -
      +
      }
      diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-period-row-buttons/tutorial-group-free-period-row-buttons.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-period-row-buttons/tutorial-group-free-period-row-buttons.component.html index 5b80e8513372..fca57919527d 100644 --- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-period-row-buttons/tutorial-group-free-period-row-buttons.component.html +++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-period-row-buttons/tutorial-group-free-period-row-buttons.component.html @@ -3,7 +3,7 @@
    -
    - {{ 'artemisApp.pages.tutorialFreePeriodsManagement.timeZoneExplanation' | artemisTranslate: { timeZone: course.timeZone } }} -
    +
    diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-periods-table/tutorial-group-free-periods-table.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-periods-table/tutorial-group-free-periods-table.component.html index 70611f9df79b..7c274032f21b 100644 --- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-periods-table/tutorial-group-free-periods-table.component.html +++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-periods-table/tutorial-group-free-periods-table.component.html @@ -3,12 +3,12 @@ - - - - - - + + + + + + diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/create-tutorial-group-session/create-tutorial-group-session.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/create-tutorial-group-session/create-tutorial-group-session.component.html index b2c5a5875541..a4637425d034 100644 --- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/create-tutorial-group-session/create-tutorial-group-session.component.html +++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/create-tutorial-group-session/create-tutorial-group-session.component.html @@ -2,7 +2,7 @@ @if (isInitialized) {
    -

    {{ 'artemisApp.pages.createTutorialSession.title' | artemisTranslate }}

    +

    diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/edit-tutorial-group-session/edit-tutorial-group-session.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/edit-tutorial-group-session/edit-tutorial-group-session.component.html index 41e95ab0fb46..bbd1add0ab9b 100644 --- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/edit-tutorial-group-session/edit-tutorial-group-session.component.html +++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/edit-tutorial-group-session/edit-tutorial-group-session.component.html @@ -2,7 +2,7 @@ @if (isInitialized) {
    -

    {{ 'artemisApp.pages.editTutorialSession.title' | artemisTranslate }}

    +

    diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/tutorial-group-session-form/tutorial-group-session-form.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/tutorial-group-session-form/tutorial-group-session-form.component.html index 818bd2dafafe..539ff442d0fe 100644 --- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/tutorial-group-session-form/tutorial-group-session-form.component.html +++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/tutorial-group-session-form/tutorial-group-session-form.component.html @@ -1,15 +1,13 @@
    -
    - {{ 'artemisApp.generic.timeZone' | artemisTranslate: { timeZone } }} -
    +
    @if (form) {
    - +
    @if (dateControl?.errors?.required) { -
    - {{ 'artemisApp.forms.sessionForm.dateInput.requiredDateError' | artemisTranslate }} -
    +
    } @if (dateControl?.errors?.owlDateTimeParse) { -
    - {{ 'artemisApp.forms.sessionForm.dateInput.parseError' | artemisTranslate }} -
    +
    }
    } @@ -45,13 +39,13 @@
    - {{ 'artemisApp.forms.sessionForm.timeInput.from' | artemisTranslate }} +
    - {{ 'artemisApp.forms.sessionForm.timeInput.to' | artemisTranslate }} +
    @@ -60,34 +54,28 @@ @if (startTimeControl?.invalid && (startTimeControl?.dirty || startTimeControl?.touched)) {
    @if (startTimeControl?.errors?.required) { -
    - {{ 'artemisApp.forms.sessionForm.timeInput.invalidTimeRange' | artemisTranslate }} -
    +
    }
    } @if (endTimeControl?.invalid && (endTimeControl?.dirty || endTimeControl?.touched)) {
    @if (endTimeControl?.errors?.required) { -
    - {{ 'artemisApp.forms.sessionForm.timeInput.invalidTimeRange' | artemisTranslate }} -
    +
    }
    } @if (form?.invalid && (form?.dirty || form?.touched)) {
    @if (form?.errors?.invalidTimeRange) { -
    - {{ 'artemisApp.forms.sessionForm.timeInput.invalidTimeRange' | artemisTranslate }} -
    +
    }
    }
    - + @if (reasonControl?.invalid && (reasonControl?.dirty || reasonControl?.touched)) {
    @if (reasonControl?.errors?.maxlength) { -
    - {{ - 'artemisApp.pages.tutorialGroupSessionManagement.cancelActivateModal.cancelSession.maxLengthValidationError' | artemisTranslate: { max: '256' } - }} -
    +
    }
    } @@ -39,8 +38,13 @@

    }

    - - + +
    diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/tutorial-group-sessions-management/tutorial-group-session-row-buttons/tutorial-group-session-row-buttons.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/tutorial-group-sessions-management/tutorial-group-session-row-buttons/tutorial-group-session-row-buttons.component.html index 1552c89a7b4a..1ecd4247b138 100644 --- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/tutorial-group-sessions-management/tutorial-group-session-row-buttons/tutorial-group-session-row-buttons.component.html +++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/tutorial-group-sessions-management/tutorial-group-session-row-buttons/tutorial-group-session-row-buttons.component.html @@ -13,7 +13,7 @@
    diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-checklist/tutorial-groups-checklist.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-checklist/tutorial-groups-checklist.component.html index b1927166f463..0f537556c16a 100644 --- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-checklist/tutorial-groups-checklist.component.html +++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-checklist/tutorial-groups-checklist.component.html @@ -2,39 +2,33 @@ @if (course) {
    -

    {{ 'artemisApp.pages.checklist.title' | artemisTranslate }}

    -

    - {{ 'artemisApp.pages.checklist.explanation' | artemisTranslate }} -

    +

    +

    -

    {{ 'artemisApp.pages.checklist.timeZoneExplanation' | artemisTranslate }}

    +

    - + -  {{ 'artemisApp.pages.checklist.editCourse' | artemisTranslate }} +  
    -

    {{ 'artemisApp.pages.checklist.configurationExplanation' | artemisTranslate }}

    +

    {{ 'global.field.id' | artemisTranslate }}{{ 'artemisApp.entities.tutorialFreePeriod.startDate' | artemisTranslate }}{{ 'artemisApp.entities.tutorialFreePeriod.endDate' | artemisTranslate }}{{ 'artemisApp.forms.tutorialFreePeriodForm.dateInput.labelStartTime' | artemisTranslate }}{{ 'artemisApp.forms.tutorialFreePeriodForm.dateInput.labelEndTime' | artemisTranslate }}{{ 'artemisApp.entities.tutorialFreePeriod.reason' | artemisTranslate }}
    - + @if (isTutorialGroupConfigurationCreated) { -  {{ 'artemisApp.pages.tutorialGroupsManagement.editConfigurationButton' | artemisTranslate }} +   } @if (!isTutorialGroupConfigurationCreated) { @@ -43,7 +37,7 @@

    {{ 'artemisApp.pages.checklist.title' | artemisTranslate }}

    class="btn btn-primary btn-md my-2" [class.disabled]="!isTimeZoneConfigured" > -  {{ 'artemisApp.pages.checklist.createConfiguration' | artemisTranslate }} +   }
    @@ -51,7 +45,7 @@

    {{ 'artemisApp.pages.checklist.title' | artemisTranslate }}

    diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/create-tutorial-groups-configuration/create-tutorial-groups-configuration.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/create-tutorial-groups-configuration/create-tutorial-groups-configuration.component.html index 8ff2c70883d0..57d838855af1 100644 --- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/create-tutorial-groups-configuration/create-tutorial-groups-configuration.component.html +++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/create-tutorial-groups-configuration/create-tutorial-groups-configuration.component.html @@ -1,7 +1,5 @@ -

    {{ 'artemisApp.pages.createTutorialGroupsConfiguration.title' | artemisTranslate }}

    - +

    +     diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/edit-tutorial-groups-configuration/edit-tutorial-groups-configuration.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/edit-tutorial-groups-configuration/edit-tutorial-groups-configuration.component.html index 9bd9a4cf4b68..383e1f597c22 100644 --- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/edit-tutorial-groups-configuration/edit-tutorial-groups-configuration.component.html +++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/edit-tutorial-groups-configuration/edit-tutorial-groups-configuration.component.html @@ -1,4 +1,4 @@ -

    {{ 'artemisApp.pages.editTutorialGroupsConfiguration.title' | artemisTranslate }}

    +

    diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/tutorial-groups-configuration-form/tutorial-groups-configuration-form.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/tutorial-groups-configuration-form/tutorial-groups-configuration-form.component.html index 5f942391994b..981804efb514 100644 --- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/tutorial-groups-configuration-form/tutorial-groups-configuration-form.component.html +++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/tutorial-groups-configuration-form/tutorial-groups-configuration-form.component.html @@ -4,7 +4,7 @@
    - +
    -
    - {{ 'artemisApp.forms.configurationForm.periodInput.explanation' | artemisTranslate }} -
    +
    @if (periodControl?.invalid && (periodControl?.dirty || periodControl?.touched)) {
    @if (periodControl?.errors?.owlRequiredDateTimeRange || periodControl?.errors?.required) { -
    - {{ 'artemisApp.forms.configurationForm.periodInput.requiredValidationError' | artemisTranslate }} -
    +
    } @if (periodControl?.errors?.owlDateTimeParse) { -
    - {{ 'artemisApp.forms.configurationForm.periodInput.parseError' | artemisTranslate }} -
    +
    } @if (periodControl?.errors?.owlDateTimeRange) { -
    - {{ 'artemisApp.forms.configurationForm.periodInput.invalidRangeError' | artemisTranslate }} -
    +
    }
    } @@ -49,41 +41,46 @@
    - - {{ - 'artemisApp.forms.configurationForm.useTutorialGroupChannelsInput.explanation' | artemisTranslate - }} + + @if (showChannelDeletionWarning) { - + }
    - +
    - + - +
    - {{ - 'artemisApp.dialogs.createChannel.channelForm.isPublicInput.explanation' | artemisTranslate - }} +
    diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/create-tutorial-group/create-tutorial-group.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/create-tutorial-group/create-tutorial-group.component.html index 25250488c664..9dd9e8d60e8e 100644 --- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/create-tutorial-group/create-tutorial-group.component.html +++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/create-tutorial-group/create-tutorial-group.component.html @@ -1,5 +1,5 @@ -

    {{ 'artemisApp.pages.createTutorialGroup.title' | artemisTranslate }}

    +

    @if (course) { } diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/edit-tutorial-group/edit-tutorial-group.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/edit-tutorial-group/edit-tutorial-group.component.html index a6e1ba53502d..47c46d6b6a74 100644 --- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/edit-tutorial-group/edit-tutorial-group.component.html +++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/edit-tutorial-group/edit-tutorial-group.component.html @@ -1,5 +1,5 @@ -

    {{ 'artemisApp.pages.editTutorialGroup.title' | artemisTranslate }}

    +

    @if (course) { } diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/tutorial-group-form/schedule-form/schedule-form.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/tutorial-group-form/schedule-form/schedule-form.component.html index 53c16975f8cb..997d0116c9b9 100644 --- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/tutorial-group-form/schedule-form/schedule-form.component.html +++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/tutorial-group-form/schedule-form/schedule-form.component.html @@ -1,38 +1,32 @@
    -

    {{ 'artemisApp.forms.scheduleForm.formTitle' | artemisTranslate }}

    +

    - +
    -
    {{ 'artemisApp.forms.scheduleForm.repetitionFrequencyInput.weeks' | artemisTranslate }}
    +
    @if (repetitionFrequencyControl?.invalid && (repetitionFrequencyControl?.dirty || repetitionFrequencyControl?.touched)) {
    @if (repetitionFrequencyControl?.errors?.min) { -
    - {{ 'artemisApp.forms.scheduleForm.repetitionFrequencyInput.minValidationError' | artemisTranslate: { min: 1 } }} -
    +
    } @if (repetitionFrequencyControl?.errors?.max) { -
    - {{ 'artemisApp.forms.scheduleForm.repetitionFrequencyInput.maxValidationError' | artemisTranslate: { max: 7 } }} -
    +
    } @if (repetitionFrequencyControl?.errors?.required) { -
    - {{ 'artemisApp.forms.scheduleForm.repetitionFrequencyInput.requiredValidationError' | artemisTranslate }} -
    +
    }
    }
    - +
    @for (weekDay of weekDays; track weekDay) { @@ -43,13 +37,13 @@

    {{ 'artemisApp.forms.scheduleForm.formTitle' | artemisTranslate }}

    - {{ 'artemisApp.forms.scheduleForm.timeInput.from' | artemisTranslate }} +
    - {{ 'artemisApp.forms.scheduleForm.timeInput.to' | artemisTranslate }} +
    @@ -58,27 +52,21 @@

    {{ 'artemisApp.forms.scheduleForm.formTitle' | artemisTranslate }}

    @if (startTimeControl?.invalid && (startTimeControl?.dirty || startTimeControl?.touched)) {
    @if (startTimeControl?.errors?.required) { -
    - {{ 'artemisApp.forms.scheduleForm.timeInput.invalidTimeRange' | artemisTranslate }} -
    +
    }
    } @if (endTimeControl?.invalid && (endTimeControl?.dirty || endTimeControl?.touched)) {
    @if (endTimeControl?.errors?.required) { -
    - {{ 'artemisApp.forms.scheduleForm.timeInput.invalidTimeRange' | artemisTranslate }} -
    +
    }
    } @if (formGroup?.invalid && (formGroup?.dirty || formGroup?.touched)) {
    @if (formGroup?.errors?.invalidTimeRange) { -
    - {{ 'artemisApp.forms.scheduleForm.timeInput.invalidTimeRange' | artemisTranslate }} -
    +
    }
    } @@ -87,10 +75,10 @@

    {{ 'artemisApp.forms.scheduleForm.formTitle' | artemisTranslate }}

    @if (parentIsOnlineControl!.value) { - + } @if (!parentIsOnlineControl!.value) { - + } - {{ - 'artemisApp.forms.tutorialGroupForm.notificationInput.help' | artemisTranslate - }} + @if (notificationControl?.invalid && (notificationControl?.dirty || notificationControl?.touched)) {
    @if (notificationControl?.errors?.maxlength) { -
    - {{ 'artemisApp.forms.tutorialGroupForm.notificationInput.maxLengthValidationError' | artemisTranslate: { max: '1000' } }} -
    +
    }
    } diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-group-row-buttons/tutorial-group-row-buttons.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-group-row-buttons/tutorial-group-row-buttons.component.html index a052ec715cf5..a8b564078cf0 100644 --- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-group-row-buttons/tutorial-group-row-buttons.component.html +++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-group-row-buttons/tutorial-group-row-buttons.component.html @@ -4,21 +4,21 @@ @if (isAtLeastInstructor || tutorialGroup.isUserTutor) { } @if (isAtLeastInstructor || tutorialGroup.isUserTutor) { } @if (isAtLeastInstructor) { - {{ 'entity.action.edit' | artemisTranslate }} + } diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-course-information/tutorial-groups-course-information.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-course-information/tutorial-groups-course-information.component.html index 7052e8afe23a..538b169cad14 100644 --- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-course-information/tutorial-groups-course-information.component.html +++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-course-information/tutorial-groups-course-information.component.html @@ -1,10 +1,10 @@
    -
    {{ 'artemisApp.pages.courseTutorialGroupOverview.sidePanel.numberOfGroups' | artemisTranslate }}
    +
    {{ tutorialGroups ? tutorialGroups.length : 0 }}
    -
    {{ 'artemisApp.pages.courseTutorialGroupOverview.sidePanel.numberOfRegistrations' | artemisTranslate }}
    +
    {{ totalNumberOfRegistrations }}
     diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-import-button/tutorial-groups-import-button.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-import-button/tutorial-groups-import-button.component.html index 2294f0c94397..ad2e2fa9e64f 100644 --- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-import-button/tutorial-groups-import-button.component.html +++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-import-button/tutorial-groups-import-button.component.html @@ -1,13 +1,13 @@
    -

    {{ 'artemisApp.tutorialGroupImportDialog.warning' | artemisTranslate }}

    +

    -

    {{ 'artemisApp.tutorialGroupImportDialog.finishedWarning' | artemisTranslate }}

    +

    diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-import-dialog/tutorial-groups-registration-import-dialog.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-import-dialog/tutorial-groups-registration-import-dialog.component.html index de2055dd82ab..cf676a9cbe75 100644 --- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-import-dialog/tutorial-groups-registration-import-dialog.component.html +++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-import-dialog/tutorial-groups-registration-import-dialog.component.html @@ -264,9 +264,10 @@

    @if (statusHeaderControl?.invalid && (statusHeaderControl?.dirty || statusHeaderControl?.touched)) {
    @if (statusHeaderControl?.errors?.maxlength) { -
    - {{ 'artemisApp.tutorialGroupImportDialog.fixedPlaceForm.statusHeaderInput.maxLengthValidationError' | artemisTranslate: { max: '255' } }} -
    +
    }
    } @@ -284,9 +285,10 @@

    @if (fixedPlaceValueControl?.invalid && (fixedPlaceValueControl?.dirty || fixedPlaceValueControl?.touched)) {
    @if (fixedPlaceValueControl?.errors?.maxlength) { -
    - {{ 'artemisApp.tutorialGroupImportDialog.fixedPlaceForm.fixedPlaceValueInput.maxLengthValidationError' | artemisTranslate: { max: '255' } }} -
    +
    }
    } @@ -429,14 +431,17 @@

    @if (!isImportDone) {
    - {{ 'artemisApp.tutorialGroupImportDialog.table.footer.total' | artemisTranslate: { count: allRegistrations.length } }} +
    } @else {
    - {{ 'artemisApp.tutorialGroupImportDialog.table.footer.imported' | artemisTranslate: { count: numberOfImportedRegistrations } }} +
    - {{ 'artemisApp.tutorialGroupImportDialog.table.footer.notImported' | artemisTranslate: { count: numberOfNotImportedRegistration } }} +
    }
    @@ -450,7 +455,7 @@

    @if (!isImportDone) { } @else { diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-management.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-management.component.html index 07bb83d83ec0..989af8120b65 100644 --- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-management.component.html +++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-management.component.html @@ -15,17 +15,15 @@

    [routerLink]="['/course-management', courseId, 'tutorial-groups', 'configuration', course!.tutorialGroupsConfiguration!.id, 'tutorial-free-days']" > - {{ 'artemisApp.pages.tutorialGroupsManagement.freePeriodsButtons' | artemisTranslate }} + } - {{ 'artemisApp.pages.tutorialGroupsManagement.creatTutorialGroupButton' | artemisTranslate }} +
    - +
    @if (course?.tutorialGroupsConfiguration) { class="btn" [routerLink]="['/course-management', courseId, 'tutorial-groups', 'configuration', course!.tutorialGroupsConfiguration!.id, 'edit']" > - {{ 'artemisApp.pages.tutorialGroupsManagement.editConfigurationButton' | artemisTranslate }} + }
    -
    {{ 'artemisApp.examScores.exerciseGroupTitle' | artemisTranslate: { groupTitle: this.averageScores.title } }}
    +
    - {{ 'artemisApp.examScores.noExerciseGroupAvailable' | artemisTranslate }} +
    } @if (!studentResults) {
    - {{ 'artemisApp.examScores.noStudentResultAvailable' | artemisTranslate }} +
    }
    @@ -58,7 +58,7 @@

    [checked]="filterForSubmittedExams" (change)="toggleFilterForSubmittedExam()" /> - +

    [checked]="filterForNonEmptySubmissions" (change)="toggleFilterForNonEmptySubmission()" /> - +

    @@ -78,24 +78,16 @@

    @if (gradingScaleExists && !isBonus) { - - {{ 'artemisApp.examScores.secondCorrectionColumn' | artemisTranslate }} - + } @if (gradingScaleExists && !isBonus) { - - {{ 'artemisApp.examScores.firstCorrectionColumn' | artemisTranslate }} - + } @if (!gradingScaleExists || isBonus) { - - {{ 'artemisApp.examScores.secondCorrectionColumn' | artemisTranslate }} - + } @if (!gradingScaleExists || isBonus) { - - {{ 'artemisApp.examScores.firstCorrectionColumn' | artemisTranslate }} - + } @@ -104,36 +96,24 @@

    @if (gradingScaleExists && !isBonus) { - - {{ 'artemisApp.examScores.passedColumn' | artemisTranslate }} - + } - - {{ 'artemisApp.examScores.submittedColumn' | artemisTranslate }} - - - {{ 'artemisApp.examScores.totalColumn' | artemisTranslate }} - + + @if (hasSecondCorrectionAndStarted && gradingScaleExists && !isBonus) { - - {{ 'artemisApp.examScores.passedColumn' | artemisTranslate }} - + } @if (hasSecondCorrectionAndStarted) { - - {{ 'artemisApp.examScores.submittedColumn' | artemisTranslate }} - + } @if (hasSecondCorrectionAndStarted) { - - {{ 'artemisApp.examScores.totalColumn' | artemisTranslate }} - + } - {{ 'artemisApp.examScores.noOfExams' | artemisTranslate }} + @if (gradingScaleExists && !isBonus) { {{ aggregatedExamResults.noOfExamsFilteredForPassed }} @@ -158,7 +138,7 @@

    } - {{ 'artemisApp.examScores.averagePointsColumn' | artemisTranslate }} + @if (gradingScaleExists && !isBonus) { {{ aggregatedExamResults.meanPointsPassed !== null ? roundAndPerformLocalConversion(aggregatedExamResults.meanPointsPassed) : '-' }} @@ -200,9 +180,7 @@

    @if (gradingScaleExists) { - - {{ isBonus ? ('artemisApp.examScores.averageBonusColumn' | artemisTranslate) : ('artemisApp.examScores.averageGradeColumn' | artemisTranslate) }} - + @if (!isBonus) { {{ aggregatedExamResults.meanGradePassed !== null ? aggregatedExamResults.meanGradePassed : '-' }} } @@ -226,7 +204,7 @@

    } - {{ 'artemisApp.examScores.medianColumn' | artemisTranslate }} + @if (gradingScaleExists && !isBonus) { {{ aggregatedExamResults.medianPassed !== null ? roundAndPerformLocalConversion(aggregatedExamResults.medianPassed) : '-' }} @@ -272,9 +250,7 @@

    @if (gradingScaleExists) { - - {{ isBonus ? ('artemisApp.examScores.medianBonusColumn' | artemisTranslate) : ('artemisApp.examScores.medianGradeColumn' | artemisTranslate) }} - + @if (!isBonus) { {{ aggregatedExamResults.medianGradePassed !== null ? aggregatedExamResults.medianGradePassed : '-' }} } @@ -298,7 +274,7 @@

    } - {{ 'artemisApp.examScores.standardDeviationColumn' | artemisTranslate }} + @if (gradingScaleExists && !isBonus) { {{ aggregatedExamResults.standardDeviationPassed !== null ? roundAndPerformLocalConversion(aggregatedExamResults.standardDeviationPassed) : '-' }} @@ -330,7 +306,7 @@

    @if (gradingScaleExists && hasNumericGrades) { - {{ 'artemisApp.examScores.standardGradeDeviationColumn' | artemisTranslate }} + @if (!isBonus) { {{ @@ -373,30 +349,30 @@

    @if (gradingScaleExists && this.aggregatedExamResults.medianRelativePassed !== null) {
    - +
    }
    - +
    @if (hasBonus) { -

    - {{ 'artemisApp.examScores.gradesBeforeBonus' | artemisTranslate }} -

    +

    }
    @if (hasBonus) { -

    - {{ 'artemisApp.examScores.gradesAfterBonus' | artemisTranslate }} -

    +

    } @if (hasBonus) {
    @@ -448,9 +422,7 @@

    # - - {{ 'artemisApp.examScores.titleExerciseGroupColumn' | artemisTranslate }} - + {{ 'artemisApp.examScores.participantsColumn' | artemisTranslate }} @@ -460,17 +432,9 @@

    @if (gradingScaleExists) { - - {{ - isBonus - ? ('artemisApp.examScores.averageBonusColumn' | artemisTranslate) - : ('artemisApp.examScores.averageGradeColumn' | artemisTranslate) - }} - + } - - {{ 'artemisApp.examScores.titleExerciseColumn' | artemisTranslate }} - + {{ 'artemisApp.examScores.participantsColumn' | artemisTranslate }} @@ -585,44 +549,43 @@

    @if (gradingScaleExists) { - {{ - isBonus ? ('artemisApp.examScores.overallBonusColumn' | artemisTranslate) : ('artemisApp.examScores.overallGradeColumn' | artemisTranslate) - }} + } @if (hasBonus) { @if (presentationScoreThreshold !== undefined) { - {{ 'artemisApp.examScores.presentationScoreThresholdColumn' | artemisTranslate: { threshold: presentationScoreThreshold } }} + } - {{ - hasBonus === BonusStrategy.POINTS - ? ('artemisApp.examScores.bonusPointsColumn' | artemisTranslate) - : ('artemisApp.examScores.bonusGradeColumn' | artemisTranslate) - }} + - {{ 'artemisApp.examScores.finalGradeColumn' | artemisTranslate }} + } @if (gradingScaleExists && !isBonus) { - {{ 'artemisApp.examScores.passedColumn' | artemisTranslate }} + } @if (hasPlagiarismVerdicts) { - {{ 'artemisApp.examScores.mostSeverePlagiarismVerdictColumn' | artemisTranslate }} + } @if (hasPlagiarismVerdictsInBonusSource) { - {{ 'artemisApp.examScores.mostSeverePlagiarismVerdictInBonusColumn' | artemisTranslate }} + } diff --git a/src/main/webapp/app/exam/manage/exam-management.component.html b/src/main/webapp/app/exam/manage/exam-management.component.html index f7689477c83e..d56b14cda7f6 100644 --- a/src/main/webapp/app/exam/manage/exam-management.component.html +++ b/src/main/webapp/app/exam/manage/exam-management.component.html @@ -7,11 +7,11 @@

    - {{ 'artemisApp.examManagement.importExam' | artemisTranslate }} + - {{ 'artemisApp.examManagement.createExam' | artemisTranslate }} +

    } @@ -24,15 +24,15 @@

    - {{ 'global.field.id' | artemisTranslate }} + - {{ 'artemisApp.exam.title' | artemisTranslate }} + - {{ 'artemisApp.examStatus.columnTitle' | artemisTranslate }} + @@ -61,10 +61,10 @@

    } @if (!exam.testExam) { -
    {{ 'artemisApp.examManagement.testExam.realExam' | artemisTranslate }}
    +
    } @if (exam.testExam) { -
    {{ 'artemisApp.examManagement.testExam.testExam' | artemisTranslate }}
    +
    } @@ -82,7 +82,7 @@

    - {{ 'artemisApp.examManagement.exerciseGroups' | artemisTranslate }} +
    } @@ -94,7 +94,7 @@

    - {{ 'artemisApp.examManagement.studentExams' | artemisTranslate }} +
    } @@ -106,7 +106,7 @@

    - {{ 'artemisApp.examManagement.assessmentDashboard' | artemisTranslate }} +
    } @@ -114,7 +114,7 @@

    - {{ 'entity.action.edit' | artemisTranslate }} +
    } @@ -123,7 +123,7 @@

    - {{ 'artemisApp.examManagement.testRun.testRun' | artemisTranslate }} + } @if (!exam.testExam && course.isAtLeastInstructor) { @@ -133,19 +133,19 @@

    - {{ 'artemisApp.examManagement.students' | artemisTranslate }} + } @if (course.isAtLeastInstructor) { - {{ 'entity.action.scores' | artemisTranslate }} + } @if (course.isAtLeastInstructor) { - {{ 'artemisApp.examManagement.examChecklist' | artemisTranslate }} + }
    diff --git a/src/main/webapp/app/exam/manage/exam-status.component.html b/src/main/webapp/app/exam/manage/exam-status.component.html index 8e51dc8bc66b..a308dd071108 100644 --- a/src/main/webapp/app/exam/manage/exam-status.component.html +++ b/src/main/webapp/app/exam/manage/exam-status.component.html @@ -12,12 +12,13 @@ }
    -
    {{ 'artemisApp.examStatus.preparation.' + (isTestExam ? 'testExam.' : '') + 'examPreparation' | artemisTranslate }}
    +
    1. - {{ - 'artemisApp.examStatus.preparation.configureExercises' | artemisTranslate: { amount: exam.exerciseGroups ? exam.exerciseGroups.length : 0 } - }} + @if (configuredExercises) { } @@ -32,14 +33,14 @@
      {{ 'artemisApp.examStatus.preparation.' + (isTestExam ? } @if (maxPointExercises !== exam.examMaxPoints) { - {{ 'artemisApp.examStatus.preparation.testExam.maxPointsWrong' | artemisTranslate: { points: maxPointExercises } }} + }
      2. } @if (!isTestExam) {
    2. - {{ 'artemisApp.examStatus.preparation.registerStudents' | artemisTranslate: { registered: exam.numberOfExamUsers } }} + @if (registeredStudents) { } @@ -50,22 +51,19 @@
      {{ 'artemisApp.examStatus.preparation.' + (isTestExam ? } @if (!isTestExam) {
    3. - {{ 'artemisApp.examStatus.preparation.generateStudentExams' | artemisTranslate }} + @if (!registeredStudents) { - {{ 'artemisApp.examStatus.preparation.notRegistered' | artemisTranslate }} + } @if (registeredStudents) { - - {{ - 'artemisApp.examStatus.preparation.registered' - | artemisTranslate - : { - generated: numberOfGeneratedStudentExams, - total: exam.numberOfExamUsers, - } - }} - + } @if (generatedStudentExams) { @@ -77,7 +75,7 @@
      {{ 'artemisApp.examStatus.preparation.' + (isTestExam ? } @if (!isTestExam) {
    4. - {{ 'artemisApp.examStatus.preparation.prepareExerciseStart' | artemisTranslate }} + @if (preparedExerciseStart) { } @@ -115,13 +113,13 @@
      {{ 'artemisApp.examStatus.preparation.' + (isTestExam ?
    -
    {{ 'artemisApp.examStatus.conduction.' + (isTestExam ? 'testExam.' : '') + 'examConduction' | artemisTranslate }}
    +
    {{ exam.startDate | artemisDate }} - {{ exam.endDate | artemisDate }}
    @if (examConductionState === examConductionStateEnum.ERROR) {
    -
    {{ 'artemisApp.examStatus.conduction.' + (isTestExam ? 'testExam.' : '') + 'conductionSuspended' | artemisTranslate }}
    +
    } @if (course?.isAtLeastInstructor && examChecklist && examConductionState !== examConductionStateEnum.ERROR) { @@ -179,7 +177,7 @@
    {{ 'artemisApp.examStatus.conduction.' + (isTestExam ? 'testExam.' : '') + ' }
    -
    {{ 'artemisApp.examStatus.correction.examCorrection' | artemisTranslate }}
    +
    @if (examChecklist) {
      @if (examChecklist.numberOfTotalExamAssessmentsFinishedByCorrectionRound !== null && numberOfSubmitted !== 0) { @@ -215,9 +213,7 @@
      {{ 'artemisApp.examStatus.correction.examCorrection' | a } @if (!exam.publishResultsDate) { - - {{ 'artemisApp.examStatus.correction.notSet' | artemisTranslate }} - + }
      diff --git a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-checklist.component.html b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-checklist.component.html index 62378895923a..d0525ddc1928 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-checklist.component.html +++ b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-checklist.component.html @@ -1,13 +1,13 @@ @if (exam?.course?.isAtLeastInstructor) {

      - {{ 'artemisApp.examManagement.checklist.' + (isTestExam ? 'testExam.' : '') + 'title' | artemisTranslate }} +

      @if (!isTestExam) {

      {{ 'artemisApp.examManagement.checklist.introduction' | artemisTranslate }} - {{ 'artemisApp.examManagement.checklist.linkDescription' | artemisTranslate }} + {{ 'artemisApp.examManagement.checklist.introductionPart2' | artemisTranslate }}

      @@ -15,13 +15,11 @@

      @if (isTestExam) {

      - {{ 'artemisApp.examManagement.checklist.testExam.introduction' | artemisTranslate }} +

      }
      -

      - {{ 'artemisApp.examStatus.preparation.' + (isTestExam ? 'testExam.' : '') + 'examPreparation' | artemisTranslate }} -

      +

      @@ -30,13 +28,13 @@

      #

      @@ -44,16 +42,16 @@

      @@ -132,20 +131,20 @@

      @@ -209,10 +208,10 @@

      - {{ 'artemisApp.examManagement.checklist.checklistItem' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.description' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.goTo' | artemisTranslate }} +
      1 - {{ 'artemisApp.examManagement.checklist.tableItem.exerciseGroups' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.descriptionItem.exerciseGroups' | artemisTranslate }} +
      • - {{ 'artemisApp.examManagement.checklist.textitems.leastoneexercisegroup' | artemisTranslate }} +
      • @@ -66,30 +64,31 @@

        (exam.numberOfExercisesInExam ?? 0) <= exam.exerciseGroups.length " /> - {{ - (!hasOptionalExercises - ? 'artemisApp.examManagement.checklist.textitems.numberofexercisegroupsequal' - : 'artemisApp.examManagement.checklist.textitems.numberofexercisegroupsinbetween' - ) | artemisTranslate - }} +

      • - {{ 'artemisApp.examManagement.checklist.textitems.eachexercisegroup' | artemisTranslate }} +
      • - {{ 'artemisApp.examManagement.checklist.textitems.pointsexercisegroupequal' | artemisTranslate }} +
      • - {{ 'artemisApp.examManagement.checklist.textitems.totalpointspossible' | artemisTranslate }} +
      @@ -100,22 +99,22 @@

      		- {{ 'artemisApp.examManagement.exerciseGroups' | artemisTranslate }} +
      2 - {{ 'artemisApp.examManagement.checklist.tableItem.testRun' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.descriptionItem.testRun' | artemisTranslate }} +
        @if (examChecklist) {
      • - {{ 'artemisApp.examManagement.checklist.textitems.testruns' | artemisTranslate }} + {{ examChecklist.numberOfTestRuns }}
        • } @@ -124,7 +123,7 @@

      		- {{ 'artemisApp.examManagement.testRun.testRun' | artemisTranslate }} +
      3 - {{ 'artemisApp.examManagement.checklist.tableItem.register' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.descriptionItem.register' | artemisTranslate }} +
      • - {{ 'artemisApp.examManagement.checklist.textitems.leastonestudent' | artemisTranslate }} +
      • - {{ 'artemisApp.examManagement.checklist.textitems.studentsregistered' | artemisTranslate }} + {{ exam.numberOfExamUsers }}
      @@ -153,23 +152,23 @@

      		- {{ 'artemisApp.examManagement.students' | artemisTranslate }} +
      4 - {{ 'artemisApp.examManagement.checklist.tableItem.generateStudentExams' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.descriptionItem.generateStudentExams' | artemisTranslate }} +
      • - {{ 'artemisApp.examManagement.checklist.textitems.allexamsgenerated' | artemisTranslate }} +
      @@ -177,23 +176,23 @@

      		- {{ 'artemisApp.examManagement.studentExams' | artemisTranslate }} +
      5 - {{ 'artemisApp.examManagement.checklist.tableItem.prepareExerciseStart' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.descriptionItem.prepareExerciseStart' | artemisTranslate }} +
        @if (examChecklist) {
      • - {{ 'artemisApp.examManagement.checklist.textitems.allExercisesPrepared' | artemisTranslate }} +
        • }
      @@ -201,7 +200,7 @@

      		- {{ 'artemisApp.examManagement.studentExams' | artemisTranslate }} +
      {{ isTestExam ? 3 : 6 }} - {{ 'artemisApp.examManagement.checklist.tableItem.examDetails' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.descriptionItem.examDetails' | artemisTranslate }} + @if (isTestExam) {
      {{ 'artemisApp.examManagement.checklist.testExam.detailsHintForTestExams' | artemisTranslate }} : @@ -221,19 +220,19 @@

    1. - {{ 'artemisApp.examManagement.checklist.testExam.studentRegistration' | artemisTranslate }} +
    2. - {{ 'artemisApp.studentExams.studentExamStatusTestExam' | artemisTranslate }} +
    3. - {{ 'artemisApp.examManagement.checklist.testExam.instantResults' | artemisTranslate }} +
      4. @@ -249,15 +248,14 @@

      -

      {{ 'artemisApp.examStatus.conduction.' + (isTestExam ? 'testExam.' : '') + 'examConduction' | artemisTranslate }}

      - {{ - 'artemisApp.examManagement.checklist.conductionPlannedFromTo' - | artemisTranslate - : { - from: exam.startDate! | artemisDate, - to: exam.endDate! | artemisDate, - } - }} +

      +
      @@ -266,13 +264,13 @@

      {{ 'artemisApp.examStatus.conduction.' + (isTestExam ? 'testExam.' : '') + ' #

      @@ -280,10 +278,10 @@

      {{ 'artemisApp.examStatus.conduction.' + (isTestExam ? 'testExam.' : '') + '

      - {{ 'artemisApp.examManagement.checklist.checklistItem' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.description' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.goTo' | artemisTranslate }} +
      1 - {{ 'artemisApp.examManagement.checklist.tableItem.conductExam' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.descriptionItem.conductExam' | artemisTranslate }} +
      @if (exam.numberOfExamUsers) { @@ -326,24 +324,24 @@

      {{ 'artemisApp.examStatus.conduction.' + (isTestExam ? 'testExam.' : '') + ' } @if (examChecklist && numberOfSubmitted! === 0) {
      - {{ 'artemisApp.examManagement.checklist.textitems.noSubmissions' | artemisTranslate }} +
      }

      		- {{ 'artemisApp.examManagement.studentExams' | artemisTranslate }} +
      2 - {{ 'artemisApp.examManagement.checklist.tableItem.editWorkingTime' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.descriptionItem.editWorkingTime' | artemisTranslate }} + @@ -368,7 +366,7 @@

      {{ 'artemisApp.examStatus.conduction.' + (isTestExam ? 'testExam.' : '') + '
      @if (!isTestExam) { -

      {{ 'artemisApp.examStatus.correction.examCorrection' | artemisTranslate }}

      +

      @@ -377,13 +375,13 @@

      {{ 'artemisApp.examStatus.correction.examCorrection' | artemisTranslate }}#

      @@ -391,27 +389,27 @@

      {{ 'artemisApp.examStatus.correction.examCorrection' | artemisTranslate }}

      diff --git a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time.component.html b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time.component.html index 0145161f28b6..e0cd3e78705c 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time.component.html +++ b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time.component.html @@ -1,4 +1,4 @@ diff --git a/src/main/webapp/app/exam/manage/exams/exam-detail.component.html b/src/main/webapp/app/exam/manage/exams/exam-detail.component.html index a2308edbf6aa..243126fc3758 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-detail.component.html +++ b/src/main/webapp/app/exam/manage/exams/exam-detail.component.html @@ -4,10 +4,10 @@

      @if (!exam.testExam) { - {{ 'artemisApp.examManagement.testExam.realExam' | artemisTranslate }} + } @if (exam.testExam) { - {{ 'artemisApp.examManagement.testExam.testExam' | artemisTranslate }} + } {{ exam.title }}

      @@ -16,50 +16,50 @@

      - {{ 'artemisApp.examManagement.exerciseGroups' | artemisTranslate }} + @if (false) { - {{ 'artemisApp.examManagement.quizPool' | artemisTranslate }} + } @if (!exam.testExam) { - {{ 'artemisApp.examManagement.students' | artemisTranslate }} + } - {{ 'artemisApp.examManagement.studentExams' | artemisTranslate }} + - {{ 'artemisApp.examManagement.testRun.testRun' | artemisTranslate }} + @if (!exam.testExam) { - {{ 'artemisApp.examManagement.assessmentDashboard' | artemisTranslate }} + } @if (!exam.testExam) { - {{ 'artemisApp.examManagement.gradingSystem' | artemisTranslate }} + } @if (canHaveBonus) { - {{ 'artemisApp.examManagement.bonus' | artemisTranslate }} + } - {{ 'entity.action.scores' | artemisTranslate }} + diff --git a/src/main/webapp/app/exam/manage/exams/exam-import/exam-import.component.html b/src/main/webapp/app/exam/manage/exams/exam-import/exam-import.component.html index cc6e19353695..04c0f2e4ae7c 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-import/exam-import.component.html +++ b/src/main/webapp/app/exam/manage/exams/exam-import/exam-import.component.html @@ -1,10 +1,10 @@
      @if (!subsequentExerciseGroupSelection) { -

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

      +

      } @if (subsequentExerciseGroupSelection) { -

      {{ 'artemisApp.examManagement.exerciseGroup.import' | artemisTranslate }}

      +

      }
      @@ -54,10 +54,10 @@

      {{ 'artemisApp.examManagement.exerciseGroup.import' | ar

      @if (exerciseGroup.id && exerciseGroupToExerciseTypesDict.get(exerciseGroup.id!)?.includes(exerciseType.PROGRAMMING)) { } @if (exerciseGroup.id && exerciseGroupToExerciseTypesDict.get(exerciseGroup.id)?.includes(exerciseType.QUIZ)) { } @if (exerciseGroup.id && exerciseGroupToExerciseTypesDict.get(exerciseGroup.id)?.includes(exerciseType.MODELING)) { } @if (exerciseGroup.id && exerciseGroupToExerciseTypesDict.get(exerciseGroup.id)?.includes(exerciseType.FILE_UPLOAD)) { } @if ( @@ -234,7 +234,7 @@
      {{ exerciseGroup.title }}
      exerciseGroupToExerciseTypesDict.get(exerciseGroup.id)?.includes(exerciseType.MODELING)) ) {       } @@ -365,9 +365,7 @@
      {{ exerciseGroup.title }}
      } @if (!exerciseGroup.exercises) { -
      - {{ 'artemisApp.examManagement.exerciseGroup.noExercises' | artemisTranslate }} -
      +
      } diff --git a/src/main/webapp/app/exam/manage/student-exams/student-exams.component.html b/src/main/webapp/app/exam/manage/student-exams/student-exams.component.html index fd714d8f3f14..5b85ae4215cd 100644 --- a/src/main/webapp/app/exam/manage/student-exams/student-exams.component.html +++ b/src/main/webapp/app/exam/manage/student-exams/student-exams.component.html @@ -177,7 +177,7 @@

      - {{ (value ? 'global.generic.yes' : 'global.generic.no') | artemisTranslate }} + @@ -188,7 +188,7 @@

      - {{ (value ? 'global.generic.yes' : 'global.generic.no') | artemisTranslate }} + diff --git a/src/main/webapp/app/exam/manage/students/exam-students.component.html b/src/main/webapp/app/exam/manage/students/exam-students.component.html index 471b3bcde32e..7a1aa199b56d 100644 --- a/src/main/webapp/app/exam/manage/students/exam-students.component.html +++ b/src/main/webapp/app/exam/manage/students/exam-students.component.html @@ -39,7 +39,7 @@

      title="{{ 'artemisApp.examManagement.examStudents.verifyAttendanceTooltip' | artemisTranslate }}" > - {{ 'artemisApp.examManagement.examStudents.verifyAttendanceBtn' | artemisTranslate }} + } @if (!isTestExam) { diff --git a/src/main/webapp/app/exam/manage/students/upload-images/students-upload-images-dialog.component.html b/src/main/webapp/app/exam/manage/students/upload-images/students-upload-images-dialog.component.html index 1e4543088f11..ac30244295db 100644 --- a/src/main/webapp/app/exam/manage/students/upload-images/students-upload-images-dialog.component.html +++ b/src/main/webapp/app/exam/manage/students/upload-images/students-upload-images-dialog.component.html @@ -34,7 +34,7 @@

      @if (hasParsed) {
      - {{ 'artemisApp.importUsers.numberOfUsersNotImported' | artemisTranslate }} + {{ notFoundUsers?.numberOfUsersNotFound }} diff --git a/src/main/webapp/app/exam/manage/students/verify-attendance-check/exam-students-attendance-check.component.html b/src/main/webapp/app/exam/manage/students/verify-attendance-check/exam-students-attendance-check.component.html index 2eee9c93ac88..85acc42e31d6 100644 --- a/src/main/webapp/app/exam/manage/students/verify-attendance-check/exam-students-attendance-check.component.html +++ b/src/main/webapp/app/exam/manage/students/verify-attendance-check/exam-students-attendance-check.component.html @@ -2,7 +2,7 @@ @if (isLoading) {
      } @else { @@ -35,26 +35,26 @@

      @@ -91,10 +91,10 @@

      }

      } diff --git a/src/main/webapp/app/exam/manage/suspicious-behavior/plagiarism-cases-overview/plagiarism-cases-overview.component.html b/src/main/webapp/app/exam/manage/suspicious-behavior/plagiarism-cases-overview/plagiarism-cases-overview.component.html index d027012cf046..88b2917e7530 100644 --- a/src/main/webapp/app/exam/manage/suspicious-behavior/plagiarism-cases-overview/plagiarism-cases-overview.component.html +++ b/src/main/webapp/app/exam/manage/suspicious-behavior/plagiarism-cases-overview/plagiarism-cases-overview.component.html @@ -1,12 +1,12 @@ -
      {{ 'artemisApp.examManagement.plagiarismCasesOverview.title' | artemisTranslate }}
      +
      - {{ 'artemisApp.examManagement.checklist.checklistItem' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.description' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.goTo' | artemisTranslate }} +
      1 - {{ 'artemisApp.examManagement.checklist.tableItem.suspiciousBehavior' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.descriptionItem.suspiciousBehavior' | artemisTranslate }} +

      		- {{ 'artemisApp.examManagement.suspiciousBehavior.title' | artemisTranslate }} +
      2 - {{ 'artemisApp.examManagement.checklist.tableItem.assessAllSubmissions' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.descriptionItem.assessAllSubmissions' | artemisTranslate }} +
      @if (examChecklist && examChecklist.numberOfTotalExamAssessmentsFinishedByCorrectionRound !== null && numberOfSubmitted !== 0) { @@ -439,7 +437,7 @@

      {{ 'artemisApp.examStatus.correction.examCorrection' | artemisTranslate }} - {{ 'artemisApp.examManagement.checklist.textitems.noSubmissions' | artemisTranslate }} + }
      @@ -447,24 +445,24 @@

      {{ 'artemisApp.examStatus.correction.examCorrection' | artemisTranslate }} - {{ 'artemisApp.examManagement.assessmentDashboard' | artemisTranslate }} +

      3 - {{ 'artemisApp.examManagement.checklist.tableItem.publishResults' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.descriptionItem.publishResults' | artemisTranslate }} +
      • - {{ 'artemisApp.examManagement.checklist.textitems.pulishingdateset' | artemisTranslate }} +
        • @if (exam.publishResultsDate) {
        @@ -574,22 +572,22 @@

        {{ 'artemisApp.examStatus.correction.examCorrection' | artemisTranslate }}

      		4 - {{ 'artemisApp.examManagement.checklist.tableItem.examReview' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.descriptionItem.examReview' | artemisTranslate }} +
      • - {{ 'artemisApp.examManagement.checklist.textitems.startdatereviewset' | artemisTranslate }} +
      • - {{ 'artemisApp.examManagement.checklist.textitems.enddatereviewset' | artemisTranslate }} +
      @@ -603,10 +601,10 @@

      {{ 'artemisApp.examStatus.correction.examCorrection' | artemisTranslate }}

      		5 - {{ 'artemisApp.examManagement.checklist.tableItem.resolveComplaints' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.descriptionItem.resolveComplaints' | artemisTranslate }} +
      @if (examChecklist && examChecklist.numberOfAllComplaintsDone !== null && examChecklist.numberOfAllComplaints !== 0) {
      @@ -621,7 +619,7 @@

      {{ 'artemisApp.examStatus.correction.examCorrection' | artemisTranslate }} - {{ 'artemisApp.examManagement.checklist.textitems.noComplaints' | artemisTranslate }} +

      }
      @@ -629,22 +627,22 @@

      {{ 'artemisApp.examStatus.correction.examCorrection' | artemisTranslate }} - {{ 'artemisApp.examManagement.assessmentDashboard' | artemisTranslate }} +

      6 - {{ 'artemisApp.examManagement.checklist.tableItem.exportResults' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.descriptionItem.exportResults' | artemisTranslate }} + - {{ 'entity.action.scores' | artemisTranslate }} +
      @if (!exam.testExam) { - {{ 'artemisApp.examManagement.testExam.realExam' | artemisTranslate }} + } @if (exam.testExam) { - {{ 'artemisApp.examManagement.testExam.testExam' | artemisTranslate }} + } diff --git a/src/main/webapp/app/exam/manage/exams/exam-mode-picker/exam-mode-picker.component.html b/src/main/webapp/app/exam/manage/exams/exam-mode-picker/exam-mode-picker.component.html index 49ee3579c49e..fe55d21b62a8 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-mode-picker/exam-mode-picker.component.html +++ b/src/main/webapp/app/exam/manage/exams/exam-mode-picker/exam-mode-picker.component.html @@ -1,8 +1,14 @@
      -
      - {{ 'artemisApp.examManagement.testExam.realExam' | artemisTranslate }} -
      +
      - {{ 'artemisApp.examManagement.testExam.testExam' | artemisTranslate }} -
      + jhiTranslate="artemisApp.examManagement.testExam.testExam" + >
      diff --git a/src/main/webapp/app/exam/manage/exams/exam-update.component.html b/src/main/webapp/app/exam/manage/exams/exam-update.component.html index 01c1a8c61705..780e07a92c40 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-update.component.html +++ b/src/main/webapp/app/exam/manage/exams/exam-update.component.html @@ -4,15 +4,15 @@ @if (!exam.id) {
      @if (!isImport) { -

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

      +

      } @if (isImport) { -

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

      +

      }
      } @else { -

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

      +

      }
      @@ -102,7 +102,7 @@
      @if (isStartDateSet && isValidStartDateValue && !isValidStartDate) { - {{ 'entity.startDateError' | artemisTranslate }} + }
      @@ -118,7 +118,7 @@
      @if (isEndDateSet && isValidEndDateValue && !isValidEndDate) { - {{ 'entity.endDateError' | artemisTranslate }} + }
      @@ -232,7 +232,7 @@
      @if (!isValidExamStudentReviewEnd) { - {{ 'artemisApp.examManagement.reviewDatesInvalidWarning' | artemisTranslate }} + } @@ -279,7 +279,7 @@
       {{ 'entity.action.' + (isImport ? 'import' : 'save') | artemisTranslate }} -
      {{ 'artemisApp.examManagement.reviewDatesInvalidExplanation' | artemisTranslate }}
      +
      @if (!isValidExamStudentReviewEnd) { diff --git a/src/main/webapp/app/exam/manage/exercise-groups/exercise-group-update.component.html b/src/main/webapp/app/exam/manage/exercise-groups/exercise-group-update.component.html index dedbac0c4960..fd9aab7bd355 100644 --- a/src/main/webapp/app/exam/manage/exercise-groups/exercise-group-update.component.html +++ b/src/main/webapp/app/exam/manage/exercise-groups/exercise-group-update.component.html @@ -1,5 +1,5 @@
      -

      {{ (exerciseGroup.id ? 'artemisApp.examManagement.exerciseGroup.update' : 'artemisApp.examManagement.exerciseGroup.create') | artemisTranslate }}

      +

      @@ -10,7 +10,7 @@

      {{ (exerciseGroup.id ? 'artemisApp.examManagement.exerciseGroup.update' : 'a

      - {{ 'artemisApp.examManagement.exerciseGroup.titleInfo' | artemisTranslate }} +
      diff --git a/src/main/webapp/app/exam/manage/exercise-groups/exercise-groups.component.html b/src/main/webapp/app/exam/manage/exercise-groups/exercise-groups.component.html index 3ef9ff418472..8b72a9f8f417 100644 --- a/src/main/webapp/app/exam/manage/exercise-groups/exercise-groups.component.html +++ b/src/main/webapp/app/exam/manage/exercise-groups/exercise-groups.component.html @@ -1,6 +1,6 @@
      -

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

      +

      @if (course?.isAtLeastEditor) {
      @@ -51,12 +51,12 @@
      {{ exerciseGroup.title }}
      - {{ 'artemisApp.fileUploadExercise.home.createLabel' | artemisTranslate }} + - {{ 'artemisApp.fileUploadExercise.home.importLabel' | artemisTranslate }} +
      @@ -65,12 +65,12 @@
      {{ exerciseGroup.title }}
      - {{ 'artemisApp.quizExercise.home.createLabel' | artemisTranslate }} + - {{ 'artemisApp.quizExercise.home.importLabel' | artemisTranslate }} +
      @@ -79,12 +79,12 @@
      {{ exerciseGroup.title }}
      - {{ 'artemisApp.textExercise.home.createLabel' | artemisTranslate }} + - {{ 'artemisApp.textExercise.home.importLabel' | artemisTranslate }} +
      @@ -93,12 +93,12 @@
      {{ exerciseGroup.title }}
      - {{ 'artemisApp.modelingExercise.home.createLabel' | artemisTranslate }} + - {{ 'artemisApp.modelingExercise.home.importLabel' | artemisTranslate }} +
      @@ -107,12 +107,12 @@
      {{ exerciseGroup.title }}
      - {{ 'artemisApp.programmingExercise.home.createLabel' | artemisTranslate }} + - {{ 'artemisApp.programmingExercise.home.importLabel' | artemisTranslate }} +
      @@ -122,7 +122,7 @@
      {{ exerciseGroup.title }}
      - {{ 'entity.action.edit' | artemisTranslate }} + @if ( exerciseGroup.id && @@ -181,50 +181,50 @@
      {{ exerciseGroup.title }}
      - {{ 'global.field.id' | artemisTranslate }} + - {{ 'artemisApp.examManagement.exerciseGroup.type' | artemisTranslate }} + - {{ 'artemisApp.examManagement.exerciseGroup.title' | artemisTranslate }} + - {{ 'artemisApp.examManagement.exerciseGroup.points' | artemisTranslate }} + - {{ 'artemisApp.exercise.bonus' | artemisTranslate }} + - {{ 'artemisApp.exercise.includedCompletely' | artemisTranslate }} + - {{ 'artemisApp.exercise.shortName' | artemisTranslate }} + - {{ 'artemisApp.programmingExercise.repositories' | artemisTranslate }} + - {{ 'artemisApp.programmingExercise.buildplans' | artemisTranslate }} + - {{ 'artemisApp.programmingExercise.participationMode' | artemisTranslate }} + - {{ 'artemisApp.quizExercise.questions' | artemisTranslate }} + - {{ 'artemisApp.modelingExercise.diagramType' | artemisTranslate }} + - {{ 'artemisApp.fileUploadExercise.filePattern' | artemisTranslate }} + - {{ 'artemisApp.assessmentMode' | artemisTranslate }} + - {{ 'global.field.id' | artemisTranslate }} + - {{ 'artemisApp.examManagement.examStudents.login' | artemisTranslate }} + - {{ 'artemisApp.examManagement.examStudents.registrationNumber' | artemisTranslate }} + - {{ 'artemisApp.examManagement.examStudents.attendanceChecks' | artemisTranslate }} + - {{ 'artemisApp.studentExams.started' | artemisTranslate }} + - {{ 'artemisApp.studentExams.submitted' | artemisTranslate }} +
      - {{ (examUser?.started ? 'global.generic.yes' : 'global.generic.no') | artemisTranslate }} + - {{ (examUser?.submitted ? 'global.generic.yes' : 'global.generic.no') | artemisTranslate }} +
      - - - - + + + + @@ -17,16 +17,22 @@
      {{ 'artemisApp.examManagement.plagiarismCasesOverview.title' | artemisTransl
      }
      #{{ 'artemisApp.examManagement.plagiarismCasesOverview.exerciseName' | artemisTranslate }}{{ 'artemisApp.examManagement.plagiarismCasesOverview.numberOfResults' | artemisTranslate }}{{ 'artemisApp.examManagement.plagiarismCasesOverview.numberOfCases' | artemisTranslate }}{{ 'artemisApp.examManagement.plagiarismCasesOverview.actions' | artemisTranslate }}
      {{ plagiarismResultsPerExercise.get(exercise) }} {{ plagiarismCasesPerExercise.get(exercise) }} - +
      @if (anyPlagiarismCases) { - + } diff --git a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-behavior.component.html b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-behavior.component.html index 6e5324ec1046..fbe0e73a6b1d 100644 --- a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-behavior.component.html +++ b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-behavior.component.html @@ -2,12 +2,10 @@
      {{ 'artemisApp.examManagement.suspiciousBehavior.title' | artemisTranslate }}
      -

      - {{ 'artemisApp.examManagement.suspiciousBehavior.suspiciousSessionDescription' | artemisTranslate }} -

      +

      - +
      id="different-student-exams-same-fingerprints" [(ngModel)]="checkboxCriterionDifferentStudentExamsSameBrowserFingerprintChecked" /> - +
      - +
      id="same-student-exam-different-fingerprints" [(ngModel)]="checkboxCriterionSameStudentExamDifferentBrowserFingerprintsChecked" /> - +
      - +
      @if (checkboxCriterionIPOutsideOfASpecificRangeChecked) {
      - +
      diff --git a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions-overview/suspicious-sessions-overview.component.html b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions-overview/suspicious-sessions-overview.component.html index 99d55bae1d19..369a156ad591 100644 --- a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions-overview/suspicious-sessions-overview.component.html +++ b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions-overview/suspicious-sessions-overview.component.html @@ -1,4 +1,4 @@ -
      {{ 'artemisApp.examManagement.suspiciousBehavior.suspiciousSessions.title' | artemisTranslate }}
      +
      @for (suspiciousSessionsSet of suspiciousSessions; track suspiciousSessionsSet; let i = $index) {

      {{ 'artemisApp.examManagement.suspiciousBehavior.suspiciousSessions.case' | artemisTranslate }} @@ -18,12 +18,12 @@

      {{ 'artemisApp.examManagement.suspiciousBehavior.suspiciousSess - - - - - - + + + + + + diff --git a/src/main/webapp/app/exam/manage/test-runs/test-run-management.component.html b/src/main/webapp/app/exam/manage/test-runs/test-run-management.component.html index 7c794b51fee1..988dcfa83074 100644 --- a/src/main/webapp/app/exam/manage/test-runs/test-run-management.component.html +++ b/src/main/webapp/app/exam/manage/test-runs/test-run-management.component.html @@ -48,7 +48,7 @@

      {{ exam?

      - - + + @if (!isExamMode) { } @if (!isExamMode) { } diff --git a/src/main/webapp/app/shared/date-time-picker/date-time-picker.component.html b/src/main/webapp/app/shared/date-time-picker/date-time-picker.component.html index 075a103d96c8..b1983a2ef7d2 100644 --- a/src/main/webapp/app/shared/date-time-picker/date-time-picker.component.html +++ b/src/main/webapp/app/shared/date-time-picker/date-time-picker.component.html @@ -41,7 +41,7 @@ @if (dateInput.invalid || (requiredField && !dateInput.value)) { -
      {{ 'entity.dateMissingOrNotValid' | artemisTranslate: { labelName: labelName } }}
      +
      } @if (warning) {
      diff --git a/src/main/webapp/app/shared/exercise-categories/exercise-categories.component.html b/src/main/webapp/app/shared/exercise-categories/exercise-categories.component.html index b78d7f984ae9..dd757a2d5b36 100644 --- a/src/main/webapp/app/shared/exercise-categories/exercise-categories.component.html +++ b/src/main/webapp/app/shared/exercise-categories/exercise-categories.component.html @@ -7,7 +7,7 @@

      } @if (asQuizExercise(exercise).isActiveQuiz && showTags.quizLive) {

      - {{ 'artemisApp.courseOverview.exerciseList.live' | artemisTranslate }} +

      } @for (category of exercise.categories; track category) { diff --git a/src/main/webapp/app/shared/layouts/navbar/navbar.component.html b/src/main/webapp/app/shared/layouts/navbar/navbar.component.html index af13f560659b..556aee6ce6bb 100644 --- a/src/main/webapp/app/shared/layouts/navbar/navbar.component.html +++ b/src/main/webapp/app/shared/layouts/navbar/navbar.component.html @@ -36,7 +36,7 @@
    4. - {{ 'global.menu.settings' | artemisTranslate }} +
      5. diff --git a/src/main/webapp/app/shared/loading-indicator-container/loading-indicator-container.component.html b/src/main/webapp/app/shared/loading-indicator-container/loading-indicator-container.component.html index 785e34640ba0..46f976b39ec6 100644 --- a/src/main/webapp/app/shared/loading-indicator-container/loading-indicator-container.component.html +++ b/src/main/webapp/app/shared/loading-indicator-container/loading-indicator-container.component.html @@ -1,7 +1,7 @@ @if (isLoading) { } @else { diff --git a/src/main/webapp/app/shared/markdown-editor/markdown-editor.component.html b/src/main/webapp/app/shared/markdown-editor/markdown-editor.component.html index 441a919c35f5..9b9c93c7be41 100644 --- a/src/main/webapp/app/shared/markdown-editor/markdown-editor.component.html +++ b/src/main/webapp/app/shared/markdown-editor/markdown-editor.component.html @@ -3,7 +3,7 @@ @if (showEditButton) { - {{ 'entity.action.edit' | artemisTranslate }} + }
      @@ -32,7 +32,7 @@ />
      @if (error) { - + } @for (notification of sortedNotifications; track notification) {
      @@ -76,14 +74,10 @@
      } @if (sortedNotifications.length > 0 && sortedNotifications.length >= totalNotifications) { - - {{ 'artemisApp.notification.allLoaded' | artemisTranslate }} - + } @if (sortedNotifications && sortedNotifications.length === 0) { - - {{ 'artemisApp.notification.noNotifications' | artemisTranslate }} - + }
      diff --git a/src/main/webapp/app/shared/participant-scores/participant-scores-distribution/participant-scores-distribution.component.html b/src/main/webapp/app/shared/participant-scores/participant-scores-distribution/participant-scores-distribution.component.html index a7b196bb2886..c5234a016536 100644 --- a/src/main/webapp/app/shared/participant-scores/participant-scores-distribution/participant-scores-distribution.component.html +++ b/src/main/webapp/app/shared/participant-scores/participant-scores-distribution/participant-scores-distribution.component.html @@ -28,17 +28,17 @@ @if (gradingScaleExists && !isBonus) {
      - {{ 'artemisApp.examScores.insufficientPerformance' | artemisTranslate }} +
      - {{ 'artemisApp.examScores.sufficientPerformance' | artemisTranslate }} +
      } @if (!gradingScaleExists || isBonus) {
      - {{ 'artemisApp.examScores.criticalPerformance' | artemisTranslate }} +
      - {{ 'artemisApp.examScores.uncriticalPerformance' | artemisTranslate }} +
      } diff --git a/src/main/webapp/app/shared/statistics-graph/statistics-average-score-graph.component.html b/src/main/webapp/app/shared/statistics-graph/statistics-average-score-graph.component.html index 531278576856..961dc2547a02 100644 --- a/src/main/webapp/app/shared/statistics-graph/statistics-average-score-graph.component.html +++ b/src/main/webapp/app/shared/statistics-graph/statistics-average-score-graph.component.html @@ -1,6 +1,6 @@
      -

      {{ 'artemisApp.course.averageScore' | artemisTranslate }}

      +

      {{ 'artemisApp.courseStatistics.courseAverage' | artemisTranslate }}: {{ courseAverage }}%

      @@ -58,15 +58,15 @@

      {{ 'artemisApp.courseStatistics.courseAverage' | artemisTranslate }}: {{ cou id="filter-dropdown-button" > - {{ - 'artemisApp.courseOverview.exerciseList.filter' - | artemisTranslate: { num: exerciseTypeFilter.numberOfActiveFilters + chartCategoryFilter.numberOfActiveFilters } - }} +
        @if (exerciseTypeFilter.typeSet.size) {
      • - {{ 'artemisApp.exercise-scores-chart.includeType' | artemisTranslate }} +
        • } @for (type of exerciseTypeFilter.typeSet; track type) { @@ -83,12 +83,12 @@

        {{ 'artemisApp.courseStatistics.courseAverage' | artemisTranslate }}: {{ cou }
      • - {{ 'artemisApp.courseOverview.statistics.includeIndividualCategories' | artemisTranslate }} +
        • @if (chartCategoryFilter.exercisesWithoutCategoriesPresent) { @@ -100,7 +100,7 @@

        {{ 'artemisApp.courseStatistics.courseAverage' | artemisTranslate }}: {{ cou [checked]="chartCategoryFilter.includeExercisesWithNoCategory" type="checkbox" /> - {{ 'artemisApp.courseOverview.statistics.exercisesWithNoCategories' | artemisTranslate }} + } diff --git a/src/main/webapp/app/shared/statistics-graph/statistics-score-distribution-graph.component.html b/src/main/webapp/app/shared/statistics-graph/statistics-score-distribution-graph.component.html index 2f15e2d4e415..88e1222da5fe 100644 --- a/src/main/webapp/app/shared/statistics-graph/statistics-score-distribution-graph.component.html +++ b/src/main/webapp/app/shared/statistics-graph/statistics-score-distribution-graph.component.html @@ -1,6 +1,6 @@
        -

        {{ 'statistics.score_distribution' | artemisTranslate }}

        +

        {{ 'artemisApp.dataExport.loginOrName' | artemisTranslate }} +
        @if (!hasImported) {
        - {{ 'artemisApp.importUsers.numberOfUsers' | artemisTranslate }} +  {{ usersToImport.length }}
        } @else {
        - {{ 'artemisApp.importUsers.numberOfUsersImported' | artemisTranslate }} + {{ numberOfUsersImported }}
        - {{ 'artemisApp.importUsers.numberOfUsersNotImported' | artemisTranslate }} + {{ numberOfUsersNotImported }} @@ -196,16 +196,16 @@

        @if (!hasImported) {
        - {{ 'artemisApp.importUsers.numberOfUsers' | artemisTranslate }} +  {{ examUsersToImport.length }}
        } @else {
        - {{ 'artemisApp.importUsers.numberOfUsersImported' | artemisTranslate }} + {{ numberOfUsersImported }}
        - {{ 'artemisApp.importUsers.numberOfUsersNotImported' | artemisTranslate }} + {{ numberOfUsersNotImported }} diff --git a/src/main/webapp/app/shared/user-settings/account-information/account-information.component.html b/src/main/webapp/app/shared/user-settings/account-information/account-information.component.html index 42462ba6efce..3839e7313a50 100644 --- a/src/main/webapp/app/shared/user-settings/account-information/account-information.component.html +++ b/src/main/webapp/app/shared/user-settings/account-information/account-information.component.html @@ -1,51 +1,33 @@ -

        - - {{ 'artemisApp.userSettings.accountInformation' | artemisTranslate }} -

        +

        @if (currentUser) {
        @if (currentUser.name) {
        -
        - - {{ 'artemisApp.userSettings.accountInformationPage.fullName' | artemisTranslate }} -
        +
        {{ currentUser.name }}
        } @if (currentUser.login) {
        -
        - - {{ 'artemisApp.userSettings.accountInformationPage.login' | artemisTranslate }} -
        +
        {{ currentUser.login }}
        } @if (currentUser.email) {
        -
        - - {{ 'artemisApp.userSettings.accountInformationPage.email' | artemisTranslate }} -
        +
        {{ currentUser.email }}
        } @if (currentUser.visibleRegistrationNumber) {
        -
        - - {{ 'artemisApp.userSettings.accountInformationPage.registrationNumber' | artemisTranslate }} -
        +
        {{ currentUser.visibleRegistrationNumber }}
        } @if (currentUser.createdDate) {
        -
        - - {{ 'artemisApp.userSettings.accountInformationPage.joinedArtemis' | artemisTranslate }} -
        +
        {{ currentUser.createdDate | artemisDate }}
        } diff --git a/src/main/webapp/app/shared/user-settings/notification-settings/notification-settings.component.html b/src/main/webapp/app/shared/user-settings/notification-settings/notification-settings.component.html index 269661531970..acacf8e53e74 100644 --- a/src/main/webapp/app/shared/user-settings/notification-settings/notification-settings.component.html +++ b/src/main/webapp/app/shared/user-settings/notification-settings/notification-settings.component.html @@ -6,10 +6,7 @@

        - - - {{ 'artemisApp.userSettings.notificationSettingsFilterInfo' | artemisTranslate }} - +
        @if (settingsChanged) { diff --git a/src/main/webapp/app/shared/user-settings/science-settings/science-settings.component.html b/src/main/webapp/app/shared/user-settings/science-settings/science-settings.component.html index 785898d7944e..5630d96781d8 100644 --- a/src/main/webapp/app/shared/user-settings/science-settings/science-settings.component.html +++ b/src/main/webapp/app/shared/user-settings/science-settings/science-settings.component.html @@ -6,16 +6,12 @@

        - - {{ 'artemisApp.userSettings.scienceSettingsInfo' | artemisTranslate }} - +
        @if (!featureToggleActive) {
        - - {{ 'artemisApp.userSettings.scienceSettingsFeatureDisabled' | artemisTranslate }} - +
        }
        diff --git a/src/main/webapp/app/shared/user-settings/user-settings-container/user-settings-container.component.html b/src/main/webapp/app/shared/user-settings/user-settings-container/user-settings-container.component.html index 7056c68a6534..87f9a29c5d01 100644 --- a/src/main/webapp/app/shared/user-settings/user-settings-container/user-settings-container.component.html +++ b/src/main/webapp/app/shared/user-settings/user-settings-container/user-settings-container.component.html @@ -16,27 +16,17 @@

        diff --git a/src/test/javascript/spec/component/assessment-shared/assessment-complaint-alert.component.spec.ts b/src/test/javascript/spec/component/assessment-shared/assessment-complaint-alert.component.spec.ts index 0bf67ea63b40..af84f8154c5f 100644 --- a/src/test/javascript/spec/component/assessment-shared/assessment-complaint-alert.component.spec.ts +++ b/src/test/javascript/spec/component/assessment-shared/assessment-complaint-alert.component.spec.ts @@ -3,6 +3,7 @@ import { AssessmentComplaintAlertComponent } from 'app/assessment/assessment-com import { ArtemisTestModule } from '../../test.module'; import { Complaint, ComplaintType } from 'app/entities/complaint.model'; import { TranslatePipeMock } from '../../helpers/mocks/service/mock-translate.service'; +import { By } from '@angular/platform-browser'; describe('AssessmentComplaintAlertComponent', () => { let component: AssessmentComplaintAlertComponent; @@ -42,16 +43,16 @@ describe('AssessmentComplaintAlertComponent', () => { it('should show complaint alert text for complaint', () => { setComplaintOfType(ComplaintType.COMPLAINT); - const alertNode = fixture.debugElement.children[0]; + const alertNode = fixture.debugElement.query(By.css('.alert-info')); expect(alertNode).toBeTruthy(); - expect(alertNode.nativeElement.textContent).toContain('artemisApp.complaint.hint'); + expect(alertNode.attributes['jhiTranslate']).toBe('artemisApp.complaint.hint'); }); it('should show complaint alert text for more feedback request', () => { setComplaintOfType(ComplaintType.MORE_FEEDBACK); - const alertNode = fixture.debugElement.children[0]; + const alertNode = fixture.debugElement.query(By.css('.alert-info')); expect(alertNode).toBeTruthy(); - expect(alertNode.nativeElement.textContent).toContain('artemisApp.moreFeedback.hint'); + expect(alertNode.attributes['jhiTranslate']).toBe('artemisApp.moreFeedback.hint'); }); }); diff --git a/src/test/javascript/spec/component/code-editor/code-editor-status.component.spec.ts b/src/test/javascript/spec/component/code-editor/code-editor-status.component.spec.ts index 1f8d058725f9..f3837316e767 100644 --- a/src/test/javascript/spec/component/code-editor/code-editor-status.component.spec.ts +++ b/src/test/javascript/spec/component/code-editor/code-editor-status.component.spec.ts @@ -1,13 +1,13 @@ -import { DebugElement } from '@angular/core/'; +import { DebugElement } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module'; import { ArtemisTestModule } from '../../test.module'; import { By } from '@angular/platform-browser'; import { CodeEditorStatusComponent } from 'app/exercises/programming/shared/code-editor/status/code-editor-status.component'; import { CommitState } from 'app/exercises/programming/shared/code-editor/model/code-editor.model'; -import { TranslatePipeMock } from '../../helpers/mocks/service/mock-translate.service'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { MockModule } from 'ng-mocks'; +import { TranslatePipeMock } from '../../helpers/mocks/service/mock-translate.service'; describe('CodeEditorStatusComponent', () => { let comp: CodeEditorStatusComponent; @@ -22,29 +22,44 @@ describe('CodeEditorStatusComponent', () => { .then(() => { fixture = TestBed.createComponent(CodeEditorStatusComponent); comp = fixture.componentInstance; + fixture.detectChanges(); }); }); + it('should create', () => { + expect(comp).toBeTruthy(); + }); + it('should show an empty status segment for CommitState if no EditorState is given', () => { + fixture.detectChanges(); const commitStateSegment = fixture.debugElement.query(By.css('#commit_state')); - expect(commitStateSegment.children).toBeEmpty(); + expect(commitStateSegment.children).toHaveLength(0); }); - Object.keys(CommitState).map((commitState) => - it(`should show exactly one status segment for CommitState ${commitState} with an icon and a non empty description`, () => { + const commitStateToTranslationKey = { + UNDEFINED: 'artemisApp.editor.changesUndefined', + COULD_NOT_BE_RETRIEVED: 'artemisApp.editor.changesError', + CONFLICT: 'artemisApp.editor.changesConflict', + CLEAN: 'artemisApp.editor.changesSubmitted', + UNCOMMITTED_CHANGES: 'artemisApp.editor.unsubmittedChanges', + COMMITTING: 'artemisApp.editor.submittingChanges', + }; + + Object.keys(CommitState).forEach((commitState) => + it(`should show exactly one status segment for CommitState ${commitState} with an icon and a non-empty description`, () => { comp.commitState = commitState as CommitState; fixture.detectChanges(); const commitStateSegment = fixture.debugElement.query(By.css('#commit_state')); - showsExactlyOneStatusSegment(commitStateSegment); + showsExactlyOneStatusSegment(commitStateSegment, commitStateToTranslationKey[commitState as keyof typeof commitStateToTranslationKey]); }), ); - const showsExactlyOneStatusSegment = (stateSegment: DebugElement) => { + const showsExactlyOneStatusSegment = (stateSegment: DebugElement, expectedKey: string) => { expect(stateSegment.children).toHaveLength(1); const icon = stateSegment.query(By.css('fa-icon')); expect(icon).not.toBeNull(); - const text = stateSegment.query(By.css('span')); + const text = stateSegment.query(By.css('span[jhiTranslate]')); expect(text).not.toBeNull(); - expect(text.nativeElement.textContent).not.toBe(''); + expect(text.attributes['jhiTranslate']).toBe(expectedKey); }; }); diff --git a/src/test/javascript/spec/component/complaints/complaints-for-tutor.component.spec.ts b/src/test/javascript/spec/component/complaints/complaints-for-tutor.component.spec.ts index 0a6055063b27..c8fdeedcc452 100644 --- a/src/test/javascript/spec/component/complaints/complaints-for-tutor.component.spec.ts +++ b/src/test/javascript/spec/component/complaints/complaints-for-tutor.component.spec.ts @@ -4,7 +4,7 @@ import { ComplaintResponseService } from 'app/complaints/complaint-response.serv import { ComplaintsForTutorComponent } from 'app/complaints/complaints-for-tutor/complaints-for-tutor.component'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; import { TextareaCounterComponent } from 'app/shared/textarea/textarea-counter.component'; -import { MockComponent, MockPipe, MockProvider } from 'ng-mocks'; +import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks'; import { RouterTestingModule } from '@angular/router/testing'; import { AlertService } from 'app/core/util/alert.service'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; @@ -17,6 +17,7 @@ import { HttpResponse } from '@angular/common/http'; import { of } from 'rxjs'; import { Course } from 'app/entities/course.model'; import { Exercise } from 'app/entities/exercise.model'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; describe('ComplaintsForTutorComponent', () => { let complaintsForTutorComponent: ComplaintsForTutorComponent; @@ -29,7 +30,13 @@ describe('ComplaintsForTutorComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [RouterTestingModule.withRoutes([]), FormsModule], - declarations: [ComplaintsForTutorComponent, MockPipe(ArtemisTranslatePipe), MockPipe(ArtemisDatePipe), MockComponent(TextareaCounterComponent)], + declarations: [ + ComplaintsForTutorComponent, + MockPipe(ArtemisTranslatePipe), + MockPipe(ArtemisDatePipe), + MockComponent(TextareaCounterComponent), + MockDirective(TranslateDirective), + ], providers: [MockProvider(ComplaintResponseService), MockProvider(ComplaintService), MockProvider(AlertService)], }) .compileComponents() diff --git a/src/test/javascript/spec/component/exam/exam-scores/exam-scores-average-scores-graph.component.spec.ts b/src/test/javascript/spec/component/exam/exam-scores/exam-scores-average-scores-graph.component.spec.ts index 80750ba8853b..5bf796d51879 100644 --- a/src/test/javascript/spec/component/exam/exam-scores/exam-scores-average-scores-graph.component.spec.ts +++ b/src/test/javascript/spec/component/exam/exam-scores/exam-scores-average-scores-graph.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateService } from '@ngx-translate/core'; -import { MockModule, MockPipe, MockProvider } from 'ng-mocks'; +import { MockDirective, MockModule, MockPipe, MockProvider } from 'ng-mocks'; import { of } from 'rxjs'; import { HttpResponse } from '@angular/common/http'; import { ExamScoresAverageScoresGraphComponent } from 'app/exam/exam-scores/exam-scores-average-scores-graph.component'; @@ -15,6 +15,7 @@ import { GraphColors } from 'app/entities/statistics.model'; import { NgxChartsSingleSeriesDataEntry } from 'app/shared/chart/ngx-charts-datatypes'; import { ExerciseType } from 'app/entities/exercise.model'; import { LocaleConversionService } from 'app/shared/service/locale-conversion.service'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; describe('ExamScoresAverageScoresGraphComponent', () => { let fixture: ComponentFixture; @@ -55,7 +56,7 @@ describe('ExamScoresAverageScoresGraphComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ArtemisTestModule, RouterTestingModule.withRoutes([]), MockModule(BarChartModule)], - declarations: [ExamScoresAverageScoresGraphComponent, MockPipe(ArtemisTranslatePipe)], + declarations: [ExamScoresAverageScoresGraphComponent, MockPipe(ArtemisTranslatePipe), MockDirective(TranslateDirective)], providers: [ MockProvider(CourseManagementService, { find: () => { diff --git a/src/test/javascript/spec/component/exam/manage/exercise-groups/exercise-group-update.component.spec.ts b/src/test/javascript/spec/component/exam/manage/exercise-groups/exercise-group-update.component.spec.ts index d20532d40dc7..8ca421927fb9 100644 --- a/src/test/javascript/spec/component/exam/manage/exercise-groups/exercise-group-update.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/exercise-groups/exercise-group-update.component.spec.ts @@ -12,13 +12,14 @@ import { ExerciseGroupUpdateComponent } from 'app/exam/manage/exercise-groups/ex import { ExerciseGroupService } from 'app/exam/manage/exercise-groups/exercise-group.service'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { AlertService } from 'app/core/util/alert.service'; -import { MockComponent, MockPipe } from 'ng-mocks'; +import { MockComponent, MockDirective, MockPipe } from 'ng-mocks'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { of, throwError } from 'rxjs'; import { MockRouter } from '../../../../helpers/mocks/mock-router'; import { MockSyncStorage } from '../../../../helpers/mocks/service/mock-sync-storage.service'; import { MockTranslateService } from '../../../../helpers/mocks/service/mock-translate.service'; import { NgbAlertsMocksModule } from '../../../../helpers/mocks/directive/ngbAlertsMocks.module'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; describe('ExerciseGroupUpdateComponent', () => { const course = { id: 456 } as Course; @@ -43,7 +44,7 @@ describe('ExerciseGroupUpdateComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [HttpClientModule, FormsModule, NgbAlertsMocksModule], - declarations: [ExerciseGroupUpdateComponent, MockPipe(ArtemisTranslatePipe), MockComponent(FaIconComponent)], + declarations: [ExerciseGroupUpdateComponent, MockPipe(ArtemisTranslatePipe), MockComponent(FaIconComponent), MockDirective(TranslateDirective)], providers: [ { provide: SessionStorageService, useClass: MockSyncStorage }, { provide: LocalStorageService, useClass: MockSyncStorage }, diff --git a/src/test/javascript/spec/component/exam/participate/exam-navigation-bar.component.spec.ts b/src/test/javascript/spec/component/exam/participate/exam-navigation-bar.component.spec.ts index 50389d445c46..fb8f91a5ba57 100644 --- a/src/test/javascript/spec/component/exam/participate/exam-navigation-bar.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/exam-navigation-bar.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; import dayjs from 'dayjs/esm'; -import { MockComponent, MockModule } from 'ng-mocks'; +import { MockComponent, MockDirective, MockModule } from 'ng-mocks'; import { Exercise, ExerciseType } from 'app/entities/exercise.model'; import { ExamSession } from 'app/entities/exam-session.model'; import { of } from 'rxjs'; @@ -21,6 +21,7 @@ import { TranslateService } from '@ngx-translate/core'; import { faCheck, faEdit } from '@fortawesome/free-solid-svg-icons'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { ExamLiveEventsButtonComponent } from 'app/exam/participate/events/exam-live-events-button.component'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; describe('Exam Navigation Bar Component', () => { let fixture: ComponentFixture; @@ -35,7 +36,7 @@ describe('Exam Navigation Bar Component', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ArtemisTestModule, TranslateTestingModule, MockModule(NgbTooltipModule)], - declarations: [ExamNavigationBarComponent, MockComponent(ExamTimerComponent), MockComponent(ExamLiveEventsButtonComponent)], + declarations: [ExamNavigationBarComponent, MockComponent(ExamTimerComponent), MockComponent(ExamLiveEventsButtonComponent), MockDirective(TranslateDirective)], providers: [ ExamParticipationService, { provide: ExamExerciseUpdateService, useValue: mockExamExerciseUpdateService }, diff --git a/src/test/javascript/spec/component/exam/participate/exercises/text-exam-submission.component.spec.ts b/src/test/javascript/spec/component/exam/participate/exercises/text-exam-submission.component.spec.ts index 97f000ca0af1..6671fb12acf4 100644 --- a/src/test/javascript/spec/component/exam/participate/exercises/text-exam-submission.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/exercises/text-exam-submission.component.spec.ts @@ -16,6 +16,7 @@ import { ExamExerciseUpdateHighlighterComponent } from 'app/exam/participate/exe import { ArtemisTestModule } from '../../../../test.module'; import { ResizeableContainerComponent } from 'app/shared/resizeable-container/resizeable-container.component'; import dayjs from 'dayjs/esm'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; describe('TextExamSubmissionComponent', () => { let fixture: ComponentFixture; @@ -38,6 +39,7 @@ describe('TextExamSubmissionComponent', () => { MockComponent(IncludedInScoreBadgeComponent), MockComponent(ExamExerciseUpdateHighlighterComponent), MockComponent(ResizeableContainerComponent), + MockDirective(TranslateDirective), ], providers: [MockProvider(TextEditorService), MockProvider(ArtemisMarkdownService)], }) diff --git a/src/test/javascript/spec/component/exam/shared/events/exam-live-event.component.spec.ts b/src/test/javascript/spec/component/exam/shared/events/exam-live-event.component.spec.ts index f53027f7a24c..fe01da3df68d 100644 --- a/src/test/javascript/spec/component/exam/shared/events/exam-live-event.component.spec.ts +++ b/src/test/javascript/spec/component/exam/shared/events/exam-live-event.component.spec.ts @@ -16,6 +16,8 @@ import { TranslateService } from '@ngx-translate/core'; import { HtmlForMarkdownPipe } from 'app/shared/pipes/html-for-markdown.pipe'; import { ArtemisDurationFromSecondsPipe } from 'app/shared/pipes/artemis-duration-from-seconds.pipe'; import { WorkingTimeChangeComponent } from 'app/exam/shared/working-time-change/working-time-change.component'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; +import { MockDirective } from 'ng-mocks'; describe('ExamLiveEventComponent', () => { let component: ExamLiveEventComponent; @@ -23,7 +25,15 @@ describe('ExamLiveEventComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ExamLiveEventComponent, WorkingTimeChangeComponent, ArtemisTranslatePipe, ArtemisDatePipe, HtmlForMarkdownPipe, ArtemisDurationFromSecondsPipe], + declarations: [ + ExamLiveEventComponent, + WorkingTimeChangeComponent, + ArtemisTranslatePipe, + ArtemisDatePipe, + HtmlForMarkdownPipe, + ArtemisDurationFromSecondsPipe, + MockDirective(TranslateDirective), + ], imports: [FontAwesomeModule], providers: [{ provide: TranslateService, useClass: MockTranslateService }], }).compileComponents(); diff --git a/src/test/javascript/spec/component/exam/test-run/test-run-management.component.spec.ts b/src/test/javascript/spec/component/exam/test-run/test-run-management.component.spec.ts index 725a5b677390..70e64fbff5d8 100644 --- a/src/test/javascript/spec/component/exam/test-run/test-run-management.component.spec.ts +++ b/src/test/javascript/spec/component/exam/test-run/test-run-management.component.spec.ts @@ -58,6 +58,7 @@ describe('Test Run Management Component', () => { MockPipe(ArtemisDatePipe), MockDirective(SortDirective), MockDirective(DeleteButtonDirective), + MockDirective(TranslateDirective), ], providers: [ { provide: LocalStorageService, useClass: MockSyncStorage }, diff --git a/src/test/javascript/spec/component/exercises/shared/result.spec.ts b/src/test/javascript/spec/component/exercises/shared/result.spec.ts index 65d663a7dd12..3314be02465d 100644 --- a/src/test/javascript/spec/component/exercises/shared/result.spec.ts +++ b/src/test/javascript/spec/component/exercises/shared/result.spec.ts @@ -23,6 +23,7 @@ import { ResultTemplateStatus } from 'app/exercises/shared/result/result.utils'; import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'; import dayjs from 'dayjs/esm'; import { MIN_SCORE_GREEN, MIN_SCORE_ORANGE } from 'app/app.constants'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; describe('ResultComponent', () => { let fixture: ComponentFixture; @@ -50,7 +51,7 @@ describe('ResultComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ArtemisTestModule, MockDirective(NgbTooltip)], - declarations: [ResultComponent, MockPipe(ArtemisTranslatePipe), MockPipe(ArtemisTimeAgoPipe), MockPipe(ArtemisDatePipe)], + declarations: [ResultComponent, MockPipe(ArtemisTranslatePipe), MockPipe(ArtemisTimeAgoPipe), MockPipe(ArtemisDatePipe), MockDirective(TranslateDirective)], providers: [ { provide: LocalStorageService, useClass: MockSyncStorage }, { provide: SessionStorageService, useClass: MockSyncStorage }, diff --git a/src/test/javascript/spec/component/grading-system/detailed-grading-system.component.spec.ts b/src/test/javascript/spec/component/grading-system/detailed-grading-system.component.spec.ts index c9fa23b97001..4e3b44045052 100644 --- a/src/test/javascript/spec/component/grading-system/detailed-grading-system.component.spec.ts +++ b/src/test/javascript/spec/component/grading-system/detailed-grading-system.component.spec.ts @@ -22,6 +22,7 @@ import { MockCourseManagementService } from '../../helpers/mocks/service/mock-co import { HelpIconComponent } from 'app/shared/components/help-icon.component'; import { PresentationType } from 'app/grading-system/grading-system-presentations/grading-system-presentations.component'; import { download, generateCsv, mkConfig } from 'export-to-csv'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; jest.mock('export-to-csv', () => { return { @@ -86,6 +87,7 @@ describe('Detailed Grading System Component', () => { MockComponent(HelpIconComponent), MockDirective(DeleteButtonDirective), MockPipe(ArtemisTranslatePipe), + MockDirective(TranslateDirective), ], providers: [ { provide: ActivatedRoute, useValue: route }, diff --git a/src/test/javascript/spec/component/overview/course-conversations/dialogs/conversation-add-users-dialog/add-users-form/conversation-add-users-form.component.spec.ts b/src/test/javascript/spec/component/overview/course-conversations/dialogs/conversation-add-users-dialog/add-users-form/conversation-add-users-form.component.spec.ts index 61f94f5c2cfc..5dba62cd4934 100644 --- a/src/test/javascript/spec/component/overview/course-conversations/dialogs/conversation-add-users-dialog/add-users-form/conversation-add-users-form.component.spec.ts +++ b/src/test/javascript/spec/component/overview/course-conversations/dialogs/conversation-add-users-dialog/add-users-form/conversation-add-users-form.component.spec.ts @@ -5,7 +5,7 @@ import { } from 'app/overview/course-conversations/dialogs/conversation-add-users-dialog/add-users-form/conversation-add-users-form.component'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { MockComponent, MockPipe } from 'ng-mocks'; +import { MockComponent, MockDirective, MockPipe } from 'ng-mocks'; import { CourseUsersSelectorComponent } from 'app/shared/course-users-selector/course-users-selector.component'; import { ConversationDTO } from 'app/entities/metis/conversation/conversation.model'; import { generateExampleChannelDTO, generateExampleGroupChatDTO } from '../../../helpers/conversationExampleModels'; @@ -13,6 +13,7 @@ import { Course } from 'app/entities/course.model'; import { isChannelDTO } from 'app/entities/metis/conversation/channel.model'; import { By } from '@angular/platform-browser'; import { UserPublicInfoDTO } from 'app/core/user/user.model'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; const examples: ConversationDTO[] = [generateExampleGroupChatDTO({}), generateExampleChannelDTO({})]; examples.forEach((activeConversation) => { @@ -24,7 +25,7 @@ examples.forEach((activeConversation) => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ReactiveFormsModule, FormsModule], - declarations: [ConversationAddUsersFormComponent, MockComponent(CourseUsersSelectorComponent), MockPipe(ArtemisTranslatePipe)], + declarations: [ConversationAddUsersFormComponent, MockComponent(CourseUsersSelectorComponent), MockPipe(ArtemisTranslatePipe), MockDirective(TranslateDirective)], }).compileComponents(); })); diff --git a/src/test/javascript/spec/component/overview/course-statistics/course-statistics.component.spec.ts b/src/test/javascript/spec/component/overview/course-statistics/course-statistics.component.spec.ts index ea11d9ecd2a4..7631c4d81136 100644 --- a/src/test/javascript/spec/component/overview/course-statistics/course-statistics.component.spec.ts +++ b/src/test/javascript/spec/component/overview/course-statistics/course-statistics.component.spec.ts @@ -29,6 +29,7 @@ import { MockComponent, MockModule, MockProvider } from 'ng-mocks'; import { of } from 'rxjs'; import { MockTranslateValuesDirective } from '../../../helpers/mocks/directive/mock-translate-values.directive'; import { ArtemisTestModule } from '../../../test.module'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; describe('CourseStatisticsComponent', () => { let comp: CourseStatisticsComponent; @@ -336,6 +337,7 @@ describe('CourseStatisticsComponent', () => { MockComponent(DocumentationButtonComponent), MockTranslateValuesDirective, ArtemisTranslatePipe, + TranslateDirective, ], providers: [ MockProvider(ArtemisNavigationUtilService), @@ -376,11 +378,11 @@ describe('CourseStatisticsComponent', () => { fixture.detectChanges(); expect(comp.ngxExerciseGroups.size).toBe(4); const modelingWrapper = fixture.debugElement.query(By.css('#modeling-wrapper')); - expect(modelingWrapper.query(By.css('h4')).nativeElement.textContent).toBe(' artemisApp.courseOverview.statistics.exerciseCount '); - expect(modelingWrapper.query(By.css('#absolute-score')).nativeElement.textContent).toBe(' artemisApp.courseOverview.statistics.yourPoints '); - expect(modelingWrapper.query(By.css('#reachable-score')).nativeElement.textContent).toBe(' artemisApp.courseOverview.statistics.reachablePoints '); - expect(modelingWrapper.query(By.css('#max-score')).nativeElement.textContent).toBe(' artemisApp.courseOverview.statistics.totalPoints '); - expect(fixture.debugElement.query(By.css('#presentation-score')).nativeElement.textContent).toBe(' artemisApp.courseOverview.statistics.presentationScore '); + expect(modelingWrapper.query(By.css('h4')).nativeElement.textContent).toBe('artemisApp.courseOverview.statistics.exerciseCount'); + expect(modelingWrapper.query(By.css('#absolute-score')).nativeElement.textContent).toBe('artemisApp.courseOverview.statistics.yourPoints'); + expect(modelingWrapper.query(By.css('#reachable-score')).nativeElement.textContent).toBe('artemisApp.courseOverview.statistics.reachablePoints'); + expect(modelingWrapper.query(By.css('#max-score')).nativeElement.textContent).toBe('artemisApp.courseOverview.statistics.totalPoints'); + expect(fixture.debugElement.query(By.css('#presentation-score')).nativeElement.textContent).toBe('artemisApp.courseOverview.statistics.presentationScore'); const programming: NgxExercise = comp.ngxExerciseGroups.get(ExerciseType.PROGRAMMING)![0]; expect(programming.series).toHaveLength(6); @@ -444,11 +446,11 @@ describe('CourseStatisticsComponent', () => { // check that html file displays the correct elements let debugElement = fixture.debugElement.query(By.css('#absolute-course-score')); - expect(debugElement.nativeElement.textContent).toBe(' artemisApp.courseOverview.statistics.yourPoints '); + expect(debugElement.nativeElement.textContent).toBe('artemisApp.courseOverview.statistics.yourPoints'); debugElement = fixture.debugElement.query(By.css('#reachable-course-score')); - expect(debugElement.nativeElement.textContent).toBe(' artemisApp.courseOverview.statistics.reachablePoints '); + expect(debugElement.nativeElement.textContent).toBe('artemisApp.courseOverview.statistics.reachablePoints'); debugElement = fixture.debugElement.query(By.css('#max-course-score')); - expect(debugElement.nativeElement.textContent).toBe(' artemisApp.courseOverview.statistics.totalPoints '); + expect(debugElement.nativeElement.textContent).toBe('artemisApp.courseOverview.statistics.totalPoints'); }); it('should set the course after being notified about a course update', () => { diff --git a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-grading.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-grading.component.spec.ts index 2f5ce3fb77d8..e59522cf01aa 100644 --- a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-grading.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-grading.component.spec.ts @@ -22,6 +22,7 @@ import { CustomMaxDirective } from 'app/shared/validators/custom-max-validator.d import { NgbAlertsMocksModule } from '../../../helpers/mocks/directive/ngbAlertsMocks.module'; import { NgbCollapse, NgbTooltip } from '@ng-bootstrap/ng-bootstrap'; import { programmingExerciseCreationConfigMock } from './programming-exercise-creation-config-mock'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; describe('ProgrammingExerciseGradingComponent', () => { let fixture: ComponentFixture; @@ -46,6 +47,7 @@ describe('ProgrammingExerciseGradingComponent', () => { MockComponent(SubmissionPolicyUpdateComponent), MockComponent(PresentationScoreComponent), MockComponent(FaIconComponent), + MockDirective(TranslateDirective), ], providers: [ { provide: TranslateService, useClass: MockTranslateService }, diff --git a/src/test/javascript/spec/component/shared/code-button.component.spec.ts b/src/test/javascript/spec/component/shared/code-button.component.spec.ts index f0fff85034ca..499a4e36dc9b 100644 --- a/src/test/javascript/spec/component/shared/code-button.component.spec.ts +++ b/src/test/javascript/spec/component/shared/code-button.component.spec.ts @@ -28,6 +28,7 @@ import { MockTranslateService } from '../../helpers/mocks/service/mock-translate import { ArtemisTestModule } from '../../test.module'; import { RouterTestingModule } from '@angular/router/testing'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; describe('CodeButtonComponent', () => { let component: CodeButtonComponent; @@ -96,6 +97,7 @@ describe('CodeButtonComponent', () => { MockPipe(SafeUrlPipe), MockDirective(FeatureToggleDirective), MockComponent(HelpIconComponent), + MockDirective(TranslateDirective), ], providers: [ MockProvider(AlertService), diff --git a/src/test/javascript/spec/component/shared/course-users-selector/course-users-selector.component.spec.ts b/src/test/javascript/spec/component/shared/course-users-selector/course-users-selector.component.spec.ts index 99a42141fbd2..ffb59f1825a3 100644 --- a/src/test/javascript/spec/component/shared/course-users-selector/course-users-selector.component.spec.ts +++ b/src/test/javascript/spec/component/shared/course-users-selector/course-users-selector.component.spec.ts @@ -1,18 +1,19 @@ import { ComponentFixture, TestBed, fakeAsync, tick, waitForAsync } from '@angular/core/testing'; -import { CourseUsersSelectorComponent, SearchRoleGroup } from 'app/shared/course-users-selector/course-users-selector.component'; -import { ArtemisSharedModule } from 'app/shared/shared.module'; -import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module'; +import { Component, DebugElement, ViewChild } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { CommonModule } from '@angular/common'; -import { MockPipe, MockProvider } from 'ng-mocks'; import { NgbTypeaheadModule } from '@ng-bootstrap/ng-bootstrap'; +import { By } from '@angular/platform-browser'; +import { of } from 'rxjs'; +import { HttpResponse } from '@angular/common/http'; +import { MockPipe, MockProvider } from 'ng-mocks'; import { CourseManagementService } from 'app/course/manage/course-management.service'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; -import { Component, DebugElement, ViewChild } from '@angular/core'; +import { CourseUsersSelectorComponent, SearchRoleGroup } from 'app/shared/course-users-selector/course-users-selector.component'; import { UserPublicInfoDTO } from 'app/core/user/user.model'; -import { HttpResponse } from '@angular/common/http'; -import { of } from 'rxjs'; -import { By } from '@angular/platform-browser'; +import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module'; +import { ArtemisSharedModule } from 'app/shared/shared.module'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ template: ` @@ -32,11 +33,9 @@ class WrapperComponent { disabled = false; courseId = 1; - label = 'TestLabel'; rolesToAllowSearchingIn: SearchRoleGroup[] = ['tutors', 'students', 'instructors']; multiSelect = true; showUserList = true; - public selectedUsers: UserPublicInfoDTO[] | undefined | null = []; } @@ -48,7 +47,7 @@ describe('CourseUsersSelectorComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - imports: [CommonModule, FormsModule, ReactiveFormsModule, ArtemisSharedModule, ArtemisSharedComponentModule, NgbTypeaheadModule], + imports: [CommonModule, FormsModule, ReactiveFormsModule, NgbTypeaheadModule, ArtemisSharedModule, ArtemisSharedComponentModule, TranslateModule.forRoot()], declarations: [CourseUsersSelectorComponent, WrapperComponent, MockPipe(ArtemisTranslatePipe)], providers: [MockProvider(CourseManagementService)], }).compileComponents(); @@ -141,61 +140,63 @@ describe('CourseUsersSelectorComponent', () => { fixture.detectChanges(); tick(1000); expect(userSelectorComponent.selectedUsers).toEqual([exampleUserPublicInfoDTO]); - expect(fixture.debugElement.query(By.css('input')).nativeElement.disabled).toBeTrue(); - expect(fixture.debugElement.queryAll(By.css('.selected-user'))).toHaveLength(1); expect(fixture.debugElement.query(By.css('.delete-user'))).toBeFalsy(); })); }); -}); -function getNativeInput(element: HTMLElement): HTMLInputElement { - return element.querySelector('input'); -} + function getNativeInput(element: HTMLElement): HTMLInputElement { + return element.querySelector('input'); + } -function changeInput(element: any, value: string) { - const input = getNativeInput(element); - input.value = value; - const evt = new Event('input', { bubbles: true, cancelable: false }); - input.dispatchEvent(evt); -} + function changeInput(element: any, value: string) { + const input = getNativeInput(element); + input.value = value; + const evt = new Event('input', { bubbles: true, cancelable: false }); + input.dispatchEvent(evt); + } -function getDropdownButtons(element: DebugElement): DebugElement[] { - return Array.from(element.queryAll(By.css('button.dropdown-item'))); -} + function getDropdownButtons(element: DebugElement): DebugElement[] { + return Array.from(element.queryAll(By.css('button.dropdown-item'))); + } -function expectDropdownItems(nativeEl: HTMLElement, dropdownEntries: string[]): void { - const pages = nativeEl.querySelectorAll('button.dropdown-item'); - expect(pages).toHaveLength(dropdownEntries.length); - for (let i = 0; i < dropdownEntries.length; i++) { - const resultDef = dropdownEntries[i]; - expect(normalizeText(pages[i].textContent)).toEqual(resultDef); + function expectDropdownItems(nativeEl: HTMLElement, dropdownEntries: string[]): void { + const pages = nativeEl.querySelectorAll('button.dropdown-item'); + expect(pages).toHaveLength(dropdownEntries.length); + for (let i = 0; i < dropdownEntries.length; i++) { + const resultDef = dropdownEntries[i]; + expect(normalizeText(pages[i].textContent)).toEqual(resultDef); + } } -} -function normalizeText(txt: string | null): string { - return txt ? txt.trim().replace(/\s+/g, ' ') : ''; -} + function normalizeText(txt: string | null): string { + return txt ? txt.trim().replace(/\s+/g, ' ') : ''; + } -function generateExampleUserPublicInfoDTO({ - id = 3, - login = 'mort', - name = 'Mortimer of Sto Helit', - firstName = 'Mortimer', - lastName = 'of Sto Helit', - isInstructor = false, - isEditor = false, - isTeachingAssistant = false, - isStudent = true, -}: UserPublicInfoDTO) { - const exampleUserPublicInfoDTO = new UserPublicInfoDTO(); - exampleUserPublicInfoDTO.id = id; - exampleUserPublicInfoDTO.login = login; - exampleUserPublicInfoDTO.name = name; - exampleUserPublicInfoDTO.firstName = firstName; - exampleUserPublicInfoDTO.lastName = lastName; - exampleUserPublicInfoDTO.isInstructor = isInstructor; - exampleUserPublicInfoDTO.isEditor = isEditor; - exampleUserPublicInfoDTO.isTeachingAssistant = isTeachingAssistant; - exampleUserPublicInfoDTO.isStudent = isStudent; - return exampleUserPublicInfoDTO; -} + function generateExampleUserPublicInfoDTO({ + id = 3, + login = 'mort', + name = 'Mortimer of Sto Helit', + firstName = 'Mortimer', + lastName = 'of Sto Helit', + isInstructor = false, + isEditor = false, + isTeachingAssistant = false, + isStudent = true, + }: Partial = {}): UserPublicInfoDTO { + const exampleUserPublicInfoDTO = new UserPublicInfoDTO(); + exampleUserPublicInfoDTO.id = id; + exampleUserPublicInfoDTO.login = login; + exampleUserPublicInfoDTO.name = name; + exampleUserPublicInfoDTO.firstName = firstName; + exampleUserPublicInfoDTO.lastName = lastName; + exampleUserPublicInfoDTO.isInstructor = isInstructor; + exampleUserPublicInfoDTO.isEditor = isEditor; + exampleUserPublicInfoDTO.isTeachingAssistant = isTeachingAssistant; + exampleUserPublicInfoDTO.isStudent = isStudent; + return exampleUserPublicInfoDTO; + } + + afterEach(() => { + jest.clearAllMocks(); + }); +}); diff --git a/src/test/javascript/spec/component/shared/notification/notification-sidebar.component.spec.ts b/src/test/javascript/spec/component/shared/notification/notification-sidebar.component.spec.ts index 8cf036109027..4d43f521b883 100644 --- a/src/test/javascript/spec/component/shared/notification/notification-sidebar.component.spec.ts +++ b/src/test/javascript/spec/component/shared/notification/notification-sidebar.component.spec.ts @@ -27,6 +27,7 @@ import { NotificationSettingsService } from 'app/shared/user-settings/notificati import { MockNotificationSettingsService } from '../../../helpers/mocks/service/mock-notification-settings.service'; import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'; import { DocumentationButtonComponent } from 'app/shared/components/documentation-button/documentation-button.component'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; describe('Notification Sidebar Component', () => { let notificationSidebarComponent: NotificationSidebarComponent; @@ -60,7 +61,13 @@ describe('Notification Sidebar Component', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ArtemisTestModule, MockDirective(NgbTooltip)], - declarations: [NotificationSidebarComponent, MockPipe(ArtemisTranslatePipe), MockRouterLinkDirective, MockComponent(DocumentationButtonComponent)], + declarations: [ + NotificationSidebarComponent, + MockPipe(ArtemisTranslatePipe), + MockRouterLinkDirective, + MockComponent(DocumentationButtonComponent), + MockDirective(TranslateDirective), + ], providers: [ { provide: LocalStorageService, useClass: MockSyncStorage }, { provide: SessionStorageService, useClass: MockSyncStorage }, diff --git a/src/test/javascript/spec/component/shared/result.component.spec.ts b/src/test/javascript/spec/component/shared/result.component.spec.ts index 14e8bea7a123..d72fdc5f3bd2 100644 --- a/src/test/javascript/spec/component/shared/result.component.spec.ts +++ b/src/test/javascript/spec/component/shared/result.component.spec.ts @@ -7,7 +7,7 @@ import { TranslatePipeMock } from '../../helpers/mocks/service/mock-translate.se import { StudentParticipation } from 'app/entities/participation/student-participation.model'; import { Result } from 'app/entities/result.model'; import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; -import { MockPipe } from 'ng-mocks'; +import { MockDirective, MockPipe } from 'ng-mocks'; import { ArtemisTimeAgoPipe } from 'app/shared/pipes/artemis-time-ago.pipe'; import { Exercise, ExerciseType } from 'app/entities/exercise.model'; import { AssessmentType } from 'app/entities/assessment-type.model'; @@ -25,6 +25,7 @@ import { faTimesCircle } from '@fortawesome/free-solid-svg-icons'; import { ParticipationService } from 'app/exercises/shared/participation/participation.service'; import { of } from 'rxjs'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; const mockExercise: Exercise = { id: 1, @@ -84,7 +85,7 @@ describe('ResultComponent', () => { await TestBed.configureTestingModule({ imports: [ArtemisTestModule, NgbTooltipMocksModule], - declarations: [ResultComponent, TranslatePipeMock, MockPipe(ArtemisDatePipe), MockPipe(ArtemisTimeAgoPipe)], + declarations: [ResultComponent, TranslatePipeMock, MockPipe(ArtemisDatePipe), MockPipe(ArtemisTimeAgoPipe), MockDirective(TranslateDirective)], providers: [ { provide: NgbModal, useClass: MockNgbModalService }, { provide: ParticipationService, useValue: participationServiceMock }, @@ -258,13 +259,22 @@ describe('ResultComponent', () => { it('should display the correct message for FAILED_PROGRAMMING_SUBMISSION_OFFLINE_IDE and FAILED_PROGRAMMING_SUBMISSION_ONLINE_IDE', () => { comp.templateStatus = ResultTemplateStatus.MISSING; + + // Test for FAILED_PROGRAMMING_SUBMISSION_OFFLINE_IDE comp.missingResultInfo = MissingResultInformation.FAILED_PROGRAMMING_SUBMISSION_OFFLINE_IDE; fixture.detectChanges(); - const compiled = fixture.nativeElement; - expect(compiled.textContent).toContain('artemisApp.result.missing.programmingFailedSubmission.message'); - comp.missingResultInfo = MissingResultInformation.FAILED_PROGRAMMING_SUBMISSION_OFFLINE_IDE; + let compiled = fixture.nativeElement; + let spanElement = compiled.querySelector('span[jhiTranslate="artemisApp.result.missing.programmingFailedSubmission.message"]'); + expect(spanElement).not.toBeNull(); + expect(spanElement.getAttribute('jhiTranslate')).toBe('artemisApp.result.missing.programmingFailedSubmission.message'); + + // Test for FAILED_PROGRAMMING_SUBMISSION_ONLINE_IDE + comp.missingResultInfo = MissingResultInformation.FAILED_PROGRAMMING_SUBMISSION_ONLINE_IDE; fixture.detectChanges(); - expect(compiled.textContent).toContain('artemisApp.result.missing.programmingFailedSubmission.message'); + compiled = fixture.nativeElement; + spanElement = compiled.querySelector('span[jhiTranslate="artemisApp.result.missing.programmingFailedSubmission.message"]'); + expect(spanElement).not.toBeNull(); + expect(spanElement.getAttribute('jhiTranslate')).toBe('artemisApp.result.missing.programmingFailedSubmission.message'); }); it('should display the submitted text for SUBMITTED template status', () => { diff --git a/src/test/javascript/spec/component/shared/sidebar/conversation-options.component.spec.ts b/src/test/javascript/spec/component/shared/sidebar/conversation-options.component.spec.ts index f9f5326d2e3c..a89b2264612a 100644 --- a/src/test/javascript/spec/component/shared/sidebar/conversation-options.component.spec.ts +++ b/src/test/javascript/spec/component/shared/sidebar/conversation-options.component.spec.ts @@ -1,5 +1,5 @@ import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { MockComponent, MockPipe, MockProvider } from 'ng-mocks'; +import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; import { ConversationOptionsComponent } from 'app/shared/sidebar/conversation-options/conversation-options.component'; @@ -26,6 +26,7 @@ import { defaultFirstLayerDialogOptions } from 'app/overview/course-conversation import { ConversationDetailDialogComponent } from 'app/overview/course-conversations/dialogs/conversation-detail-dialog/conversation-detail-dialog.component'; import { MetisConversationService } from 'app/shared/metis/metis-conversation.service'; import { isOneToOneChatDTO } from 'app/entities/metis/conversation/one-to-one-chat.model'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; const examples: (() => ConversationDTO)[] = [ () => generateOneToOneChatDTO({}), @@ -59,7 +60,7 @@ examples.forEach((conversation) => { { path: 'courses/:courseId/exams/:examId', component: ExamDetailComponent }, ]), ], - declarations: [ConversationOptionsComponent, MockComponent(FaIconComponent), MockPipe(ArtemisTranslatePipe)], + declarations: [ConversationOptionsComponent, MockComponent(FaIconComponent), MockPipe(ArtemisTranslatePipe), MockDirective(TranslateDirective)], providers: [ MockProvider(ConversationService), MockProvider(MetisConversationService), diff --git a/src/test/javascript/spec/component/statistics/statistics-average-score-graph.component.spec.ts b/src/test/javascript/spec/component/statistics/statistics-average-score-graph.component.spec.ts index feb25f210d85..e850210ee35e 100644 --- a/src/test/javascript/spec/component/statistics/statistics-average-score-graph.component.spec.ts +++ b/src/test/javascript/spec/component/statistics/statistics-average-score-graph.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ArtemisTestModule } from '../../test.module'; import { RouterTestingModule } from '@angular/router/testing'; -import { MockModule, MockPipe, MockProvider } from 'ng-mocks'; +import { MockDirective, MockModule, MockPipe, MockProvider } from 'ng-mocks'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { PerformanceInterval, StatisticsAverageScoreGraphComponent } from 'app/shared/statistics-graph/statistics-average-score-graph.component'; import { BarChartModule } from '@swimlane/ngx-charts'; @@ -11,6 +11,7 @@ import { CourseManagementStatisticsModel } from 'app/entities/quiz/course-manage import { ArtemisNavigationUtilService } from 'app/utils/navigation.utils'; import { ChartExerciseTypeFilter } from 'app/shared/chart/chart-exercise-type-filter'; import { ChartCategoryFilter } from 'app/shared/chart/chart-category-filter'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; describe('StatisticsAverageScoreGraphComponent', () => { let fixture: ComponentFixture; @@ -77,7 +78,7 @@ describe('StatisticsAverageScoreGraphComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ArtemisTestModule, RouterTestingModule.withRoutes([]), MockModule(BarChartModule)], - declarations: [StatisticsAverageScoreGraphComponent, MockPipe(ArtemisTranslatePipe)], + declarations: [StatisticsAverageScoreGraphComponent, MockPipe(ArtemisTranslatePipe), MockDirective(TranslateDirective)], providers: [MockProvider(ArtemisNavigationUtilService), MockProvider(ChartExerciseTypeFilter), MockProvider(ChartCategoryFilter)], }) .compileComponents() diff --git a/src/test/javascript/spec/component/text-submission-assessment/text-assessment-area.component.spec.ts b/src/test/javascript/spec/component/text-submission-assessment/text-assessment-area.component.spec.ts index 6c98166d5210..1ddc5bf27049 100644 --- a/src/test/javascript/spec/component/text-submission-assessment/text-assessment-area.component.spec.ts +++ b/src/test/javascript/spec/component/text-submission-assessment/text-assessment-area.component.spec.ts @@ -4,9 +4,10 @@ import { ArtemisTestModule } from '../../test.module'; import { TextblockAssessmentCardComponent } from 'app/exercises/text/assess/textblock-assessment-card/textblock-assessment-card.component'; import { TextBlockRef } from 'app/entities/text-block-ref.model'; import { By } from '@angular/platform-browser'; -import { MockComponent } from 'ng-mocks'; +import { MockComponent, MockDirective } from 'ng-mocks'; import { TranslatePipeMock } from '../../helpers/mocks/service/mock-translate.service'; import { ManualTextblockSelectionComponent } from 'app/exercises/text/assess/manual-textblock-selection/manual-textblock-selection.component'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; describe('TextAssessmentAreaComponent', () => { let component: TextAssessmentAreaComponent; @@ -15,7 +16,13 @@ describe('TextAssessmentAreaComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ArtemisTestModule], - declarations: [TextAssessmentAreaComponent, MockComponent(TextblockAssessmentCardComponent), MockComponent(ManualTextblockSelectionComponent), TranslatePipeMock], + declarations: [ + TextAssessmentAreaComponent, + MockComponent(TextblockAssessmentCardComponent), + MockComponent(ManualTextblockSelectionComponent), + TranslatePipeMock, + MockDirective(TranslateDirective), + ], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/component/text-submission-assessment/text-submission-assessment.component.spec.ts b/src/test/javascript/spec/component/text-submission-assessment/text-submission-assessment.component.spec.ts index 4cdcd197c837..e1027d236097 100644 --- a/src/test/javascript/spec/component/text-submission-assessment/text-submission-assessment.component.spec.ts +++ b/src/test/javascript/spec/component/text-submission-assessment/text-submission-assessment.component.spec.ts @@ -5,7 +5,7 @@ import { By } from '@angular/platform-browser'; import { of, throwError } from 'rxjs'; import { AssessmentLayoutComponent } from 'app/assessment/assessment-layout/assessment-layout.component'; import { TextAssessmentAreaComponent } from 'app/exercises/text/assess/text-assessment-area/text-assessment-area.component'; -import { MockComponent, MockPipe, MockProvider } from 'ng-mocks'; +import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks'; import { TextblockAssessmentCardComponent } from 'app/exercises/text/assess/textblock-assessment-card/textblock-assessment-card.component'; import { TextblockFeedbackEditorComponent } from 'app/exercises/text/assess/textblock-feedback-editor/textblock-feedback-editor.component'; import { ExerciseType } from 'app/entities/exercise.model'; @@ -46,6 +46,7 @@ import { TextAssessmentBaseComponent } from 'app/exercises/text/assess/text-asse import { AthenaService } from 'app/assessment/athena.service'; import { MockAthenaService } from '../../helpers/mocks/service/mock-athena-service'; import { TextBlockRef } from 'app/entities/text-block-ref.model'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; describe('TextSubmissionAssessmentComponent', () => { let component: TextSubmissionAssessmentComponent; @@ -160,6 +161,7 @@ describe('TextSubmissionAssessmentComponent', () => { MockComponent(ResizeableContainerComponent), MockComponent(UnreferencedFeedbackComponent), MockPipe(ArtemisTranslatePipe), + MockDirective(TranslateDirective), ], providers: [ { provide: ActivatedRoute, useValue: mockActivatedRoute }, diff --git a/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-group-card.component.spec.ts b/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-group-card.component.spec.ts index 1f8fa36ce3c9..de181aa7add3 100644 --- a/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-group-card.component.spec.ts +++ b/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-group-card.component.spec.ts @@ -1,13 +1,15 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { CourseTutorialGroupCardComponent } from 'app/overview/course-tutorial-groups/course-tutorial-group-card/course-tutorial-group-card.component'; -import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; -import { MockComponent, MockPipe } from 'ng-mocks'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; +import { TranslateService } from '@ngx-translate/core'; import { generateExampleTutorialGroup } from '../helpers/tutorialGroupExampleModels'; import { User } from 'app/core/user/user.model'; import { TutorialGroup } from 'app/entities/tutorial-group/tutorial-group.model'; import { Course } from 'app/entities/course.model'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; +import { MockComponent, MockDirective } from 'ng-mocks'; +import { TranslatePipeMock } from '../../../helpers/mocks/service/mock-translate.service'; describe('CourseTutorialGroupCardComponent', () => { let component: CourseTutorialGroupCardComponent; @@ -18,7 +20,16 @@ describe('CourseTutorialGroupCardComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ imports: [RouterTestingModule.withRoutes([])], - declarations: [CourseTutorialGroupCardComponent, MockComponent(FaIconComponent), MockPipe(ArtemisTranslatePipe)], + declarations: [CourseTutorialGroupCardComponent, MockComponent(FaIconComponent), TranslatePipeMock, MockDirective(TranslateDirective)], + providers: [ + { + provide: TranslateService, + useValue: { + instant: (key: string) => key, + get: (key: string) => key, + }, + }, + ], }).compileComponents(); fixture = TestBed.createComponent(CourseTutorialGroupCardComponent); diff --git a/src/test/javascript/spec/component/tutorial-groups/shared/tutorial-group-sessions-table.component.spec.ts b/src/test/javascript/spec/component/tutorial-groups/shared/tutorial-group-sessions-table.component.spec.ts index 4580f627bbe5..8f630c5f5fe9 100644 --- a/src/test/javascript/spec/component/tutorial-groups/shared/tutorial-group-sessions-table.component.spec.ts +++ b/src/test/javascript/spec/component/tutorial-groups/shared/tutorial-group-sessions-table.component.spec.ts @@ -3,7 +3,7 @@ import { TutorialGroupSessionsTableComponent } from 'app/course/tutorial-groups/ import { TutorialGroupSession } from 'app/entities/tutorial-group/tutorial-group-session.model'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TutorialGroupSessionRowStubComponent } from '../stubs/tutorial-group-sessions-table-stub.component'; -import { MockPipe } from 'ng-mocks'; +import { MockDirective, MockPipe } from 'ng-mocks'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { generateExampleTutorialGroupSession } from '../helpers/tutorialGroupSessionExampleModels'; import dayjs from 'dayjs/esm'; @@ -11,6 +11,7 @@ import { TutorialGroup } from 'app/entities/tutorial-group/tutorial-group.model' import { generateExampleTutorialGroup } from '../helpers/tutorialGroupExampleModels'; import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; import { NgbCollapseMocksModule } from '../../../helpers/mocks/directive/ngbCollapseMocks.module'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; @Component({ selector: 'jhi-mock-extra-column', template: '' }) class MockExtraColumnComponent { @@ -63,6 +64,7 @@ describe('TutorialGroupSessionsTableWrapperTest', () => { MockExtraColumnComponent, MockPipe(ArtemisTranslatePipe), MockPipe(ArtemisDatePipe), + MockDirective(TranslateDirective), ], }) .compileComponents() @@ -112,7 +114,13 @@ describe('TutorialGroupSessionTableComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [NgbCollapseMocksModule], - declarations: [TutorialGroupSessionsTableComponent, TutorialGroupSessionRowStubComponent, MockPipe(ArtemisTranslatePipe), MockPipe(ArtemisDatePipe)], + declarations: [ + TutorialGroupSessionsTableComponent, + TutorialGroupSessionRowStubComponent, + MockPipe(ArtemisTranslatePipe), + MockPipe(ArtemisDatePipe), + MockDirective(TranslateDirective), + ], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/component/tutorial-groups/shared/tutorial-groups-table.component.spec.ts b/src/test/javascript/spec/component/tutorial-groups/shared/tutorial-groups-table.component.spec.ts index 120203545f35..d01aa3af255b 100644 --- a/src/test/javascript/spec/component/tutorial-groups/shared/tutorial-groups-table.component.spec.ts +++ b/src/test/javascript/spec/component/tutorial-groups/shared/tutorial-groups-table.component.spec.ts @@ -16,6 +16,7 @@ import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; import { runOnPushChangeDetection } from '../../../helpers/on-push-change-detection.helper'; import { NgbTooltipMocksModule } from '../../../helpers/mocks/directive/ngbTooltipMocks.module'; import { TutorialGroupUtilizationIndicatorComponent } from 'app/course/tutorial-groups/shared/tutorial-group-utilization-indicator/tutorial-group-utilization-indicator.component'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; @Component({ selector: 'jhi-mock-extra-column', template: '' }) class MockExtraColumnComponent { @@ -74,6 +75,7 @@ describe('TutorialGroupTableWrapperTest', () => { MockDirective(SortByDirective), MockComponent(FaIconComponent), MockComponent(TutorialGroupUtilizationIndicatorComponent), + MockDirective(TranslateDirective), ], providers: [MockProvider(SortService)], }) @@ -131,6 +133,7 @@ describe('TutorialGroupsTableComponent', () => { MockDirective(SortByDirective), MockComponent(TutorialGroupUtilizationIndicatorComponent), MockComponent(FaIconComponent), + MockDirective(TranslateDirective), ], providers: [MockProvider(SortService)], }) diff --git a/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-free-periods/crud/tutorial-group-free-period-form.component.spec.ts b/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-free-periods/crud/tutorial-group-free-period-form.component.spec.ts index d14fa5f1cc77..3c718f75bc2c 100644 --- a/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-free-periods/crud/tutorial-group-free-period-form.component.spec.ts +++ b/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-free-periods/crud/tutorial-group-free-period-form.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed, fakeAsync } from '@angular/core/testing'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; -import { MockComponent, MockPipe } from 'ng-mocks'; +import { MockComponent, MockDirective, MockPipe } from 'ng-mocks'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; import { OwlDateTimeModule, OwlNativeDateTimeModule } from '@danielmoncada/angular-datetime-picker'; import { @@ -13,6 +13,7 @@ import { generateClickSubmitButton, generateTestFormIsInvalidOnMissingRequiredPr import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; import { runOnPushChangeDetection } from '../../../../../helpers/on-push-change-detection.helper'; import dayjs from 'dayjs/esm'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; describe('TutorialFreePeriodFormComponent', () => { let fixture: ComponentFixture; @@ -35,7 +36,13 @@ describe('TutorialFreePeriodFormComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ReactiveFormsModule, FormsModule, OwlDateTimeModule, OwlNativeDateTimeModule], - declarations: [TutorialGroupFreePeriodFormComponent, MockPipe(ArtemisTranslatePipe), MockComponent(FaIconComponent), MockPipe(ArtemisDatePipe)], + declarations: [ + TutorialGroupFreePeriodFormComponent, + MockPipe(ArtemisTranslatePipe), + MockComponent(FaIconComponent), + MockPipe(ArtemisDatePipe), + MockDirective(TranslateDirective), + ], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-periods-management.component.spec.ts b/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-periods-management.component.spec.ts index 1de186d73aae..f47763db3b2e 100644 --- a/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-periods-management.component.spec.ts +++ b/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-periods-management.component.spec.ts @@ -1,5 +1,5 @@ import { ComponentFixture, TestBed, fakeAsync } from '@angular/core/testing'; -import { MockComponent, MockPipe, MockProvider } from 'ng-mocks'; +import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks'; import { AlertService } from 'app/core/util/alert.service'; import { MockRouter } from '../../../../../helpers/mocks/mock-router'; import { of } from 'rxjs'; @@ -25,6 +25,7 @@ import { Course } from 'app/entities/course.model'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { CreateTutorialGroupFreePeriodComponent } from 'app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/crud/create-tutorial-group-free-period/create-tutorial-group-free-period.component'; import { TutorialGroupFreePeriodsTableComponent } from 'app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-periods-table/tutorial-group-free-periods-table.component'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; @Component({ selector: 'jhi-tutorial-group-free-period-row-buttons', template: '' }) class TutorialGroupRowButtonsStubComponent { @@ -61,6 +62,7 @@ describe('TutorialGroupFreePeriodsManagementComponent', () => { MockComponent(FaIconComponent), MockRouterLinkDirective, TutorialGroupFreePeriodsTableComponent, + MockDirective(TranslateDirective), ], providers: [ MockProvider(TutorialGroupsConfigurationService), diff --git a/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/tutorial-group-session-form.component.spec.ts b/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/tutorial-group-session-form.component.spec.ts index c1139fec76c6..b4f3aa70133a 100644 --- a/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/tutorial-group-session-form.component.spec.ts +++ b/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/tutorial-group-session-form.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed, fakeAsync } from '@angular/core/testing'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; -import { MockComponent, MockPipe } from 'ng-mocks'; +import { MockComponent, MockDirective, MockPipe } from 'ng-mocks'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; import { TutorialGroupSessionFormComponent, @@ -13,6 +13,7 @@ import { OwlDateTimeModule, OwlNativeDateTimeModule } from '@danielmoncada/angul import { generateClickSubmitButton, generateTestFormIsInvalidOnMissingRequiredProperty } from '../../../helpers/tutorialGroupFormsUtils'; import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; import { runOnPushChangeDetection } from '../../../../../helpers/on-push-change-detection.helper'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; describe('TutorialGroupSessionForm', () => { let fixture: ComponentFixture; @@ -28,7 +29,13 @@ describe('TutorialGroupSessionForm', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ReactiveFormsModule, FormsModule, NgbTimepickerModule, OwlDateTimeModule, OwlNativeDateTimeModule], - declarations: [TutorialGroupSessionFormComponent, MockPipe(ArtemisTranslatePipe), MockComponent(FaIconComponent), MockPipe(ArtemisDatePipe)], + declarations: [ + TutorialGroupSessionFormComponent, + MockPipe(ArtemisTranslatePipe), + MockComponent(FaIconComponent), + MockPipe(ArtemisDatePipe), + MockDirective(TranslateDirective), + ], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/tutorial-groups-configuration-form.component.spec.ts b/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/tutorial-groups-configuration-form.component.spec.ts index 8deb6bc1350b..9393704774ea 100644 --- a/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/tutorial-groups-configuration-form.component.spec.ts +++ b/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/tutorial-groups-configuration-form.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed, fakeAsync } from '@angular/core/testing'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; -import { MockComponent, MockPipe } from 'ng-mocks'; +import { MockComponent, MockDirective, MockPipe } from 'ng-mocks'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; import { NgbTypeaheadModule } from '@ng-bootstrap/ng-bootstrap'; import { OwlDateTimeModule, OwlNativeDateTimeModule } from '@danielmoncada/angular-datetime-picker'; @@ -13,6 +13,7 @@ import { generateClickSubmitButton, generateTestFormIsInvalidOnMissingRequiredPr import { ArtemisDateRangePipe } from 'app/shared/pipes/artemis-date-range.pipe'; import { runOnPushChangeDetection } from '../../../../../helpers/on-push-change-detection.helper'; import { Course } from 'app/entities/course.model'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; describe('TutorialGroupsConfigurationFormComponent', () => { let fixture: ComponentFixture; @@ -28,7 +29,13 @@ describe('TutorialGroupsConfigurationFormComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ReactiveFormsModule, FormsModule, NgbTypeaheadModule, OwlDateTimeModule, OwlNativeDateTimeModule], - declarations: [TutorialGroupsConfigurationFormComponent, MockPipe(ArtemisTranslatePipe), MockPipe(ArtemisDateRangePipe), MockComponent(FaIconComponent)], + declarations: [ + TutorialGroupsConfigurationFormComponent, + MockPipe(ArtemisTranslatePipe), + MockPipe(ArtemisDateRangePipe), + MockComponent(FaIconComponent), + MockDirective(TranslateDirective), + ], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-registration-import-dialog.component.spec.ts b/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-registration-import-dialog.component.spec.ts index ccd0f11f74b5..f896954754a3 100644 --- a/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-registration-import-dialog.component.spec.ts +++ b/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-registration-import-dialog.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TutorialGroupsRegistrationImportDialogComponent } from 'app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-import-dialog/tutorial-groups-registration-import-dialog.component'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; -import { MockComponent, MockPipe, MockProvider } from 'ng-mocks'; +import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { TranslateService } from '@ngx-translate/core'; import { TutorialGroupsService } from 'app/course/tutorial-groups/services/tutorial-groups.service'; @@ -14,6 +14,7 @@ import { StudentDTO } from 'app/entities/student-dto.model'; import { ParseError, ParseResult, ParseWorkerConfig, parse } from 'papaparse'; import { of } from 'rxjs'; import { HttpResponse } from '@angular/common/http'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; jest.mock('papaparse', () => { const original = jest.requireActual('papaparse'); return { @@ -30,7 +31,7 @@ describe('TutorialGroupsRegistrationImportDialog', () => { beforeEach(async () => { await TestBed.configureTestingModule({ imports: [FormsModule, ReactiveFormsModule], - declarations: [TutorialGroupsRegistrationImportDialogComponent, MockPipe(ArtemisTranslatePipe), MockComponent(FaIconComponent)], + declarations: [TutorialGroupsRegistrationImportDialogComponent, MockPipe(ArtemisTranslatePipe), MockComponent(FaIconComponent), MockDirective(TranslateDirective)], providers: [MockProvider(TranslateService), MockProvider(AlertService), MockProvider(TutorialGroupsService), MockProvider(NgbActiveModal)], }).compileComponents();

      {{ 'artemisApp.examSession.id' | artemisTranslate }}{{ 'artemisApp.examSession.browserFingerprintHash' | artemisTranslate }}{{ 'artemisApp.examSession.ipAddress' | artemisTranslate }}{{ 'artemisApp.examSession.createdDate' | artemisTranslate }}{{ 'artemisApp.examSession.studentExamId' | artemisTranslate }}{{ 'artemisApp.examSession.userLogin' | artemisTranslate }}
      - {{ 'global.field.id' | artemisTranslate }} + @@ -84,8 +84,8 @@

      {{ exam? {{ testRun.user?.name || '--' }}

      		{{ testRun.workingTime || 0 | artemisDurationFromSeconds }}{{ (testRun.started ? 'global.generic.yes' : 'global.generic.no') | artemisTranslate }}{{ (testRun.submitted ? 'global.generic.yes' : 'global.generic.no') | artemisTranslate }} {{ testRun.submissionDate | artemisDate }}
      diff --git a/src/main/webapp/app/exam/participate/exam-cover/exam-participation-cover.component.html b/src/main/webapp/app/exam/participate/exam-cover/exam-participation-cover.component.html index a90146998779..9d56b746c3c9 100644 --- a/src/main/webapp/app/exam/participate/exam-cover/exam-participation-cover.component.html +++ b/src/main/webapp/app/exam/participate/exam-cover/exam-participation-cover.component.html @@ -193,9 +193,7 @@

      @if (handInEarly) {
      -
      - {{ 'artemisApp.examParticipation.continueAfterHandInEarlyDescription' | artemisTranslate }} -
      +
      }
      diff --git a/src/main/webapp/app/exam/participate/exam-navigation-bar/exam-navigation-bar.component.html b/src/main/webapp/app/exam/participate/exam-navigation-bar/exam-navigation-bar.component.html index 7d86f3a1f68b..e8f14a4be1c1 100644 --- a/src/main/webapp/app/exam/participate/exam-navigation-bar/exam-navigation-bar.component.html +++ b/src/main/webapp/app/exam/participate/exam-navigation-bar/exam-navigation-bar.component.html @@ -1,19 +1,22 @@
      @if (exercises && exercises.length > 0 && !overviewPageOpen) { -
      - {{ 'artemisApp.examParticipation.progress' | artemisTranslate: { current: exerciseIndex + 1, all: exercises.length } }} -
      +
      } @if (exercises && exercises.length > 0 && !overviewPageOpen) { -
      - {{ 'artemisApp.examParticipation.progressSmall' | artemisTranslate: { current: exerciseIndex + 1, all: exercises.length } }} -
      +
      } @if (overviewPageOpen) { -
      - {{ 'artemisApp.examParticipation.examOverview' | artemisTranslate }} -
      +
      }
      @@ -83,9 +86,7 @@ {{ 'artemisApp.examParticipation.' + (exerciseIndex >= exercises.length - 1 ? 'submitLastExercise' : 'submitOtherExercise') | artemisTranslate }} } - +
      diff --git a/src/main/webapp/app/exam/participate/exam-participation.component.html b/src/main/webapp/app/exam/participate/exam-participation.component.html index bfa6fe636568..391c435fee09 100644 --- a/src/main/webapp/app/exam/participate/exam-participation.component.html +++ b/src/main/webapp/app/exam/participate/exam-participation.component.html @@ -96,9 +96,11 @@ @if ((generateParticipationStatus | async) === 'failed') {

      - +
      } diff --git a/src/main/webapp/app/exam/participate/exercises/file-upload/file-upload-exam-submission.component.html b/src/main/webapp/app/exam/participate/exercises/file-upload/file-upload-exam-submission.component.html index e1aae0b032ca..be5dce5a54a3 100644 --- a/src/main/webapp/app/exam/participate/exercises/file-upload/file-upload-exam-submission.component.html +++ b/src/main/webapp/app/exam/participate/exercises/file-upload/file-upload-exam-submission.component.html @@ -27,9 +27,12 @@

      - +

      @@ -46,9 +49,7 @@

      @if (submittedFileName && studentSubmission?.filePath) {
      -
      - {{ 'artemisApp.fileUploadSubmission.submittedFile' | artemisTranslate: { filename: submittedFileName } }} -
      +
      @if (submittedFileExtension) { @@ -59,9 +60,7 @@
      } @if (!submittedFileName && examTimeline) {
      -
      - {{ 'artemisApp.timeline.fileUploadNotSubmitted' | artemisTranslate }} -
      +
      }
      diff --git a/src/main/webapp/app/exam/participate/exercises/text/text-exam-submission.component.html b/src/main/webapp/app/exam/participate/exercises/text/text-exam-submission.component.html index b10c4cbac26c..653d0f6b0ad5 100644 --- a/src/main/webapp/app/exam/participate/exercises/text/text-exam-submission.component.html +++ b/src/main/webapp/app/exam/participate/exercises/text/text-exam-submission.component.html @@ -20,12 +20,8 @@

      - - {{ 'artemisApp.textExercise.wordCount' | artemisTranslate: { count: wordCount } }} - - - {{ 'artemisApp.textExercise.characterCount' | artemisTranslate: { count: characterCount } }} - + +
      - + @if ( (isChannel(channelOrGroupChat) && canChangeChannelProperties(channelOrGroupChat)) || (isGroupChat(channelOrGroupChat) && canChangeGroupChatProperties(channelOrGroupChat)) ) { - + }
      @@ -39,11 +41,13 @@ value="{{ channel.topic ?? ('artemisApp.dialogs.conversationDetail.infoTab.noTopic' | artemisTranslate) }}" > - + @if (canChangeChannelProperties(channel)) { - + }

      @@ -61,11 +65,13 @@ value="{{ channel.description ?? ('artemisApp.dialogs.conversationDetail.infoTab.noDescription' | artemisTranslate) }}" > - + @if (canChangeChannelProperties(channel)) { - + } @@ -73,7 +79,7 @@
      -
      {{ 'artemisApp.dialogs.conversationDetail.infoTab.moreInfo' | artemisTranslate }}
      +
        @if (activeConversation.creator) { diff --git a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-member-row/conversation-member-row.component.html b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-member-row/conversation-member-row.component.html index 53d064bb2901..a481df162d51 100644 --- a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-member-row/conversation-member-row.component.html +++ b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-member-row/conversation-member-row.component.html @@ -15,19 +15,28 @@ }
        @if (canBeRemovedFromConversation) { - + } @if (canBeGrantedChannelModeratorRole) { - + } @if (canBeRevokedChannelModeratorRole) { - + }
      diff --git a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-members.component.html b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-members.component.html index 91fd0d162bcf..c2184ede4a74 100644 --- a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-members.component.html +++ b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-members.component.html @@ -27,25 +27,21 @@
      - +
      @if (isSearching) {
      - {{ 'artemisApp.dialogs.conversationDetail.memberTab.searching' | artemisTranslate }} +
      } diff --git a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-settings/conversation-settings.component.html b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-settings/conversation-settings.component.html index fb8898763af2..752c1e385261 100644 --- a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-settings/conversation-settings.component.html +++ b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-settings/conversation-settings.component.html @@ -4,24 +4,33 @@
      @if (canLeaveConversation) { - + }
      @if (conversationAsChannel; as channel) { @if (!channel.isArchived && canChangeChannelArchivalState) {
      - +
      } @if (channel.isArchived && canChangeChannelArchivalState) {
      - +
      } @if (canDeleteChannel) { diff --git a/src/main/webapp/app/overview/course-conversations/dialogs/generic-confirmation-dialog/generic-confirmation-dialog.component.html b/src/main/webapp/app/overview/course-conversations/dialogs/generic-confirmation-dialog/generic-confirmation-dialog.component.html index 6ff8585d7b43..b6e603c38de9 100644 --- a/src/main/webapp/app/overview/course-conversations/dialogs/generic-confirmation-dialog/generic-confirmation-dialog.component.html +++ b/src/main/webapp/app/overview/course-conversations/dialogs/generic-confirmation-dialog/generic-confirmation-dialog.component.html @@ -18,7 +18,7 @@

      {{ translationKeys.titleKey | artemisTranslate: translat }

      - + diff --git a/src/main/webapp/app/overview/course-conversations/dialogs/generic-update-text-property-dialog/generic-update-text-property-dialog.component.html b/src/main/webapp/app/overview/course-conversations/dialogs/generic-update-text-property-dialog/generic-update-text-property-dialog.component.html index d32db2260889..1ad09b261236 100644 --- a/src/main/webapp/app/overview/course-conversations/dialogs/generic-update-text-property-dialog/generic-update-text-property-dialog.component.html +++ b/src/main/webapp/app/overview/course-conversations/dialogs/generic-update-text-property-dialog/generic-update-text-property-dialog.component.html @@ -38,7 +38,7 @@

      diff --git a/src/main/webapp/app/overview/course-conversations/dialogs/group-chat-create-dialog/group-chat-create-dialog.component.html b/src/main/webapp/app/overview/course-conversations/dialogs/group-chat-create-dialog/group-chat-create-dialog.component.html index 8625d0cc8d3a..d8e0e8a5aa1a 100644 --- a/src/main/webapp/app/overview/course-conversations/dialogs/group-chat-create-dialog/group-chat-create-dialog.component.html +++ b/src/main/webapp/app/overview/course-conversations/dialogs/group-chat-create-dialog/group-chat-create-dialog.component.html @@ -2,7 +2,7 @@

      - {{ 'artemisApp.dialogs.createGroupChat.title' | artemisTranslate }} +

      @@ -16,21 +16,17 @@

      @if (selectedUsersControl?.invalid && (selectedUsersControl?.dirty || selectedUsersControl?.touched)) {
      @if (selectedUsersControl?.errors?.required) { -
      - {{ 'artemisApp.dialogs.createGroupChat.requiredError' | artemisTranslate }} -
      +
      } @if (selectedUsersControl?.errors?.maxlength) { -
      - {{ 'artemisApp.dialogs.createGroupChat.maxError' | artemisTranslate: { max: 9 } }} -
      +
      }
      }
      diff --git a/src/main/webapp/app/overview/course-conversations/dialogs/one-to-one-chat-create-dialog/one-to-one-chat-create-dialog.component.html b/src/main/webapp/app/overview/course-conversations/dialogs/one-to-one-chat-create-dialog/one-to-one-chat-create-dialog.component.html index 5f0b53b0a223..cbe9bcfbf6bb 100644 --- a/src/main/webapp/app/overview/course-conversations/dialogs/one-to-one-chat-create-dialog/one-to-one-chat-create-dialog.component.html +++ b/src/main/webapp/app/overview/course-conversations/dialogs/one-to-one-chat-create-dialog/one-to-one-chat-create-dialog.component.html @@ -2,7 +2,7 @@

      - {{ 'artemisApp.dialogs.createOneToOneChat.title' | artemisTranslate }} +

      diff --git a/src/main/webapp/app/overview/course-conversations/layout/conversation-header/conversation-header.component.html b/src/main/webapp/app/overview/course-conversations/layout/conversation-header/conversation-header.component.html index ad47e0362fb6..77c54a91e20f 100644 --- a/src/main/webapp/app/overview/course-conversations/layout/conversation-header/conversation-header.component.html +++ b/src/main/webapp/app/overview/course-conversations/layout/conversation-header/conversation-header.component.html @@ -19,9 +19,13 @@

      - {{ - 'artemisApp.entities.tutorialGroup.channelReverse' | artemisTranslate: { title: activeConversationAsChannel.tutorialGroupTitle } - }} +

      } } diff --git a/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.html b/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.html index 37468268ca6e..373d7b8d9694 100644 --- a/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.html +++ b/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.html @@ -7,7 +7,7 @@
      - {{ 'artemisApp.conversationsLayout.conversationMessages.searchLabel' | artemisTranslate }} + - {{ 'artemisApp.conversationsLayout.conversationMessages.clearSearch' | artemisTranslate }} + } @switch (totalNumberOfPosts) { @case (0) { - {{ 'artemisApp.conversationsLayout.conversationMessages.searchResultsNone' | artemisTranslate }} + } @case (1) { - {{ 'artemisApp.conversationsLayout.conversationMessages.searchResultsSingle' | artemisTranslate }} + } @default { - {{ 'artemisApp.conversationsLayout.conversationMessages.searchResultsMultiple' | artemisTranslate: { count: totalNumberOfPosts } }} + } } @@ -91,9 +94,7 @@
      @if (getAsChannel(_activeConversation)?.isAnnouncementChannel) {
      - +
      } @else { diff --git a/src/main/webapp/app/overview/course-exercises/course-exercise-row.component.html b/src/main/webapp/app/overview/course-exercises/course-exercise-row.component.html index edfb84460b84..1ae605ca2ad2 100644 --- a/src/main/webapp/app/overview/course-exercises/course-exercise-row.component.html +++ b/src/main/webapp/app/overview/course-exercises/course-exercise-row.component.html @@ -50,7 +50,7 @@
      {{ exercise.title }}
      {{ dueDate | artemisTimeAgo }}
      } @else { -
      {{ 'artemisApp.courseOverview.exerciseList.noDueDate' | artemisTranslate }}
      +
      }

      diff --git a/src/main/webapp/app/overview/course-lectures/course-lecture-details.component.html b/src/main/webapp/app/overview/course-lectures/course-lecture-details.component.html index 31e417b42160..3e27cd79cf9b 100644 --- a/src/main/webapp/app/overview/course-lectures/course-lecture-details.component.html +++ b/src/main/webapp/app/overview/course-lectures/course-lecture-details.component.html @@ -1,7 +1,7 @@ @if (isLoading) {
      } @@ -26,9 +26,12 @@

      @if (lecture?.course?.isAtLeastEditor) {
      - +
      } @@ -40,7 +43,7 @@

      @if (lecture.description) {
      -

      {{ 'artemisApp.courseOverview.lectureDetails.description' | artemisTranslate }}

      +

      @@ -51,12 +54,15 @@

      {{ 'artemisApp.courseOverview.lectureDetails.description' | artemisTranslate @if (lecture.lectureUnits) {
      -

      {{ 'artemisApp.courseOverview.lectureDetails.lectureUnits' | artemisTranslate }}

      +

      @if (hasPdfLectureUnit) { - + }
      } @@ -95,7 +101,7 @@

      {{ 'artemisApp.courseOverview.lectureDetails.lectureUnits' | artemisTranslat @if (lecture.attachments) {
      -

      {{ 'artemisApp.courseOverview.lectureDetails.attachments' | artemisTranslate }}

      +

      } @@ -120,9 +126,7 @@

      {{ attachmentExtension(attachment) | uppercase }} @if (attachmentNotReleased(attachment)) { - - {{ 'artemisApp.courseOverview.lectureDetails.notReleased' | artemisTranslate }} - + }
      diff --git a/src/main/webapp/app/overview/course-lectures/course-lecture-row.component.html b/src/main/webapp/app/overview/course-lectures/course-lecture-row.component.html index e3f6841c9e09..d26daae4d1c5 100644 --- a/src/main/webapp/app/overview/course-lectures/course-lecture-row.component.html +++ b/src/main/webapp/app/overview/course-lectures/course-lecture-row.component.html @@ -23,7 +23,7 @@

      {{ lecture?.title }}

      ({{ lecture.startDate | artemisTimeAgo }})
      } @else { -
      {{ 'artemisApp.courseOverview.exerciseList.noDueDate' | artemisTranslate }}
      +
      } diff --git a/src/main/webapp/app/overview/course-overview.component.html b/src/main/webapp/app/overview/course-overview.component.html index 1cd9605ef9ef..ee6f77d51b5a 100644 --- a/src/main/webapp/app/overview/course-overview.component.html +++ b/src/main/webapp/app/overview/course-overview.component.html @@ -158,9 +158,7 @@
      @if (isNotManagementView && course.isAtLeastTutor) { } @if (showRefreshButton) { diff --git a/src/main/webapp/app/overview/course-registration/course-prerequisites-button/course-prerequisites-button.component.html b/src/main/webapp/app/overview/course-registration/course-prerequisites-button/course-prerequisites-button.component.html index f60094d04581..530576179db6 100644 --- a/src/main/webapp/app/overview/course-registration/course-prerequisites-button/course-prerequisites-button.component.html +++ b/src/main/webapp/app/overview/course-registration/course-prerequisites-button/course-prerequisites-button.component.html @@ -1,5 +1,3 @@ @if (course.prerequisites?.length) { - + } diff --git a/src/main/webapp/app/overview/course-registration/course-registration-button/course-registration-button.component.html b/src/main/webapp/app/overview/course-registration/course-registration-button/course-registration-button.component.html index 6b40d0b02e0d..960a67b4c207 100644 --- a/src/main/webapp/app/overview/course-registration/course-registration-button/course-registration-button.component.html +++ b/src/main/webapp/app/overview/course-registration/course-registration-button/course-registration-button.component.html @@ -11,7 +11,5 @@ /> } @if (!course.enrollmentConfirmationMessage!) { - + } diff --git a/src/main/webapp/app/overview/course-registration/course-registration-detail/course-registration-detail.component.html b/src/main/webapp/app/overview/course-registration/course-registration-detail/course-registration-detail.component.html index df46fef541bf..d03a7b1b8572 100644 --- a/src/main/webapp/app/overview/course-registration/course-registration-detail/course-registration-detail.component.html +++ b/src/main/webapp/app/overview/course-registration/course-registration-detail/course-registration-detail.component.html @@ -1,13 +1,11 @@ -

      {{ 'artemisApp.studentDashboard.enroll.title' | artemisTranslate }}

      +

      @if (loading) {
      - {{ 'artemisApp.studentDashboard.enroll.courseLoading' | artemisTranslate }} +
      } @else {

      {{ course?.title }}

      -

      - {{ 'artemisApp.studentDashboard.enroll.notInCourseButCanEnroll' | artemisTranslate }} -

      +

      } diff --git a/src/main/webapp/app/overview/course-registration/course-registration-prerequisites-modal/course-prerequisites-modal.component.html b/src/main/webapp/app/overview/course-registration/course-registration-prerequisites-modal/course-prerequisites-modal.component.html index 076549012a21..3e4ef9383be6 100644 --- a/src/main/webapp/app/overview/course-registration/course-registration-prerequisites-modal/course-prerequisites-modal.component.html +++ b/src/main/webapp/app/overview/course-registration/course-registration-prerequisites-modal/course-prerequisites-modal.component.html @@ -7,7 +7,7 @@

      @if (isLoading) {
      } @else { diff --git a/src/main/webapp/app/overview/course-registration/course-registration.component.html b/src/main/webapp/app/overview/course-registration/course-registration.component.html index 487181793162..36da4167694c 100644 --- a/src/main/webapp/app/overview/course-registration/course-registration.component.html +++ b/src/main/webapp/app/overview/course-registration/course-registration.component.html @@ -1,5 +1,5 @@
      -

      {{ 'artemisApp.studentDashboard.enroll.title' | artemisTranslate }}

      +

      @@ -46,14 +46,12 @@

      {{ 'artemisApp.studentDashboard.enroll.title' | artemisTranslate }}

      } @if (!loading && !coursesToSelect) { -
      - {{ 'artemisApp.studentDashboard.enroll.noCourse' | artemisTranslate }} -
      +
      } @if (loading && !coursesToSelect) {
      } diff --git a/src/main/webapp/app/overview/course-statistics/course-statistics.component.html b/src/main/webapp/app/overview/course-statistics/course-statistics.component.html index 2bf923aec355..73dd416ef9d2 100644 --- a/src/main/webapp/app/overview/course-statistics/course-statistics.component.html +++ b/src/main/webapp/app/overview/course-statistics/course-statistics.component.html @@ -3,23 +3,23 @@
      • - {{ 'artemisApp.courseOverview.statistics.includeStandardCategories' | artemisTranslate }} +
      • - {{ 'artemisApp.courseOverview.statistics.includeIndividualCategories' | artemisTranslate }} +
        • @if (categoryFilter.exercisesWithoutCategoriesPresent) { @@ -31,7 +31,7 @@ [checked]="categoryFilter.includeExercisesWithNoCategory" type="checkbox" /> - {{ 'artemisApp.courseOverview.statistics.exercisesWithNoCategories' | artemisTranslate }} + } @@ -53,7 +53,7 @@
        -

        {{ 'artemisApp.courseOverview.statistics.totalScore' | artemisTranslate }}

        +

        @@ -80,13 +80,17 @@
        {{ exerciseType.name | artemisTranslate }}
        }
        -
        - {{ 'artemisApp.courseOverview.statistics.yourPoints' | artemisTranslate: { number: overallPoints } }} -
        +
        - - {{ 'artemisApp.courseOverview.statistics.reachablePoints' | artemisTranslate: { number: reachablePoints, relative: currentRelativeScore } }} - + />
        - - {{ 'artemisApp.courseOverview.statistics.totalPoints' | artemisTranslate: { number: overallMaxPoints, relative: totalRelativeScore } }} - +
        - - {{ - isBonus - ? ('artemisApp.exam.examSummary.gradeKeyButtonBonus' | artemisTranslate) - : ('artemisApp.exam.examSummary.gradeKeyButton' | artemisTranslate) - }} - +
        } @if (course?.presentationScore) {
        -
        - {{ 'artemisApp.courseOverview.statistics.totalPresentationScore' | artemisTranslate: { number: overallPresentationScore } }} -
        -
        - {{ 'artemisApp.courseOverview.statistics.presentationScoreBonus' | artemisTranslate: { number: course?.presentationScore } }} -
        +
        +
        } @if (reachablePresentationPoints) {
        -
        - {{ 'artemisApp.courseOverview.statistics.totalPresentationPoints' | artemisTranslate: { number: overallPresentationScore } }} -
        -
        - {{ 'artemisApp.courseOverview.statistics.achievablePresentationPoints' | artemisTranslate: { number: reachablePresentationPoints } }} -
        +
        +
        {{ 'artemisApp.courseOverview.statistics.gradeInfo' | artemisTranslate }}
        -

        {{ 'artemisApp.courseOverview.statistics.pointsPerExercise' | artemisTranslate }}

        +

        @for (exerciseGroup of ngxExerciseGroups | keyvalue; let index = $index; track index) { @if (exerciseGroup.value[0]) {
        -

        - {{ - 'artemisApp.courseOverview.statistics.exerciseCount' | artemisTranslate: { number: exerciseGroup.value.length, type: exerciseGroup.key } - }} -

        +

        @if ([barChartTitle.INCLUDED, barChartTitle.BONUS, barChartTitle.NOT_INCLUDED, barChartTitle.NO_DUE_DATE].includes(model.name)) {
        @if (!model.isProgrammingExercise) { - - {{ - 'artemisApp.courseOverview.statistics.exerciseAchievedScore' - | artemisTranslate - : { points: model.absoluteValue, percentage: roundScoreSpecifiedByCourseSettings(model.value, course) } - }} - + } @if (model.isProgrammingExercise) { - - {{ - 'artemisApp.courseOverview.statistics.programmingExercisePassedTests' - | artemisTranslate - : { tests: model.absoluteValue, percentage: roundScoreSpecifiedByCourseSettings(model.value, course) } - }} - + } @if (model.name === barChartTitle.BONUS) { @@ -237,54 +242,43 @@

        @case (barChartTitle.MISSED) {
        @if (!model.afterDueDate && !model.notParticipated && !model.isProgrammingExercise) { - - {{ - 'artemisApp.courseOverview.statistics.exerciseMissedScore' - | artemisTranslate - : { - points: model.absoluteValue, - percentage: roundScoreSpecifiedByCourseSettings(model.value, course), - } - }} - + } @if (model.notParticipated) { - - {{ - 'artemisApp.courseOverview.statistics.exerciseNotParticipated' - | artemisTranslate: { exercise: model.exerciseTitle } - }} - + } @if (model.afterDueDate) { - - {{ - 'artemisApp.courseOverview.statistics.exerciseParticipatedAfterDueDate' - | artemisTranslate: { exercise: model.exerciseTitle } - }} - + } @if (model.isProgrammingExercise && !model.notParticipated) { - - {{ - 'artemisApp.courseOverview.statistics.programmingExerciseFailedTests' - | artemisTranslate - : { - tests: model.absoluteValue, - percentage: roundScoreSpecifiedByCourseSettings(model.value, course), - } - }} - + }
        } @case (barChartTitle.NOT_GRADED) {
        - - {{ - 'artemisApp.courseOverview.statistics.exerciseNotGraded' | artemisTranslate: { exercise: model.exerciseTitle } - }} +
        } } @@ -294,17 +288,17 @@

        @if (exerciseGroup.value && exerciseGroup.value.length) {
        -
        - {{ 'artemisApp.courseOverview.statistics.yourPoints' | artemisTranslate: { number: exerciseGroup.value[0].absoluteScore } }} -
        +
        - - {{ - 'artemisApp.courseOverview.statistics.reachablePoints' - | artemisTranslate - : { number: exerciseGroup.value[0].reachablePoints, relative: exerciseGroup.value[0].currentRelativeScore } - }} - + />
        - - {{ - 'artemisApp.courseOverview.statistics.totalPoints' - | artemisTranslate: { number: exerciseGroup.value[0].overallMaxPoints, relative: exerciseGroup.value[0].relativeScore } - }} - + />
        @if (exerciseGroup.value[0].presentationScoreEnabled && course?.presentationScore) { -
        - {{ - 'artemisApp.courseOverview.statistics.presentationScore' - | artemisTranslate: { number: exerciseGroup.value[0].presentationScore } - }} -
        +
        }
        } @@ -343,9 +335,7 @@
        } @else {
        -
        - {{ 'artemisApp.courseOverview.statistics.noStatistics' | artemisTranslate }} -
        +
        }
        diff --git a/src/main/webapp/app/overview/course-tutorial-groups/course-tutorial-group-card/course-tutorial-group-card.component.html b/src/main/webapp/app/overview/course-tutorial-groups/course-tutorial-group-card/course-tutorial-group-card.component.html index fcdc854c1e4a..4add37514666 100644 --- a/src/main/webapp/app/overview/course-tutorial-groups/course-tutorial-group-card/course-tutorial-group-card.component.html +++ b/src/main/webapp/app/overview/course-tutorial-groups/course-tutorial-group-card/course-tutorial-group-card.component.html @@ -17,9 +17,7 @@
        {{ tutorialGroup?.title ?? '' }}
        @if (tutorialGroup.teachingAssistantName) { -
        - {{ 'artemisApp.tutorialGroupCard.teachingAssistant' | artemisTranslate: { name: tutorialGroup.teachingAssistantName } }} -
        +
        } @if (showChannelLink && tutorialGroup.channel && isMessagingEnabled(course)) {
        @@ -29,10 +27,11 @@
        {{ tutorialGroup?.title ?? '' }}
        [routerLink]="['/courses', course.id!, 'communication']" [queryParams]="{ conversationId: tutorialGroup.channel.id }" class="btn btn-primary" - >{{ 'artemisApp.entities.tutorialGroup.channelWithName' | artemisTranslate: { channel: tutorialGroup.channel.name } }} + jhiTranslate="artemisApp.entities.tutorialGroup.channelWithName" + [translateValues]="{ channel: tutorialGroup.channel.name }" + > } @else { - {{ 'artemisApp.entities.tutorialGroup.channelWithName' | artemisTranslate: { channel: tutorialGroup.channel.name } }} + }
        } diff --git a/src/main/webapp/app/overview/course-unenrollment-modal.component.html b/src/main/webapp/app/overview/course-unenrollment-modal.component.html index 213dd615c852..31d17bde6bbc 100644 --- a/src/main/webapp/app/overview/course-unenrollment-modal.component.html +++ b/src/main/webapp/app/overview/course-unenrollment-modal.component.html @@ -1,7 +1,5 @@
        -

        - {{ 'artemisApp.courseOverview.exerciseList.details.unenrollmentModal.title' | artemisTranslate }} -

        +

        @@ -10,9 +8,7 @@

        {{ course?.title }} ?

        @if (!canEnrollAgain) { -
        - {{ 'artemisApp.courseOverview.exerciseList.details.unenrollmentModal.reenrollmentNotPossible' | artemisTranslate }} -
        +
        } @if (canEnrollAgain) {
        @@ -22,22 +18,16 @@

        }

        - +
        diff --git a/src/main/webapp/app/overview/courses.component.html b/src/main/webapp/app/overview/courses.component.html index ebfd4deb06f6..92381c38c62b 100644 --- a/src/main/webapp/app/overview/courses.component.html +++ b/src/main/webapp/app/overview/courses.component.html @@ -1,8 +1,6 @@ @if (nextRelevantExam && nextRelevantCourseForExam) {
        -

        - {{ 'artemisApp.studentDashboard.examTitle' | artemisTranslate: { course: nextRelevantCourseForExam.title } }} -

        +

        @@ -11,10 +9,10 @@

        {{ nextRelevantExam.title }}

        @if (nextRelevantExam.startDate) { -
        {{ 'artemisApp.exam.overview.start' | artemisTranslate: { start: nextRelevantExam.startDate | artemisDate } }}
        +
        } @if (nextRelevantExam.examMaxPoints) { -
        {{ 'artemisApp.exam.overview.maxPoints' | artemisTranslate: { points: nextRelevantExam.examMaxPoints } }}
        +
        }
        @@ -28,7 +26,7 @@

        @if (regularCourses.length) {
        - {{ 'artemisApp.studentDashboard.enroll.title' | artemisTranslate }} +
        }
        @@ -51,7 +49,7 @@

        - {{ 'artemisApp.studentDashboard.enroll.title' | artemisTranslate }} +
        } @else { diff --git a/src/main/webapp/app/overview/discussion-section/discussion-section.component.html b/src/main/webapp/app/overview/discussion-section/discussion-section.component.html index c423a6c9ca5f..a1a4fc4d2944 100644 --- a/src/main/webapp/app/overview/discussion-section/discussion-section.component.html +++ b/src/main/webapp/app/overview/discussion-section/discussion-section.component.html @@ -20,15 +20,13 @@
        <
        @if (noChannelAvailable) { -
        - {{ 'artemisApp.metis.channel.noChannel' | artemisTranslate }} -
        +
        } @else {
        @if (currentPost !== undefined) {
        - {{ 'artemisApp.metis.post.showAllPosts' | artemisTranslate }} +
        } @else { @@ -65,7 +63,7 @@
        < id="filterToUnresolved" (change)="onSelectContext()" /> - +
        < id="filterToOwn" (change)="onSelectContext()" /> - +
        < id="filterToAnsweredOrReacted" (change)="onSelectContext()" /> - +
        @@ -98,7 +98,7 @@
        <
        - {{ 'artemisApp.metis.discussionSection.sortByDate' | artemisTranslate }} +
        @if (!currentSortDirection) {
        @@ -142,13 +142,13 @@
        < @if (isLoading) {
        -
        {{ 'artemisApp.metis.discussionSection.loadingMessages' | artemisTranslate }}
        +
        } @if (!isLoading && posts.length === 0) {
        -
        {{ 'artemisApp.metis.discussionSection.noMessages' | artemisTranslate }}
        +
        } @@ -163,10 +163,10 @@
        < } @if (!shouldSendMessage) { - {{ 'artemisApp.metis.newMessage' | artemisTranslate }} + } @if (shouldSendMessage) { - {{ 'artemisApp.metis.collapseNewMessage' | artemisTranslate }} + } @if (shouldSendMessage) { diff --git a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html index 07fbccb20ec1..0d8f889d1ed5 100644 --- a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html +++ b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html @@ -113,7 +113,7 @@
        -

        {{ 'artemisApp.courseOverview.exerciseDetails.recentResults' | artemisTranslate }}

        +

        @@ -130,7 +130,7 @@

        {{ 'artemisApp.courseOverview.exerciseDetails.recentResults' | artemisTransl @if (showMoreResults) {
        -

        {{ 'artemisApp.courseOverview.exerciseDetails.allResults' | artemisTranslate }}

        +

        @@ -153,9 +153,7 @@

        } @if (!sortedHistoryResults) { -
        - {{ 'artemisApp.courseOverview.exerciseDetails.noResults' | artemisTranslate }} -
        +
        }

        @@ -170,7 +168,7 @@

        @if (exampleSolutionInfo?.exampleSolutionPublished) {
        - {{ 'artemisApp.exercise.exampleSolution' | artemisTranslate }} +
        diff --git a/src/main/webapp/app/overview/exercise-details/problem-statement/problem-statement.component.html b/src/main/webapp/app/overview/exercise-details/problem-statement/problem-statement.component.html index ebed5c03ce91..771aaf0cc970 100644 --- a/src/main/webapp/app/overview/exercise-details/problem-statement/problem-statement.component.html +++ b/src/main/webapp/app/overview/exercise-details/problem-statement/problem-statement.component.html @@ -6,7 +6,7 @@ @if (exercise?.problemStatement) {
        -

        {{ 'artemisApp.courseOverview.exerciseDetails.problemStatement' | artemisTranslate }}

        +

        diff --git a/src/main/webapp/app/overview/header-course.component.html b/src/main/webapp/app/overview/header-course.component.html index df28e8ec031e..43a30615e2c8 100644 --- a/src/main/webapp/app/overview/header-course.component.html +++ b/src/main/webapp/app/overview/header-course.component.html @@ -17,9 +17,7 @@

        {{ courseDescription }}
        - - {{ 'artemisApp.courseOverview.studentView' | artemisTranslate }} - +
        diff --git a/src/main/webapp/app/overview/submission-result-status.component.html b/src/main/webapp/app/overview/submission-result-status.component.html index 47a0b3e0b172..2cc0eaac36b4 100644 --- a/src/main/webapp/app/overview/submission-result-status.component.html +++ b/src/main/webapp/app/overview/submission-result-status.component.html @@ -18,25 +18,25 @@ } @else {
        @if (exercise.teamMode && exercise.studentAssignedTeamIdComputed && !exercise.studentAssignedTeamId) { - {{ 'artemisApp.courseOverview.exerciseList.userNotAssignedToTeamShort' | artemisTranslate }} + } @if (uninitialized) { - {{ 'artemisApp.courseOverview.exerciseList.userNotStartedExerciseShort' | artemisTranslate }} + } @if (exerciseMissedDueDate) { - {{ 'artemisApp.courseOverview.exerciseList.exerciseMissedDueDateShort' | artemisTranslate }} + } @if (notSubmitted) { - {{ 'artemisApp.courseOverview.exerciseList.exerciseNotSubmittedShort' | artemisTranslate }} + } @if (!notSubmitted && studentParticipation?.initializationState === InitializationState.FINISHED) { - {{ 'artemisApp.courseOverview.exerciseList.userSubmittedShort' | artemisTranslate }} + } @if (studentParticipation?.initializationState === InitializationState.INITIALIZED && exercise.type === ExerciseType.QUIZ) { - {{ 'artemisApp.courseOverview.exerciseList.userParticipatingShort' | artemisTranslate }} + } @if (quizNotStarted) { - {{ 'artemisApp.courseOverview.exerciseList.quizNotStartedShort' | artemisTranslate }} + }
        } diff --git a/src/main/webapp/app/overview/visualizations/exercise-scores-chart/exercise-scores-chart.component.html b/src/main/webapp/app/overview/visualizations/exercise-scores-chart/exercise-scores-chart.component.html index fa692113e2d2..c4918ffe1525 100644 --- a/src/main/webapp/app/overview/visualizations/exercise-scores-chart/exercise-scores-chart.component.html +++ b/src/main/webapp/app/overview/visualizations/exercise-scores-chart/exercise-scores-chart.component.html @@ -1,5 +1,5 @@
        -

        {{ 'artemisApp.exercise-scores-chart.title' | artemisTranslate }}

        +

        @if (exerciseTypeFilter.typeSet.size > 0) {
        • - {{ 'artemisApp.exercise-scores-chart.includeType' | artemisTranslate }} +
          • @for (type of exerciseTypeFilter.typeSet; track type) {
        • diff --git a/src/main/webapp/app/shared/components/code-button/code-button.component.html b/src/main/webapp/app/shared/components/code-button/code-button.component.html index 6cbcb0d59b52..89d1b5aa952f 100644 --- a/src/main/webapp/app/shared/components/code-button/code-button.component.html +++ b/src/main/webapp/app/shared/components/code-button/code-button.component.html @@ -20,9 +20,7 @@ @if (participations && participations.length > 1) {
          - +
          }
          {{ cloneHeadline | artemisTranslate }}
          @@ -92,9 +90,8 @@
          {{ cloneHeadline | artemisTranslate }}
          class="btn btn-primary btn-sm me-2" type="button" style="min-width: 100px" - > - {{ wasCopied ? ('artemisApp.exerciseActions.copiedUrl' | artemisTranslate) : ('artemisApp.exerciseActions.copyUrl' | artemisTranslate) }} - + jhiTranslate="{{ wasCopied ? 'artemisApp.exerciseActions.copiedUrl' : 'artemisApp.exerciseActions.copyUrl' }}" + > diff --git a/src/main/webapp/app/shared/components/not-released-tag.component.html b/src/main/webapp/app/shared/components/not-released-tag.component.html index c9aca3c9a85e..3a2f4c880ba1 100644 --- a/src/main/webapp/app/shared/components/not-released-tag.component.html +++ b/src/main/webapp/app/shared/components/not-released-tag.component.html @@ -4,7 +4,6 @@ [class.ms-1]="!noMargin" container="body" ngbTooltip="{{ 'artemisApp.courseOverview.exerciseList.notReleasedTooltip' | artemisTranslate }}{{ exercise.releaseDate | artemisDate }}" - > - {{ 'artemisApp.courseOverview.exerciseList.notReleased' | artemisTranslate }} - + jhiTranslate="artemisApp.courseOverview.exerciseList.notReleased" + > } diff --git a/src/main/webapp/app/shared/components/open-code-editor-button/open-code-editor-button.component.html b/src/main/webapp/app/shared/components/open-code-editor-button/open-code-editor-button.component.html index f588a174193f..ce94f86bca0c 100644 --- a/src/main/webapp/app/shared/components/open-code-editor-button/open-code-editor-button.component.html +++ b/src/main/webapp/app/shared/components/open-code-editor-button/open-code-editor-button.component.html @@ -32,9 +32,7 @@ @if (participations && participations.length > 1) {
          - +
          }
          -
          {{ 'artemisApp.exerciseActions.practiceMode.title' | artemisTranslate }}
          -

          {{ 'artemisApp.exerciseActions.practiceMode.explanation' | artemisTranslate }}

          +
          +

          @if (gradedStudentParticipation) { -

          {{ 'artemisApp.exerciseActions.practiceMode.repositoryChoice' | artemisTranslate }}

          +

          }
        @if (isLoading) {
        } @else { diff --git a/src/main/webapp/app/shared/course-users-selector/course-users-selector.component.html b/src/main/webapp/app/shared/course-users-selector/course-users-selector.component.html index ed2531800f65..78e11295962c 100644 --- a/src/main/webapp/app/shared/course-users-selector/course-users-selector.component.html +++ b/src/main/webapp/app/shared/course-users-selector/course-users-selector.component.html @@ -20,28 +20,28 @@ #instance="ngbTypeahead" /> @if (isSearching) { - {{ 'artemisApp.userSelector.searchingText' | artemisTranslate }} +
        } @if (searchFailed) { - {{ 'artemisApp.userSelector.searchFailedText' | artemisTranslate }} +
        } @if (searchStudents) { - {{ 'artemisApp.userSelector.helpText' | artemisTranslate }} + }
        @if (rolesToAllowSearchingIn.includes('students')) {
        - +
        } @if (rolesToAllowSearchingIn.includes('tutors')) {
        - +
        } @if (rolesToAllowSearchingIn.includes('instructors')) { @@ -53,7 +53,7 @@ [checked]="searchInstructors" (change)="searchInstructors = !searchInstructors; onFilterChange()" /> - +
        }
      diff --git a/src/main/webapp/app/shared/dashboards/tutor-leaderboard/tutor-leaderboard.component.html b/src/main/webapp/app/shared/dashboards/tutor-leaderboard/tutor-leaderboard.component.html index c914924f30b2..28b4b692e1e5 100644 --- a/src/main/webapp/app/shared/dashboards/tutor-leaderboard/tutor-leaderboard.component.html +++ b/src/main/webapp/app/shared/dashboards/tutor-leaderboard/tutor-leaderboard.component.html @@ -4,43 +4,43 @@

      # - {{ 'artemisApp.assessmentDashboard.tutorLeaderboard.name' | artemisTranslate }} + - {{ 'artemisApp.assessmentDashboard.tutorLeaderboard.points' | artemisTranslate }} + - {{ 'artemisApp.assessmentDashboard.tutorLeaderboard.numberOfAssessments' | artemisTranslate }} + - {{ 'artemisApp.assessmentDashboard.tutorLeaderboard.numberOfAcceptedComplaints' | artemisTranslate }} + - {{ 'artemisApp.assessmentDashboard.tutorLeaderboard.numberOfNotAnsweredMoreFeedbackRequests' | artemisTranslate }} + - {{ 'artemisApp.assessmentDashboard.tutorLeaderboard.numberOfComplaintResponses' | artemisTranslate }} + - {{ 'artemisApp.assessmentDashboard.tutorLeaderboard.numberOfAnsweredMoreFeedbackRequests' | artemisTranslate }} + - {{ 'artemisApp.assessmentDashboard.tutorLeaderboard.averageScore' | artemisTranslate }} + - {{ 'artemisApp.assessmentDashboard.tutorLeaderboard.averageRating' | artemisTranslate }} +