reusable function

learningequality · Nov 8, 2024 · b90340a · b90340a
1 parent a64dc78
commit b90340a
Showing 1 changed file with 19 additions and 8 deletions.
diff --git a/kolibri/plugins/coach/assets/src/views/reports/ReportsLearnerReportPage.vue b/kolibri/plugins/coach/assets/src/views/reports/ReportsLearnerReportPage.vue
@@ -129,9 +129,14 @@
       learner() {
         return this.learnerMap[this.$route.params.learnerId];
       },
+      getLessons(){
+        return this.lessons.filter(lesson => this.isAssignedLesson(lesson));
+      },
+      getExam(){
+        return this.exams.filter(exam => this.isAssignedQuiz(exam));
+      },
       lessonsTable() {
-        const filtered = this.lessons.filter(lesson => this.isAssignedLesson(lesson));
-        const sorted = this._.orderBy(filtered, ['date_created'], ['desc']);
+        const sorted = this._.orderBy(this.getLessons, ['date_created'], ['desc']);
         const limitedResults = sorted.slice(0, this.limit);
         return limitedResults.map(lesson => {
           const tableRow = {
@@ -142,12 +147,10 @@
         });
       },
       showViewMoreButton(){
-        const assignedlessons = this.lessons.filter(lesson => this.isAssignedLesson(lesson));
-        return (assignedlessons.length !== this.lessonsTable.length) || assignedlessons.length > 10;
+        return (this.getLessons.length !== this.lessonsTable.length) && this.getLessons.length > 10;
       },
       examsTable() {
-        const filtered = this.exams.filter(exam => this.isAssignedQuiz(exam));
-        const sorted = this._.orderBy(filtered, ['date_created'], ['desc']);
+        const sorted = this._.orderBy(this.getExam, ['date_created'], ['desc']);
         const limitedQuizResults = sorted.slice(0, this.quizLimit);
         return limitedQuizResults.map(exam => {
           const tableRow = {
@@ -158,8 +161,7 @@
         });
       },
       showQuizViewMoreButton(){
-        const quizzes = this.exams.filter(exam => this.isAssignedQuiz(exam));
-        return (quizzes.length !== this.examsTable.length) || quizzes.length > 10;
+        return (this.getExam.length !== this.examsTable.length) && this.getExam.length > 2;
       },
     },
     methods: {
@@ -173,9 +175,18 @@
         return this.classRoute(PageNames.REPORTS_LEARNER_REPORT_QUIZ_PAGE_ROOT, { quizId });
       },
       loadMoreLessonTable(){
+        if(this.limit > 20){
+          this.limit = this.getLessons.length;
+          return;
+        }
+
         this.limit += 10;
       },
       loadMoreQuizzes(){
+        if(this.quizLimit > 20){
+          this.quizLimit = this.getExam.length;
+          return;
+        }
         this.quizLimit += 10;
       }
     },