diff --git a/scripts/langindex.json b/scripts/langindex.json index 0816e51a6..49cc3dddf 100644 --- a/scripts/langindex.json +++ b/scripts/langindex.json @@ -873,6 +873,7 @@ "addon.mod_quiz.summaryofattempts": "quiz", "addon.mod_quiz.timeleft": "quiz", "addon.mod_quiz.timetaken": "quiz", + "addon.mod_quiz.unit": "quiz", "addon.mod_quiz.warningattemptfinished": "local_moodlemobileapp", "addon.mod_quiz.warningdatadiscarded": "local_moodlemobileapp", "addon.mod_quiz.warningdatadiscardedfromfinished": "local_moodlemobileapp", diff --git a/src/addons/calendar/pages/edit-event/edit-event.html b/src/addons/calendar/pages/edit-event/edit-event.html index fdb52f008..d858edae4 100644 --- a/src/addons/calendar/pages/edit-event/edit-event.html +++ b/src/addons/calendar/pages/edit-event/edit-event.html @@ -44,6 +44,7 @@ *ngIf="eventTypes.length > 1" formControlName="eventtype" interface="action-sheet" + [interfaceOptions]="{header: 'addon.calendar.eventkind' | translate}" > {{ type.name | translate }} @@ -56,8 +57,8 @@

{{ 'core.category' | translate }}

- + {{ category.name }} @@ -69,8 +70,8 @@

{{ 'core.course' | translate }}

- + {{ course.fullname }} @@ -84,7 +85,7 @@ + (ionChange)="groupCourseSelected()" [interfaceOptions]="{header: 'core.course' | translate}"> {{ course.fullname }} @@ -99,8 +100,8 @@

{{ 'core.group' | translate }}

- + {{ group.name }} diff --git a/src/addons/calendar/pages/settings/settings.html b/src/addons/calendar/pages/settings/settings.html index c408d5f2e..8cc5f6dee 100644 --- a/src/addons/calendar/pages/settings/settings.html +++ b/src/addons/calendar/pages/settings/settings.html @@ -10,7 +10,8 @@ {{ 'addon.calendar.defaultnotificationtime' | translate }} - + {{ 'core.settings.disabled' | translate }} {{ 600 | coreDuration }} {{ 1800 | coreDuration }} diff --git a/src/addons/mod/assign/components/index/addon-mod-assign-index.html b/src/addons/mod/assign/components/index/addon-mod-assign-index.html index d992ec91a..d662546c1 100644 --- a/src/addons/mod/assign/components/index/addon-mod-assign-index.html +++ b/src/addons/mod/assign/components/index/addon-mod-assign-index.html @@ -69,7 +69,7 @@ {{'core.groupsvisible' | translate }} + interface="action-sheet" [interfaceOptions]="{header: 'core.group' | translate}"> {{groupOpt.name}} diff --git a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html index 7f368c34a..433112f61 100644 --- a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html +++ b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html @@ -244,7 +244,8 @@

{{ 'addon.mod_assign.grade' | translate }}

- + {{grade.label}} @@ -255,7 +256,8 @@

{{ outcome.name }}

