project-booster-vue 9.59.3 → 9.61.0

package/package.json

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

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

@@ -9,7 +9,11 @@
             AS_SOON_AS_POSSIBLE: 'Dès que possible',
             IN_LESS_THAN_TWO_WEEKS: 'Dans moins de 15 jours',
             IN_LESS_THAN_THREE_MONTHS: 'Dans moins de 3 mois',
+            IN_THREE_MONTHS: 'Dans 3 mois',
             IN_MORE_THAN_THREE_MONTHS: 'Dans plus de 3 mois',
+            IN_SIX_MONTHS: 'Dans 6 mois',
+            IN_MORE_THAN_SIX_MONTHS: 'Dans plus de 6 mois',
+            DO_NOT_KNOW_YET: 'Je ne sais pas',
           }[attribute.value]
         "
         :image="
@@ -22,6 +26,14 @@
               'https://storage.googleapis.com/project-booster-media/project-attributes/work-start-date/in-less-than-three-months.jpg',
             IN_MORE_THAN_THREE_MONTHS:
               'https://storage.googleapis.com/project-booster-media/project-attributes/work-start-date/in-more-than-three-months.jpg',
+            IN_THREE_MONTHS:
+              'https://storage.googleapis.com/project-booster-media/project-attributes/work-start-date/as-soon-as-possible.jpg',
+            IN_SIX_MONTHS:
+              'https://storage.googleapis.com/project-booster-media/project-attributes/work-start-date/as-soon-as-possible.jpg',
+            IN_MORE_THAN_SIX_MONTHS:
+              'https://storage.googleapis.com/project-booster-media/project-attributes/work-start-date/as-soon-as-possible.jpg',
+            DO_NOT_KNOW_YET:
+              'https://storage.googleapis.com/project-booster-media/project-attributes/work-start-date/as-soon-as-possible.jpg',
           }[attribute.value]
         "
       />
@@ -71,18 +83,50 @@
         label="Budget"
         :value="
           {
+            BETWEEN_1000_AND_3000_EUROS: '1000-3000€',
             BETWEEN_1500_AND_2000_EUROS: '1500-2000 €',
             BETWEEN_2000_AND_3000_EUROS: '2000-3000 €',
             BETWEEN_3000_AND_4000_EUROS: '3000-4000 €',
+            BETWEEN_3000_AND_6000_EUROS: '3000-6000€',
             BETWEEN_4000_AND_5000_EUROS: '4000-5000 €',
             MORE_THAN_5000_EUROS: 'Plus de 5000 €',
+            BETWEEN_5000_AND_7000_EUROS: '5000-7000€',
+            MORE_THAN_6000_EUROS: 'Plus de 6000€',
+            BETWEEN_7000_AND_10000_EUROS: '7000-10000€',
+            MORE_THAN_10000_EUROS: 'Plus de 10000€',
             DO_NOT_KNOW_YET: 'Pas d\'idée de budget',
           }[attribute.value]
         "
-        image="https://storage.googleapis.com/project-booster-media/project-attributes/budget/budget-attribute.jpg
-      "
+        image="https://storage.googleapis.com/project-booster-media/project-attributes/budget/budget-attribute.jpg"
       />
     </template>
+
+    <div class="pb-project-attributes__section-title">
+      <h2>Les éléments que vous souhaitez installer</h2>
+    </div>
+
+    <ul class="pb-project-attributes__works">
+      <template v-for="[attributeId, attribute] of displayedProjectAttributes" :key="attributeId">
+        <template v-if="attributeId === 'bathroomStyle' && isArray(attribute.value)">
+          <li v-for="value in JSON.parse(attribute.value)">Style: {{ bathroomStyle[value] }}</li>
+        </template>
+        <template v-else-if="attributeId === 'bathroomStyle'">
+          <li>Style: {{ bathroomStyle[attribute.value] }}</li>
+        </template>
+      </template>
+      <template v-for="[attributeId, attribute] of displayedProjectAttributes" :key="attributeId">
+        <template v-if="attributeId === 'works' && isArray(attribute.value)">
+          <li v-for="value in JSON.parse(attribute.value)">
+            {{ works[value] }}
+          </li>
+        </template>
+        <template v-else-if="attributeId === 'works'">
+          <li>
+            {{ works[attribute.value] }}
+          </li>
+        </template>
+      </template>
+    </ul>
   </m-flexy>
 </template>
 
