update message for questions in exercise

learningequality · May 31, 2024 · bab6c45 · bab6c45
1 parent 23ba159
commit bab6c45
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue
@@ -61,7 +61,7 @@
         :selectAllChecked="selectAllChecked"
         :selectAllIndeterminate="selectAllIndeterminate"
         :contentIsChecked="contentPresentInWorkingResourcePool"
-        :contentHasCheckbox="hasCheckbox"
+        :contentHasCheckbox="c => hasCheckbox(c) && unusedQuestionsCount(c) > 0"
         :contentCardMessage="selectionMetadata"
         :contentCardLink="contentLink"
         :loadingMoreState="loadingMore"
@@ -172,6 +172,7 @@
         cannotSelectSomeTopicWarning$,
         closeConfirmationMessage$,
         closeConfirmationTitle$,
+        questionsUnusedInSection$,
       } = enhancedQuizManagementStrings;
 
       // TODO let's not use text for this
@@ -490,6 +491,7 @@
         sectionSettings$,
         selectFromBookmarks$,
         numberOfSelectedBookmarks$,
+        questionsUnusedInSection$,
         selectFoldersOrExercises$,
         numberOfSelectedResources$,
         numberOfResourcesSelected$,
@@ -551,23 +553,24 @@
       }
     },
     methods: {
-      cardNoticeContent(content) {
+      unusedQuestionsCount(content) {
         if (content.kind === ContentNodeKinds.EXERCISE) {
-          const questionCount = content.assessmentmetadata.assessment_item_ids.length;
           const questionItems = content.assessmentmetadata.assessment_item_ids.map(
             aid => `${content.id}:${aid}`
           );
           const questionsItemsAlreadyUsed = this.allQuestionsInQuiz
             .map(q => q.item)
             .filter(i => questionItems.includes(i));
           const questionItemsAvailable = questionItems.length - questionsItemsAlreadyUsed.length;
-
-          if (questionsItemsAlreadyUsed.length) {
-            return `${questionItemsAvailable} of ${questionCount} questions available,
-                    ${questionsItemsAlreadyUsed.length} questions are used in other sections`;
-          } else {
-            return `${questionCount} questions`;
-          }
+          return questionItemsAvailable;
+        }
+        return -1;
+      },
+      cardNoticeContent(content) {
+        if (content.kind === ContentNodeKinds.EXERCISE) {
+          return this.questionsUnusedInSection$({
+            count: this.unusedQuestionsCount(content),
+          });
         } else {
           return '';
         }

diff --git a/packages/kolibri-common/strings/enhancedQuizManagementStrings.js b/packages/kolibri-common/strings/enhancedQuizManagementStrings.js
@@ -200,4 +200,7 @@ export const enhancedQuizManagementStrings = createTranslator('EnhancedQuizManag
   allSectionsEmptyWarning: {
     message: "You don't have any questions in the quiz",
   },
+  questionsUnusedInSection: {
+    message: '{ count, number } { count, plural, one { question } other { questions }} unused',
+  },
 });