Merge branch 'dev' into CSCEXAM-1395

CSCfi · Jan 10, 2025 · 4ef2d8a · 4ef2d8a
2 parents b730bc5 + bd30449
commit 4ef2d8a
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 29 deletions.
diff --git a/ui/src/app/maturity/listing/reviewed-inspections.component.html b/ui/src/app/maturity/listing/reviewed-inspections.component.html
@@ -8,17 +8,17 @@
     <div class="col-md-6">
         {{ 'i18n_processed_language_inspections' | translate }}
         @if (inspections.length > 0) {
-            <a (click)="hideItems = !hideItems" class="pointer ms-1">
+            <button (click)="hideItems = !hideItems" class="btn btn-link ms-1">
                 <img [hidden]="!hideItems" src="/assets/images/icon_list_show_right.svg" alt="" />
                 <img [hidden]="hideItems" src="/assets/images/icon_list_show_down.svg" alt="" />
-            </a>
+            </button>
         }
     </div>
     <div class="col-md-6">
         <small class="float-end">
-            <a [routerLink]="['/staff/inspections/reports']">{{
-                'i18n_language_inspection_report_link' | translate
-            }}</a>
+            <button class="btn btn-primary" [routerLink]="['/staff/inspections/reports']">
+                {{ 'i18n_language_inspection_report_link' | translate }}
+            </button>
         </small>
     </div>
 </div>
@@ -248,9 +248,12 @@
                         </td>
                         <!-- 11 -->
                         <td>
-                            <a class="pointer" (click)="showStatement(inspection.statement)">{{
-                                'i18n_view' | translate
-                            }}</a>
+                            <button
+                                class="btn btn-sm btn-outline-secondary"
+                                (click)="showStatement(inspection.statement)"
+                            >
+                                {{ 'i18n_view_feedback' | translate }}
+                            </button>
                         </td>
                     </tr>
                 }

diff --git a/ui/src/app/maturity/listing/unfinished-inspections.component.html b/ui/src/app/maturity/listing/unfinished-inspections.component.html
@@ -10,10 +10,10 @@
             {{ 'i18n_ongoing_language_inspections' | translate }}
             <span>{{ getInspectionAmounts() }}</span>
             @if (inspections.length > 0) {
-                <a (click)="hideItems = !hideItems" class="pointer ms-1">
+                <button (click)="hideItems = !hideItems" class="btn btn-link ms-1">
                     <img [hidden]="!hideItems" src="/assets/images/icon_list_show_right.svg" alt="" />
                     <img [hidden]="hideItems" src="/assets/images/icon_list_show_down.svg" alt="" />
-                </a>
+                </button>
             }
         </div>
     </div>
@@ -189,21 +189,29 @@ <h5 class="col-md-12">
                             }
                             @if (inspection.modifier) {
                                 <td>
-                                    <a class="pointer" [routerLink]="['/staff/assessments', inspection.exam.id]">{{
-                                        'i18n_view' | translate
-                                    }}</a>
+                                    <button
+                                        class="btn btn-sm btn-outline-secondary"
+                                        [routerLink]="['/staff/assessments', inspection.exam.id]"
+                                    >
+                                        {{ 'i18n_view_assessment' | translate }}
+                                    </button>
                                 </td>
                             }
                             @if (!inspection.modifier && !user.isAdmin) {
                                 <td>
-                                    <a class="pointer" (click)="assignInspection(inspection)"
-                                        >{{ 'i18n_assign_to_me' | translate }}
-                                    </a>
+                                    <button
+                                        class="btn btn-sm btn-outline-secondary"
+                                        (click)="assignInspection(inspection)"
+                                    >
+                                        {{ 'i18n_assign_assessments_to_me' | translate }}
+                                    </button>
                                 </td>
                             }
                             @if (!inspection.modifier && user.isAdmin) {
                                 <td>
-                                    <span class="text-muted">{{ 'i18n_assign_to_me' | translate }}</span>
+                                    <button class="btn btn-sm btn-outline-secondary" disabled="disabled">
+                                        {{ 'i18n_assign_assessments_to_me' | translate }}
+                                    </button>
                                 </td>
                             }
                         </tr>

diff --git a/ui/src/app/review/assessment/assessment.component.html b/ui/src/app/review/assessment/assessment.component.html
@@ -19,14 +19,14 @@ <h3>
             <xm-course-code [course]="exam.course"></xm-course-code> -
         }
         {{ exam.name }}
-        <a class="pointer" (click)="hideGeneralInfo = !hideGeneralInfo">
+        <button class="pointer btn btn-link" (click)="hideGeneralInfo = !hideGeneralInfo">
             @if (hideGeneralInfo) {
                 <img src="/assets/images/icon_list_show_right.svg" alt="" />
             }
             @if (!hideGeneralInfo) {
                 <img src="/assets/images/icon_list_show_down.svg" alt="" />
             }
-        </a>
+        </button>
     </h3>
     <!-- General Information -->
     <div class="row" [ngbCollapse]="hideGeneralInfo">
@@ -57,12 +57,12 @@ <h3>
     <h4 class="row mt-2">
         <div class="col-12">
             {{ 'i18n_grading_info' | translate }}
-            <a (click)="hideGradeInfo = !hideGradeInfo">
+            <button class="btn btn-link" (click)="hideGradeInfo = !hideGradeInfo">
                 @if (hideGradeInfo) {
                     <img src="/assets/images/icon_list_show_right.svg" alt="" />
                 }
                 <img [hidden]="hideGradeInfo" src="/assets/images/icon_list_show_down.svg" alt="" />
