fcad-core-dragon 2.0.0-beta.5 → 2.0.0-beta.6

package/src/mixins/timerMixin.js

@@ -1,155 +1,155 @@
-/*
-@ Description: Mixins to extends general fonctionnalities in a page of an activity. Add time tracker in activities
-@ Note: .
-*/
-export const timerMixin = {
-  data() {
-    return {
-      lessonTimeCounter: 0,
-      activityTimeCounter: 0,
-      elapsedCounter: 0, // count the elapse time since lesson started
-      activityInterval: null,
-      lessonInterval: null,
-      fullInterval: null,
-      timerState: 'stopped',
-      elapsedInterval: null // interval of passed time since the lesson is started. used only for saving purposed
-    }
-  },
-  methods: {
-    /* Start the timer */
-    startTimer(op) {
-      if (op && !['activity', 'lesson'].includes(op))
-        throw new Error('this is not a valid option for the timer')
-      if (this.timerState === 'stopped') {
-        switch (op) {
-          case 'activity':
-            this.activityInterval = setInterval(() => {
-              this.activityTimeCounter += 1
-            }, 1000)
-            this.timerState = 'started'
-
-            break
-
-          case 'lesson':
-            this.lessonInterval = setInterval(() => {
-              this.lessonTimeCounter += 1
-            }, 1000)
-            break
-
-          default:
-            this.fullInterval = setInterval(() => {
-              this.activityTimeCounter += 1
-              this.lessonTimeCounter += 1
-            }, 1000)
-        }
-      }
-    },
-    /* Stop the timer and reset  thimer to zero */
-    stopTimer(op) {
-      if (op && !['activity', 'lesson'].includes(op))
-        throw new Error('this is not a valid parameter')
-
-      if (this.timerState === 'started') {
-        if (op === 'activity' && this.activityTimeCounter > 0) {
-          this.lessonTimeCounter =
-            this.lessonTimeCounter + this.activityTimeCounter //add to the lesson counter
-          clearInterval(this.activityInterval) //clear the interval
-          this.activityTimeCounter = 0 // reset the counter
-          this.timerState = 'stopped'
-        } else if (op === 'lesson' && this.lessonTimeCounter > 0) {
-          clearInterval(this.lessonInterval)
-          this.lessonTimeCounter = 0
-        } else {
-          clearInterval(this.fullInterval)
-          clearInterval(this.elapsedCounter)
-          clearInterval(this.elapsedInterval)
-
-          this.activityTimeCounter = 0
-          this.lessonTimeCounter = 0
-          this.elapsedCounter = 0
-        }
-      }
-    },
-    /* Pause the timer but does not reset to zero*/
-    pauseTimer(op) {
-      if (op && !['activity', 'lesson'].includes(op))
-        throw new Error('this is not a valid parameter')
-
-      if (op === 'activity' && this.activityTimeCounter > 0) {
-        clearInterval(this.activityInterval)
-      } else if (op === 'lesson') {
-        clearInterval(this.lessonInterval)
-      } else {
-        clearInterval(this.fullInterval)
-        clearInterval(this.elapsedInterval)
-      }
-    },
-
-    /* Format seconds to ISO 8601 format */
-    formatToISOString(seconds) {
-      let d = new Date(null) //create a default date ref
-      d.setSeconds(seconds) //set the time with passed numbers of seconds
-      //Example of ISO 8601 time format of 24 chars: "1970-01-04T14:50:00.000Z"
-      let ISOTime = d.toISOString()
-
-      return ISOTime // YYYY-MM-DDTHH:mm:ss.sssZ
-    },
-
-    /* Parse a ISO string time period to the format of HH:mm:ss */
-    ISOTimeParser(seconds) {
-      let ISOTimePeriod = this.formatToISOString(seconds).substring(8, 19) // only the time portion of it
-      ISOTimePeriod = ISOTimePeriod.split('T')
-      const DDToHrs = (parseInt(ISOTimePeriod[0]) - 1) * 24 // convert xxT to hrs
-      const periodOfTime = ISOTimePeriod[1] ? ISOTimePeriod[1].split(':') : null
-
-      if (!periodOfTime) return '00:00:00'
-
-      let timeString = ''
-      let HH = (DDToHrs + parseInt(periodOfTime[0])).toString()
-      let mm = periodOfTime[1]
-      let ss = periodOfTime[2]
-
-      if (HH.length === 1) HH = `0${HH}`
-
-      timeString = `${HH}:${mm}:${ss}`
-
-      return timeString
-    }
-  },
-  beforeUnmount() {
-    this.$bus.$off('start-timer', this.startTimer)
-    this.$bus.$off('stop-timer', this.stopTimer)
-    this.$bus.$off('pause-timer', this.pauseTimer)
-  },
-  mounted() {
-    this.$bus.$on('start-timer', this.startTimer)
-
-    this.$bus.$on('stop-timer', this.stopTimer)
-
-    this.$bus.$on('pause-timer', this.pauseTimer)
-
-    this.elapsedInterval = setInterval(() => {
-      this.elapsedCounter += 1
-    }, 1000)
-  },
-  computed: {
-    activityDuration() {
-      let duration
-      if (this.activityTimeCounter > 0)
-        duration = this.ISOTimeParser(this.activityTimeCounter)
-      else duration = '00:00:00'
-
-      return duration
-    },
-    lessonDuration() {
-      this.lessonTimeCounter = this.lessonTimeCounter + this.activityTimeCounter
-
-      let duration = this.ISOTimeParser(this.lessonTimeCounter)
-      return duration
-    },
-    elapsedTime() {
-      const eTime = this.elapsedCounter
-      return eTime
-    }
-  }
-}
+/*
+@ Description: Mixins to extends general fonctionnalities in a page of an activity. Add time tracker in activities
+@ Note: .
+*/
+export const timerMixin = {
+  data() {
+    return {
+      lessonTimeCounter: 0,
+      activityTimeCounter: 0,
+      elapsedCounter: 0, // count the elapse time since lesson started
+      activityInterval: null,
+      lessonInterval: null,
+      fullInterval: null,
+      timerState: 'stopped',
+      elapsedInterval: null // interval of passed time since the lesson is started. used only for saving purposed
+    }
+  },
+  methods: {
+    /* Start the timer */
+    startTimer(op) {
+      if (op && !['activity', 'lesson'].includes(op))
+        throw new Error('this is not a valid option for the timer')
+      if (this.timerState === 'stopped') {
+        switch (op) {
+          case 'activity':
+            this.activityInterval = setInterval(() => {
+              this.activityTimeCounter += 1
+            }, 1000)
+            this.timerState = 'started'
+
+            break
+
+          case 'lesson':
+            this.lessonInterval = setInterval(() => {
+              this.lessonTimeCounter += 1
+            }, 1000)
+            break
+
+          default:
+            this.fullInterval = setInterval(() => {
+              this.activityTimeCounter += 1
+              this.lessonTimeCounter += 1
+            }, 1000)
+        }
+      }
+    },
+    /* Stop the timer and reset  thimer to zero */
+    stopTimer(op) {
+      if (op && !['activity', 'lesson'].includes(op))
+        throw new Error('this is not a valid parameter')
+
+      if (this.timerState === 'started') {
+        if (op === 'activity' && this.activityTimeCounter > 0) {
+          this.lessonTimeCounter =
+            this.lessonTimeCounter + this.activityTimeCounter //add to the lesson counter
+          clearInterval(this.activityInterval) //clear the interval
+          this.activityTimeCounter = 0 // reset the counter
+          this.timerState = 'stopped'
+        } else if (op === 'lesson' && this.lessonTimeCounter > 0) {
+          clearInterval(this.lessonInterval)
+          this.lessonTimeCounter = 0
+        } else {
+          clearInterval(this.fullInterval)
+          clearInterval(this.elapsedCounter)
+          clearInterval(this.elapsedInterval)
+
+          this.activityTimeCounter = 0
+          this.lessonTimeCounter = 0
+          this.elapsedCounter = 0
+        }
+      }
+    },
+    /* Pause the timer but does not reset to zero*/
+    pauseTimer(op) {
+      if (op && !['activity', 'lesson'].includes(op))
+        throw new Error('this is not a valid parameter')
+
+      if (op === 'activity' && this.activityTimeCounter > 0) {
+        clearInterval(this.activityInterval)
+      } else if (op === 'lesson') {
+        clearInterval(this.lessonInterval)
+      } else {
+        clearInterval(this.fullInterval)
+        clearInterval(this.elapsedInterval)
+      }
+    },
+
+    /* Format seconds to ISO 8601 format */
+    formatToISOString(seconds) {
+      let d = new Date(null) //create a default date ref
+      d.setSeconds(seconds) //set the time with passed numbers of seconds
+      //Example of ISO 8601 time format of 24 chars: "1970-01-04T14:50:00.000Z"
+      let ISOTime = d.toISOString()
+
+      return ISOTime // YYYY-MM-DDTHH:mm:ss.sssZ
+    },
+
+    /* Parse a ISO string time period to the format of HH:mm:ss */
+    ISOTimeParser(seconds) {
+      let ISOTimePeriod = this.formatToISOString(seconds).substring(8, 19) // only the time portion of it
+      ISOTimePeriod = ISOTimePeriod.split('T')
+      const DDToHrs = (parseInt(ISOTimePeriod[0]) - 1) * 24 // convert xxT to hrs
+      const periodOfTime = ISOTimePeriod[1] ? ISOTimePeriod[1].split(':') : null
+
+      if (!periodOfTime) return '00:00:00'
+
+      let timeString = ''
+      let HH = (DDToHrs + parseInt(periodOfTime[0])).toString()
+      let mm = periodOfTime[1]
+      let ss = periodOfTime[2]
+
+      if (HH.length === 1) HH = `0${HH}`
+
+      timeString = `${HH}:${mm}:${ss}`
+
+      return timeString
+    }
+  },
+  beforeUnmount() {
+    this.$bus.$off('start-timer', this.startTimer)
+    this.$bus.$off('stop-timer', this.stopTimer)
+    this.$bus.$off('pause-timer', this.pauseTimer)
+  },
+  mounted() {
+    this.$bus.$on('start-timer', this.startTimer)
+
+    this.$bus.$on('stop-timer', this.stopTimer)
+
+    this.$bus.$on('pause-timer', this.pauseTimer)
+
+    this.elapsedInterval = setInterval(() => {
+      this.elapsedCounter += 1
+    }, 1000)
+  },
+  computed: {
+    activityDuration() {
+      let duration
+      if (this.activityTimeCounter > 0)
+        duration = this.ISOTimeParser(this.activityTimeCounter)
+      else duration = '00:00:00'
+
+      return duration
+    },
+    lessonDuration() {
+      this.lessonTimeCounter = this.lessonTimeCounter + this.activityTimeCounter
+
+      let duration = this.ISOTimeParser(this.lessonTimeCounter)
+      return duration
+    },
+    elapsedTime() {
+      const eTime = this.elapsedCounter
+      return eTime
+    }
+  }
+}

