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

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/AppCompInputMath.vue

@@ -0,0 +1,20 @@
+<template>
+  <div>
+    <v-text-field
+      :id="id"
+      autocomplete="off"
+      max-width="80"
+      class="mx-3"
+    />
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    id: {
+      type: String,
+      default: ''
+    }
+  }
+}
+</script>

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/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
@@ -345,12 +353,15 @@ export default {
       } = config
 
       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 +407,34 @@ 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, preferredSettings, lessonStatus } =
+              await $xapi._getBulkData(fetchParams)
 
             const {
-              userData,
+              routeHistory = [],
               savedPoint,
-              preferredSettings,
               playbarValues,
-              lessonStatus
-            } = await $xapi._getBulkData(fetchParams)
-
-            const { routeHistory = [], ...progress } = userData
+              ...progress
+            } = userData
 
             const completedState = lessonStatus || {}
             const lessonPosition = savedPoint || ''
-            const userSettings = preferredSettings || {}
 
             data = {
               progress,
               routeHistory,
               lessonPosition,
               completedState,
-              playbarValues,
-              userSettings
+              playbarValues
             }
           } catch (err) {
             throw new Error(err)
@@ -489,8 +475,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
     },
 
     /**

package/src/module/xapi/ADL.js

@@ -4,6 +4,7 @@ import xAPILaunch from './launch'
 import { defineUtils } from './utils'
 import { xapiwrapper } from './wrapper'
 import { xapiStatement } from './xapiStatement'
+import { de } from 'vuetify/locale'
 
 //ref: https://github.com/adlnet/xAPI-Spec/blob/master/xAPI-Communication.md#partthree
 
@@ -156,11 +157,14 @@ export default class ADL {
     params['activity'] = activityId // this current activity define by this id
     params['agent'] = `{"mbox": "mailto:${email}"}` // the user identify by this email
     params['limit'] = 200 //limit of record to return by the LRS
+    // params['limit'] = 1 //limit of record to return by the LRS
     params['ascending'] = true //ordered by the oldest statement recorded
+    // params['ascending'] = false //ordered by the oldest statement recorded
 
     let date = new Date()
     let dd = new Date(date.setDate(date.getDate() + 1)).toISOString() //Date is set to next day(tomorrow) for Lrs to take in account statement registered today.
-    params['until'] = dd
+    // params['until'] = dd
+    params['until'] = 'now'
 
     try {
       let userData //placeholder for user data
@@ -172,6 +176,7 @@ export default class ADL {
         completedStmts.statements.length
       ) {
         let lastRecord = completedStmts.statements.toReversed()[0] // get last recorded statement
+        // let lastRecord = completedStmts.statements[0] // get last recorded statement
 
         // Verify that the extensions value of the statement as elements
         if (
@@ -419,102 +424,86 @@ export default class ADL {
       let { email, verb, activityId } = param
       let vb = verb && validVerbs.includes(verb) ? verb : 'terminated'
       const params = {}
-
       params['verb'] = this.verbs[vb].id // completed state
       params['activity'] = activityId // this current activity define by this id
       params['agent'] = `{"mbox": "mailto:${email}"}` // the user identify by this email
-      params['ascending'] = true //ordered by the oldest statement recorded
-      params['limit'] = 250 //limit of record to return by the LRS
+      params['ascending'] = false //ordered by the most recent statement recorded
+      params['limit'] = 1 //limit of record to return by the LRS
 
       params['until'] = dd
       paramList.push(params)
     }
-    const { response } = await this.XAPIWrapper.getStatements(paramList)
-
     let userData = {},
-      playbarValues = {},
       preferredSettings = {},
-      lessonStatus = {},
-      savedPoint = ''
+      lessonStatus = {}
 
-    if (response && response.length > 0) {
-      for (const res of response) {
-        const { statements } = await res.json()
-        if (!statements || statements.length == 0) continue
+    let { response } = await this.XAPIWrapper.getStatements(paramList)
 
-        let lastRecord = statements.toReversed()[0] // get last recorded statement
-        // Verify that the extensions value of the statement has elements
+    if (!response || response.length == 0)
+      response = {
+        userData,
+        preferredSettings,
+        lessonStatus
+      }
 
-        //Handeling Lession comppletion status
-        if (lastRecord.verb.id.includes('completed')) {
-          lessonStatus = lastRecord.result ? lastRecord.result : {}
-        }
+    const jsons = await Promise.all(
+      response.map((r) => r.json().catch(() => ({})))
+    )
 
-        if (
-          lastRecord.object.definition.extensions &&
-          Object.keys(lastRecord.object.definition.extensions).length
-        ) {
-          const allExtensionsKeys = Object.keys(
-            lastRecord.object.definition.extensions
-          )
+    for (const data of jsons) {
+      const { statements } = data
+      if (!statements || statements.length == 0) continue
+      let lastRecord = statements[0] // get last recorded statement
+      // Verify that the extensions value of the statement has elements
+      //Handeling Lession comppletion status
+      if (lastRecord.verb.id.includes('completed')) {
+        lessonStatus = lastRecord.result ? lastRecord.result : {}
+      }
 
-          //Search for the user-data entry in the extensions
-          allExtensionsKeys.forEach((extension) => {
-            switch (true) {
-              case extension.includes('user-data'): {
-                //Search for the user-data entry in the extensions
-                const userDataExtension = allExtensionsKeys.filter(
-                  (extension) => extension.includes('user-data')
-                )
-                userData =
-                  lastRecord.object.definition.extensions[userDataExtension[0]]
-
-                break
-              }
-              case extension.includes('ending-point'): {
-                const userDataExtension = allExtensionsKeys.filter(
-                  (extension) => extension.includes('ending-point')
-                )
-                savedPoint =
-                  lastRecord.object.definition.extensions[userDataExtension[0]]
-
-                break
-              }
-              case extension.includes('application-settings'): {
-                const userDataExtension = allExtensionsKeys.filter(
-                  (extension) => extension.includes('application-settings')
-                )
-
-                const settingsData =
-                  lastRecord.object.definition.extensions[userDataExtension[0]]
-
-                preferredSettings = settingsData ? settingsData : {}
-
-                break
-              }
-              case extension.includes('playbar-values'): {
-                const userDataExtension = allExtensionsKeys.filter(
-                  (extension) => extension.includes('playbar-values')
-                )
-
-                const playbarData =
-                  lastRecord.object.definition.extensions[userDataExtension[0]]
-                playbarValues = playbarData ? playbarData : {}
-
-                break
-              }
+      if (
+        lastRecord.object.definition.extensions &&
+        Object.keys(lastRecord.object.definition.extensions).length
+      ) {
+        const allExtensionsKeys = Object.keys(
+          lastRecord.object.definition.extensions
+        )
+
+        //Search for the user-data entry in the extensions
+        allExtensionsKeys.forEach((extension) => {
+          switch (true) {
+            case extension.includes('user-data'): {
+              //Search for the user-data entry in the extensions
+              const userDataExtension = allExtensionsKeys.filter((extension) =>
+                extension.includes('user-data')
+              )
+              userData =
+                lastRecord.object.definition.extensions[userDataExtension[0]]
+              break
             }
-          })
-        }
+            case extension.includes('application-settings'): {
+              const userDataExtension = allExtensionsKeys.filter((extension) =>
+                extension.includes('application-settings')
+              )
+
+              const settingsData =
+                lastRecord.object.definition.extensions[userDataExtension[0]]
+
+              preferredSettings = settingsData ? settingsData : {}
+
+              break
+            }
+            default: {
+              return
+            }
+          }
+        })
       }
     }
 
     return {
       userData,
-      savedPoint,
-      preferredSettings,
-      playbarValues,
-      lessonStatus
+      lessonStatus,
+      preferredSettings
     }
   }
 }

package/src/shared/generalfuncs.js

@@ -5,7 +5,6 @@ const allfile = import.meta.glob(['@/**/*.vue', '!@/**/_*'], {
 
 const allfileKeys = Object.keys(allfile)
 
-//console.log('ALL PATHS', fileArray)
 allfileKeys.forEach(function (key, index, array) {
   array[index] = {
     name: key.replace('/src', '.').replace('.vue', ''),

package/vitest.setup.js

@@ -87,11 +87,6 @@ config.global.mocks = {
       id: 'P01'
     }
   },
-  // $bus: {
-  //   $on: vi.fn(),
-  //   $emit: vi.fn(),
-  //   $off: vi.fn()
-  // },
   $helper: {
     formatTime: vi.fn((t) => `00:${t}`)
   }