Merge pull request #12312 from marcellamaki/post-ditto-review-strings…

…-and-ui-changes First pass string updates following UX writing and ditto review
learningequality · Jun 20, 2024 · d887f89 · d887f89
2 parents 8e46ec2 + 99ab30a
commit d887f89
Show file tree

Hide file tree

Showing 7 changed files with 211 additions and 386 deletions.
diff --git a/kolibri/core/assets/src/constants.js b/kolibri/core/assets/src/constants.js
@@ -198,3 +198,5 @@ export const Presets = Object.freeze({
 // This should be kept in sync with the value in
 // kolibri/core/exams/constants.py
 export const MAX_QUESTIONS_PER_QUIZ_SECTION = 50;
+// this is not used for the actual exam model
+export const MAX_QUESTION_OPTIONS_PER_QUIZ_SECTION = 500;
diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
@@ -1,9 +1,6 @@
 <template>
 
   <div>
-    <p :style="addQuizSectionsStyles">
-      {{ addQuizSections$() }}
-    </p>
 
     <KGrid :style="tabsWrapperStyles">
       <KGridItem
@@ -142,8 +139,11 @@
             :layout4="{ span: 2 }"
           >
             <h2 :style="{ color: $themeTokens.annotation }">
-              {{ questionList$() }}
+              {{ questionsLabel$() }}
             </h2>
+            <p :style="{ color: $themeTokens.annotation, fontSize: '.75rem' }">
+              {{ numberOfReplacementsAvailable$({ count: replacementQuestionPool.length }) }}
+            </p>
           </KGridItem>
           <KGridItem
             class="right-side-heading"
@@ -195,7 +195,7 @@
             <KIconButton
               icon="refresh"
               :tooltip="replaceAction$()"
-              :disabled="selectedActiveQuestions.length === 0"
+              :disabled="!canReplaceQuestions"
               @click="handleReplaceSelection()"
             />
             <KIconButton
@@ -308,14 +308,6 @@
       </div>
 
     </KTabsPanel>
-
-    <NotEnoughResourcesModal
-      v-if="showNotEnoughResourcesModal"
-      :selectedQuestions="selectedActiveQuestions"
-      :availableQuestions="replacementQuestionPool"
-      @close="showNotEnoughResourcesModal = false"
-      @addResources="redirectToSelectResources"
-    />
     <KModal
       v-if="showDeleteConfirmation"
       :title="deleteSectionLabel$()"
@@ -356,7 +348,6 @@
   import commonCoach from '../../common';
   import { PageNames } from '../../../constants';
   import TabsWithOverflow from './TabsWithOverflow';
-  import NotEnoughResourcesModal from './NotEnoughResourcesModal';
 
   const logger = logging.getLogger(__filename);
 
@@ -370,14 +361,12 @@
       DragSortWidget,
       DragHandle,
       TabsWithOverflow,
-      NotEnoughResourcesModal,
     },
     mixins: [commonCoreStrings, commonCoach],
     setup() {
       const {
         sectionLabel$,
         selectAllLabel$,
-        addQuizSections$,
         addSectionLabel$,
         quizSectionsLabel$,
         addQuestionsLabel$,
@@ -387,10 +376,10 @@
         editSectionLabel$,
         deleteSectionLabel$,
         replaceAction$,
-        questionList$,
+        questionsLabel$,
+        numberOfReplacementsAvailable$,
         sectionDeletedNotification$,
         deleteConfirmation$,
-        updateResources$,
         changesSavedSuccessfully$,
         questionsDeletedNotification$,
         expandAll$,
@@ -448,7 +437,6 @@
         expandAll$,
         collapseAll$,
         selectAllLabel$,
-        addQuizSections$,
         quizSectionsLabel$,
         addSectionLabel$,
         addQuestionsLabel$,
@@ -459,7 +447,8 @@
         deleteSectionLabel$,
         questionDeletionConfirmation$,
         replaceAction$,
-        questionList$,
+        questionsLabel$,
+        numberOfReplacementsAvailable$,
         sectionDeletedNotification$,
         deleteConfirmation$,
         changesSavedSuccessfully$,
@@ -474,7 +463,6 @@
         addSection,
         removeSection,
         updateQuiz,
-        updateResources$,
         displaySectionTitle,
         displayQuestionTitle,
 
@@ -504,12 +492,11 @@
           userSelect: this.dragActive ? 'none!important' : 'text',
         };
       },
-      addQuizSectionsStyles() {
-        return {
-          margin: '0 0 1rem 0',
-          padding: '0 0 1rem 0',
-          borderBottom: `1px solid ${this.$themeTokens.fineLine}`,
-        };
+      canReplaceQuestions() {
+        return (
+          this.selectedActiveQuestions.length > 0 &&
+          this.selectedActiveQuestions.length <= this.replacementQuestionPool.length
+        );
       },
       tabsWrapperStyles() {
         return {
@@ -701,10 +688,6 @@
           })
         );
       },
