Merge branch 'dev' into CSCEXAM-478

CSCfi · Aug 12, 2024 · 14f32e9 · 14f32e9
2 parents cf15f85 + 5e6ab08
commit 14f32e9
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/ui/src/app/navigation/navigation.component.html b/ui/src/app/navigation/navigation.component.html
@@ -15,9 +15,10 @@
                             class="mobile-menu"
                             (click)="openMenu()"
                             [hidden]="!user"
-                            [attr.aria-open]="mobileMenuOpen"
+                            [attr.aria-expanded]="mobileMenuOpen"
+                            [attr.aria-label]="'i18n_open_main_menu' | translate"
                         >
-                            <img src="/assets/images/icon_menu_mobile.svg" alt="{{ 'i18n_mobile_menu' | translate }}" />
+                            <img src="/assets/images/icon_menu_mobile.svg" alt="" />
                         </button>
                     </div>
                 </div>

diff --git a/ui/src/app/review/assessment/sections/section.component.ts b/ui/src/app/review/assessment/sections/section.component.ts
@@ -60,9 +60,11 @@ export class ExamSectionComponent implements OnInit, AfterViewInit {
         this.essayQuestionAmounts = this.Question.getEssayQuestionAmountsBySection(this.section);
     };
 
+    // getReviewProgress gathers the questions that have been reviewed by calculating essay answers that have been evaluated plus the rest of the questions.
+    // Since the essay questions are the only ones that need to be evaluated and the rest of the questions are evaluated automatically.
     getReviewProgress = () => {
         return this.section.sectionQuestions.filter((q: ExamSectionQuestion) => {
-            return q.forcedScore || q.essayAnswer?.evaluatedScore;
+            return q.question.type !== 'EssayQuestion' || q.essayAnswer?.evaluatedScore;
         }).length;
     };
 

diff --git a/ui/src/assets/i18n/en.json b/ui/src/assets/i18n/en.json
@@ -1112,7 +1112,7 @@
     "i18n_date_too_far_in_future": "Selected date is later than latest date allowed:",
     "i18n_enrolment_assessment_not_received": "Re-enrolment is not possible because your previous examination has not returned from exam visit university",
     "i18n_not_allowed_to_modify_reservation": "Your current reservation is active so you can't edit it",
-    "i18n_mobile_menu": "Mobile menu",
+    "i18n_open_main_menu": "Open main menu",
     "i18n_exam_logo": "Exam logo",
     "i18n_show_hide_clock": "Show/hide time",
     "i18n_select_time_in_future": "Time must be in future",

diff --git a/ui/src/assets/i18n/fi.json b/ui/src/assets/i18n/fi.json
@@ -1112,7 +1112,7 @@
     "i18n_date_too_far_in_future": "Valittu ajankohta on myöhemmin kuin kaukaisin tällä hetkellä sallittu:",
     "i18n_enrolment_assessment_not_received": "Uudelleen ilmoittautuminen ei sallittu, edellinen tenttivierailusuoritus ei ole vielä saapunut",
     "i18n_not_allowed_to_modify_reservation": "Varaus on käynnissä ja sitä ei voi muuttaa",
-    "i18n_mobile_menu": "Mobiili-menu",
+    "i18n_open_main_menu": "Avaa päävalikko",
     "i18n_exam_logo": "Exam-logo",
     "i18n_show_hide_clock": "Näytä/piilota aika",
     "i18n_select_time_in_future": "Valitse aika tulevaisuudesta",

diff --git a/ui/src/assets/i18n/sv.json b/ui/src/assets/i18n/sv.json
@@ -1112,7 +1112,7 @@
     "i18n_date_too_far_in_future": "Det valda datumet är senare än sista möjliga tidpunkt:",
     "i18n_enrolment_assessment_not_received": "Det är inte tillåtet att anmäla sig på nytt, eftersom den föregående tentamensprestationen inte ännu har kommit från den högskola där du skrev tentamen. ",
     "i18n_not_allowed_to_modify_reservation": "Din bokning pågår och kan därför inte ändras",
-    "i18n_mobile_menu": "Mobilmeny",
+    "i18n_open_main_menu": "Öppna huvudmenyn",
     "i18n_exam_logo": "Examlogo",
     "i18n_show_hide_clock": "Visa/dölj tiden",
     "i18n_select_time_in_future": "Välj tidpunkt i framtiden",