From 1458d2b0105044316faddafd86a30fa28905bdbb Mon Sep 17 00:00:00 2001
From: ozer550 <prathameshd419@gmail.com>
Date: Mon, 30 Sep 2024 12:10:02 +0530
Subject: [PATCH 01/12] add avgScore and progress in CoreTabel

---
 .../src/views/plan/CoachExamsPage/index.vue   | 40 ++++++++++++++++---
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue b/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue
index 9a0c7c76b56..49176125303 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue
@@ -48,6 +48,11 @@
         <CoreTable>
           <template #headers>
             <th>{{ titleLabel$() }}</th>
+            <th style="position: relative">
+              {{ avgScoreLabel$() }}
+              <AverageScoreTooltip v-show="!$isPrint" />
+            </th>
+            <th>{{ coreString('progressLabel') }}</th>
             <th>{{ recipientsLabel$() }}</th>
             <th>{{ sizeLabel$() }}</th>
             <th class="center-text">
@@ -71,7 +76,16 @@
                     icon="quiz"
                   />
                 </td>
-
+                <td>
+                  <Score :value="exam.avgScore" />
+                </td>
+                <td>
+                  <StatusSummary
+                    :tally="exam.tally"
+                    :verbose="true"
+                    :includeNotStarted="true"
+                  />
+                </td>
                 <td>
                   <Recipients
                     :groupNames="getRecipientNamesForExam(exam)"
@@ -184,6 +198,8 @@
   import Recipients from '../../common/Recipients';
   import useCoreCoach from '../../../composables/useCoreCoach';
   import useQuizzes from '../../../composables/useQuizzes';
+  import AverageScoreTooltip from '../../common/AverageScoreTooltip';
+  import commonCoach from '../../common';
 
   export default {
     name: 'CoachExamsPage',
@@ -192,8 +208,9 @@
       CoachAppBarPage,
       PlanHeader,
       Recipients,
+      AverageScoreTooltip,
     },
