fcad-core-dragon 2.3.0-test.5 → 2.3.0-test.6

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [2.3.0-test.6](https://git.crosemont.qc.ca/fcad/core/fcad-core-2/compare/v2.3.0-test.5...v2.3.0-test.6) (2026-05-01)
+
+
+### Bug Fixes
+
+* **Git Page:** Application ne ce lance pas correctement lorsque le projet est deployé sur serveur non cegepadistance. ([2683336](https://git.crosemont.qc.ca/fcad/core/fcad-core-2/commit/2683336bd0928c2550f7d1266675beda8465d580))
+
 # [2.3.0-test.5](https://git.crosemont.qc.ca/fcad/core/fcad-core-2/compare/v2.3.0-test.4...v2.3.0-test.5) (2026-04-20)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fcad-core-dragon",
-  "version": "2.3.0-test.5",
+  "version": "2.3.0-test.6",
   "private": false,
   "type": "module",
   "main": "./src/main.js",

package/src/components/AppBasePage.vue

@@ -524,11 +524,11 @@ export default {
     completePage() {
       if (
         ['pg_menu', 'pg_branch'].includes(this.type) ||
-        this.state == 'completed' ||
-        this.isBranchingPage
+        this.state == 'completed'
       )
         return
 
+
       this.state = 'completed'
       this.userInteraction.state = this.state
     },

package/src/components/AppCompBranchButtons.vue

@@ -55,7 +55,6 @@ Si la composante est appelée sans prop, les boutons par défaut seront génér
 
           <app-comp-button-progress
             :set-target="sidebar"
-            :percent="branch.progression ? branch.progression : 0"
             :branch-data="branch"
             :btn-title="getMatchingElement(branch.id).btnTitle"
             no-interaction
@@ -69,7 +68,6 @@ Si la composante est appelée sans prop, les boutons par défaut seront génér
             <v-card-title v-html="branch.title"></v-card-title>
             <app-comp-button-progress
               :set-target="sidebar"
-              :percent="branch.progression ? branch.progression : 0"
               :branch-data="branch"
               :btn-title="getMatchingElement(branch.id).btnTitle"
             ></app-comp-button-progress>
@@ -80,7 +78,6 @@ Si la composante est appelée sans prop, les boutons par défaut seront génér
         <div v-else class="branch-btn-wrapper">
           <app-comp-button-progress
             :set-target="sidebar"
-            :percent="branch.progression ? branch.progression : 0"
             :branch-data="branch"
             :btn-title="branch.text"
           ></app-comp-button-progress>
@@ -99,10 +96,6 @@ export default {
     AppCompButtonProgress
   },
   props: {
-    consigne: {
-      type: Boolean,
-      default: false
-    },
     sidebar: {
       type: String,
       default: 'branch-viewer'
@@ -202,7 +195,7 @@ export default {
       radius: svgRadius,
       circumference: svgRadius * 2 * Math.PI,
       branchs: null,
-      branchsStateData: null,
+      branchsStateData: [],
       idActivity: null,
       isCustomButton: false,
       isCard: false,
@@ -237,11 +230,12 @@ export default {
       deep: true,
       //watch the completions to update the branches progression
       handler() {
+
         if (
           this.getAllCompleted[this.idActivity] &&
           this.getAllCompleted[this.idActivity].length
         )
-          this.getbranchsData()
+        this.UpdateBranchProgress()
       }
     }
   },
@@ -251,102 +245,77 @@ export default {
     this.idActivity = this.$router.currentRoute.value.meta.activity_ref
     this.branchs = this.$router.currentRoute.value.meta.children
 
-    this.getbranchsData()
+    this.WhatToLoad()
   },
   methods: {
     /**
-     * @description Method to get the progression for a branch
-     *
+     * @description Method used to sort according to input type
      */
-    getbranchsData() {
-      this.branchsStateData = []
-      this.branchs.forEach((branch, index) => {
-        let branchData = {}
-        branchData.id = branch._ref
-        branchData.route = branch._namedRoute
-        let { state = 'new', progression = 0 } = this.getBranchProgression(
-          branchData.id
-        )
+    WhatToLoad(){
 
-        branchData.state = state
-        branchData.progression = progression
-        if (isNaN(branchData.progression)) branchData.progression = 0
-
-        if (this.isCard && this.getMatchingElement(branchData.id)) {
-          const { title, text, imgFile, imgAlt, btnTitle } =
-            this.getMatchingElement(branchData.id)
-
-          branchData = {
-            ...branchData,
-            text,
-            title,
-            imgFile,
-            imgAlt,
-            btnTitle
-          }
+      if(this.cards){
+        this.cards.forEach((e)=>{
+          this.ColletBranchData(e)
+        })
+      }
 
-          if (
-            typeof branchData.imgAlt === 'undefined' &&
-            branchData.imgFile === 'undefined' &&
-            import.meta.env.DEV
-          ) {
-            branchData.imgAlt = ''
-            console.warn(
-              `Bouton d’embranchement: ALT image sans valeur définie pour ${branchData.id}`
-            )
-          }
-        }
-        this.branchsStateData[index] = branchData
-      })
+      if(this.customButtons){
+        this.customButtons.forEach((e)=>{
+          this.ColletBranchData(e)
+        })
+      }
     },
-
     /**
-     * @description Method to get the progression for a branch
-     * @param {String} idBranch the id of the branch ex: "P01_E01"
-     * @return {Number} Return the percentage of completion (from 0 to 100) and the current state of a specific branch
+     * @description Method responsible for gathering all the information used to build the card or button
+     * @param {object} DataCard
+     * @return {Array} branchsStateData collection of all card or button to create
      */
-    getBranchProgression(idBranch) {
-      let result = { state: null, progression: null }
+    ColletBranchData(DataCard){
 
-      if (!this.getAllCompleted[this.idActivity]) return result // no progression found for this activity return result
+      let branchData = {}
 
-      const total = this.getBranchPagesCount(idBranch) // get all pages for in this branch
-      //get all completed branches pages
-      const completedPages = this.getAllCompleted[this.idActivity].filter(
-        (page) => {
-          return Object.keys(page)[0].search(idBranch) !== -1
-        }
-      )
-      result.progression = Math.floor((completedPages.length / total) * 100)
+      let options = ['text','title','imgFile','imgAlt']
 
-      if (isNaN(result.progression)) result.progression = 0
+      branchData = options.reduce((acc, opt)=>{
+        acc[opt] = opt in DataCard ? DataCard[opt]: null;
+        return acc
+      }, {})
 
-      if (result.progression === 0) {
-        result.state = this.status.NEW
-      } else if (result.progression === 100) {
-        result.state = this.status.COMPLETE
-      } else {
-        result.state = this.status.STARTED
+      branchData.id = DataCard.brchName
+
+      this.branchs.forEach((e)=>{
+        if(e._ref == branchData.id )
+          branchData.route = e._namedRoute
+      })
+
+      if(!this.branchsStateData.length) this.branchsStateData.push(branchData)
+      else{
+        this.branchsStateData.forEach((e)=>{
+          if(e.id != branchData.id){
+            this.branchsStateData.push(branchData)
+          }
+        })
       }
-      return result
-    },
 
+    },
     /**
-     * @description Method to get the numbers of pages in a branch
-     * @param {String} idBranch the id of the branch ex: "A02_E01_P01"
-     * @return {Array} /Return the total of pages in a specific branch
+     * @description Method that updates the progression state of a branch
+     * @param N/A
+     * @return {String}  Update State
      */
-    getBranchPagesCount(idBranch) {
-      if (this.$router.currentRoute.value.meta.type !== 'branching') return
-
-      const allPages = this.getAllActivities()
-        .list.get(this.idActivity)
-        .get(this.$router.currentRoute.value.meta.id)
-        .get(idBranch)
+    UpdateBranchProgress(){
+      if(!this.branchsStateData.length) return
+      let act = this.getAllCompleted[this.idActivity]
+      let t
+      this.branchsStateData.forEach((e)=>{
+        t = e.id
+
+        act.forEach((a)=>{
+          if(a.hasOwnProperty(t)) e.state = a[t]
+        })
+      })
 
-      return allPages.size ? allPages.size : 1
     },
-
     /**
      * @description Method to validate data in the prop card|customButton.
      * @param {String} propName  The name of the property card|customButton
@@ -356,14 +325,14 @@ export default {
       let isValid = true
       let errMsg = false
 
-      switch (propName) {
+       switch (propName) {
         case 'cards': {
           // verify that numbers of element is equal to number
           //card must have at least 2 elements
           if (
             this.cards.constructor !== Array ||
-            this.cards.length !== this.branchs.length
-          ) {
+            this.cards.length < 1
+           ) {
             isValid = false
             errMsg = `La propriété cards doit être un tableau contenant ${this.branchs.length} elements`
           } else {
@@ -387,6 +356,7 @@ export default {
                   b._ref.includes(el.brchName)
                 )
 
+
                 if (!searchEl) {
                   errMsg = `Aucune branch correspondante avec le nom ${el.brchName} pour la carte ${
                     index + 1
@@ -404,7 +374,7 @@ export default {
         case 'customButtons': {
           if (
             this.customButtons.constructor !== Array ||
-            this.customButtons.length !== this.branchs.length
+            this.customButtons.length < 1
           ) {
             isValid = false
             errMsg = `La propriété customButtons doit être un tableau contenant ${this.branchs.length} elements`
@@ -470,7 +440,6 @@ export default {
 
       return errMsg
     },
-
     /**
      * @description methode to retive matching data of branch in the prop card| customButton
      * @param {String} id The id of the branch

package/src/components/AppCompButtonProgress.vue

@@ -41,11 +41,6 @@ export default {
       type: Boolean,
       default: false
     },
-    percent: {
-      type: [Number],
-      default: 0,
-      required: true
-    },
     branchData: {
       type: Object,
       required: true
@@ -72,7 +67,7 @@ export default {
       status: {
         NEW: 'new',
         STARTED: 'started',
-        COMPLETE: 'complete'
+        COMPLETE: 'completed'
       },
       withRouter: false, //Only for demo purpose. Remove after demo
       isActive: false,

package/src/components/AppCompInputDropdownNx.vue

@@ -202,7 +202,6 @@ export default {
      * @Return a collection of item representing the options for a the selectables
      */
     getItemOptions(index) {
-      console.log(Object.values(this.mappedOptions[index])[0])
       return Object.values(this.mappedOptions[index])[0]
     },
     /**

package/src/components/AppCompTableOfContent.vue

@@ -284,10 +284,12 @@ export default {
       let tabcomplete = []
 
       if (nextIndex < menuInfo[this.activity].anchors.length) {
+        //console.log('dans le premier if')
         nextSec = menuInfo[this.activity].anchors[nextIndex].pageRef
       }
 
       if (nextSec != undefined) {
+        //  console.log('dans le Deuxieme if')
         nb = parseInt(nextSec.substring(1))
 
         while (nb > parseInt(curSec.substring(1))) {
@@ -300,14 +302,20 @@ export default {
           let numPage = this.getAllActivitiesState[this.activity].size
 
           for (let g = 1; g == numPage; g++) {
-            tabPageSec.push(`P${g}`)
+            if(g<10){
+              tabPageSec.push(`P0${g}`)
+            }else{
+              tabPageSec.push(`P${g}`)
+            }
           }
+
           if (
             typeof this.getAllCompleted[this.activity] !== 'undefined' &&
             this.getAllCompleted[this.activity].length !==
               this.getAllActivitiesState[this.activity].size
           )
-            return false
+          return
+
         }
         tabPageSec.push(curSec)
       }

package/src/main.js

@@ -131,6 +131,7 @@ export default {
           if (name !== 'initializeApp') return
           let { appConfigs } = appStore.$state
           let { remote = false, specification } = appConfigs
+
           const c = await configConnection(appConfigs)
           store.lrsConfig = c
           const { $scorm, $xapi, $idb } = app.config.globalProperties
@@ -139,21 +140,22 @@ export default {
               auth,
               endpoint,
               registration = $xapi.ruuid()
-            } = store.lrsConfig
-
-            const config = {
-              auth,
-              endpoint,
-              registration,
-              activity_platform: `SIPI_organizationId`
+            } = store?.lrsConfig ?? {}
+
+            if (auth && endpoint) {
+              const config = {
+                auth,
+                endpoint,
+                registration,
+                activity_platform: `SIPI_organizationId`
+              }
+              // configure and launch LRS
+              $xapi._configLRS(config)
             }
-
-            $xapi._configLRS(config) // configure and launch LRS
           }
 
           //Configure connection with the Data from appBase
           //===================================================
-
           const activity_id = c ? c.activity_id : null
 
           //Redefine actor with  value from connection informtion
@@ -191,6 +193,9 @@ export default {
             if (lessonPosition) appStore.setLessonPosition([lessonPosition])
             if (completedState) appStore.setCompletionState(completedState)
           }
+
+          if (window.location.hostname !== 'localhost') remote = false
+
           //Open Connection to IDB and Save the store state to localDB
           let dbStoreActive =
             !window.location.hostname.includes('cegepadistance.ca') && !remote
@@ -334,6 +339,8 @@ export default {
           }
           break
         }
+        default:
+          connectionInfo = null
       }
 
       return connectionInfo
@@ -346,7 +353,6 @@ export default {
         $idb,
         actor,
         activity_id,
-        crs_id,
         idb_id,
         specification,
         remote

package/tests/unit/AppCompBranchButtons.spec.js

@@ -80,32 +80,6 @@ describe('AppCompBranchButtons.vue', () => {
     vi.clearAllMocks()
   })
 
-  it('Renders ErrorDisplay when cards has errors', async () => {
-    const wrapper = mount(AppCompBranchButtons, {
-      global: globalConfig,
-      props: {
-        cards: [dummyProps.cards[0], dummyProps.cards[1]] // Only 2 cards passed instead of 3
-      }
-    })
-
-    await wrapper.vm.$nextTick() // Must wait for DOM updates to display AppBaseErrorDisplay
-
-    if (wrapper.vm.hasErrors) {
-      const cards = wrapper.vm.cards
-      console.log(colors.green, `\n ✅ Current cards: ${JSON.stringify(cards)}`)
-      console.log(
-        '✅ wrapper.vm.hasErrors:',
-        wrapper.vm.hasErrors,
-        colors.reset
-      )
-    }
-    // Error should be displayed
-    expect(wrapper.vm.hasErrors.length).toBeGreaterThan(0)
-    expect(
-      wrapper.findComponent({ name: 'AppBaseErrorDisplay' }).exists()
-    ).toBe(true)
-  })
-
   it('Renders ErrorDisplay when customButtons has errors', async () => {
     const wrapper = mount(AppCompBranchButtons, {
       global: globalConfig,
@@ -166,7 +140,6 @@ describe('AppCompBranchButtons.vue', () => {
     ).not.toBe(true)
     // element to rendered correctly in DOM
     expect(wrapper.find('#branch-buttons-component').exists()).toBe(true)
-    //should display 3 buttons
-    expect(wrapper.findAll('.branch-btn').length).toBe(3)
+
   })
 })