+ interface="action-sheet" [disabled]="gradeInfo!.disabled" + [interfaceOptions]="{header: outcome.name }"> {{grade.label}} diff --git a/src/addons/mod/assign/pages/submission-list/submission-list.html b/src/addons/mod/assign/pages/submission-list/submission-list.html index e79b970bb..9f2ef968f 100644 --- a/src/addons/mod/assign/pages/submission-list/submission-list.html +++ b/src/addons/mod/assign/pages/submission-list/submission-list.html @@ -31,7 +31,7 @@ {{ 'core.groupsvisible' | translate }} + interface="action-sheet" slot="end" [interfaceOptions]="{header: 'core.group' | translate}"> {{groupOpt.name}} diff --git a/src/addons/mod/chat/pages/sessions/sessions.html b/src/addons/mod/chat/pages/sessions/sessions.html index c574fd6a8..afd0cac47 100644 --- a/src/addons/mod/chat/pages/sessions/sessions.html +++ b/src/addons/mod/chat/pages/sessions/sessions.html @@ -18,7 +18,7 @@ {{'core.groupsvisible' | translate }} + interface="action-sheet" [interfaceOptions]="{header: 'core.group' | translate}"> {{groupOpt.name}} diff --git a/src/addons/mod/data/components/index/addon-mod-data-index.html b/src/addons/mod/data/components/index/addon-mod-data-index.html index 6485aa73f..807e08626 100644 --- a/src/addons/mod/data/components/index/addon-mod-data-index.html +++ b/src/addons/mod/data/components/index/addon-mod-data-index.html @@ -62,7 +62,7 @@ {{'core.groupsvisible' | translate }} + interface="action-sheet" [interfaceOptions]="{header: 'core.group' | translate}"> {{groupOpt.name}} diff --git a/src/addons/mod/data/components/search/search.html b/src/addons/mod/data/components/search/search.html index dbbe340e0..d137cabcc 100644 --- a/src/addons/mod/data/components/search/search.html +++ b/src/addons/mod/data/components/search/search.html @@ -27,7 +27,7 @@ {{ 'core.sortby' | translate }} + [placeholder]="'core.sortby' | translate" [interfaceOptions]="{header: 'core.sortby' | translate}"> {{field.name}} diff --git a/src/addons/mod/data/pages/edit/edit.html b/src/addons/mod/data/pages/edit/edit.html index 5d3a38486..05ec1f563 100644 --- a/src/addons/mod/data/pages/edit/edit.html +++ b/src/addons/mod/data/pages/edit/edit.html @@ -22,7 +22,7 @@ {{ 'core.groupsseparate' | translate }} + interface="action-sheet" [interfaceOptions]="{header: 'core.group' | translate}"> {{groupOpt.name}} diff --git a/src/addons/mod/data/pages/entry/entry.html b/src/addons/mod/data/pages/entry/entry.html index 9229f6c15..539db3691 100644 --- a/src/addons/mod/data/pages/entry/entry.html +++ b/src/addons/mod/data/pages/entry/entry.html @@ -30,7 +30,7 @@ {{ 'core.groupsseparate' | translate }} + interface="action-sheet" [interfaceOptions]="{header: 'core.group' | translate}"> {{groupOpt.name}} diff --git a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html index 74641e68c..e159aa314 100644 --- a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html +++ b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html @@ -67,7 +67,7 @@ {{'core.groupsvisible' | translate }} + interface="action-sheet" [interfaceOptions]="{header: 'core.group' | translate}"> {{groupOpt.name}} diff --git a/src/addons/mod/feedback/pages/form/form.html b/src/addons/mod/feedback/pages/form/form.html index 209a184bf..c470f8ac2 100644 --- a/src/addons/mod/feedback/pages/form/form.html +++ b/src/addons/mod/feedback/pages/form/form.html @@ -61,7 +61,8 @@ + name="{{item.typ}}_{{item.id}}" [(ngModel)]="item.value" interface="action-sheet" + [interfaceOptions]="{header: item.name}"> {{'core.groupsvisible' | translate }} + aria-labelledby="addon-feedback-groupslabel" interface="action-sheet" + [interfaceOptions]="{header: 'core.group' | translate}"> {{groupOpt.name}} diff --git a/src/addons/mod/feedback/pages/respondents/respondents.html b/src/addons/mod/feedback/pages/respondents/respondents.html index 6b5b7319e..54bd44f9b 100644 --- a/src/addons/mod/feedback/pages/respondents/respondents.html +++ b/src/addons/mod/feedback/pages/respondents/respondents.html @@ -19,7 +19,8 @@ {{'core.groupsvisible' | translate }} + aria-labelledby="addon-feedback-groupslabel" interface="action-sheet" + [interfaceOptions]="{header: 'core.group' | translate}"> {{groupOpt.name}} diff --git a/src/addons/mod/forum/pages/new-discussion/new-discussion.html b/src/addons/mod/forum/pages/new-discussion/new-discussion.html index 8c8c696ac..7120b5455 100644 --- a/src/addons/mod/forum/pages/new-discussion/new-discussion.html +++ b/src/addons/mod/forum/pages/new-discussion/new-discussion.html @@ -53,7 +53,8 @@ {{ 'addon.mod_forum.group' | translate }} + aria-labelledby="addon-mod-forum-groupslabel" interface="action-sheet" name="groupid" + [interfaceOptions]="{header: 'addon.mod_forum.group' | translate}"> {{ group.name }} diff --git a/src/addons/mod/glossary/pages/edit/edit.html b/src/addons/mod/glossary/pages/edit/edit.html index 765701f60..1c7d899ff 100644 --- a/src/addons/mod/glossary/pages/edit/edit.html +++ b/src/addons/mod/glossary/pages/edit/edit.html @@ -31,7 +31,8 @@ {{ 'addon.mod_glossary.categories' | translate }} + interface="action-sheet" [placeholder]="'addon.mod_glossary.categories' | translate" name="categories" + [interfaceOptions]="{header: 'addon.mod_glossary.categories' | translate}"> {{ category.name }} diff --git a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html index 9643f3d90..52ea9eed8 100644 --- a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html +++ b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html @@ -166,7 +166,7 @@ {{ 'core.groupsvisible' | translate }} + interface="action-sheet" [interfaceOptions]="{header: 'core.group' | translate}"> {{groupOpt.name}} diff --git a/src/addons/mod/lesson/pages/user-retake/user-retake.html b/src/addons/mod/lesson/pages/user-retake/user-retake.html index 0145af03c..a9f17d998 100644 --- a/src/addons/mod/lesson/pages/user-retake/user-retake.html +++ b/src/addons/mod/lesson/pages/user-retake/user-retake.html @@ -27,7 +27,8 @@ {{ 'addon.mod_lesson.attemptheader' | translate }} + aria-labelledby="addon-mod_lesson-retakeslabel" interface="action-sheet" + [interfaceOptions]="{header: 'addon.mod_lesson.attemptheader' | translate}"> {{retake.label}} diff --git a/src/addons/mod/quiz/lang.json b/src/addons/mod/quiz/lang.json index 080059c18..ae212f6f7 100644 --- a/src/addons/mod/quiz/lang.json +++ b/src/addons/mod/quiz/lang.json @@ -75,9 +75,10 @@ "summaryofattempts": "Summary of your previous attempts", "timeleft": "Time left", "timetaken": "Time taken", + "unit": "Unit", "warningattemptfinished": "Offline attempt discarded as it was finished on the site or not found.", "warningdatadiscarded": "Some offline answers were discarded because the questions were modified online.", "warningdatadiscardedfromfinished": "Attempt unfinished because some offline answers were discarded. Please review your answers then resubmit the attempt.", "warningquestionsnotsupported": "This quiz contains questions not supported by the app:", "yourfinalgradeis": "Your final grade for this quiz is {{$a}}." -} \ No newline at end of file +} diff --git a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html index 88c5cc1d0..fe53cf595 100644 --- a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html +++ b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html @@ -135,7 +135,7 @@ {{ 'addon.mod_scorm.organizations' | translate }} + interface="action-sheet" [interfaceOptions]="{header: 'addon.mod_scorm.organizations' | translate}"> {{ org.title }} diff --git a/src/addons/mod/survey/components/index/addon-mod-survey-index.html b/src/addons/mod/survey/components/index/addon-mod-survey-index.html index 4278d0b91..e17441410 100644 --- a/src/addons/mod/survey/components/index/addon-mod-survey-index.html +++ b/src/addons/mod/survey/components/index/addon-mod-survey-index.html @@ -102,7 +102,7 @@ + [name]="question.name" [interfaceOptions]="{header: question.text}"> {{ 'core.choose' | translate }} @@ -127,7 +127,7 @@ + [name]="question.name" [interfaceOptions]="{header: question.text}"> {{option}} diff --git a/src/addons/mod/workshop/assessment/accumulative/component/addon-mod-workshop-assessment-strategy-accumulative.html b/src/addons/mod/workshop/assessment/accumulative/component/addon-mod-workshop-assessment-strategy-accumulative.html index 33cc08a48..a65648ab1 100644 --- a/src/addons/mod/workshop/assessment/accumulative/component/addon-mod-workshop-assessment-strategy-accumulative.html +++ b/src/addons/mod/workshop/assessment/accumulative/component/addon-mod-workshop-assessment-strategy-accumulative.html @@ -14,7 +14,9 @@ {{ 'addon.mod_workshop_assessment_accumulative.dimensiongradefor' | translate : {'$a': field.dimtitle } }} - + {{grade.label}} diff --git a/src/addons/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html b/src/addons/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html index d4da19737..df65c40e7 100644 --- a/src/addons/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html +++ b/src/addons/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html @@ -45,7 +45,8 @@ {{ 'addon.mod_workshop.assessmentweight' | translate }} - + {{w}} diff --git a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html index 48c7856db..169ed21b4 100644 --- a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html +++ b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html @@ -223,7 +223,7 @@ {{ 'core.groupsvisible' | translate }} + interface="action-sheet" [interfaceOptions]="{header: 'core.group' | translate}"> {{groupOpt.name}} diff --git a/src/addons/mod/workshop/components/submission/addon-mod-workshop-submission.html b/src/addons/mod/workshop/components/submission/addon-mod-workshop-submission.html index 0e23e8821..82de0e97e 100644 --- a/src/addons/mod/workshop/components/submission/addon-mod-workshop-submission.html +++ b/src/addons/mod/workshop/components/submission/addon-mod-workshop-submission.html @@ -92,10 +92,12 @@ {{ 'addon.mod_workshop.gradinggradeof' | translate:{$a: workshop.gradinggrade } }}: {{submission.gradinggrade}}

