project-booster-vue 10.24.1 → 10.24.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "project-booster-vue",
-  "version": "10.24.1",
+  "version": "10.24.3",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/projects/project-attributes/PbProjectAttributes.vue

@@ -1,6 +1,33 @@
 <template>
   <m-flexy class="pb-project-attributes">
     <template v-for="[attributeId, attribute] of displayedProjectAttributes" :key="attributeId">
+      <pb-project-attribute
+        v-if="attributeId === 'projectType'"
+        label="Type de projet"
+        :value="
+          {
+            NEW: 'Création',
+            RENOVATION: 'Rénovation',
+          }[attribute.value]
+        "
+        :image="
+          {
+            NEW: 'https://storage.googleapis.com/project-booster-media/declaration_projet/Creation.png',
+            RENOVATION: 'https://storage.googleapis.com/project-booster-media/declaration_projet/Renovation.png',
+          }[attribute.value]
+        "
+      />
+      <pb-project-attribute
+        v-if="attributeId === 'constructionDate'"
+        label="Date de construction"
+        :value="
+          {
+            MORE_THAN_2_YEARS: 'Plus de 2 ans',
+            LESS_THAN_2_YEARS: 'Moins de 2 ans',
+          }[attribute.value]
+        "
+        image="https://storage.googleapis.com/project-booster-media/mozaic-icons/svg/Navigation_Display_Calendar_64px.svg"
+      />
       <pb-project-attribute
         v-if="attributeId === 'workStartDate'"
         label="Début des travaux"
@@ -157,7 +184,7 @@
         </template>
         <template v-if="attributeId === 'gateMotorized'">
           <li>
-            Portail - Motoriser : <span>{{ gateMotorized[attribute.value] }}</span>
+            Portail - Motorisé : <span>{{ gateMotorized[attribute.value] }}</span>
           </li>
         </template>
         <template v-if="attributeId === 'gateMaterialType'">
@@ -184,7 +211,7 @@
         </template>
         <template v-if="attributeId === 'bioclimaticPergolaMotorized'">
           <li>
-            Pergola bioclimatique - Motoriser : <span>{{ bioclimaticPergolaMotorized[attribute.value] }}</span>
+            Pergola bioclimatique - Motorisée : <span>{{ bioclimaticPergolaMotorized[attribute.value] }}</span>
           </li>
         </template>
         <template v-if="attributeId === 'bioclimaticPergolaMaterialType'">
@@ -193,16 +220,15 @@
           </li>
         </template>
       </template>
+      <template v-if="isRigidSpaWanted">
+        <li>Spa rigide - Désiré : <span>Oui</span></li>
+      </template>
     </ul>
 
     <div class="pb-project-attributes__section-title">Détails</div>
 
-    <div
-      class="pb-project-attributes__details"
-      v-for="[attributeId, attribute] of displayedProjectAttributes"
-      :key="attributeId"
-    >
-      <p v-if="attributeId === 'comment'" v-html="attribute.value"></p>
+    <div class="pb-project-attributes__details" v-if="getCommentAttribute">
+      <p v-html="getCommentAttribute"></p>
     </div>
   </m-flexy>
 </template>
@@ -230,7 +256,17 @@ export default defineComponent({
         COVERING_FLOOR: 'Revêtement sol',
         COVERING_WALL: 'Revêtement mûr',
         REPLACE_BATHTUB_TO_SHOWER: 'Remplacer une baignoire par une douche',
+
+        TERRACE: 'Terrasse',
+        GATE: 'Portail',
+        FENCE: 'Clôture',
+        BIOCLIMATIC_PERGOLA: 'Pergola bioclimatique',
+        RIGID_SPA: 'Spa rigide',
       },
+
+      /**
+       * Bathroom appointment qualification
+       */
       bathroomStyle: {
         NATURAL: 'Naturel',
         INDUSTRIAL: 'Industriel',
@@ -348,6 +384,19 @@ export default defineComponent({
     displayedProjectAttributes() {
       return Object.entries(this.projectAttributes);
     },
+
+    getCommentAttribute(): string | null {
+      const commentAttribute = Object.entries(this.projectAttributes).find(
+        ([attributeId]) => attributeId === 'comment',
+      );
+      return commentAttribute ? commentAttribute[1].value : null;
+    },
+
+    isRigidSpaWanted(): boolean {
+      return Object.entries(this.projectAttributes).some(
+        ([attributeId, attribute]) => attributeId === 'works' && attribute.value.includes('RIGID_SPA'),
+      );
+    },
   },
 });
 </script>

package/src/components/projects/project-hub/PbProjectHub.vue

@@ -403,14 +403,6 @@
                 <pb-consent />
               </div>
             </m-flex>
-            <m-flex
-              v-if="!readOnly"
-              class="pb-project-hub__section pb-project-hub__section-separator"
-              direction="column"
-              full-width
-            >
-              <pb-m-opinion :trigger="{ page_name: 'Project-Hub' }" />
-            </m-flex>
             <m-flex
               v-if="!readOnly"
               class="pb-project-hub__section pb-project-hub__section-separator"

package/src/components/scenario/scenarii/appointment-qualification-garden.json

@@ -28,11 +28,11 @@
   "GARDEN": {
     "code": "GARDEN",
     "type": "SCENARIO",
-    "stepCode": "LMFR_KIND_OF_PROJECT"
+    "stepCode": "LMFR_QUESTION_PROJECT_TYPE"
   },
 
-  "LMFR_KIND_OF_PROJECT": {
-    "code": "LMFR_KIND_OF_PROJECT",
+  "LMFR_QUESTION_PROJECT_TYPE": {
+    "code": "LMFR_QUESTION_PROJECT_TYPE",
     "type": "STEP",
     "component": "MPbQuestion",
     "slots": {
@@ -58,8 +58,8 @@
       },
 
       "answers": {
-        "NEW_PROJECT": {
-          "code": "NEW_PROJECT",
+        "NEW": {
+          "code": "NEW",
           "viewModel": {
             "title": "Je créé mon aménagement"
           },
@@ -67,8 +67,8 @@
             "ranking": 1
           }
         },
-        "RENOVATION_PROJECT": {
-          "code": "RENOVATION_PROJECT",
+        "RENOVATION": {
+          "code": "RENOVATION",
           "viewModel": {
             "title": "Je rénove de l'existant"
           },
@@ -79,12 +79,12 @@
       }
     },
     "nextStep": {
-      "code": "LMFR_QUESTION_CONSTRUCTION_AGE"
+      "code": "LMFR_QUESTION_CONSTRUCTION_DATE"
     }
   },
 
-  "LMFR_QUESTION_CONSTRUCTION_AGE": {
-    "code": "LMFR_QUESTION_CONSTRUCTION_AGE",
+  "LMFR_QUESTION_CONSTRUCTION_DATE": {
+    "code": "LMFR_QUESTION_CONSTRUCTION_DATE",
     "type": "STEP",
     "component": "MPbQuestion",
     "slots": {