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

package/src/components/AppCompAudio.vue

@@ -165,7 +165,38 @@ export default {
     },
     errorHandling(e) {
       this.hasSourceLoadingError = true
+    },
+    // ===================================TEST TRANSCRIP================================================
+    /**
+     * @description Fetching method for transcript
+     * @summary Fetch a transcript from HTML file to display. File URL is defined in the media data
+     *  and return its content for display
+     * @return {String} HTML string
+     */
+    async fetchTranscript() {
+      try {
+        //const tFile = 'exemple_transcript2.html'
+        const { mTranscript } = this.mediaToPlay
+        const tFile = mTranscript
+        if (!tFile) throw new Error('Missing transcript File!')
+
+        // validate file types. Only .html are allowed
+        if (!tFile.endsWith('.html'))
+          throw new Error(
+            'Invalid valid transcript file. \n Expecting .html file'
+          )
+
+        const fileUrl = !tFile.includes('/') ? `./${tFile}` : tFile //allow passing file in Public folder
+        // const fileUrl = new URL(tFile, import.meta.url))
+        const res = await axios.get(fileUrl, { responseType: 'blob' })
+        const content = await res.data.text()
+
+        return content
+      } catch (err) {
+        console.warn("YOU'VE GOT AN ERROR!\n", err)
+      }
     }
+    // ===================================TEST TRANSCRIP================================================
   }
 }
 </script>

package/src/components/AppCompBranchButtons.vue

@@ -38,7 +38,7 @@ Si la composante est appelée sans prop, les boutons par défaut seront génér
     <v-row v-else>
       <v-col
         v-for="branch of branchsStateData"
-        :id="branch.id"
+        :id="`branch_${branch.id}`"
         :key="branch.id"
         class="branch-btn"
       >
@@ -65,24 +65,20 @@ Si la composante est appelée sans prop, les boutons par défaut seront génér
           v-else-if="isCard && cards.length"
           class="branch-btn-wrapper branch-btn-card"
         >
-          <v-card class="mx-auto" max-width="20rem">
-            <v-img :src="branch.imgFile" :alt="`${branch.imgAlt}`" cover>
-              <v-toolbar color="transparent">
-                <template #append>
-                  <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>
-                </template>
-              </v-toolbar>
-            </v-img>
+          <v-card class="mx-auto" max-width="15rem">
+            <v-img :src="branch.imgFile" :alt="`${branch.imgAlt}`" cover />
 
             <v-card-title>{{ branch.title }}</v-card-title>
             <v-card-text>
               {{ branch.text }}
             </v-card-text>
+
+            <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>
           </v-card>
         </div>
         <div v-else class="branch-btn-wrapper">
@@ -98,7 +94,6 @@ Si la composante est appelée sans prop, les boutons par défaut seront génér
   </v-row>
 </template>
 <script>
-// ...
 import { mapState } from 'pinia'
 import { useAppStore } from '../module/stores/appStore'
 import AppCompButtonProgress from './AppCompButtonProgress.vue'
