From f89daae6b5900b606c8b7ca3b655eb7bf3161b34 Mon Sep 17 00:00:00 2001
From: Allan Otodi Opeto <103313919+AllanOXDi@users.noreply.github.com>
Date: Tue, 11 Mar 2025 14:44:27 +0300
Subject: [PATCH 1/3] remove the class name from the appbarr
---
.../assets/src/views/common/CoachHeader.vue | 24 +------------------
1 file changed, 1 insertion(+), 23 deletions(-)
diff --git a/kolibri/plugins/coach/assets/src/views/common/CoachHeader.vue b/kolibri/plugins/coach/assets/src/views/common/CoachHeader.vue
index 064207d75dc..7d35cc05fc9 100644
--- a/kolibri/plugins/coach/assets/src/views/common/CoachHeader.vue
+++ b/kolibri/plugins/coach/assets/src/views/common/CoachHeader.vue
@@ -7,13 +7,6 @@
-
-
- {{ className }}
-
@@ -21,7 +14,7 @@
@@ -47,16 +37,4 @@
justify-content: space-between;
}
- .class-name-icon {
- position: relative;
- top: 0.4em;
- width: 1.5em;
- height: 1.5em;
- margin-right: 0.5em;
- }
-
- .class-name-label {
- margin-bottom: 16px;
- }
-
From 1f5c8ae19b2b94b5ba48686a521a4020757233fa Mon Sep 17 00:00:00 2001
From: Allan Otodi Opeto <103313919+AllanOXDi@users.noreply.github.com>
Date: Tue, 11 Mar 2025 16:44:53 +0300
Subject: [PATCH 2/3] removes the class name from the appbar
---
.../assets/src/composables/useCoreCoach.js | 25 +------------------
.../assets/src/views/common/CoachHeader.vue | 24 +++++++++++++++++-
2 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/kolibri/plugins/coach/assets/src/composables/useCoreCoach.js b/kolibri/plugins/coach/assets/src/composables/useCoreCoach.js
index 90f449c3727..1e74c06eaca 100644
--- a/kolibri/plugins/coach/assets/src/composables/useCoreCoach.js
+++ b/kolibri/plugins/coach/assets/src/composables/useCoreCoach.js
@@ -1,10 +1,7 @@
-import find from 'lodash/find';
import logger from 'kolibri-logging';
import { get } from '@vueuse/core';
import { computed, getCurrentInstance } from 'vue';
import { currentLanguage, isRtl } from 'kolibri/utils/i18n';
-import useUser from 'kolibri/composables/useUser';
-import useFacilities from 'kolibri-common/composables/useFacilities';
import { coachStrings } from '../views/common/commonCoachStrings';
const logging = logger.getLogger(__filename);
@@ -17,28 +14,8 @@ export default function useCoreCoach(store) {
const authorized = computed(() => store.getters.userIsAuthorizedForCoach);
const classId = computed(() => get(route).params.classId);
const groups = computed(() => store.getters['classSummary/groups']);
- const { isSuperuser } = useUser();
- const { facilities } = useFacilities();
-
function getAppBarTitle() {
- let facilityName;
- // Using coachStrings.$tr() here because mixins are not applied
- // prior to props being processed.
- const { facility_id, name } = store.state.classSummary;
- if (facility_id && get(facilities).length > 1 && get(isSuperuser)) {
- const match = find(get(facilities), { id: facility_id }) || {};
- facilityName = match.name;
- }
- if (facilityName && name) {
- return coachStrings.$tr('coachLabelWithOneTwoNames', {
- name1: facilityName,
- name2: name,
- });
- } else if (name) {
- return coachStrings.$tr('coachLabelWithOneName', { name });
- } else {
- return coachStrings.$tr('coachLabel');
- }
+ return coachStrings.$tr('coachLabel');
}
function formatPageTitle() {
diff --git a/kolibri/plugins/coach/assets/src/views/common/CoachHeader.vue b/kolibri/plugins/coach/assets/src/views/common/CoachHeader.vue
index 7d35cc05fc9..064207d75dc 100644
--- a/kolibri/plugins/coach/assets/src/views/common/CoachHeader.vue
+++ b/kolibri/plugins/coach/assets/src/views/common/CoachHeader.vue
@@ -7,6 +7,13 @@
+
+
+ {{ className }}
+
@@ -14,7 +21,7 @@
@@ -37,4 +47,16 @@
justify-content: space-between;
}
+ .class-name-icon {
+ position: relative;
+ top: 0.4em;
+ width: 1.5em;
+ height: 1.5em;
+ margin-right: 0.5em;
+ }
+
+ .class-name-label {
+ margin-bottom: 16px;
+ }
+
From 74b406814ae4fa5c1e2c2464e3ecd2075341df36 Mon Sep 17 00:00:00 2001
From: Allan Otodi Opeto <103313919+AllanOXDi@users.noreply.github.com>
Date: Thu, 13 Mar 2025 18:30:07 +0300
Subject: [PATCH 3/3] restores facility name
---
.../assets/src/composables/useCoreCoach.js | 22 ++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/kolibri/plugins/coach/assets/src/composables/useCoreCoach.js b/kolibri/plugins/coach/assets/src/composables/useCoreCoach.js
index 1e74c06eaca..9d7e9847d23 100644
--- a/kolibri/plugins/coach/assets/src/composables/useCoreCoach.js
+++ b/kolibri/plugins/coach/assets/src/composables/useCoreCoach.js
@@ -1,7 +1,10 @@
+import find from 'lodash/find';
import logger from 'kolibri-logging';
import { get } from '@vueuse/core';
import { computed, getCurrentInstance } from 'vue';
import { currentLanguage, isRtl } from 'kolibri/utils/i18n';
+import useUser from 'kolibri/composables/useUser';
+import useFacilities from 'kolibri-common/composables/useFacilities';
import { coachStrings } from '../views/common/commonCoachStrings';
const logging = logger.getLogger(__filename);
@@ -14,8 +17,25 @@ export default function useCoreCoach(store) {
const authorized = computed(() => store.getters.userIsAuthorizedForCoach);
const classId = computed(() => get(route).params.classId);
const groups = computed(() => store.getters['classSummary/groups']);
+ const { isSuperuser } = useUser();
+ const { facilities } = useFacilities();
+
function getAppBarTitle() {
- return coachStrings.$tr('coachLabel');
+ let facilityName;
+ // Using coachStrings.$tr() here because mixins are not applied
+ // prior to props being processed.
+ const { facility_id, name } = store.state.classSummary;
+ if (facility_id && get(facilities).length > 1 && get(isSuperuser)) {
+ const match = find(get(facilities), { id: facility_id }) || {};
+ facilityName = match.name;
+ }
+ if (facilityName && name) {
+ return coachStrings.$tr('coachLabelWithOneName', {
+ name: facilityName,
+ });
+ } else {
+ return coachStrings.$tr('coachLabel');
+ }
}
function formatPageTitle() {