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

package/src/components/AppCompInputTextToFillNext.vue

@@ -1,171 +1,171 @@
-<!-- About this Component--
-  * Renders a Series of inputs to collect input for the Quiz component.
-  * Related Quiz to question: TEXTE_TROUE
-  * Receives the a data object defined by user
-  * Used by AppCompQuizNext
-  * Uses useQuiz composable
--->
-<template>
-  <div class="input-box">
-    <div
-      v-for="textInput in theInputData"
-      :key="textInput.id"
-      class="texteatrou"
-    >
-      <span v-if="!textInput.type" v-html="textInput.content"></span>
-      <label
-        :for="`${inputDataId}_${textInput.id}-champ`"
-        style="display: none"
-      >
-        {{ $t('text.quiz') }}
-      </label>
-      <v-text-field
-        v-if="textInput.type == 'inputText'"
-        :id="`${inputDataId}_${textInput.id}-champ`"
-        v-model="quizInputTypeValue[textInput.id]"
-        :placeholder="$t('text.place_holder.for_textarea')"
-        :disabled="quizLimitActive"
-        no-resize
-        :class="classInput(textInput.id, quizInputTypeValue)"
-        class="input-textatrou"
-        :aria-describedby="`${inputDataId}_${textInput.id}-msg-erreur`"
-        :aria-labelledby="`${inputDataId}_${textInput.id}-label`"
-      />
-      <span :id="`${inputDataId}_${textInput.id}-msg-erreur`" class="sr-only">
-        {{ messageAccessibility(textInput.id, quizInputTypeValue) }}
-      </span>
-    </div>
-  </div>
-</template>
-<script>
-import { useQuiz } from '../composables/useQuiz'
-import { toRefs } from 'vue'
-export default {
-  name: 'AppCompInputTextToFillNext',
-  props: {
-    quizType: {
-      type: String,
-      default: ''
-    },
-    inputDataId: {
-      type: String,
-      default: ''
-    },
-    inputData: {
-      type: Array,
-      default: () => []
-    },
-    inputType: {
-      type: String,
-      default: ''
-    },
-    textBase: {
-      type: String,
-      default: ''
-    },
-    quizInputType: {
-      type: Array,
-      default: () => []
-    },
-    solution: {
-      type: Array,
-      default: () => []
-    },
-    showSolution: {
-      type: Boolean,
-      default: false
-    },
-    quizLimitActive: {
-      type: Boolean,
-      default: false
-    }, //use to set if quiz should be active or not
-    quizSubmit: {
-      type: Boolean,
-      default: false
-    } //use to call a submit
-  },
-  emits: ['input-change'],
-  setup(props) {
-    const { shuffleArray, classInput, messageAccessibility } = useQuiz(
-      toRefs(props)
-    )
-    return { shuffleArray, classInput, messageAccessibility }
-  },
-  data() {
-    return {
-      quizInputTypeValue: [], //not using quizInputType because quizInputType is a prop
-      theInputData: [], //to create the list of drop down and text mixed togeter
-      quizSolution: null
-    }
-  },
-
-  watch: {
-    /**
-     * @description to pass value to AppCompQuiz
-     * @fires input-change to AppCompQuiz.vue
-     */
-    quizInputTypeValue: {
-      deep: true,
-      handler(newValue) {
-        this.$emit('input-change', newValue)
-      }
-    }
-  },
-
-  mounted() {
-    this.initQuiz()
-  },
-
-  methods: {
-    initQuiz() {
-      this.quizSolution = this.solution
-      if (this.quizSolution !== null) {
-        this.quizSolution.sort(function (a, b) {
-          return a - b
-        })
-      }
-      let textChoices = []
-
-      const regex = /\$%\S*%\$/g // regex pattern to match exp: $%number%$
-      let matchAll = this.textBase.split(regex)
-
-      for (let i = 0; i < matchAll.length - 1; i++) {
-        textChoices.push('')
-      }
-      //apply previous answers
-      if (this.quizInputType && this.quizInputType.length == 0) {
-        this.quizInputTypeValue = textChoices
-      } else {
-        this.quizInputTypeValue = this.quizInputType
-      }
-      this.createTextWithInput(this.textBase)
-    },
-    /**
-     * @description create the object to genate the text and inputs
-     * @param {String} str the text with holes to fill
-     */
-    createTextWithInput(str) {
-      const regex = /\$%\S*%\$/g // regex pattern to match exp: $%number%$
-      let matchAll = str.split(regex)
-      let listInput = []
-      for (let i = 0; i < matchAll.length - 1; i++) {
-        listInput.push({ id: 't' + i, content: matchAll[i] })
-        listInput.push({ id: i, type: 'inputText' })
-      }
-      let lastItem = matchAll.length - 1
-      listInput.push({ id: 't' + lastItem, content: matchAll[lastItem] })
-      this.theInputData = listInput
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.texteatrou {
-  display: inline;
-  position: relative;
-}
-.texteatrou > input {
-  display: inline;
-  width: auto;
-}
-</style>
+<!-- About this Component--
+  * Renders a Series of inputs to collect input for the Quiz component.
+  * Related Quiz to question: TEXTE_TROUE
+  * Receives the a data object defined by user
+  * Used by AppCompQuizNext
+  * Uses useQuiz composable
+-->
+<template>
+  <div class="input-box">
+    <div
+      v-for="textInput in theInputData"
+      :key="textInput.id"
+      class="texteatrou"
+    >
+      <span v-if="!textInput.type" v-html="textInput.content"></span>
+      <label
+        :for="`${inputDataId}_${textInput.id}-champ`"
+        style="display: none"
+      >
+        {{ $t('text.quiz') }}
+      </label>
+      <v-text-field
+        v-if="textInput.type == 'inputText'"
+        :id="`${inputDataId}_${textInput.id}-champ`"
+        v-model="quizInputTypeValue[textInput.id]"
+        :placeholder="$t('text.place_holder.for_textarea')"
+        :disabled="quizLimitActive"
+        no-resize
+        :class="classInput(textInput.id, quizInputTypeValue)"
+        class="input-textatrou"
+        :aria-describedby="`${inputDataId}_${textInput.id}-msg-erreur`"
+        :aria-labelledby="`${inputDataId}_${textInput.id}-label`"
+      />
+      <span :id="`${inputDataId}_${textInput.id}-msg-erreur`" class="sr-only">
+        {{ messageAccessibility(textInput.id, quizInputTypeValue) }}
+      </span>
+    </div>
+  </div>
+</template>
+<script>
+import { useQuiz } from '../composables/useQuiz'
+import { toRefs } from 'vue'
+export default {
+  name: 'AppCompInputTextToFillNext',
+  props: {
+    quizType: {
+      type: String,
+      default: ''
+    },
+    inputDataId: {
+      type: String,
+      default: ''
+    },
+    inputData: {
+      type: Array,
+      default: () => []
+    },
+    inputType: {
+      type: String,
+      default: ''
+    },
+    textBase: {
+      type: String,
+      default: ''
+    },
+    quizInputType: {
+      type: Array,
+      default: () => []
+    },
+    solution: {
+      type: Array,
+      default: () => []
+    },
+    showSolution: {
+      type: Boolean,
+      default: false
+    },
+    quizLimitActive: {
+      type: Boolean,
+      default: false
+    }, //use to set if quiz should be active or not
+    quizSubmit: {
+      type: Boolean,
+      default: false
+    } //use to call a submit
+  },
+  emits: ['input-change'],
+  setup(props) {
+    const { shuffleArray, classInput, messageAccessibility } = useQuiz(
+      toRefs(props)
+    )
+    return { shuffleArray, classInput, messageAccessibility }
+  },
+  data() {
+    return {
+      quizInputTypeValue: [], //not using quizInputType because quizInputType is a prop
+      theInputData: [], //to create the list of drop down and text mixed togeter
+      quizSolution: null
+    }
+  },
+
+  watch: {
+    /**
+     * @description to pass value to AppCompQuiz
+     * @fires input-change to AppCompQuiz.vue
+     */
+    quizInputTypeValue: {
+      deep: true,
+      handler(newValue) {
+        this.$emit('input-change', newValue)
+      }
+    }
+  },
+
+  mounted() {
+    this.initQuiz()
+  },
+
+  methods: {
+    initQuiz() {
+      this.quizSolution = this.solution
+      if (this.quizSolution !== null) {
+        this.quizSolution.sort(function (a, b) {
+          return a - b
+        })
+      }
+      let textChoices = []
+
+      const regex = /\$%\S*%\$/g // regex pattern to match exp: $%number%$
+      let matchAll = this.textBase.split(regex)
+
+      for (let i = 0; i < matchAll.length - 1; i++) {
+        textChoices.push('')
+      }
+      //apply previous answers
+      if (this.quizInputType && this.quizInputType.length == 0) {
+        this.quizInputTypeValue = textChoices
+      } else {
+        this.quizInputTypeValue = this.quizInputType
+      }
+      this.createTextWithInput(this.textBase)
+    },
+    /**
+     * @description create the object to genate the text and inputs
+     * @param {String} str the text with holes to fill
+     */
+    createTextWithInput(str) {
+      const regex = /\$%\S*%\$/g // regex pattern to match exp: $%number%$
+      let matchAll = str.split(regex)
+      let listInput = []
+      for (let i = 0; i < matchAll.length - 1; i++) {
+        listInput.push({ id: 't' + i, content: matchAll[i] })
+        listInput.push({ id: i, type: 'inputText' })
+      }
+      let lastItem = matchAll.length - 1
+      listInput.push({ id: 't' + lastItem, content: matchAll[lastItem] })
+      this.theInputData = listInput
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.texteatrou {
+  display: inline;
+  position: relative;
+}
+.texteatrou > input {
+  display: inline;
+  width: auto;
+}
+</style>

package/src/components/AppCompJauge.vue

@@ -1,74 +1,74 @@
-<template>
-  <div v-if="!error" class="box-g" :class="state">
-    <v-progress-linear
-      class="jauge"
-      :model-value="value"
-      :height="12"
-      :max="maxValue"
-      aria-hidden="true"
-    ></v-progress-linear>
-    <p class="prcnt">{{ getPourcent }} %</p>
-  </div>
-  <div v-else>
-    <div class="warning">
-      <p class="title">Attention</p>
-      <p class="info">
-        Attention les valeurs que vous donnez au composant ne sont pas des
-        nombres.
-      </p>
-    </div>
-  </div>
-</template>
-<script>
-export default {
-  props: {
-    // props Give value to show progress
-    state: {
-      type: String,
-      default: 'started'
-    },
-    maxValue: {
-      type: Number,
-      default: 100
-    },
-    value: { type: Number, default: 0 },
-    pourcent: { type: Boolean, default: false },
-    fraction: { type: Boolean, default: false }
-  },
-  data() {
-    return {}
-  },
-  computed: {
-    getPourcent() {
-      // Calculate on a 100%
-      let result = (this.value * 100) / this.maxValue
-      if (result > 100) return 100
-      else return Math.round(result)
-    },
-    error() {
-      if (typeof this.value != 'number' || typeof this.maxValue != 'number') {
-        return true
-      } else {
-        return false
-      }
-    }
-  },
-  methods: {}
-}
-</script>
-<style lang="scss">
-.box-g {
-  width: 100%;
-  display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
-
-  .jauge {
-    width: 70%;
-  }
-
-  .prcnt {
-    margin-left: 10px;
-  }
-}
-</style>
+<template>
+  <div v-if="!error" class="box-g" :class="state">
+    <v-progress-linear
+      class="jauge"
+      :model-value="value"
+      :height="12"
+      :max="maxValue"
+      aria-hidden="true"
+    ></v-progress-linear>
+    <p class="prcnt">{{ getPourcent }} %</p>
+  </div>
+  <div v-else>
+    <div class="warning">
+      <p class="title">Attention</p>
+      <p class="info">
+        Attention les valeurs que vous donnez au composant ne sont pas des
+        nombres.
+      </p>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    // props Give value to show progress
+    state: {
+      type: String,
+      default: 'started'
+    },
+    maxValue: {
+      type: Number,
+      default: 100
+    },
+    value: { type: Number, default: 0 },
+    pourcent: { type: Boolean, default: false },
+    fraction: { type: Boolean, default: false }
+  },
+  data() {
+    return {}
+  },
+  computed: {
+    getPourcent() {
+      // Calculate on a 100%
+      let result = (this.value * 100) / this.maxValue
+      if (result > 100) return 100
+      else return Math.round(result)
+    },
+    error() {
+      if (typeof this.value != 'number' || typeof this.maxValue != 'number') {
+        return true
+      } else {
+        return false
+      }
+    }
+  },
+  methods: {}
+}
+</script>
+<style lang="scss">
+.box-g {
+  width: 100%;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+
+  .jauge {
+    width: 70%;
+  }
+
+  .prcnt {
+    margin-left: 10px;
+  }
+}
+</style>

package/src/components/AppCompMenu.vue

@@ -6,8 +6,8 @@
   <div class="menu-container">
     <div
       id="page_info_section"
+      class="sr-only"
       aria-labelledby="page_info"
-      aria-live="true"
     ></div>
     <a
       class="skip-link"
@@ -56,7 +56,7 @@
           <app-base-button
             :id="`btn-quiz`"
             class="btn lk-btn"
-            :is-active="resetStatus !== false"
+            :is-disabled="resetStatus !== false"
             @click="askResetUserData"
           >
             Réinitialiser la leçon
@@ -78,9 +78,9 @@
         </div>
       </v-col>
     </v-row>
-    <div id="page_info" class="sr-only" aria-hidden="true">
+    <span id="page_info" class="sr-only" aria-hidden="true">
       {{ $t('text.title_content_view') }}
-    </div>
+    </span>
   </div>
 </template>
 <script>
@@ -105,7 +105,8 @@ export default {
       'getModuleInfo',
       'getMenuSettings',
       'getAppDebugMode',
-      'getAllCompleted'
+      'getAllCompleted',
+      'getDataFromServer'
     ]),
     appDebugMode() {
       return this.getAppDebugMode
@@ -129,9 +130,14 @@ export default {
       return label
     },
     getLessonid() {
-      // ATTENDRE UX*UI poure voir si on garde le concept ou pas
       let lessonLabel = this.$t('text.lesson')
-      let lessonId = 99
+      let lessonId
+      if (this.getMenuSettings.lessonNumber) {
+        lessonId = this.getMenuSettings.lessonNumber
+      } else {
+        lessonId =
+          'La variable lessonNumber est introuvable dans menu.setting.js'
+      }
       return `${lessonLabel} ${lessonId}`
     },
     getLessonTitle() {
@@ -165,10 +171,20 @@ export default {
         }
       }, 2000)
     },
+    // GoToLastRoute() {
+    //   let lastRoute
+    //   //Get all activity state (menu not included)
+
+    //   //No route history Should link to introduction route
+    //   if (!this.getRouteHistory.length) return 'introduction'
+    //   //last Route should be the last element in route history
+    //   lastRoute = this.getRouteHistory.toReversed()[0]
+    //   //create the route link and return it
+    //   return this.createdRoute(lastRoute)
+    // },
     GoToLastRoute() {
       let lastRoute
       let path
-
       //Get all activity state (menu not included)
       const { allActivitiesState } = this.progressWithMenu()
       let state = Object.values(allActivitiesState)
@@ -212,7 +228,7 @@ export default {
         activity = newRoute.type
       } else {
         activity =
-          newRoute.activity_ref.charAt(1) == '0'
+          newRoute.activity_ref && newRoute.activity_ref.charAt(1) == '0'
             ? `activite_${newRoute.activity_ref.substring(2)}`
             : `activite_${newRoute.activity_ref.substring(1)}`
       }
@@ -223,7 +239,6 @@ export default {
 
       //Define path
       path = page !== ' ' ? `${activity}.page_${page}` : activity
-
       return path
     },
     progressWithMenu() {