fcad-core-dragon 2.2.0 → 2.3.0-test.2

package/src/components/AppBaseModule.vue

@@ -29,8 +29,6 @@
       />
     </nav>
     <base-module :m-data="$data">
-          
-
       <v-container
         id="wrapper-content"
         fluid
@@ -376,6 +374,7 @@ export default {
           'normal',
           'branching'
         ]
+
         if (trackedRouteType.includes(this.$route.meta.type)) {
           //Navigation should only trigger timer and xapi statement when app is ready and activity has changed
           if (!this.activityHasChanged || !this.appReady) return
@@ -440,7 +439,6 @@ export default {
           this.getConnectionInfo.remote
         ) {
           const lessonPosition = this.getLessonPosition
-
           const lastReached = lessonPosition.length ? lessonPosition[0] : ''
 
           //only Send savepoint statement when 3 navigation happen and the route is different from last saved
@@ -471,11 +469,26 @@ export default {
               extensions: [
                 {
                   id: 'ending-point',
-                  content: (() =>
-                    this.$route.name == 'menu'
-                      ? this.$helper.getRoutesFromVueRouter().meta.children[0]
-                          ._namedRoute
-                      : this.$route.name)()
+                  content: (() => {
+                    const {
+                      name,
+                      meta: { activity_ref, id, type }
+                    } = this.$route
+                    let bookmark = {
+                      name,
+                      activity_ref,
+                      id,
+                      type
+                    }
+                    if (this.$route.name == 'menu') {
+                      bookmark =
+                        this.getLessonPosition.length > 0
+                          ? this.getLessonPosition[0]
+                          : this.$helper.getRoutesFromVueRouter().meta
+                              .children[0]
+                    }
+                    return bookmark
+                  })()
                 }
               ],
               duration: this.appTimer.ISOTimeParser(this.lessonDuration)
@@ -548,21 +561,13 @@ export default {
     this.updateIntroStatus(this.theIntroIsActivated)
     //Communication events
     this.$bus.$on('open-popup', this.openPopup)
-
     this.$bus.$on('close-popup', this.closePopup)
-
     this.$bus.$on('start-onboarding', this.startOnboarding)
-
     this.$bus.$on('open-sidebar', this.openSidebar)
-
     this.$bus.$on('close-sidebar', this.closeSidebar)
-
     this.$bus.$on('videoFullScreen', this.onVideoFullScreen)
-
     this.$bus.$on('save-to-scorm', this.saveToScorm)
-
     this.$bus.$on('launch-xapi-resource', this.launchResource)
-
     this.$bus.$on('update-route-history', this.updateRouteHistory)
     this.$bus.$on('update-content', this.updateContent)
     this.$bus.$on('show-transcript', this.openTranscript)
@@ -664,7 +669,6 @@ export default {
       //delay animation
       this.rightSidebarVisible = true
       this.updatesideBIsOpen(this.rightSidebarVisible)
-      // setTimeout(() => {
       const rightSidebarContent = this.getRightSidebar() // Emelent displayed in the sidebar-body
       if (!rightSidebarContent) return
       rightSidebarContent.scrollTop = 0
@@ -672,7 +676,6 @@ export default {
       rSidebar.dispatchEvent(this.rightSidebarEvent)
       rSidebar.setAttribute('tabindex', -1)
       this.resetFocus(rSidebar) //set focus on the sidebar
-      // }, 100)
     },
     /**
      * @description close the right sidebar component
@@ -852,7 +855,6 @@ export default {
         this.$bus.$emit('set-comp-status', 'appBaseModule', 'loading')
         this.updateCurrentTimeline(null)
         this.updateCurrentMediaElements([])
-        // this.updateCurrentPage({})
         this.$bus.$emit('set-comp-status', 'appBaseModule', 'ready')
         res(this.getCompStatusTracker)
       })
@@ -1016,7 +1018,6 @@ export default {
 
       // Add route route in history
       this.routeData.push(from.meta)
-
       if (this.routeData.length >= 4) this.routeData.shift()
     },
 
@@ -1067,17 +1068,15 @@ export default {
             this.nextOnboarding('message_1')
           } catch (e) {
             //fetch default values for popups
-            this.onboardingMessages = import(
-              '../assets/data/onboardingMessages.json'
-            )
+            this.onboardingMessages =
+              import('../assets/data/onboardingMessages.json')
             this.nextOnboarding('message_1')
           }
         }
       } else {
         if (this.getOnboardingEnabled) {
-          this.onboardingMessages = import(
-            '../assets/data/onboardingMessages.json'
-          )
+          this.onboardingMessages =
+            import('../assets/data/onboardingMessages.json')
           this.nextOnboarding('message_1')
         }
       }
@@ -1421,7 +1420,18 @@ export default {
               {
                 id: 'user-data',
                 content: {
-                  routeHistory: this.getRouteHistory,
+                  routeHistory: (() => {
+                    const history = this.getRouteHistory.toReversed() //get the route history from the last
+
+                    if (this.$route.name !== 'menu')
+                      history[0] = this.$route.meta // change the last recored route to the current route
+
+                    return history.toReversed()
+                  })(),
+
+                  playbarValues: {
+                    ...this.getMediaPlaybarValues()
+                  },
                   ...lessonsData
                 }
               }
@@ -1469,7 +1479,17 @@ export default {
                 {
                   id: 'user-data',
                   content: {
-                    routeHistory: this.getRouteHistory,
+                    routeHistory: (() => {
+                      const history = this.getRouteHistory.toReversed() //get the route history from the last
+
+                      if (this.$route.name !== 'menu')
+                        history[0] = this.$route.meta // change the last recored route to the current route
+
+                      return history.toReversed()
+                    })(),
+                    playbarValues: {
+                      ...this.getMediaPlaybarValues()
+                    },
                     ...lessonsData
                   }
                 }

package/src/components/AppBasePage.vue

@@ -95,7 +95,6 @@ export default {
     }
   },
   setup(props) {
-    //console.log('dans setup')
     const store = useAppStore()
     const { activityRef, id: pageID, type: pageType } = props.pageData
     const { t } = useI18n()
@@ -374,8 +373,6 @@ export default {
         /**
          * Observe changes in the number of poperties to dispatch updates in the userdata in the Store
          */
-        // console.log('ici')
-        //console.log(this.userInteraction)
         if (newValue && Object.entries(this.userInteraction).length) {
           await this.store.updateUserMetaData({
             activityRef: this.pageData.activityRef,

package/src/components/AppCompInputTextToFillNx.vue

@@ -20,7 +20,8 @@
         <label :for="`${id}_${textInput.id}-champ`" style="display: none">
           {{ $t('text.quiz') }}
         </label>
-
+        {{ textInput }}
+        {{ textInput.index }}
         <v-text-field
           v-if="textInput.type == 'input'"
           :id="`${id}_${textInput.id}-champ`"

package/src/components/AppCompMenu.vue

@@ -112,7 +112,8 @@ export default {
       'getMenuSettings',
       'getAppDebugMode',
       'getAppConfigs',
-      'getAllCompleted'
+      'getAllCompleted',
+      'getLessonPosition'
     ]),
     appDebugMode() {
       return this.getAppDebugMode
@@ -177,10 +178,12 @@ export default {
         }
       }, 2000)
     },
+
     //Go to the last route you were before the menu
     GoToLastRoute() {
       let lastRoute
       let path
+
       //Get all activity state (menu not included)
       const { allActivitiesState } = this.progressWithMenu()
       let state = Object.values(allActivitiesState)
@@ -200,7 +203,10 @@ export default {
       }
 
       // create path from the last you saw
-      if (lastRoute) path = this.createdRoute(lastRoute)
+      if (lastRoute)
+        path = this.createdRoute(
+          this.getRouteHistory[this.getRouteHistory.length - 1]
+        )
 
       return path
     },
@@ -236,6 +242,10 @@ export default {
 
       //Define path
       path = page !== ' ' ? `${activity}.page_${page}` : activity
+
+      if (path == 'activite_0') path = 'introduction'
+      if (path == 'activite_99') path = 'conclusion'
+
       return path
     },
     progressWithMenu() {

package/src/components/AppCompNoteCredit.vue

@@ -351,10 +351,6 @@ export default {
       const elTarget = widgetContent.namedItem(ref) // Target current button
       const pageRef = elTarget.getAttribute('pageref')
 
-      console.log('widgetContent :', widgetContent)
-      console.log('elTarget :', elTarget)
-      console.log('pageRef :', pageRef)
-
       if (!this.sideBarIsOpen) this.prevNote = null //reset previous when sidebar is opened
 
       let prevPageref = this.prevNote

package/src/components/AppCompPlayBarNext.vue

@@ -922,7 +922,6 @@ export default {
         //window handlers for playbar progress
         window.addEventListener('mousemove', this.progressWindowMove)
         window.addEventListener('mouseup', this.progressWindowUp)
-        // console.log('⚠️--- TEST AppCompPlayBarNext---', this.mediaElement)
         //Update data when media as a timeupdate/ended
         this.mediaElement.addEventListener(
           'timeupdate',
@@ -1635,7 +1634,6 @@ export default {
      */
     toggleFullScreen() {
       const fullscreenElement = this.mediaContainer
-      //console.log(fullscreenElement)
 
       if (document.fullscreenElement) {
         // exitFullscreen is only available on the Document object.

package/src/components/AppCompQuizNext.vue

@@ -512,4 +512,17 @@ export default {
 .custom-control {
   z-index: 0;
 }
+
+.math-ex-infinity{
+
+  div.box-btn{
+    display: flex;
+    flex-wrap: wrap;
+    flex-direction: row;
+
+    :last-child{
+      margin-left: 10px;
+    }
+  }
+}
 </style>

package/src/main.js

@@ -6,7 +6,6 @@ import AppBaseFlipCard from './components/AppBaseFlipCard.vue'
 import AppBasePopover from './components/AppBasePopover.vue'
 import AppCompJauge from './components/AppCompJauge.vue'
 import AppBaseErrorDisplay from './components/AppBaseErrorDisplay.vue'
-//import AppCompBif from './components/AppCompBif.vue'
 import AppCompAudio from './components/AppCompAudio.vue'
 import AppCompBranchButtons from './components/AppCompBranchButtons.vue'
 import AppCompCarousel from './components/AppCompCarousel.vue'
@@ -45,6 +44,7 @@ import fcadRouter from './router/index.js'
 import '@mdi/font/css/materialdesignicons.css'
 import 'vuetify/styles'
 import { createVuetify } from 'vuetify'
+
 import { fr, en } from 'vuetify/locale'
 
 const pinia = createPinia()
@@ -60,6 +60,7 @@ export default {
     app.component('FocusTrap', FocusTrap)
     app.use(eventBus)
     app.use($idb)
+
     const vuetify = createVuetify({
       locale: {
         locale: 'fr',
@@ -76,7 +77,6 @@ export default {
     app.component('AppBaseFlipCard', AppBaseFlipCard)
     app.component('AppBaseErrorDisplay', AppBaseErrorDisplay)
     app.component('AppCompMenu', AppCompMenu)
-    //app.component('app-comp-bif', AppCompBif)
     app.component('AppCompAudioPlayer', AppCompAudio)
     app.component('AppCompBranchButtons', AppCompBranchButtons)
     app.component('AppCompCarousel', AppCompCarousel)
@@ -125,7 +125,6 @@ export default {
       ({
         name, // name of the action
         store, // store instance, same as `someStore`
-        args, // array of parameters passed to the action
         after // hook after the action returns or resolves
       }) => {
         after(async (result) => {
@@ -189,8 +188,7 @@ export default {
 
             if (playbarValues)
               appStore.$state.mediaPlaybarValues = playbarValues
-
-            if (lessonPosition) appStore.setLessonPosition(lessonPosition)
+            if (lessonPosition) appStore.setLessonPosition([lessonPosition])
             if (completedState) appStore.setCompletionState(completedState)
           }
           //Open Connection to IDB and Save the store state to localDB
@@ -278,9 +276,19 @@ export default {
                 }
               }
               // Get LRS autorisation info from serveur
-              const request = await axios.get('../../configs-xapi/xapi.json')
-
-              const { basicauth } = request.data
+              const request = await axios.get(
+                '../../configs-xapi/xapi-org.json'
+              )
+              let { organization = null } = data
+              const { basicauth } =
+                organization && request.data[organization.toLowerCase()]
+                  ? (() => request.data[organization.toLowerCase()])()
+                  : (() => {
+                      console.warn(
+                        `🚩 No organization found with the name '${organization}'. will default to organization 'root'.`
+                      )
+                      return request.data.root
+                    })()
 
               c.auth = basicauth
               connectionInfo = c
@@ -332,7 +340,7 @@ export default {
     }
     /* Local Method for data fetching */
     const fetchDatasFromServer = async (config) => {
-      const {
+      let {
         $scorm,
         $xapi,
         $idb,
@@ -344,13 +352,19 @@ export default {
         remote
       } = config
 
+      if (window.location.hostname.includes('cegepadistance.ca')) remote = true
+
       let server = remote ? specification : 'local'
+
+      const unknownHost =
+        !window.location.hostname.includes('cegepadistance.ca') &&
+        window.location.hostname !== 'localhost'
       //falback to idb when scorm and origin is localhost
       if (
         (specification == 'scorm' && window.location.hostname == 'localhost') ||
-        !window.location.hostname.includes('cegepadistance.ca')
+        unknownHost
       )
-        server = 'local'
+        server = 'unknown'
 
       let data = null
 
@@ -396,59 +410,29 @@ export default {
           try {
             const actorMbox = actor.mbox.replace('mailto:', '')
             const activityId = activity_id
-            const _url = new URL(activityId)
-            const parentID = `${_url.origin}/${crs_id}` // redefining activity id for statement
-
             const lessonProgressParam = { email: actorMbox, activityId }
             const lessonStateParam = {
               email: actorMbox,
               activityId,
               verb: 'completed'
             }
-            const lessonPosionParam = {
-              email: actorMbox,
-              activityId
-            }
-            const playbarParam = {
-              email: actorMbox,
-              activityId,
-              verb: 'played'
-            }
-            const preferencesParam = {
-              email: actorMbox,
-              activityId: parentID,
-              verb: 'preferred'
-            }
 
-            const fetchParams = [
-              lessonProgressParam,
-              lessonStateParam,
-              lessonPosionParam,
-              playbarParam,
-              preferencesParam
-            ]
+            const fetchParams = [lessonProgressParam, lessonStateParam]
 
-            const {
-              userData,
-              savedPoint,
-              preferredSettings,
-              playbarValues,
-              lessonStatus
-            } = await $xapi._getBulkData(fetchParams)
+            const { userData, preferredSettings, lessonStatus, savedPoint } =
+              await $xapi._getBulkData(fetchParams)
 
-            const { routeHistory = [], ...progress } = userData
+            const { routeHistory = [], playbarValues, ...progress } = userData
 
             const completedState = lessonStatus || {}
-            const lessonPosition = savedPoint || ''
-            const userSettings = preferredSettings || {}
+            const lessonPosition = savedPoint.name ? savedPoint : null
 
             data = {
               progress,
               routeHistory,
               lessonPosition,
               completedState,
-              playbarValues,
-              userSettings
+              playbarValues
             }
           } catch (err) {
             throw new Error(err)
@@ -489,8 +473,9 @@ export default {
 
     appStore.applicationSettings = settingsOptions
     //=================================END SETTING PREFERENCES ====================================//
-    // const appi18b = options.i18n
-    // console.log('i18n options received in appBase plugin...', appi18b)
+    app.provide('FCAD_STORE', appStore)
+    app.provide('FCAD_ROUTER', fcadRouter)
+
     const i18n = initLocalisation(options.i18n)
     app.use(i18n)
     app.use(helper)

package/src/module/stores/appStore.js

@@ -125,9 +125,9 @@ export const useAppStore = defineStore('$appStore', {
      * @description: Check if auto-show subtitles is enabled in application settings
      */
     getBookmarkEnabled: (state) => {
-      return state.applicationSettings.bookmark
-        ? state.applicationSettings.bookmark
-        : null
+      return state.appConfigs.bookmark_active
+        ? state.appConfigs.bookmark_active
+        : false
     },
 
     /**