-    mixins: [commonCoreStrings],
+    mixins: [commonCoach, commonCoreStrings],
     setup() {
       const { createSnackbar } = useSnackbar();
       const { classId, initClassInfo, refreshClassSummary } = useCoreCoach();
@@ -242,6 +259,7 @@
         filterQuizStatus$,
         quizClosedLabel$,
         canNoLongerEditQuizNotice$,
+        avgScoreLabel$,
       } = coachStrings;
 
       const statusSelected = ref({
@@ -283,6 +301,7 @@
         filterQuizStatus$,
         quizClosedLabel$,
         createSnackbar,
+        avgScoreLabel$,
       };
     },
     computed: {
@@ -322,14 +341,23 @@
       },
       filteredExams() {
         const filter = this.statusSelected.label;
+        let selectedExams;
         if (filter === this.filterQuizStarted$()) {
-          return this.startedExams;
+          selectedExams = this.startedExams;
         } else if (filter === this.filterQuizNotStarted$()) {
-          return this.notStartedExams;
+          selectedExams = this.notStartedExams;
         } else if (filter === this.filterQuizEnded$()) {
-          return this.endedExams;
+          selectedExams = this.endedExams;
+        } else {
+          selectedExams = this.quizzes;
         }
-        return this.quizzes;
+
+        return selectedExams.map(quiz => {
+          const learnersForQuiz = this.getLearnersForExam(quiz);
+          quiz.tally = this.getExamStatusTally(quiz.id, learnersForQuiz);
+          quiz.avgScore = this.getExamAvgScore(quiz.id, learnersForQuiz);
+          return quiz;
+        });
       },
       newExamRoute() {
         return {

From d404f8b6c0b68b0882b1301dec8d3ae60454de48 Mon Sep 17 00:00:00 2001
From: ozer550 <prathameshd419@gmail.com>
Date: Thu, 3 Oct 2024 16:09:01 +0530
Subject: [PATCH 02/12] add report controls

---
 .../src/views/plan/CoachExamsPage/index.vue   | 77 +++++++++++++++++--
 .../src/views/reports/ReportsControls.vue     |  1 +
 2 files changed, 70 insertions(+), 8 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue b/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue
index 49176125303..6442374a3e0 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue
@@ -8,15 +8,12 @@
         :activeTabId="PlanTabs.QUIZZES"
       >
         <div class="filter-and-button">
-          <p v-if="filteredExams.length && filteredExams.length > 0">
+          <p
+            v-if="filteredExams.length && filteredExams.length > 0"
+            class="total-quiz-size"
+          >
             {{ $tr('totalQuizSize', { size: calcTotalSizeOfVisibleQuizzes }) }}
           </p>
-          <KSelect
-            v-model="statusSelected"
-            :label="filterQuizStatus$()"
-            :options="statusOptions"
-            :inline="true"
-          />
           <KButtonGroup v-if="practiceQuizzesExist">
             <KButton
               primary
@@ -45,6 +42,20 @@
             />
           </div>
         </div>
+        <ReportsControls @export="exportCSV">
+          <KSelect
+            v-model="statusSelected"
+            :label="filterQuizStatus$()"
+            :options="statusOptions"
+            :inline="true"
+          />
+          <KSelect
+            v-model="recipientSelected"
+            :label="recipientsLabel$()"
+            :options="recipientOptions"
+            :inline="true"
+          />
+        </ReportsControls>
         <CoreTable>
           <template #headers>
             <th>{{ titleLabel$() }}</th>
@@ -200,6 +211,9 @@
   import useQuizzes from '../../../composables/useQuizzes';
   import AverageScoreTooltip from '../../common/AverageScoreTooltip';
   import commonCoach from '../../common';
+  import ReportsControls from '../../../views/reports/ReportsControls.vue';
+  import CSVExporter from '../../../csv/exporter';
+  import * as csvFields from '../../../csv/fields';
 
   export default {
     name: 'CoachExamsPage',
@@ -209,6 +223,7 @@
       PlanHeader,
       Recipients,
       AverageScoreTooltip,
+      ReportsControls,
     },
     mixins: [commonCoach, commonCoreStrings],
     setup() {
@@ -260,6 +275,7 @@
         quizClosedLabel$,
         canNoLongerEditQuizNotice$,
         avgScoreLabel$,
+        entireClassLabel$,
       } = coachStrings;
 
       const statusSelected = ref({
@@ -267,6 +283,11 @@
         value: filterQuizAll$(),
       });
 
+      const recipientSelected = ref({
+        label: entireClassLabel$(),
+        value: entireClassLabel$(),
+      });
+
       return {
         quizzes,
         refreshClassSummary,
@@ -302,6 +323,8 @@
         quizClosedLabel$,
         createSnackbar,
         avgScoreLabel$,
+        entireClassLabel$,
+        recipientSelected,
       };
     },
     computed: {
@@ -329,7 +352,26 @@
           },
         ];
       },
-
+      recipientOptions() {
+        return [
+          {
+            label: this.entireClassLabel$(),
+            value: this.entireClassLabel$(),
+          },
+          {
+            label: 'Red',
+            value: 'Red',
+          },
+          {
+            label: 'Green',
+            value: 'Green',
+          },
+          {
+            label: 'Yellow',
+            value: 'Yellow',
+          },
+        ];
+      },
       startedExams() {
         return this.quizzes.filter(exam => exam.active === true && exam.archive === false);
       },
@@ -411,6 +453,15 @@
             this.createSnackbar(this.quizFailedToOpenMessage$());
           });
       },
+      exportCSV() {
+        const columns = [
+          ...csvFields.title(),
+          ...csvFields.recipients(this.className),
+          ...csvFields.tally(),
+        ];
+        const fileName = this.$tr('printLabel', { className: this.className });
+        new CSVExporter(columns, fileName).export(this.filteredExams);
+      },
       handleCloseQuiz(quizId) {
         const promise = ExamResource.saveModel({
           id: quizId,
@@ -459,6 +510,11 @@
         context:
           'Descriptive text at the top of the table that displays the calculated file size of all quiz resources (i.e. 120 MB)',
       },
+      printLabel: {
+        message: '{className} Lessons',
+        context:
+          "Title that displays on a printed copy of the 'Reports' > 'Lessons' page. This shows if the user uses the 'Print' option by clicking on the printer icon.",
+      },
     },
   };
 
@@ -477,6 +533,11 @@
     }
   }
 
+  .total-quiz-size {
+    flex-basis: 50%;
+    margin-bottom: 25px;
+  }
+
   .center-text {
     text-align: center;
   }