-      redirectToSelectResources() {
-        this.showNotEnoughResourcesModal = false;
-        this.openSelectResources();
-      },
     },
   };
 

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/NotEnoughResourcesModal.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/NotEnoughResourcesModal.vue
diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
@@ -1,16 +1,10 @@
 <template>
 
   <div class="wrapper">
-    <h1 class="section-header" :style="{ color: `${$themeTokens.annotation}` }">
-      {{ activeSectionTitle }}
-    </h1>
-    <span
-      class="divider"
-      :style="{ borderTop: `solid 1px ${$themeTokens.fineLine}` }"
-    >
-    </span>
     <h1 class="section-header">
-      {{ replaceQuestions$() }}
+      {{ replaceQuestions$({
+        sectionTitle: displaySectionTitle(activeSection, activeSectionIndex
+        ) }) }}
     </h1>
     <p>{{ replaceQuestionsHeading$() }}</p>
     <span
@@ -135,7 +129,9 @@
       v-if="showReplacementConfirmation"
       :submitText="coreString('confirmAction')"
       :cancelText="coreString('cancelAction')"
-      :title="replaceQuestions$()"
+      :title="replaceQuestions$({
+        sectionTitle: displaySectionTitle(activeSection, activeSectionIndex)
+      })"
       @cancel="showReplacementConfirmation = false"
       @submit="submitReplacement"
     >
@@ -198,7 +194,7 @@
         numberOfSelectedReplacements$,
         numberOfQuestionsReplaced$,
         noUndoWarning$,
-        selectMoreQuestion$,
+        selectQuestionsToContinue$,
         selectFewerQuestion$,
         collapseAll$,
         expandAll$,
@@ -207,6 +203,7 @@
       const {
         // Computed
         activeSection,
+        activeSectionIndex,
         selectedActiveQuestions,
         activeResourceMap,
         replacementQuestionPool,
@@ -301,6 +298,7 @@
 
         toggleInReplacements,
         activeSection,
+        activeSectionIndex,
         activeSectionTitle,
         selectAllReplacementQuestions,
         selectedActiveQuestions,
@@ -327,11 +325,12 @@
         noUndoWarning$,
         replaceQuestionsExplaination$,
         replaceQuestionsHeading$,
-        selectMoreQuestion$,
+        selectQuestionsToContinue$,
         selectFewerQuestion$,
         collapseAll$,
         expandAll$,
         displayQuestionTitle,
+        displaySectionTitle,
       };
     },
     computed: {
@@ -361,13 +360,9 @@
             count: this.replacements.length,
             total: this.selectedActiveQuestions.length,
           });
-        } else if (unreplacedCount > 0) {
-          return this.selectMoreQuestion$({
-            count: unreplacedCount,
-          });
         } else {
-          return this.selectFewerQuestion$({
-            count: Math.abs(unreplacedCount),
+          return this.selectQuestionsToContinue$({
+            count: this.selectedActiveQuestions.length,
           });
         }
       },