fcad-core-dragon 2.0.0-beta.9 → 2.0.1-beta.0

package/src/mixins/timerMixin.js

@@ -1,155 +1,195 @@
-/*
-@ 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,
+      activityInterval: null,
+      lessonInterval: null,
+      fullInterval: null,
+      timerState: 'stopped',
+      idleCounter: 0,
+      idleTimeoutID: null,
+      idleTimeout: 5 * 60000, //5 mins
+      idleTimer: null
+    }
+  },
+  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)
+            break
+
+          case 'lesson':
+            this.lessonInterval = setInterval(() => {
+              this.lessonTimeCounter += 1
+            }, 1000)
+            break
+
+          default:
+            this.fullInterval = setInterval(() => {
+              this.activityTimeCounter += 1
+              this.lessonTimeCounter += 1
+            }, 1000)
+        }
+        this.timerState = 'started'
+      }
+    },
+    /* 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
+        } else if (op == 'lesson' && this.lessonTimeCounter > 0) {
+          clearInterval(this.lessonInterval)
+          this.lessonTimeCounter = 0
+        } else {
+          clearInterval(this.activityInterval) //clear the interval
+          clearInterval(this.fullInterval)
+          clearInterval(this.lessonInterval)
+          clearInterval(this.elapsedCounter)
+
+          this.activityTimeCounter = 0
+          this.lessonTimeCounter = 0
+          this.elapsedCounter = 0
+        }
+        this.timerState = 'stopped'
+      }
+    },
+    /* 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.elapsedCounter)
+      }
+      this.timerState = 'stopped'
+    },
+    /*
+     * Inialize the idle Timer,
+     * create a  timer to trick time passed since idle is start
+     * create a countdown to pause activity timer
+     */
+    startIdleTimer() {
+      this.idleTimer = setInterval(() => {
+        this.idleCounter += 1
+      }, 1000)
+      this.idleTimeoutID = setTimeout(
+        () => this.pauseTimer('activity'),
+        this.idleTimeout
+      )
+    },
+    /*
+     * reset idle timer .
+     * retart the activity counter
+     */
+    resetIdleTimer() {
+      this.stopIdleTimer()
+      if (this.timerState == 'stopped') this.startTimer('activity')
+      this.startIdleTimer()
+    },
+    /**
+     * clear  idle timer
+     * clear idle countdown
+     * reset idle counter
+     */
+    stopIdleTimer() {
+      this.idleCounter = 0
+      clearInterval(this.idleTimer)
+      clearTimeout(this.idleTimeoutID)
+    },
+
+    /* 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('timer-start', this.startTimer)
+    this.$bus.$off('timer-tart', this.stopTimer)
+    this.$bus.$off('timer-pause', this.pauseTimer)
+    this.$bus.$off('stop-idle-timer', this.stopIdleTimer)
+    this.$bus.$off('start-idle-timer', this.startIdleTimer)
+  },
+  mounted() {
+    this.$bus.$on('timer-start', this.startTimer)
+    this.$bus.$on('timer-stop', this.stopTimer)
+    this.$bus.$on('timer-pause', this.pauseTimer)
+    this.$bus.$on('start-idle-timer', this.startIdleTimer)
+    this.$bus.$on('stop-idle-timer', this.stopIdleTimer)
+  },
+  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
+    },
+    elapsedIdleTime() {
+      return this.idleCounter
+    },
+    timerCurrentState() {
+      return this.timerState
+    }
+  }
+}

package/src/module/stores/appStore.js

@@ -628,7 +628,7 @@ export const useAppStore = defineStore('$appStore', {
       this.introAcitve = status
     },
 
-    setAppDebugMode(state, bool) {
+    setAppDebugMode(bool) {
       this.appDebugMode = bool
     },
 
@@ -641,7 +641,7 @@ export const useAppStore = defineStore('$appStore', {
     setDeviceType(device) {
       this.deviceType = device
     },
-    setErrorMenu(state, error) {
+    setErrorMenu(error) {
       this.errMenuSetting = error
     },
     setApplicationSettings(settings) {
@@ -652,7 +652,7 @@ export const useAppStore = defineStore('$appStore', {
       this.mediaVolume = volume
     },
 
-    setMediaMuted(state, bool) {
+    setMediaMuted(bool) {
       this.mediaMuted = bool
     },
 

package/src/module/xapi/ADL.js

@@ -191,7 +191,6 @@ export default class ADL {
       } else {
         userData = {}
       }
-
       return userData
     } catch (err) {
       console.log(err)