diff --git a/kolibri/plugins/coach/assets/src/views/reports/ReportsControls.vue b/kolibri/plugins/coach/assets/src/views/reports/ReportsControls.vue
index 586a3d65d3c..690bbe731ff 100644
--- a/kolibri/plugins/coach/assets/src/views/reports/ReportsControls.vue
+++ b/kolibri/plugins/coach/assets/src/views/reports/ReportsControls.vue
@@ -82,6 +82,7 @@
           'QuizSummaryPage',
           'PLAN_LESSONS_ROOT',
           'PLAN_LESSONS_ROOT_BETTER',
+          'EXAMS'
         ].includes(this.$route.name);
       },
       classLearnersListRoute() {

From 4522fd7bc86a79f85732247d39f1e28007b2b219 Mon Sep 17 00:00:00 2001
From: ozer550 <prathameshd419@gmail.com>
Date: Thu, 3 Oct 2024 16:18:57 +0530
Subject: [PATCH 03/12] remove unsused styles

---
 .../assets/src/views/plan/CoachExamsPage/index.vue     | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue b/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue
index 6442374a3e0..996198dd46a 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue
@@ -8,10 +8,7 @@
         :activeTabId="PlanTabs.QUIZZES"
       >
         <div class="filter-and-button">
-          <p
-            v-if="filteredExams.length && filteredExams.length > 0"
-            class="total-quiz-size"
-          >
+          <p v-if="filteredExams.length && filteredExams.length > 0">
             {{ $tr('totalQuizSize', { size: calcTotalSizeOfVisibleQuizzes }) }}
           </p>
           <KButtonGroup v-if="practiceQuizzesExist">
@@ -533,11 +530,6 @@
     }
   }
 
-  .total-quiz-size {
-    flex-basis: 50%;
-    margin-bottom: 25px;
-  }
-
   .center-text {
     text-align: center;
   }

From 64825f746c71140dafb6384f8702d7417cac230c Mon Sep 17 00:00:00 2001
From: ozer550 <prathameshd419@gmail.com>
Date: Mon, 7 Oct 2024 12:28:46 +0530
Subject: [PATCH 04/12] add class name

---
 .../src/views/plan/CoachExamsPage/index.vue   | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue b/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue
index 996198dd46a..e2333063a1a 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue
@@ -8,6 +8,13 @@
         :activeTabId="PlanTabs.QUIZZES"
       >
         <div class="filter-and-button">
+          <div>
+            <KIcon
+              icon="classes"
+              class="class-name-icon"
+            />
+            <span>{{ className }}</span>
+          </div>
           <p v-if="filteredExams.length && filteredExams.length > 0">
             {{ $tr('totalQuizSize', { size: calcTotalSizeOfVisibleQuizzes }) }}
           </p>
@@ -39,7 +46,10 @@
             />
           </div>
         </div>
-        <ReportsControls @export="exportCSV">
+        <ReportsControls
+          class="report-controls"
+          @export="exportCSV"
+        >
           <KSelect
             v-model="statusSelected"
             :label="filterQuizStatus$()"
@@ -538,4 +548,16 @@
     vertical-align: middle;
   }
 
+  .class-name-icon {
+    position: relative;
+    top: 0.34em;
+    width: 1.5em;
+    height: 1.5em;
+    margin-right: 0.5em;
+  }
+
+  .report-controls {
+    margin-top: 1em;
+  }
+
 </style>

From caa8614550dacdbdcb193bb32f5213e38bbecff8 Mon Sep 17 00:00:00 2001
From: ozer550 <prathameshd419@gmail.com>
Date: Mon, 7 Oct 2024 13:41:26 +0530
Subject: [PATCH 05/12] fix margin

---
 .../src/views/plan/CoachExamsPage/index.vue   | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue b/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue
index e2333063a1a..5b4d6eb65ed 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue
@@ -7,14 +7,15 @@
         :tabsId="PLAN_TABS_ID"
         :activeTabId="PlanTabs.QUIZZES"
       >
+        <div>
+          <KIcon
+            icon="classes"
+            class="class-name-icon"
+          />
+          <span>{{ className }}</span>
+        </div>
+
         <div class="filter-and-button">
-          <div>
-            <KIcon
-              icon="classes"
-              class="class-name-icon"
-            />
-            <span>{{ className }}</span>
-          </div>
           <p v-if="filteredExams.length && filteredExams.length > 0">
             {{ $tr('totalQuizSize', { size: calcTotalSizeOfVisibleQuizzes }) }}
           </p>