package/src/module/stores/appStore.js

@@ -672,7 +672,7 @@ export const useAppStore = defineStore('$appStore', {
     },
 
     /* set/update the Application configuration*/
-    setAppConfigs(data) {
+    async setAppConfigs(data) {
       this.appConfigs = data
       const {
         id,

package/src/module/xapi/ADL.js

@@ -154,7 +154,7 @@ export default class ADL {
     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['limit'] = 500 //limit of record to return by the LRS
+    params['limit'] = 200 //limit of record to return by the LRS
     params['ascending'] = true //ordered by the oldest statement recorded
 
     let date = new Date()
@@ -191,6 +191,7 @@ export default class ADL {
       } else {
         userData = {}
       }
+
       return userData
     } catch (err) {
       console.log(err)
@@ -245,7 +246,7 @@ 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['ascending'] = true //ordered by the oldest statement recorded
-    params['limit'] = 500 //limit of record to return by the LRS
+    params['limit'] = 200 //limit of record to return by the LRS
 
     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.
@@ -296,7 +297,7 @@ 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['ascending'] = true //ordered by the oldest statement recorded
-    params['limit'] = 500 //limit of record to return by the LRS
+    params['limit'] = 200 //limit of record to return by the LRS
 
     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.
@@ -345,7 +346,7 @@ 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['ascending'] = true //ordered by the oldest statement recorded
-    params['limit'] = 500 //limit of record to return by the LRS
+    params['limit'] = 200 //limit of record to return by the LRS
 
     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.
@@ -377,4 +378,143 @@ export default class ADL {
     }
     return playbarValues[0] ? playbarValues[0] : {}
   }
+  /**
+   * Method to get a multiple concurent requests using promiseAll to the server
+   * and return all data at once.
+   * the following request are made to the server:
+   * get application-settings: saved value for the user preferred settings
+   * get user-data: saved values for user progression
+   * get playbar-value : saved value for the medias play-bar
+   * get lesson-status : saved value for the lession status
+   *
+   * @param {Array} searchParams - Array of Object with key value representing each search paremeter.
+   * a parameter object definition is expected to have the following signature:
+   *     {
+   *        email{String} agent email,
+   *        verb {String} verb for the request,
+   *        activityId {String} - activity id ,
+   *      }
+   * @example here is an exemple of the search param:
+   *  {email: 'wizardy0@mymailbox.com', verb: 'completed',activityId:'"http://localhost:5173/vuetify_p4/v3"' }
+   * @return {object} data with a collection of all the reponses
+   *            from the promiseAll  and the status of last request
+   */
+  async _getBulkData(searchParams) {
+    const validVerbs = [
+      'progressed',
+      'completed',
+      'suspended',
+      'terminated',
+      'preferred',
+      'played',
+      'exited'
+    ]
+
+    const paramList = []
+    // account statement registered today.
+    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
+
+    for (let param of searchParams) {
+      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['until'] = dd
+      paramList.push(params)
+    }
+    const { response } = await this.XAPIWrapper.getStatements(paramList)
+
+    let userData = {},
+      playbarValues = {},
+      preferredSettings = {},
+      lessonStatus = {},
+      savedPoint = ''
+
+    if (response && response.length > 0) {
+      for (const res of response) {
+        const { statements } = await res.json()
+        if (!statements || statements.length == 0) continue
+
+        let lastRecord = statements.toReversed()[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 : {}
+        }
+
+        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('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
+              }
+            }
+          })
+        }
+      }
+    }
+
+    return {
+      userData,
+      savedPoint,
+      preferredSettings,
+      playbarValues,
+      lessonStatus
+    }
+  }
 }