fcad-core-dragon 2.5.0-test.2 → 2.5.0-test.4

package/CHANGELOG.md

@@ -1,3 +1,20 @@
+# [2.5.0-test.4](https://git.crosemont.qc.ca/fcad/core/fcad-core-2/compare/v2.5.0-test.3...v2.5.0-test.4) (2026-06-17)
+
+
+### Bug Fixes
+
+* **quiz:** ajout nouveau quiz dans quiz ([2303128](https://git.crosemont.qc.ca/fcad/core/fcad-core-2/commit/23031281322e5b2cc8a493a88d31dd53a873f9ec))
+* **quiz:** correction ([2e45cd4](https://git.crosemont.qc.ca/fcad/core/fcad-core-2/commit/2e45cd4400abbf463dab2f5a86d87011959bd7a8))
+* **quiz:** correction enregistrer faute d'authographe ([c2d62cf](https://git.crosemont.qc.ca/fcad/core/fcad-core-2/commit/c2d62cf44c1adf15be8bb11808ef6412c5f94d72))
+* **quiz:** fix du quiz catégorie ([0732fd4](https://git.crosemont.qc.ca/fcad/core/fcad-core-2/commit/0732fd4fab65598506b871d98c6647aa193f8207))
+
+# [2.5.0-test.3](https://git.crosemont.qc.ca/fcad/core/fcad-core-2/compare/v2.5.0-test.2...v2.5.0-test.3) (2026-06-15)
+
+
+### Features
+
+* **fix:** correction du calcul du pourcentage de completion ([98b98ab](https://git.crosemont.qc.ca/fcad/core/fcad-core-2/commit/98b98ab6e55d15211d0bb58b7851cd63ce15ad25))
+
 # [2.5.0-test.2](https://git.crosemont.qc.ca/fcad/core/fcad-core-2/compare/v2.5.0-test.1...v2.5.0-test.2) (2026-06-09)
 
 

package/package.json

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

package/src/components/AppBasePage.vue

@@ -528,7 +528,6 @@ export default {
       )
         return
 
-
       this.state = 'completed'
       this.userInteraction.state = this.state
     },

package/src/components/AppCompInputCategorieCheckBoxNx.vue

@@ -120,9 +120,7 @@ export default {
         return this.$bus.$emit('input-error', { e: this.id, errors })
     }
   },
-  mounted() {
-  },
-
+  mounted() {},
   methods: {
     /**
      * @description validate the raw data received by the component to render is view

package/src/components/AppCompMenuItem.vue

@@ -156,7 +156,9 @@ export default {
           completed = this.getAllCompleted[idActivity] //get all completed page for the activity
         }
 
-        return completed.length
+        let noBranch = completed.filter(item => !Object.keys(item)[0].includes("_"))
+
+        return noBranch.length
       }
     },
     /**
@@ -174,10 +176,15 @@ export default {
       const allActivitiesState = JSON.parse(
         JSON.stringify(this.getAllActivitiesState)
       )
+
+      const actList = this.getAllActivities().list
+
       let size = allActivitiesState[activityID]
-        ? allActivitiesState[activityID].size
+        ? actList.get(activityID).size
         : 0
 
+      // console.log(activityID,size)
+
       return size
     },
     createRoutes(data) {

package/src/components/AppCompQuizNext.vue

@@ -95,6 +95,9 @@ export default {
     AppCompInputCheckBox: defineAsyncComponent(
       () => import('./AppCompInputCheckBoxNx.vue')
     ),
+    AppCompInputCategorieCheckBoxNx: defineAsyncComponent(
+      () => import('./AppCompInputCategorieCheckBoxNx.vue')
+    ),
     AppCompInputDropdown: defineAsyncComponent(
       () => import('./AppCompInputDropdownNx.vue')
     ),
@@ -179,6 +182,7 @@ export default {
     ]),
     quizElement() {
       const propMapping = {
+        choix_catergorie: 'inputData',
         choix_reponse: 'inputData',
         texte_base: 'textBase',
         max_essai: 'maxEssai'
@@ -228,6 +232,9 @@ export default {
         case type_question == 'choix_mult':
           inputComponent = 'AppCompInputCheckBox'
           break
+        case type_question == 'choix_mult_cat':
+          inputComponent = 'AppCompInputCategorieCheckBoxNx'
+          break
         case type_question == 'reponse_ouverte':
           inputComponent = 'AppCompInputTextBox'
           break
@@ -437,10 +444,17 @@ export default {
 
       this.totalAttempts = total_attempts
       if (this.quizLimitActive) this.quizCompleted = true //Signal that quiz has been completed
-      let isExecption = ['choix_unique']
-      if (isExecption.includes(type_question)) {
-        this.isReady = true
-        return (this.response = [value])
+      let isException = ['choix_unique','choix_mult_cat']
+      if (isException.includes(type_question)) {
+         switch(type_question){
+          case 'choix_unique' :
+            this.isReady = true
+            return (this.response = [value])
+          case 'choix_mult_cat' :
+           this.isReady = true
+           this.response = value.map((e) => { return e.map((a) => (a.selected)) })
+           return this.response
+        }
       }
 
       this.response = value.map((a) => (a = a.filled || a.selected))

package/src/components/AppCompTableOfContent.vue

@@ -11,7 +11,6 @@
   <div v-if="error" id="sidebar-submenu" :class="{ isOpen: isOpened }">
     <focus-trap :active="isOpened" :prevent-scroll="true">
       <div ref="target">
-        <!-- <div class="submenu-header"> -->
         <app-base-button
           id="close-toc"
           class="btn-ghost"
@@ -22,9 +21,7 @@
             <use href="#close-square-icon" />
           </svg>
         </app-base-button>
-        <!-- </div> -->
 
-        <!-- <div class="submenu-content"> -->
         <p class="t-act" v-html="`${title}`"></p>
         <div class="box-prog-act">
           <p>
@@ -100,6 +97,7 @@ export default {
       'getAnchorsForActivity',
       'getBifChoice',
       'getAllCompleted',
+      'getAllActivities',
       'getAllActivitiesState'
     ])
   },
@@ -249,15 +247,20 @@ export default {
           completed = this.getAllCompleted[idActivity] //get all completed page for the activity
         }
 
+        let noBranch = completed.filter(item => !Object.keys(item)[0].includes("_"))
+
         const allActivitiesState = JSON.parse(
           JSON.stringify(this.getAllActivitiesState)
         )
+
+        const actList = this.getAllActivities().list
+
         let size = allActivitiesState[idActivity]
-          ? allActivitiesState[idActivity].size
+          ? actList.get(idActivity).size
           : 0
 
         // return pourcent of activity completion
-        this.actProgress = `${Math.round((completed.length * 100) / size)} %`
+        this.actProgress = `${Math.round((noBranch.length * 100) / size)} %`
       }
     },
     close() {
@@ -284,12 +287,10 @@ 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))) {
@@ -328,6 +329,7 @@ export default {
           tabcomplete.push(w[0])
         })
 
+        //console.log(completeActPage)
         const isSubset = (array1, array2) =>
           array2.every((element) => array1.includes(element))