- + {{ 'addon.mod_workshop.assessedsubmission' | translate }} - + {{ 'addon.mod_workshop.notassessed' | translate }} diff --git a/src/addons/mod/workshop/pages/assessment/assessment.html b/src/addons/mod/workshop/pages/assessment/assessment.html index c4862bb4a..ae932276e 100644 --- a/src/addons/mod/workshop/pages/assessment/assessment.html +++ b/src/addons/mod/workshop/pages/assessment/assessment.html @@ -63,19 +63,21 @@ {{ 'addon.mod_workshop.assessmentweight' | translate }} - + {{ w }}

{{ 'addon.mod_workshop.gradinggradecalculated' | translate }}

-

{{ assessment.gradinggrade }}

+

{{ gradingGrade }}

{{ 'addon.mod_workshop.gradinggradeover' | translate }} - + {{grade.label}} diff --git a/src/addons/mod/workshop/pages/assessment/assessment.ts b/src/addons/mod/workshop/pages/assessment/assessment.ts index 2085832e1..ea8b2ec52 100644 --- a/src/addons/mod/workshop/pages/assessment/assessment.ts +++ b/src/addons/mod/workshop/pages/assessment/assessment.ts @@ -73,7 +73,8 @@ export class AddonModWorkshopAssessmentPage implements OnInit, OnDestroy, CanLea weights: number[] = []; evaluateByProfile?: CoreUserProfile; - evaluationGrades: CoreGradesMenuItem[] =[]; + evaluationGrades: CoreGradesMenuItem[] = []; + gradingGrade?: string | number; protected workshopId!: number; protected originalEvaluation: AddonModWorkshopAssessmentEvaluation = { @@ -193,6 +194,7 @@ export class AddonModWorkshopAssessmentPage implements OnInit, OnDestroy, CanLea this.assessment = AddonModWorkshopHelper.realGradeValue(this.workshop, assessment); this.evaluate.text = this.assessment.feedbackreviewer || ''; this.evaluate.weight = this.assessment.weight; + this.gradingGrade = this.assessment.gradinggrade ?? '-'; if (this.evaluating) { if (this.access.canallocate) { diff --git a/src/addons/mod/workshop/pages/submission/submission.html b/src/addons/mod/workshop/pages/submission/submission.html index 96c64cf83..b342f27b3 100644 --- a/src/addons/mod/workshop/pages/submission/submission.html +++ b/src/addons/mod/workshop/pages/submission/submission.html @@ -117,7 +117,8 @@ {{ 'addon.mod_workshop.gradeover' | translate }} - + {{grade.label}} diff --git a/src/addons/qtype/calculated/component/addon-qtype-calculated.html b/src/addons/qtype/calculated/component/addon-qtype-calculated.html index 1b2d55d30..40d2d9f42 100644 --- a/src/addons/qtype/calculated/component/addon-qtype-calculated.html +++ b/src/addons/qtype/calculated/component/addon-qtype-calculated.html @@ -50,7 +50,7 @@ + [slot]="calcQuestion?.selectFirst ? 'start' : 'end'" [interfaceOptions]="{header: 'addon.mod_quiz.unit' | translate}"> {{option.label}} diff --git a/src/addons/userprofilefield/menu/component/addon-user-profile-field-menu.html b/src/addons/userprofilefield/menu/component/addon-user-profile-field-menu.html index 74524fc97..8b5a78c24 100644 --- a/src/addons/userprofilefield/menu/component/addon-user-profile-field-menu.html +++ b/src/addons/userprofilefield/menu/component/addon-user-profile-field-menu.html @@ -13,7 +13,8 @@ {{ field.name }} - + {{ 'core.choosedots' | translate }} {{option}} diff --git a/src/core/components/site-picker/core-site-picker.html b/src/core/components/site-picker/core-site-picker.html index ff07a6a1e..5e66a7a32 100644 --- a/src/core/components/site-picker/core-site-picker.html +++ b/src/core/components/site-picker/core-site-picker.html @@ -1,6 +1,7 @@ {{ 'core.site' | translate }} - + {{ site.fullNameAndSiteName }} diff --git a/src/core/features/mainmenu/pages/home/home.html b/src/core/features/mainmenu/pages/home/home.html index aa46be819..903bcb8ff 100644 --- a/src/core/features/mainmenu/pages/home/home.html +++ b/src/core/features/mainmenu/pages/home/home.html @@ -12,9 +12,7 @@ - - - + diff --git a/src/core/features/mainmenu/pages/home/home.ts b/src/core/features/mainmenu/pages/home/home.ts index 201215b47..c7dfce575 100644 --- a/src/core/features/mainmenu/pages/home/home.ts +++ b/src/core/features/mainmenu/pages/home/home.ts @@ -86,6 +86,7 @@ export class CoreMainMenuHomePage implements OnInit { */ initHandlers(handlers: CoreMainMenuHomeHandlerToDisplay[]): void { // Re-build the list of tabs. + const loaded = CoreMainMenuHomeDelegate.areHandlersLoaded(); const handlersMap = CoreUtils.arrayToObject(handlers, 'title'); const newTabs = handlers.map((handler): CoreTabsOutletTab => { const tab = this.tabs.find(tab => tab.title == handler.title); @@ -125,7 +126,10 @@ export class CoreMainMenuHomePage implements OnInit { this.tabs = newTabs; - this.loaded = CoreMainMenuHomeDelegate.areHandlersLoaded(); + // Try to prevent empty box displayed for an instant when it shouldn't. + setTimeout(() => { + this.loaded = loaded; + }, 50); } /** diff --git a/src/core/features/rating/components/rate/core-rating-rate.html b/src/core/features/rating/components/rate/core-rating-rate.html index c347d12a3..fdcb93e50 100644 --- a/src/core/features/rating/components/rate/core-rating-rate.html +++ b/src/core/features/rating/components/rate/core-rating-rate.html @@ -1,7 +1,7 @@ {{ 'core.rating.rating' | translate }} + [disabled]="!item!.canrate" [interfaceOptions]="{header: 'core.rating.rating' | translate}"> {{ scaleItem.name }} diff --git a/src/core/services/screen.ts b/src/core/services/screen.ts index 592b98ec2..b53dcbcb7 100644 --- a/src/core/services/screen.ts +++ b/src/core/services/screen.ts @@ -131,7 +131,7 @@ export class CoreScreenService { * @return Active layout. */ protected calculateLayout(breakpoints: Record): CoreScreenLayout { - if (breakpoints[Breakpoint.LARGE]) { + if (breakpoints[Breakpoint.MEDIUM]) { return CoreScreenLayout.TABLET; }