Switch timeSpent to a prop in LearningActivityBar, and pass from Lear…

…nImmersiveLayout
learningequality · Nov 20, 2021 · 11f946e · 11f946e
1 parent 340dda5
commit 11f946e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/kolibri/plugins/learn/assets/src/views/LearnImmersiveLayout.vue b/kolibri/plugins/learn/assets/src/views/LearnImmersiveLayout.vue
@@ -15,6 +15,7 @@
       :isQuiz="practiceQuiz"
       :showingReportState="currentlyMastered"
       :duration="content.duration"
+      :timeSpent="timeSpent"
       :isBookmarked="bookmark ? true : bookmark"
       :isCoachContent="isCoachContent"
       :contentProgress="contentProgress"
@@ -199,6 +200,7 @@
         error: state => state.core.error,
         loading: state => state.core.loading,
         blockDoubleClicks: state => state.core.blockDoubleClicks,
+        timeSpent: state => state.core.logging.time_spent,
       }),
       ...mapState('topicsTree', {
         isCoachContent: state => (state.content.coach_content ? 1 : 0),

diff --git a/kolibri/plugins/learn/assets/src/views/LearningActivityBar.vue b/kolibri/plugins/learn/assets/src/views/LearningActivityBar.vue
@@ -133,7 +133,6 @@
 <script>
 
   import difference from 'lodash/difference';
-  import { mapState } from 'vuex';
   import KResponsiveWindowMixin from 'kolibri-design-system/lib/KResponsiveWindowMixin';
   import CoachContentLabel from 'kolibri.coreVue.components.CoachContentLabel';
   import CoreMenu from 'kolibri.coreVue.components.CoreMenu';
@@ -263,6 +262,14 @@
         required: false,
         default: null,
       },
+      /**
+      Actual time spent in seconds
+      */
+      timeSpent: {
+        type: Number,
+        required: false,
+        default: null,
+      },
     },
     data() {
       return {
@@ -272,9 +279,6 @@
       };
     },
     computed: {
-      ...mapState({
-        timeSpent: state => state.core.logging.time_spent,
-      }),
       allActions() {
         const actions = [
           {