@@ -96,6 +140,28 @@ export default defineComponent({
 
   components: { MFlexy, PbProjectAttribute },
 
+  data() {
+    return {
+      works: {
+        FURNITURES: 'Meubles',
+        SHOWER: 'Douche',
+        BATHTUB: 'Baignoire',
+        WC: 'WC',
+        COVERING_FLOOR: 'Revêtement sol',
+        COVERING_WALL: 'Revêtement mûr',
+        REPLACE_BATHTUB_TO_SHOWER: 'Remplacer une baignoire par une douche',
+      },
+      bathroomStyle: {
+        NATURAL: 'Naturel',
+        INDUSTRIAL: 'Industriel',
+        GLAMOR_CHIC: 'Glamour',
+        DESIGN: 'Design',
+        CHARME: 'Charme',
+        NEO: 'Néo-classique',
+      },
+    };
+  },
+
   props: {
     /**
      * The project attributes
@@ -106,6 +172,12 @@ export default defineComponent({
     },
   },
 
+  methods: {
+    isArray(value: any) {
+      return value.includes('[') ? true : false;
+    },
+  },
+
   computed: {
     displayedProjectAttributes() {
       return Object.entries(this.projectAttributes);
@@ -126,5 +198,30 @@ $responsive-breakpoint: 'l';
 .pb-project-attributes {
   align-items: stretch;
   height: 100%;
+
+  &__section-title {
+    width: 100%;
+    @include set-font-face('semi-bold');
+    @include set-font-scale('05', 'm');
+
+    color: $color-grey-800;
+    margin-left: $mu100;
+  }
+
+  &__works {
+    list-style: none;
+    margin: 0;
+    padding: 0 $mu100;
+    width: 100%;
+
+    li {
+      @include set-font-face('semi-bold');
+
+      margin: 0;
+      padding: $mu125 $mu025;
+      border-bottom: 1px solid $color-primary-02-200;
+      width: 100%;
+    }
+  }
 }
 </style>

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

@@ -712,7 +712,7 @@
           "code": "NATURAL",
           "viewModel": {
             "title": "Nature",
-            "image": "https://storage.googleapis.com/project-booster-media/bathroom/size/size-small.png"
+            "image": "https://storage.googleapis.com/project-booster-media/bathroom/styles/nature.jpg"
           },
           "meta": {
             "ranking": 1
@@ -722,7 +722,7 @@
           "code": "INDUSTRIAL",
           "viewModel": {
             "title": "Industriel",
-            "image": "https://storage.googleapis.com/project-booster-media/bathroom/size/size-medium.png"
+            "image": "https://storage.googleapis.com/project-booster-media/bathroom/styles/industriel.jpg"
           },
           "meta": {
             "ranking": 2
@@ -732,7 +732,7 @@
           "code": "GLAMOR_CHIC",
           "viewModel": {
             "title": "Glamour Chic",
-            "image": "https://storage.googleapis.com/project-booster-media/bathroom/size/size-large.png"
+            "image": "https://storage.googleapis.com/project-booster-media/bathroom/styles/glamour.jpg"
           },
           "meta": {
             "ranking": 3
@@ -742,7 +742,7 @@
           "code": "DESIGN",
           "viewModel": {
             "title": "Design",
-            "image": "https://storage.googleapis.com/project-booster-media/bathroom/size/size-medium.png"
+            "image": "https://storage.googleapis.com/project-booster-media/bathroom/styles/design.jpg"
           },
           "meta": {
             "ranking": 2
@@ -752,11 +752,21 @@
           "code": "CHARME",
           "viewModel": {
             "title": "Charme",
-            "image": "https://storage.googleapis.com/project-booster-media/bathroom/size/size-large.png"
+            "image": "https://storage.googleapis.com/project-booster-media/bathroom/styles/charme.jpg"
           },
           "meta": {
             "ranking": 3
           }
+        },
+        "NEO": {
+          "code": "NEO",
+          "viewModel": {
+            "title": "Néo-classique",
+            "image": "https://storage.googleapis.com/project-booster-media/bathroom/styles/neo-classique.jpg"
+          },
+          "meta": {
+            "ranking": 4
+          }
         }
       }
     }

package/src/services/api/mocks/jsons/projects.json

@@ -228,6 +228,26 @@
       "budget": {
         "value": "BETWEEN_2000_AND_3000_EUROS",
         "date": "2019-08-23T13:53:25.137541515Z"
+      },
+      "works": {
+        "id": "7cfd6d6a-6c39-404d-9186-255ce4e86703",
+        "name": "works",
+        "value": "SHOWER",
+        "date": "2022-07-21T15:06:58.33537Z",
+        "inhabitantProjectId": "caf335a6-95f1-4903-83bd-3c8fcd2881b3",
+        "businessUnit": "001",
+        "ownerId": "90817164",
+        "creatorId": "90817164"
+      },
+      "bathroomStyle": {
+        "id": "7cfd6d6a-6c39-404d-9186-255ce4e86703",
+        "name": "bathroomStyle",
+        "value": "INDUSTRIAL",
+        "date": "2022-07-21T15:06:58.33537Z",
+        "inhabitantProjectId": "caf335a6-95f1-4903-83bd-3c8fcd2881b3",
+        "businessUnit": "001",
+        "ownerId": "90817164",
+        "creatorId": "90817164"
       }
     }
   },