diff --git a/kolibri/plugins/coach/assets/src/constants/tabsConstants.js b/kolibri/plugins/coach/assets/src/constants/tabsConstants.js index 97cd630210f..2b473c7f302 100644 --- a/kolibri/plugins/coach/assets/src/constants/tabsConstants.js +++ b/kolibri/plugins/coach/assets/src/constants/tabsConstants.js @@ -20,8 +20,8 @@ export const ReportsGroupTabs = { ACTIVITY: 'tabActivity', }; -export const LEARNERS_TABS_ID = 'reportLearners'; -export const LearnersTabs = { +export const REPORTS_LEARNERS_TABS_ID = 'coachReportsLearners'; +export const ReportsLearnersTabs = { REPORTS: 'tabReports', ACTIVITY: 'tabActivity', }; @@ -31,3 +31,8 @@ export const QuizzesTabs = { REPORT: 'tabReport', DIFFICULT_QUESTIONS: 'tabDifficultQuestions', }; +export const REPORTS_LESSON_TABS_ID = 'coachReportsLesson'; +export const ReportsLessonTabs = { + REPORTS: 'tabReports', + LEARNERS: 'tabLearners', +}; diff --git a/kolibri/plugins/coach/assets/src/views/common/commonCoachStrings.js b/kolibri/plugins/coach/assets/src/views/common/commonCoachStrings.js index 14a870d1e7e..0677c01ce2e 100644 --- a/kolibri/plugins/coach/assets/src/views/common/commonCoachStrings.js +++ b/kolibri/plugins/coach/assets/src/views/common/commonCoachStrings.js @@ -603,6 +603,10 @@ const coachStrings = createTranslator('CommonCoachStrings', { context: 'Indicates to the coach how many questions the learner answered correctly compared to the previous attempt', }, + coachReportsLesson: { + message: 'Report lesson', + context: 'Labels the Reports > Lesson tab for screen reader users', + }, }); // Strings for the Missing Content modals, tooltips, alerts, etc. diff --git a/kolibri/plugins/coach/assets/src/views/reports/ReportsLearnerActivityPage.vue b/kolibri/plugins/coach/assets/src/views/reports/ReportsLearnerActivityPage.vue index d762633af5a..67dce32873a 100644 --- a/kolibri/plugins/coach/assets/src/views/reports/ReportsLearnerActivityPage.vue +++ b/kolibri/plugins/coach/assets/src/views/reports/ReportsLearnerActivityPage.vue @@ -7,10 +7,10 @@ - + @@ -71,7 +71,7 @@ import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings'; import commonCoach from '../common'; - import { LEARNERS_TABS_ID, LearnersTabs } from '../../constants/tabsConstants'; + import { REPORTS_LEARNERS_TABS_ID, ReportsLearnersTabs } from '../../constants/tabsConstants'; import { useCoachTabs } from '../../composables/useCoachTabs'; export default { @@ -97,7 +97,7 @@ }, data() { return { - LEARNERS_TABS_ID, + REPORTS_LEARNERS_TABS_ID, }; }, computed: { @@ -136,12 +136,12 @@ tabs() { return [ { - id: LearnersTabs.REPORTS, + id: ReportsLearnersTabs.REPORTS, label: this.coachString('reportsLabel'), to: this.classRoute('ReportsLearnerReportPage', {}), }, { - id: LearnersTabs.ACTIVITY, + id: ReportsLearnersTabs.ACTIVITY, label: this.coachString('activityLabel'), to: this.classRoute('ReportsLearnerActivityPage', {}), }, @@ -153,8 +153,8 @@ // that this header was re-mounted as a result // of navigation after clicking a tab (focus shouldn't // be manipulated programatically in other cases, e.g. - // when visiting the Plan page for the first time) - if (this.wereTabsClickedRecently(this.LEARNERS_TABS_ID)) { + // when visiting the page for the first time) + if (this.wereTabsClickedRecently(this.REPORTS_LEARNERS_TABS_ID)) { this.$nextTick(() => { this.$refs.tabList.focusActiveTab(); }); @@ -168,7 +168,7 @@ }, reportLearners: { message: 'Report learners', - context: 'Labels the Reports > Learners tab for screen reander users', + context: 'Labels the Reports > Learners tab for screen reader users', }, }, }; diff --git a/kolibri/plugins/coach/assets/src/views/reports/ReportsLearnerReportPage.vue b/kolibri/plugins/coach/assets/src/views/reports/ReportsLearnerReportPage.vue index 9923de4cfc4..f8e6d055f08 100644 --- a/kolibri/plugins/coach/assets/src/views/reports/ReportsLearnerReportPage.vue +++ b/kolibri/plugins/coach/assets/src/views/reports/ReportsLearnerReportPage.vue @@ -7,10 +7,10 @@ - + @@ -101,7 +101,7 @@ import commonCoach from '../common'; import CoachAppBarPage from '../CoachAppBarPage'; import { PageNames } from '../../constants'; - import { LEARNERS_TABS_ID, LearnersTabs } from '../../constants/tabsConstants'; + import { REPORTS_LEARNERS_TABS_ID, ReportsLearnersTabs } from '../../constants/tabsConstants'; import ReportsLearnerHeader from './ReportsLearnerHeader'; import ReportsControls from './ReportsControls'; @@ -115,8 +115,8 @@ mixins: [commonCoach, commonCoreStrings], data() { return { - LEARNERS_TABS_ID, - LearnersTabs, + REPORTS_LEARNERS_TABS_ID, + ReportsLearnersTabs, }; }, computed: { diff --git a/kolibri/plugins/coach/assets/src/views/reports/ReportsLessonBase.vue b/kolibri/plugins/coach/assets/src/views/reports/ReportsLessonBase.vue index e97599cbedb..8d70619c83f 100644 --- a/kolibri/plugins/coach/assets/src/views/reports/ReportsLessonBase.vue +++ b/kolibri/plugins/coach/assets/src/views/reports/ReportsLessonBase.vue @@ -39,17 +39,13 @@ - - { + this.$refs.tabList.focusActiveTab(); + }); + } }, methods: { handleSelectOption(action) { diff --git a/kolibri/plugins/coach/assets/src/views/reports/ReportsLessonLearnerListPage.vue b/kolibri/plugins/coach/assets/src/views/reports/ReportsLessonLearnerListPage.vue index b88cde7ba18..f3a29f3010e 100644 --- a/kolibri/plugins/coach/assets/src/views/reports/ReportsLessonLearnerListPage.vue +++ b/kolibri/plugins/coach/assets/src/views/reports/ReportsLessonLearnerListPage.vue @@ -1,12 +1,15 @@ diff --git a/kolibri/plugins/coach/assets/src/views/reports/ReportsLessonReportPage.vue b/kolibri/plugins/coach/assets/src/views/reports/ReportsLessonReportPage.vue index 932daa61187..741f7fca323 100644 --- a/kolibri/plugins/coach/assets/src/views/reports/ReportsLessonReportPage.vue +++ b/kolibri/plugins/coach/assets/src/views/reports/ReportsLessonReportPage.vue @@ -1,12 +1,15 @@