Channel based quizzes

kolibri/core/content/api.py

@@ -143,6 +143,9 @@ class Meta:
         fields = ["ids"]
 
 
+MODALITIES = set(["QUIZ"])
+
+
 class ContentNodeFilter(IdFilter):
     kind = ChoiceFilter(
         method="filter_kind",
@@ -151,12 +154,15 @@ class ContentNodeFilter(IdFilter):
     exclude_content_ids = CharFilter(method="filter_exclude_content_ids")
     kind_in = CharFilter(method="filter_kind_in")
     parent = UUIDFilter("parent")
+    parent__isnull = BooleanFilter(field_name="parent", lookup_expr="isnull")
     include_coach_content = BooleanFilter(method="filter_include_coach_content")
+    contains_quiz = CharFilter(method="filter_contains_quiz")
 
     class Meta:
         model = models.ContentNode
         fields = [
             "parent",
+            "parent__isnull",
             "prerequisite_for",
             "has_prerequisite",
             "related",
@@ -167,6 +173,7 @@ class Meta:
             "kind",
             "include_coach_content",
             "kind_in",
+            "contains_quiz",
         ]
 
     def filter_kind(self, queryset, name, value):
@@ -200,6 +207,14 @@ def filter_include_coach_content(self, queryset, name, value):
             return queryset
         return queryset.filter(coach_content=False)
 
+    def filter_contains_quiz(self, queryset, name, value):
+        if value:
+            quizzes = models.ContentNode.objects.filter(
+                options__contains='"modality": "QUIZ"'
+            ).get_ancestors(include_self=True)
+            return queryset.filter(pk__in=quizzes.values_list("pk", flat=True))
+        return queryset
+
 
 class OptionalPageNumberPagination(ValuesViewsetPageNumberPagination):
     """

kolibri/plugins/coach/assets/src/constants/index.js

@@ -6,6 +6,9 @@ export const PageNames = {
   NEW_COACH_PAGES: 'NEW_COACH_PAGES',
   EXAMS: 'EXAMS',
   EXAM_CREATION_ROOT: 'EXAM_CREATION_ROOT',
+  EXAM_CREATION_CHANNEL_QUIZ: 'EXAM_CREATION_CHANNEL_QUIZ',
+  EXAM_CREATION_SELECT_CHANNEL_QUIZ_TOPIC: 'EXAM_CREATION_SELECT_CHANNEL_QUIZ_TOPIC',
+  EXAM_CREATION_CHANNEL_QUIZ_PREVIEW: 'EXAM_CREATION_CHANNEL_QUIZ_PREVIEW',
   EXAM_CREATION_TOPIC: 'EXAM_CREATION_TOPIC',
   EXAM_CREATION_PREVIEW: 'EXAM_CREATION_PREVIEW',
   EXAM_CREATION_SEARCH: 'EXAM_CREATION_SEARCH',

kolibri/plugins/coach/assets/src/modules/examCreation/actions.js

@@ -86,7 +86,7 @@ export function fetchAdditionalSearchResults(store, params) {
   });
 }
 
-export function createExamAndRoute(store, { classId }) {
+export function createChannelQuizAndRoute(store, { classId }) {
   const exam = {
     collection: classId,
     title: store.state.title,
@@ -98,7 +98,23 @@ export function createExamAndRoute(store, { classId }) {
     date_archived: null,
     date_activated: null,
   };
+  return createExam(store, exam).then(() => {
+    return router.push({ name: PageNames.EXAMS });
+  });
+}
 
+export function createExamAndRoute(store, { classId }) {
+  const exam = {
+    collection: classId,
+    title: store.state.title,
+    seed: store.state.seed,
+    question_count: store.state.selectedQuestions.length,
+    question_sources: store.state.selectedQuestions,
+    assignments: [classId],
+    learners_see_fixed_order: store.state.learnersSeeFixedOrder,
+    date_archived: null,
+    date_activated: null,
+  };
   return createExam(store, exam).then(() => {
     return router.push({ name: PageNames.EXAMS });
   });
@@ -218,3 +234,12 @@ export function updateSelectedQuestions(store) {
     });
   });
 }
+
+export function fetchChannelQuizzes(parent = null) {
+  return ContentNodeResource.fetchCollection({
+    getParams: {
+      [parent ? 'parent' : 'parent__isnull']: parent ? parent : true,
+      contains_quiz: true,
+    },
+  });
+}

kolibri/plugins/coach/assets/src/modules/examCreation/handlers.js

@@ -5,11 +5,10 @@ import { ContentNodeResource, ContentNodeSearchResource, ChannelResource } from
 import { assessmentMetaDataState } from 'kolibri.coreVue.vuex.mappers';
 import router from 'kolibri.coreVue.router';
 import { PageNames } from '../../constants';
-import { filterAndAnnotateContentList } from './actions';
+import { filterAndAnnotateContentList, fetchChannelQuizzes } from './actions';
 
 function showExamCreationPage(store, params) {
   const { contentList, pageName, ancestors = [], searchResults = null } = params;
-
   return store.dispatch('loading').then(() => {
     store.commit('examCreation/SET_ANCESTORS', ancestors);
     store.commit('examCreation/SET_CONTENT_LIST', contentList);
@@ -44,7 +43,53 @@ export function showExamCreationRootPage(store, params) {
     });
   });
 }
+export function showChannelQuizCreationRootPage(store, params) {
+  return fetchChannelQuizzes().then(channels => {
+    const channelContentList = channels.map(channel => ({
+      ...channel,
+      id: channel.id,
+      title: channel.title,
+      kind: ContentNodeKinds.CHANNEL,
+      is_leaf: false,
+    }));
+    store.commit('SET_TOOLBAR_ROUTE', {
+      name: PageNames.EXAMS,
+    });
+    return showExamCreationPage(store, {
+      classId: params.classId,
+      contentList: channelContentList,
+      pageName: PageNames.EXAM_CREATION_CHANNEL_QUIZ,
+    });
+  });
+}
+export function showChannelQuizCreationTopicPage(store, params) {
+  return store.dispatch('loading').then(() => {
+    const { topicId } = params;
+    const topicNodePromise = ContentNodeResource.fetchModel({ id: topicId });
+    const childNodesPromise = ContentNodeResource.fetchCollection({
+      getParams: {
+        parent: topicId,
+        kind_in: [ContentNodeKinds.TOPIC, ContentNodeKinds.EXERCISE],
+      },
+    });
+    const loadRequirements = [topicNodePromise, childNodesPromise];
+
+    return Promise.all(loadRequirements).then(([topicNode, childNodes]) => {
+      return filterAndAnnotateContentList(childNodes).then(contentList => {
+        store.commit('SET_TOOLBAR_ROUTE', {
+          name: PageNames.EXAMS,
+        });
 
+        return showExamCreationPage(store, {
+          classId: params.classId,
+          contentList,
+          pageName: PageNames.EXAM_CREATION_SELECT_CHANNEL_QUIZ_TOPIC,
+          ancestors: [...topicNode.ancestors, topicNode],
+        });
+      });
+    });
+  });
+}
 export function showExamCreationTopicPage(store, params) {
   return store.dispatch('loading').then(() => {
     const { topicId } = params;
@@ -104,7 +149,44 @@ export function showExamCreationPreviewPage(store, params, query = {}) {
       });
   });
 }
+export function showChannelQuizCreationPreviewPage(store, params) {
+  const { classId, contentId } = params;
+  return store.dispatch('loading').then(() => {
+    return Promise.all([_prepChannelQuizContentPreview(store, classId, contentId)])
+      .then(([contentNode]) => {
+        store.commit('SET_TOOLBAR_ROUTE', {
+          name: PageNames.EXAM_CREATION_SELECT_CHANNEL_QUIZ_TOPIC,
+          params: {
+            topicId: contentNode.parent,
+          },
+        });
+        store.dispatch('notLoading');
+      })
+      .catch(error => {
+        store.dispatch('notLoading');
+        return store.dispatch('handleApiError', error);
+      });
+  });
+}
 
+function _prepChannelQuizContentPreview(store, classId, contentId) {
+  return ContentNodeResource.fetchModel({ id: contentId }).then(
+    contentNode => {
+      const contentMetadata = assessmentMetaDataState(contentNode);
+      store.commit('SET_TOOLBAR_ROUTE', {});
+      store.commit('examCreation/SET_CURRENT_CONTENT_NODE', { ...contentNode });
+      store.commit('examCreation/SET_PREVIEW_STATE', {
+        questions: contentMetadata.assessmentIds,
+        completionData: contentMetadata.masteryModel,
+      });
+      store.commit('SET_PAGE_NAME', PageNames.EXAM_CREATION_CHANNEL_QUIZ_PREVIEW);
+      return contentNode;
+    },
+    error => {
+      return store.dispatch('handleApiError', error);
+    }
+  );
+}
 function _prepExamContentPreview(store, classId, contentId) {
   return ContentNodeResource.fetchModel({ id: contentId }).then(
     contentNode => {

kolibri/plugins/coach/assets/src/routes/planExamRoutes.js

@@ -6,14 +6,19 @@ import {
   showExamCreationSearchPage,
   showExamCreationQuestionSelectionPage,
   showExamCreationPreviewPage,
+  showChannelQuizCreationRootPage,
+  showChannelQuizCreationTopicPage,
+  showChannelQuizCreationPreviewPage,
 } from '../modules/examCreation/handlers';
+import CreateChannelQuizPage from '../views/plan/CreateExamPage/CreateChannelQuizPage.vue';
 import CreateExamPage from '../views/plan/CreateExamPage';
 import CreateExamPreview from '../views/plan/CreateExamPage/CreateExamPreview.vue';
 import PlanQuizPreviewPage from '../views/plan/PlanQuizPreviewPage';
 import CoachExamsPage from '../views/plan/CoachExamsPage';
 import { showExamsPage } from '../modules/examsRoot/handlers';
 import QuizSummaryPage from '../views/plan/QuizSummaryPage';
 import QuizEditDetailsPage from '../views/plan/QuizEditDetailsPage';
+import PlanChannelQuizPreviewPage from '../views/plan/CreateExamPage/PlanChannelQuizPreviewPage';
 
 export default [
   {
@@ -35,6 +40,22 @@ export default [
       showExamCreationRootPage(store, toRoute.params);
     },
   },
+  {
+    name: PageNames.EXAM_CREATION_CHANNEL_QUIZ,
+    path: '/:classId/plan/quizzes/new/channel_quiz',
+    component: CreateChannelQuizPage,
+    handler: toRoute => {
+      showChannelQuizCreationRootPage(store, toRoute.params);
+    },
+  },
+  {
+    name: PageNames.EXAM_CREATION_SELECT_CHANNEL_QUIZ_TOPIC,
+    path: '/:classId/plan/quizzes/new/channel_quiz/topic/:topicId',
+    component: CreateChannelQuizPage,
+    handler: toRoute => {
+      showChannelQuizCreationTopicPage(store, toRoute.params);
+    },
+  },
   {
     name: PageNames.EXAM_CREATION_TOPIC,
     path: '/:classId/plan/quizzes/new/topic/:topicId',
@@ -59,6 +80,14 @@ export default [
       showExamCreationQuestionSelectionPage(store, toRoute, fromRoute);
     },
   },
+  {
+    name: PageNames.EXAM_CREATION_CHANNEL_QUIZ_PREVIEW,
+    path: '/:classId/plan/quizzes/new/channel_quiz/preview/',
+    component: PlanChannelQuizPreviewPage,
+    handler: toRoute => {
+      showChannelQuizCreationPreviewPage(store, toRoute.params);
+    },
+  },
   {
     name: PageNames.EXAM_CREATION_PREVIEW,
     path: '/:classId/plan/quizzes/new/preview/',

kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue

@@ -26,12 +26,16 @@
             while the above <KSelect> is hidden
         -->
         <div>&nbsp;</div>
-        <KRouterLink
-          :primary="true"
-          appearance="raised-button"
-          :to="newExamRoute"
-          :text="coachString('newQuizAction')"
-        />
+        <KButtonGroup>
+          <KDropdownMenu
+            appearance="raised-button"
+            :primary="true"
+            :text="coachString('newQuizAction')"
+            :options="dropdownOptions"
+            class="options-btn"
+            @select="handleSelect"
+          />
+        </KButtonGroup>
       </div>
       <CoreTable>
         <template #headers>
@@ -203,8 +207,11 @@
         }
         return this.sortedExams;
       },
-      newExamRoute() {
-        return { name: PageNames.EXAM_CREATION_ROOT };
+      dropdownOptions() {
+        return [
+          { label: this.$tr('newQuiz'), value: 'MAKE_NEW_QUIZ' },
+          { label: this.$tr('selectQuiz'), value: 'SELECT_QUIZ' },
+        ];
       },
     },
     methods: {
@@ -248,11 +255,20 @@
             this.$store.dispatch('createSnackbar', this.coachString('quizFailedToCloseMessage'));
           });
       },
+      handleSelect({ value }) {
+        const nextRoute = {
+          MAKE_NEW_QUIZ: PageNames.EXAM_CREATION_ROOT,
+          SELECT_QUIZ: PageNames.EXAM_CREATION_CHANNEL_QUIZ,
+        }[value];
+        this.$router.push(this.$router.getRoute(nextRoute));
+      },
     },
     $trs: {
       noExams: 'You do not have any quizzes',
       noActiveExams: 'No active quizzes',
       noInactiveExams: 'No inactive quizzes',
+      newQuiz: 'Create new quiz',
+      selectQuiz: 'Select channel quiz',
     },
   };