@@ -550,14 +551,10 @@
 
   .class-name-icon {
     position: relative;
-    top: 0.34em;
+    top: 0.5em;
     width: 1.5em;
     height: 1.5em;
     margin-right: 0.5em;
   }
 
-  .report-controls {
-    margin-top: 1em;
-  }
-
 </style>

From cd5a27334e0142fdf8cc4227b61823b613bdedd9 Mon Sep 17 00:00:00 2001
From: ozer550 <prathameshd419@gmail.com>
Date: Thu, 10 Oct 2024 12:04:34 +0530
Subject: [PATCH 06/12] avoid importing commonCoach mixin

---
 .../src/views/plan/CoachExamsPage/index.vue   | 43 ++++++++++++-------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue b/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue
index 5b4d6eb65ed..374580a3b41 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue
@@ -207,7 +207,7 @@
   import { ExamResource, UserSyncStatusResource } from 'kolibri.resources';
   import plugin_data from 'plugin_data';
   import bytesForHumans from 'kolibri.utils.bytesForHumans';
-  import { mapGetters } from 'kolibri.lib.vuex';
+  import { mapState, mapGetters } from 'kolibri.lib.vuex';
   import useSnackbar from 'kolibri.coreVue.composables.useSnackbar';
   import { PageNames } from '../../../constants';
   import { PLAN_TABS_ID, PlanTabs } from '../../../constants/tabsConstants';
@@ -218,10 +218,11 @@
   import useCoreCoach from '../../../composables/useCoreCoach';
   import useQuizzes from '../../../composables/useQuizzes';
   import AverageScoreTooltip from '../../common/AverageScoreTooltip';
-  import commonCoach from '../../common';
   import ReportsControls from '../../../views/reports/ReportsControls.vue';
   import CSVExporter from '../../../csv/exporter';
   import * as csvFields from '../../../csv/fields';
+  import Score from '../../common/Score.vue';
+  import StatusSummary from '../../common/status/StatusSummary';
 
   export default {
     name: 'CoachExamsPage',
@@ -232,8 +233,10 @@
       Recipients,
       AverageScoreTooltip,
       ReportsControls,
+      Score,
+      StatusSummary,
     },
-    mixins: [commonCoach, commonCoreStrings],
+    mixins: [commonCoreStrings],
     setup() {
       const { createSnackbar } = useSnackbar();
       const { classId, initClassInfo, refreshClassSummary } = useCoreCoach();
@@ -336,7 +339,15 @@
       };
     },
     computed: {
-      ...mapGetters('classSummary', ['getRecipientNamesForExam']),
+      ...mapGetters('classSummary', [
+        'learners',
+        'groups',
+        'getExamAvgScore',
+        'getExamStatusTally',
+        'getLearnersForExam',
+        'getRecipientNamesForExam',
+      ]),
+      ...mapState('classSummary', { className: 'name' }),
       practiceQuizzesExist() {
         return plugin_data.practice_quizzes_exist;
       },
@@ -361,23 +372,23 @@
         ];
       },
       recipientOptions() {
+        const groupOptions = this.groups.map(group => ({
+          label: group.name,
+          value: group.name,
+        }));
+
+        const learnerOptions = this.learners.map(learner => ({
+          label: learner.name,
+          value: learner.name,
+        }));
+
         return [
           {
             label: this.entireClassLabel$(),
             value: this.entireClassLabel$(),
           },
-          {
-            label: 'Red',
-            value: 'Red',
-          },
-          {
-            label: 'Green',
-            value: 'Green',
-          },
-          {
-            label: 'Yellow',
-            value: 'Yellow',
-          },
+          ...groupOptions,
+          ...learnerOptions,
         ];
       },
       startedExams() {

From 058a9a8df3fcfe545f8883d1951a90ee75da4d6a Mon Sep 17 00:00:00 2001
From: ozer550 <prathameshd419@gmail.com>
Date: Thu, 10 Oct 2024 15:45:06 +0530
Subject: [PATCH 07/12] fix new quiz button overflow problem

---
 .../src/views/plan/CoachExamsPage/index.vue   | 41 +++++++++----------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue b/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue
index 374580a3b41..158b8799b6f 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue
@@ -7,18 +7,14 @@
         :tabsId="PLAN_TABS_ID"
         :activeTabId="PlanTabs.QUIZZES"
       >
-        <div>
-          <KIcon
-            icon="classes"
-            class="class-name-icon"
-          />
-          <span>{{ className }}</span>
-        </div>
-
-        <div class="filter-and-button">
-          <p v-if="filteredExams.length && filteredExams.length > 0">
-            {{ $tr('totalQuizSize', { size: calcTotalSizeOfVisibleQuizzes }) }}
-          </p>
+        <div class="classname-quiz-button-div">
+          <div>
+            <KIcon
+              icon="classes"
+              class="class-name-icon"
+            />
+            <span>{{ className }}</span>
+          </div>
           <KButtonGroup v-if="practiceQuizzesExist">
             <KButton
               primary
@@ -47,6 +43,11 @@
             />
           </div>
         </div>
+
+        <p v-if="filteredExams.length && filteredExams.length > 0">
+          {{ $tr('totalQuizSize', { size: calcTotalSizeOfVisibleQuizzes }) }}
+        </p>
+
         <ReportsControls
           class="report-controls"
           @export="exportCSV"
@@ -542,16 +543,6 @@
 
 <style lang="scss" scoped>
 
-  .filter-and-button {
-    display: flex;
-    flex-wrap: wrap-reverse;
-    justify-content: space-between;
-
-    button {
-      align-self: flex-end;
-    }
-  }
-
   .center-text {
     text-align: center;
   }
@@ -568,4 +559,10 @@
     margin-right: 0.5em;
   }
 