-            </a>
+            </button>
         </div>
     </h4>
 

diff --git a/ui/src/app/review/assessment/questions/cloze-test.component.html b/ui/src/app/review/assessment/questions/cloze-test.component.html
@@ -8,14 +8,18 @@
     <div class="col-md-12">
         <!-- question text -->
         <div class="float-end">
-            <a class="float-end" (click)="reviewExpanded = !reviewExpanded" [attr.aria-expanded]="reviewExpanded">
+            <button
+                class="float-end btn btn-link"
+                (click)="reviewExpanded = !reviewExpanded"
+                [attr.aria-expanded]="reviewExpanded"
+            >
                 @if (!reviewExpanded) {
                     <img src="/assets/images/icon_list_show_right.svg" alt="" />
                 }
                 @if (reviewExpanded) {
                     <img src="/assets/images/icon_list_show_down.svg" alt="" />
                 }
-            </a>
+            </button>
             <!-- grade -->
             <div class="pe-3 me-2">
                 <!-- grade -->

diff --git a/ui/src/app/review/assessment/questions/essay-question.component.html b/ui/src/app/review/assessment/questions/essay-question.component.html
@@ -47,7 +47,8 @@
                     </div>
                 }
                 <!--chevron -->
-                <a
+                <button
+                    class="float-end btn btn-link"
                     (click)="reviewExpanded = !reviewExpanded"
                     [attr.aria-label]="reviewExpanded ? ('i18n_collapse' | translate) : ('i18n_expand' | translate)"
                 >
@@ -57,7 +58,7 @@
                     @if (reviewExpanded) {
                         <img src="/assets/images/icon_list_show_down.svg" alt="" />
                     }
-                </a>
+                </button>
             </div>
         </div>
 

diff --git a/ui/src/app/review/assessment/questions/multi-choice-question.component.html b/ui/src/app/review/assessment/questions/multi-choice-question.component.html
@@ -50,14 +50,14 @@
                         / {{ getCorrectClaimChoiceOptionScore() }} {{ 'i18n_unit_points' | translate }}
                     </div>
                 }
-                <a class="d-inline-block" (click)="reviewExpanded = !reviewExpanded">
+                <button class="d-inline-block btn btn-link" (click)="reviewExpanded = !reviewExpanded">
                     @if (!reviewExpanded) {
                         <img src="/assets/images/icon_list_show_right.svg" alt="" />
                     }
                     @if (reviewExpanded) {
                         <img src="/assets/images/icon_list_show_down.svg" alt="" />
                     }
-                </a>
+                </button>
             </div>
         </div>
 

diff --git a/ui/src/assets/i18n/en.json b/ui/src/assets/i18n/en.json
@@ -1191,6 +1191,9 @@
     "i18n_exam_owner_info": "Exam needs to have at least one examiner.",
     "i18n_csv_uploading_cancelled": "CSV file upload cancelled",
     "i18n_exam_last_owner_info": "Exam needs to have at least one owner. The last owner can't be removed.",
+    "i18n_view_assessment": "View assessments",
+    "i18n_assign_assessments_to_me": "Start evaluation",
+    "i18n_view_feedback": "View feedback",
     "i18n_iop_reservations": "Tenttivierailut EN",
     "i18n_outbound_reservations": "Muihin korkeakouluihin tehdyt varaukset EN",
     "i18n_inbound_reservations": "Muista korkeakouluista tehdyt varaukset EN",

diff --git a/ui/src/assets/i18n/fi.json b/ui/src/assets/i18n/fi.json
@@ -1191,6 +1191,9 @@
     "i18n_exam_owner_info": "Tentissä pitää olla vähintään yksi tentaattori.",
     "i18n_csv_uploading_cancelled": "CSV tiedoston tuonti peruutettu",
     "i18n_exam_last_owner_info": "Tentissä pitää olla vähintään yksi omistaja. Viimeistä tentaattoria ei voi poistaa.",
+    "i18n_view_assessment": "Näytä arviointi",
+    "i18n_assign_assessments_to_me": "Arvioi suoritus",
+    "i18n_view_feedback": "Näytä palaute",
     "i18n_iop_reservations": "Tenttivierailut",
     "i18n_outbound_reservations": "Muihin korkeakouluihin tehdyt varaukset",
     "i18n_inbound_reservations": "Muista korkeakouluista tehdyt varaukset",

diff --git a/ui/src/assets/i18n/sv.json b/ui/src/assets/i18n/sv.json
@@ -1189,10 +1189,11 @@
     "i18n_show_participants": "Visa deltagare",
     "i18n_hide_participants": "Dölj deltagare",
     "i18n_exam_owner_info": "Tentamen behöver minst en bedömare.SV",
-    "i18n_csv_uploading_cancelled": "Uppladdning av CSV-fil avbruten",
     "i18n_exam_last_owner_info": "Tentissä pitää olla vähintään yksi omistaja. Viimeistä tentaattoria ei voi poistaa. SV",
     "i18n_exam_owner_info": "Tentamen behöver minst en bedömare. SV",
-    "i18n_csv_uploading_cancelled": "Uppladdning av CSV-fil avbruten",
+    "i18n_view_assessment": "Visa bedöm SV",
+    "i18n_assign_assessments_to_me": "Arvioi suoritus SV",
+    "i18n_view_feedback": "Visa feedback SV",
     "i18n_iop_reservations": "Tenttivierailut SV",
     "i18n_outbound_reservations": "Muihin korkeakouluihin tehdyt varaukset SV",
     "i18n_inbound_reservations": "Muista korkeakouluista tehdyt varaukset SV",