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

package/.releaserc

@@ -1,9 +1,18 @@
 {
   "branches": [
     "master",
-    { "name": "beta", "prerelease": true },
-    { "name": "alpha", "prerelease": true },
-    { "name": "test", "prerelease": true }
+    {
+      "name": "beta",
+      "prerelease": true
+    },
+    {
+      "name": "alpha",
+      "prerelease": true
+    },
+    {
+      "name": "test",
+      "prerelease": "test"
+    }
   ],
   "plugins": [
     "@semantic-release/commit-analyzer",
@@ -18,7 +27,10 @@
     [
       "@semantic-release/git",
       {
-        "assets": ["package.json", "CHANGELOG.md"],
+        "assets": [
+          "package.json",
+          "CHANGELOG.md"
+        ],
         "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
       }
     ],

package/CHANGELOG.md

@@ -1,10 +1,17 @@
+# [2.3.0-test.2](https://git.crosemont.qc.ca/fcad/core/fcad-core-2/compare/v2.3.0-test.1...v2.3.0-test.2) (2026-04-10)
+
+
+### Bug Fixes
+
+* **server connection:** remote parameter prevent production build to connect to LRS when deployed on Moodle ([994e702](https://git.crosemont.qc.ca/fcad/core/fcad-core-2/commit/994e702ce0ed69633798adec8830d33b87680e92))
+
 # [2.3.0-test.1](https://git.crosemont.qc.ca/fcad/core/fcad-core-2/compare/v2.2.0...v2.3.0-test.1) (2026-03-27)
 
 
 ### Bug Fixes
 
-* **ci-config:** fixed the rule for npm deployment on granches beta, apha and test ([38923e7](https://git.crosemont.qc.ca/fcad/core/fcad-core-2/commit/38923e7ad775795f2ea27f0d304915a740185892))
-* **ci-config:** fixed the rule for npm deployment on granches beta, apha and test ([808d3de](https://git.crosemont.qc.ca/fcad/core/fcad-core-2/commit/808d3de37bf1d03d420e05fa13412ce17ca72ad1))
+* **ci-config:** fixed the rule for npm deployment on branches beta, apha and test ([38923e7](https://git.crosemont.qc.ca/fcad/core/fcad-core-2/commit/38923e7ad775795f2ea27f0d304915a740185892))
+* **ci-config:** fixed the rule for npm deployment on branches beta, apha and test ([808d3de](https://git.crosemont.qc.ca/fcad/core/fcad-core-2/commit/808d3de37bf1d03d420e05fa13412ce17ca72ad1))
 * **dependencies:** fixed depentencies conflicts causing npm ci to fail ([469918e](https://git.crosemont.qc.ca/fcad/core/fcad-core-2/commit/469918e24d0b2948adf7d2f0135d80aeba2b35a8))
 * remaning release config file to .releaserc ([2a746d0](https://git.crosemont.qc.ca/fcad/core/fcad-core-2/commit/2a746d0b294577128937a22fae8f556984e97fda))
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fcad-core-dragon",
-  "version": "2.3.0-test.1",
+  "version": "2.3.0-test.2",
   "private": false,
   "type": "module",
   "main": "./src/main.js",
@@ -28,7 +28,6 @@
     "axios": "^1.6.8",
     "gsap": "^3.12.5",
     "idb": "^8.0.0",
-    "mathjs": "^15.1.0",
     "mobile-detect": "^1.4.5",
     "pinia": "^3.0.3",
     "tiny-emitter": "^2.1.0",

package/src/components/AppBase.vue

@@ -205,7 +205,9 @@ export default {
     appReady: {
       handler(newValue) {
         if (newValue) {
-          this.setInitialLoadingDone()
+          this.$nextTick(() => {
+            this.setInitialLoadingDone()
+          })
         }
       }
     }
@@ -372,8 +374,9 @@ export default {
       )
     },
 
-    setInitialLoadingDone() {
+    async setInitialLoadingDone() {
       this.initialLoading = false
+
       if (this.bookmarkActive) {
         const bookmark = this.getLessonPosition[0]
         this.$router.push({ name: bookmark })
@@ -763,11 +766,25 @@ 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
+            })()
           },
           {
             id: 'user-data',
@@ -775,15 +792,11 @@ export default {
               routeHistory: (() => {
                 const history = this.getRouteHistory.toReversed() //get the route history from the last
 
-                history[0] = this.$route.meta // change the last recored route to the current route
+                if (this.$route.name !== 'menu') history[0] = this.$route.meta // change the last recored route to the current route
 
                 return history.toReversed()
               })(),
-              savedPoint: (() =>
-                this.$route.name == 'menu'
-                  ? this.$helper.getRoutesFromVueRouter().meta.children[0]
-                      ._namedRoute
-                  : this.$route.name)(),
+
               playbarValues: {
                 ...this.getMediaPlaybarValues()
               },
@@ -918,7 +931,6 @@ export default {
           }
 
           const fetchParams = [lessonProgressParam, lessonStateParam]
-
           const { userData, savedPoint, playbarValues, lessonStatus } =
             await this.$xapi._getBulkData(fetchParams)
 

package/src/components/AppBaseModule.vue

@@ -374,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
@@ -468,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)
@@ -545,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)
@@ -661,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
@@ -669,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
@@ -849,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)
       })
@@ -1013,7 +1018,6 @@ export default {
 
       // Add route route in history
       this.routeData.push(from.meta)
-
       if (this.routeData.length >= 4) this.routeData.shift()
     },
 
@@ -1419,15 +1423,12 @@ export default {
                   routeHistory: (() => {
                     const history = this.getRouteHistory.toReversed() //get the route history from the last
 
-                    history[0] = this.$route.meta // change the last recored route to the current route
+                    if (this.$route.name !== 'menu')
+                      history[0] = this.$route.meta // change the last recored route to the current route
 
                     return history.toReversed()
                   })(),
-                  savedPoint: (() =>
-                    this.$route.name == 'menu'
-                      ? this.$helper.getRoutesFromVueRouter().meta.children[0]
-                          ._namedRoute
-                      : this.$route.name)(),
+
                   playbarValues: {
                     ...this.getMediaPlaybarValues()
                   },
@@ -1481,15 +1482,11 @@ export default {
                     routeHistory: (() => {
                       const history = this.getRouteHistory.toReversed() //get the route history from the last
 
-                      history[0] = this.$route.meta // change the last recored route to the current route
+                      if (this.$route.name !== 'menu')
+                        history[0] = this.$route.meta // change the last recored route to the current route
 
                       return history.toReversed()
                     })(),
-                    savedPoint: (() =>
-                      this.$route.name == 'menu'
-                        ? this.$helper.getRoutesFromVueRouter().meta.children[0]
-                            ._namedRoute
-                        : this.$route.name)(),
                     playbarValues: {
                       ...this.getMediaPlaybarValues()
                     },

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/main.js

@@ -340,7 +340,7 @@ export default {
     }
     /* Local Method for data fetching */
     const fetchDatasFromServer = async (config) => {
-      const {
+      let {
         $scorm,
         $xapi,
         $idb,
@@ -352,7 +352,10 @@ 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'
@@ -416,18 +419,13 @@ export default {
 
             const fetchParams = [lessonProgressParam, lessonStateParam]
 
-            const { userData, preferredSettings, lessonStatus } =
+            const { userData, preferredSettings, lessonStatus, savedPoint } =
               await $xapi._getBulkData(fetchParams)
 
-            const {
-              routeHistory = [],
-              savedPoint,
-              playbarValues,
-              ...progress
-            } = userData
+            const { routeHistory = [], playbarValues, ...progress } = userData
 
             const completedState = lessonStatus || {}
-            const lessonPosition = savedPoint || ''
+            const lessonPosition = savedPoint.name ? savedPoint : null
 
             data = {
               progress,

package/src/module/xapi/ADL.js

@@ -4,7 +4,6 @@ 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
 
@@ -284,7 +283,7 @@ export default class ADL {
       }
     }
 
-    return savedPoint && savedPoint.length > 0 ? savedPoint[0] : ''
+    return savedPoint && savedPoint.length > 0 ? savedPoint[0] : null
   }
 
   /* @description: Helper to get the Preferred Settings of the user
@@ -435,7 +434,8 @@ export default class ADL {
     }
     let userData = {},
       preferredSettings = {},
-      lessonStatus = {}
+      lessonStatus = {},
+      savedPoint = null
 
     let { response } = await this.XAPIWrapper.getStatements(paramList)
 
@@ -492,6 +492,14 @@ export default class ADL {
 
               break
             }
+            case extension.includes('ending-point'): {
+              const dataExtension = allExtensionsKeys.filter((extension) =>
+                extension.includes('ending-point')
+              )
+              savedPoint =
+                lastRecord.object.definition.extensions[dataExtension[0]]
+              break
+            }
             default: {
               return
             }
@@ -503,7 +511,8 @@ export default class ADL {
     return {
       userData,
       lessonStatus,
-      preferredSettings
+      preferredSettings,
+      savedPoint
     }
   }
 }

package/src/router/index.js

@@ -31,7 +31,6 @@ router.beforeResolve((to, from, next) => {
   if (getWidgetOpen) app.config.globalProperties.$bus.$emit('close-widget') //close opened widget
   if (getPopupIsOpen) app.config.globalProperties.$bus.$emit('close-popup') //close the popup
   if (getSidebarIsOpen) app.config.globalProperties.$bus.$emit('close-sidebar') //close the sidebar
-
   if (from.name !== 'module')
     app.config.globalProperties.$bus.$emit('update-route-history', from)
 

package/src/shared/generalfuncs.js

@@ -129,9 +129,9 @@ const fileAssets = {
   },
 
   /**
-   * @description Validator for the content of menu setting file
+   * @description build a map tree of all the file in the folder
+   * './src/module' of the project with name respecting following condition:
    * @param {String} a- array of file for use case
-   * @param {Object} [requiredArgs] list of arguments to include consider in validation ()
    */
   buildMapTree: (a) => {
     // Load files in module folder

package/src/components/AppCompInputMath.vue

@@ -1,20 +0,0 @@
-<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>