+  .classname-quiz-button-div {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 0.5em;
+  }
+
 </style>

From 2aa99dccb528e4687edaab795b1941ca9ced8422 Mon Sep 17 00:00:00 2001
From: ozer550 <prathameshd419@gmail.com>
Date: Mon, 14 Oct 2024 10:55:22 +0530
Subject: [PATCH 08/12] fix NAN b for quizSize

---
 .../src/views/plan/CoachExamsPage/index.vue   | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue b/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue
index 158b8799b6f..014accf4ae5 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue
@@ -434,17 +434,20 @@
         ];
       },
       calcTotalSizeOfVisibleQuizzes() {
-        if (this.filteredExams) {
-          let sum = 0;
-          for (const exam of this.filteredExams) {
-            if (exam.active) {
-              sum += exam.size;
-            }
+        if (!this.filteredExams || this.filteredExams.length === 0) {
+          return '--';
+        }
+        let sum = 0;
+        for (const exam of this.filteredExams) {
+          if (exam.active && exam.size && !isNaN(exam.size)) {
+            sum += exam.size;
           }
-          const size = bytesForHumans(sum);
-          return size;
         }
-        return '--';
+        if (sum === 0) {
+          return '--';
+        }
+        const size = bytesForHumans(sum);
+        return size;
       },
     },
     mounted() {

From 315eaea4becb67c9bd96370484174eadbf0b2c04 Mon Sep 17 00:00:00 2001
From: ozer550 <prathameshd419@gmail.com>
Date: Tue, 15 Oct 2024 17:03:53 +0530
Subject: [PATCH 09/12] fix started progress number in coreTabel

---
 .../assets/src/modules/classSummary/dataHelpers.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/modules/classSummary/dataHelpers.js b/kolibri/plugins/coach/assets/src/modules/classSummary/dataHelpers.js
index 4f2ae469e36..528e99940c7 100644
--- a/kolibri/plugins/coach/assets/src/modules/classSummary/dataHelpers.js
+++ b/kolibri/plugins/coach/assets/src/modules/classSummary/dataHelpers.js
@@ -99,9 +99,17 @@ export default {
       }
       const groups = getters.getGroupIdsForAssignment(assignment);
       const adHocLearners = assignment.learner_ids;
-      return adHocLearners.length
-        ? uniq(adHocLearners.concat(getters.getLearnersForGroups(groups)))
-        : getters.getLearnersForGroups(groups);
+
+      let learners;
+      const totalLearnersInClass = Object.keys(state.learnerMap).length;
+
+      if (getters.getLearnersForGroups(groups).length === totalLearnersInClass) {
+        learners = adHocLearners;
+      } else {
+        learners = uniq(adHocLearners.concat(getters.getLearnersForGroups(groups)));
+      }
+
+      return adHocLearners.length ? learners : getters.getLearnersForGroups(groups);
     };
   },
   /*

From 6ccaa296eca745433635d2a09c946f0167d9c9a9 Mon Sep 17 00:00:00 2001
From: ozer550 <prathameshd419@gmail.com>
Date: Mon, 21 Oct 2024 12:54:41 +0530
Subject: [PATCH 10/12] simplify datahelper logic

---
 .../assets/src/modules/classSummary/dataHelpers.js | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/modules/classSummary/dataHelpers.js b/kolibri/plugins/coach/assets/src/modules/classSummary/dataHelpers.js
index 528e99940c7..b1940aa9292 100644
--- a/kolibri/plugins/coach/assets/src/modules/classSummary/dataHelpers.js
+++ b/kolibri/plugins/coach/assets/src/modules/classSummary/dataHelpers.js
@@ -100,16 +100,10 @@ export default {
       const groups = getters.getGroupIdsForAssignment(assignment);
       const adHocLearners = assignment.learner_ids;
 
-      let learners;
-      const totalLearnersInClass = Object.keys(state.learnerMap).length;
-
-      if (getters.getLearnersForGroups(groups).length === totalLearnersInClass) {
-        learners = adHocLearners;
-      } else {
-        learners = uniq(adHocLearners.concat(getters.getLearnersForGroups(groups)));
-      }
-
-      return adHocLearners.length ? learners : getters.getLearnersForGroups(groups);
+      // NOTE: getters.getLearnersForGroups returns the learner_ids of the whole class
+      // when no groups exist.
+      const learnersFromGroups = groups.length ? getters.getLearnersForGroups(groups) : [];
+      return uniq(adHocLearners.concat(learnersFromGroups));
     };
   },
   /*

From 850e63a52817b5615a074bb9c343e8ee10f3f395 Mon Sep 17 00:00:00 2001
From: ozer550 <prathameshd419@gmail.com>
Date: Mon, 21 Oct 2024 17:10:15 +0530
Subject: [PATCH 11/12] add client side filtering wrt recipients

---
 .../assets/src/views/plan/CoachExamsPage/index.vue  | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue b/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue
index 014accf4ae5..bef3bfa5a64 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue
@@ -375,12 +375,12 @@
       recipientOptions() {
         const groupOptions = this.groups.map(group => ({
           label: group.name,
-          value: group.name,
+          value: group.id,
         }));
 
         const learnerOptions = this.learners.map(learner => ({
           label: learner.name,
-          value: learner.name,
+          value: learner.id,
         }));
 
         return [
@@ -414,6 +414,15 @@
           selectedExams = this.quizzes;
         }
 
+        const recipientsFilter = this.recipientSelected.value;
+
+        if (recipientsFilter !== this.entireClassLabel$()) {
+          selectedExams = selectedExams.filter(
+            exam =>
+              exam.groups.includes(recipientsFilter) || exam.learner_ids.includes(recipientsFilter),
+          );
+        }
+
         return selectedExams.map(quiz => {
           const learnersForQuiz = this.getLearnersForExam(quiz);
           quiz.tally = this.getExamStatusTally(quiz.id, learnersForQuiz);

From 1bb0cb5b9fc58be74c8ed0d63ef5e38f0ec7c19f Mon Sep 17 00:00:00 2001
From: "pre-commit-ci-lite[bot]"
 <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
Date: Thu, 24 Oct 2024 05:58:39 +0000
Subject: [PATCH 12/12] [pre-commit.ci lite] apply automatic fixes

---
 .../plugins/coach/assets/src/views/reports/ReportsControls.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kolibri/plugins/coach/assets/src/views/reports/ReportsControls.vue b/kolibri/plugins/coach/assets/src/views/reports/ReportsControls.vue
index 690bbe731ff..6c1c6aed54b 100644
--- a/kolibri/plugins/coach/assets/src/views/reports/ReportsControls.vue
+++ b/kolibri/plugins/coach/assets/src/views/reports/ReportsControls.vue
@@ -82,7 +82,7 @@
           'QuizSummaryPage',
           'PLAN_LESSONS_ROOT',
           'PLAN_LESSONS_ROOT_BETTER',
-          'EXAMS'
+          'EXAMS',
         ].includes(this.$route.name);
       },
       classLearnersListRoute() {