@@ -304,7 +299,6 @@ export default {
         let { state = 'new', progression = 0 } = this.getBranchProgression(
           branchData.id
         )
-        // if (!state || !progression) return
 
         branchData.state = state
         branchData.progression = progression
@@ -544,9 +538,19 @@ export default {
 <style lang="scss">
 .branch-btn-wrapper {
   position: relative;
+
   .branch-btn-custom {
     background-color: transparent;
     border: none;
   }
 }
+
+.v-card {
+  position: relative;
+  .button-progress-wrapper {
+    position: absolute;
+    right: 55px;
+    top: 15px;
+  }
+}
 </style>

package/src/components/AppCompButtonProgress.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="button-progress-wrapper">
-    <button
+    <app-base-button
       :id="`btn_branch_${branchData.id}`"
       :target-ref="branchData.id"
       :title="btnTitle || $t('text.place_holder.for_title_btn_progress')"
@@ -17,11 +17,13 @@
       <svg v-if="branchData.state != status.COMPLETE">
         <use href="#navigate-next-icon"></use>
       </svg>
-    </button>
+    </app-base-button>
   </div>
 </template>
 <script>
+import AppBaseButton from './AppBaseButton.vue'
 export default {
+  components: { AppBaseButton },
   props: {
     mini: {
       type: Boolean,
@@ -63,7 +65,6 @@ export default {
   },
 
   created() {
-    // if (isNaN(this.percent)) this.percent = 0
     this.$bus.$on('branching-hidden', this.resetIsActive)
   },
 
@@ -98,12 +99,6 @@ export default {
 .button-progress-wrapper {
   &:not(.card-btn) {
     .branch-btn-default {
-      // left: 4px;
-      // top: 4px;
-      // min-width: 42px;
-      // min-height: 42px;
-      right: 15px !important;
-      top: -15px !important;
       min-width: 42px;
       min-height: 42px;
     }

package/src/components/AppCompCarousel.vue

@@ -3,82 +3,95 @@
  @ What it does: Create an html element including an array of slides. These slides are objects including required property (imgSrc) and optional properties (imgAlt, Title, Hypertext).
 -->
 
-<template>
+<template v-if="slides">
   <section id="carousel" :aria-label="$t('text.carousel')">
-    <div class="carousel-inner">
-      <div id="mycarousel-slides" class="carousel-slides" aria-live="polite">
-        <div
-          v-for="(slide, index) in slides"
-          :key="index"
-          class="carousel-slide"
-          :class="{
-            current: currentSlide == index + 1,
-            prev: currentSlide >= index + 2,
-            next: currentSlide <= index
-          }"
-          role="group"
-          :aria-hidden="!(currentSlide == index + 1)"
-        >
-          <span class="sr-only">
-            {{
-              $t('text.slide') +
-              ' ' +
-              (index + 1) +
-              ' ' +
-              $t('text.of') +
-              ' ' +
-              slideLength
-            }}
-          </span>
+    <app-base-error-display
+      v-if="errorsSlider.length"
+      :error-group="'component'"
+      :error-title="'ERREUR: CRÉATION CAROUSEL'"
+      :errors-list="errorsSlider"
+    ></app-base-error-display>
+    <template v-else>
+      <div class="carousel-inner">
+        <div id="mycarousel-slides" class="carousel-slides" aria-live="polite">
           <div
-            class="carousel-image"
-            :class="{ 'full-width': !(slide.title || slide.hypertext) }"
+            v-for="(slide, index) in slides"
+            :key="index"
+            class="carousel-slide"
+            :class="{
+              current: currentSlide == index + 1,
+              prev: currentSlide >= index + 2,
+              next: currentSlide <= index
+            }"
+            role="group"
+            :aria-hidden="!(currentSlide == index + 1)"
           >
-            <img
-              :src="slide.imgSrc"
-              :alt="slide.imgAlt"
-              :aria-hidden="slide.imgAlt == ' ' || !slide.imgAlt ? true : false"
-            />
-          </div>
-          <div v-if="slide.title || slide.hypertext" class="carousel-text">
-            <h3 v-if="slide.title">
-              {{ slide.title }}
-            </h3>
-            <div v-html="slide.hypertext"></div>
+            <span class="sr-only">
+              {{
+                $t('text.slide') +
+                ' ' +
+                (index + 1) +
+                ' ' +
+                $t('text.of') +
+                ' ' +
+                slideLength
+              }}
+            </span>
+            <div
+              class="carousel-image"
+              :class="{ 'full-width': !(slide.title || slide.hypertext) }"
+            >
+              <img
+                :src="slide.imgSrc"
+                :alt="slide.imgAlt"
+                :aria-hidden="
+                  slide.imgAlt == ' ' || !slide.imgAlt ? true : false
+                "
+              />
+            </div>
+            <div v-if="slide.title || slide.hypertext" class="carousel-text">
+              <h3 v-if="slide.title">
+                {{ slide.title }}
+              </h3>
+              <div v-html="slide.hypertext"></div>
+            </div>
           </div>
         </div>
+
+        <div class="carousel-controls">
+          <app-base-button
+            id="carousel-btn-prev"
+            class="carousel-btn"
+            :aria-label="$t('button.carousel_prev')"
+            aria-controls="mycarousel-slides"
+            :title="$t('button.carousel_prev')"
+            :aria-disabled="disablePrev"
+            :is-disabled="disablePrev"
+            :disabled="disablePrev"
+            @click="prevSlide()"
+          >
+            <svg>
+              <use href="#fleche-gauche-icon"></use>
+            </svg>
+          </app-base-button>
+          <app-base-button
+            id="carousel-btn-next"
+            class="carousel-btn"
+            :aria-label="$t('button.carousel_next')"
+            aria-controls="mycarousel-slides"
+            :title="$t('button.carousel_next')"
+            :aria-disabled="disableNext"
+            :is-disabled="disableNext"
+            :disabled="disableNext"
+            @click="nextSlide()"
+          >
+            <svg>
+              <use href="#fleche-droite-icon"></use>
+            </svg>
+          </app-base-button>
+        </div>
       </div>
-      <div class="carousel-controls">
-        <app-base-button
-          id="carousel-btn-prev"
-          class="carousel-btn"
-          :aria-label="$t('button.carousel_prev')"
-          aria-controls="mycarousel-slides"
-          :title="$t('button.carousel_prev')"
-          :disabled="disablePrev"
-          :aria-disabled="disablePrev"
-          @click="prevSlide()"
-        >
-          <svg>
-            <use href="#fleche-gauche-icon"></use>
-          </svg>
-        </app-base-button>
-        <app-base-button
-          id="carousel-btn-next"
-          class="carousel-btn"
-          :aria-label="$t('button.carousel_next')"
-          aria-controls="mycarousel-slides"
-          :title="$t('button.carousel_next')"
-          :disabled="disableNext"
-          :aria-disabled="disableNext"
-          @click="nextSlide()"
-        >
-          <svg>
-            <use href="#fleche-droite-icon"></use>
-          </svg>
-        </app-base-button>
-      </div>
-    </div>
+    </template>
     <div class="carousel-index">
       <p aria-hidden="true">{{ currentSlide }}/{{ slideLength }}</p>
     </div>
@@ -86,16 +99,20 @@
 </template>
 
 <script>
+import AppBaseErrorDisplay from './AppBaseErrorDisplay.vue'
 export default {
   name: 'AppCompSlider',
+  components: { AppBaseErrorDisplay },
   props: {
-    slides: { type: Array, required: true } //Array of slides {imgSrc, imgAlt, title, hypertext}
+    slides: { type: Array, required: true }, //Array of slides {imgSrc, imgAlt, title, hypertext}
+    name: { type: String, default: 'toto cool' }
   },
   data() {
     return {
-      currentSlide: 1, //Slide management
+      currentSlide: null, //Slide management
       requiredProperties: ['imgSrc'], //For slides validation
-      optionalProperties: ['title', 'imgAlt', 'hypertext'] //For slides validation
+      optionalProperties: ['title', 'imgAlt', 'hypertext'], //For slides validation
+      errorsSlider: []
     }
   },
   computed: {
@@ -106,26 +123,14 @@ export default {
       return !(this.currentSlide < this.slideLength)
     },
     slideLength() {
-      return this.slides.length
+      return this.slides ? this.slides.length : 0
     }
   },
+  created() {
+    this.currentSlide = this.slides && this.slides.length ? 1 : 0
+  },
   mounted() {
-    //Validating slides
-    if (Array.isArray(this.slides) && this.slideLength > 0) {
-      //Validate properties for all the slides
-      for (const slide of this.slides) {
-        this.validateProperties(
-          this.requiredProperties,
-          this.optionalProperties,
-          slide
-        )
-      }
-    } else {
-      console.warn(
-        `%c WARNING!>>> AppCompSlider : slides must be an array of at least one item`,
-        'background: orange; color: white; display: block; margin:5px;'
-      )
-    }
+    this.validateCarousel()
   },
   methods: {
     prevSlide() {
@@ -138,6 +143,27 @@ export default {
         this.currentSlide++
       }
     },
+    validateCarousel() {
+      //Validating slides
+
+      if (Array.isArray(this.slides) && this.slideLength > 0) {
+        //Validate properties for all the slides
+        for (const slide of this.slides) {
+          this.validateProperties(
+            this.requiredProperties,
+            this.optionalProperties,
+            slide
+          )
+        }
+      } else {
+        let msg = `Le corrousel doit avoit au moins un element.`
+        this.errorsSlider.push(msg)
+        console.warn(
+          `%c WARNING!>>> AppCompSlider : slides must be an array of at least one item`,
+          'background: orange; color: white; display: block; margin:5px;'
+        )
+      }
+    },
     //Validate the properties of a specific object (currentObject)
     validateProperties(requiredProperties, optionalProperties, currentObject) {
       let allProperties = requiredProperties.concat(optionalProperties)
@@ -154,6 +180,8 @@ export default {
           `%c WARNING!>>> AppCompSlider : slides ${wrongProperties} invalid. Required properties: ${requiredProperties} . Optional properties: ${optionalProperties}`,
           'background: orange; color: white; display: block; margin:5px;'
         )
+        let msg = `Attribut(s) invalide(s): <i>${wrongProperties}</i> .  Consultez la console pour plus de details.`
+        this.errorsSlider.push(msg)
       }
       //Validate if all required properties are present in currentObject
       if (missingRequired.length > 0) {
@@ -161,6 +189,8 @@ export default {
           `%c WARNING!>>>  AppCompQuizSlider : slides missing required ${missingRequired} property. Required properties: ${requiredProperties} . Optional properties: ${optionalProperties}`,
           'background: orange; color: white; display: block; margin:5px;'
         )
+        let msg = `Une/certaines propriété(s) sont manquante(s). Consultez la console pour plus de details.`
+        this.errorsSlider.push(msg)
       }
     },
     //Get all the invalids properties from the object

package/src/components/AppCompInputCheckBoxNext.vue

@@ -166,6 +166,11 @@ fieldset {
   -webkit-box-shadow: inherit;
 }
 
+fieldset{
+  border: inherit;
+}
+
+
 .custom-checkbox {
   width: 100%;
   height: 100%;

package/src/components/AppCompInputDropdownNext.vue

@@ -22,9 +22,12 @@
         :id="inputDataId + '_' + singleDropdown.id"
         v-model="quizInputTypeValue[singleDropdown.id]"
         item-title="text"
+        :item-props="true"
         :items="singleDropdown.option"
         :disabled="quizLimitActive"
-      />
+        :open-text="$t('message.dropdown_list') + ' ' + singleDropdown.ennonce"
+        close-text=""
+      ></v-select>
     </div>
   </div>
 </template>
@@ -124,17 +127,15 @@ export default {
       const defaultAnswer = {
         value: null,
         disabled: true,
-        text: this.$t('message.first_option_dropdown')
+        text: this.$t('message.first_option_dropdown'),
+        selected: true
       }
       let selectedChoices = []
       for (let i = 0; i < this.inputData.length; i++) {
-        let singleDropdown
-        if (this.shuffleAnswers) {
-          singleDropdown = this.inputData[i]
+        let singleDropdown = this.inputData[i]
+        if (this.shuffleAnswers)
           singleDropdown.option = this.shuffleArray(singleDropdown.option)
-        } else {
-          singleDropdown = this.inputData[i]
-        }
+
         if (
           this.inputData[i].option[0].text !==
           this.$t('message.first_option_dropdown')
@@ -156,4 +157,45 @@ export default {
 .dropdown-container {
   position: relative;
 }
+
+.texteatrou {
+  display: inline !important;
+  .cnt-input {
+    display: inline;
+
+    .v-input {
+      display: inline-block !important;
+
+      .v-input__control,
+      .v-field {
+        width: 240px !important;
+        grid-area: inherit !important;
+
+        .v-field__field {
+          height: 25px !important;
+          padding: 0 !important;
+          min-height: inherit !important;
+
+          .v-field__input {
+            padding-top: 0 !important;
+            padding-bottom: 0 !important;
+            min-height: inherit !important;
+
+            .v-select__selection {
+              min-height: inherit !important;
+            }
+          }
+        }
+
+        .v-field__append-inner {
+          margin-right: 6px;
+        }
+      }
+
+      .v-input__details {
+        display: none;
+      }
+    }
+  }
+}
 </style>

package/src/components/AppCompInputTextNext.vue

@@ -100,7 +100,26 @@ export default {
   }
 }
 </script>
-<style>
-.box-reponse-ouverte {
+<style lang="scss">
+.quiz-texte-troue {
+  .texteatrou {
+    .v-input {
+      display: inline-block !important;
+      width: 150px;
+
+      .v-field {
+        height: 25px;
+
+        input {
+          padding: 0 24px;
+          min-height: 25px !important;
+        }
+      }
+
+      .v-input__details {
+        display: none;
+      }
+    }
+  }
 }
 </style>

package/src/components/AppCompInputTextTableNext.vue

@@ -101,6 +101,7 @@ export default {
     quizInputTypeValue: {
       deep: true,
       handler(newValue) {
+        // const val = newValue.length == 0 ? null : newValue
         this.$emit('input-change', newValue)
       }
     }

package/src/components/AppCompInputTextToFillDropdownNext.vue

@@ -30,8 +30,11 @@
           item-title="text"
           class="dropdown"
           :items="singleDropdown.option"
+          :item-props="true"
           :disabled="quizLimitActive"
           :aria-describedby="`${inputDataId}_${singleDropdown.id}-msg-erreur`"
+          :open-text="$t('message.dropdown_list')"
+          close-text=""
         />
       </div>
 
@@ -163,16 +166,20 @@ export default {
       const defaultAnswer = {
         value: null,
         disabled: true,
+        selected: true,
         text: this.$t('message.first_option_dropdown')
       }
       let selectedChoices = []
+
       for (let i = 0; i < this.inputData.length; i++) {
         let singleDropdown = {}
         if (this.shuffleAnswers) {
           singleDropdown = this.inputData[i]
+
           singleDropdown[Object.keys(this.inputData[i])[0].toString()] =
             this.shuffleArray(Object.values(this.inputData[i])[0])
         } else {
+          // this.inputData[i].splice(0, 0, defaultAnswer)
           singleDropdown = this.inputData[i]
         }
         for (
@@ -188,6 +195,7 @@ export default {
             Object.values(singleDropdown)[0].splice(index, 1)
           }
         }
+
         Object.values(singleDropdown)[0].unshift(defaultAnswer)
 
         selectedChoices.push(null)