Merge remote-tracking branch 'origin/master' into foldlist_in_entity

src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/BadgeEntity.vue

@@ -24,6 +24,11 @@
         {{ $t('user')}}
     </span>
 
+    <span v-if="entity.type === 'household'" class="badge rounded-pill bg-user">
+        {{ $t('household')}}
+    </span>
+
+
 </template>
 
 <script>
@@ -40,7 +45,8 @@ export default {
                     company: "Personne morale",
                     contact: "Personne physique",
                 },
-                user: 'TMS'
+                user: 'TMS',
+                household: 'Ménage',
             }
         }
     }

src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflow.vue

@@ -2,7 +2,7 @@
    <div class="flex-table workflow" id="workflow-list">
       <div v-for="(w, i) in workflows" :key="`workflow-${i}`"
          class="item-bloc">
-         
+
          <div>
             <div class="item-row col">
                <h2>Workflow</h2>
@@ -13,11 +13,10 @@
                   </div>
                </div>
             </div>
-            
+
             <div class="breadcrumb">
-               <template v-for="(step, j) in w.steps">
+               <template v-for="(step, j) in w.steps" :key="`step-${j}`">
                   <span class="mx-2"
-                     :key="`step-${j}`"
                      tabindex="0"
                      data-bs-trigger="focus hover"
                      data-bs-toggle="popover"
@@ -25,7 +24,7 @@
                      data-bs-custom-class="workflow-transition"
                      :title="getPopTitle(step)"
                      :data-bs-content="getPopContent(step)">
-                     
+
                      <i v-if="step.currentStep.name === 'initial'"
                         class="fa fa-circle me-1 text-chill-yellow">
                      </i>
@@ -40,7 +39,7 @@
                </template>
             </div>
          </div>
-         
+
          <div class="item-row">
             <div class="item-col flex-grow-1">
                <p v-if="isUserSubscribedToStep(w)">
@@ -60,7 +59,7 @@
                </ul>
             </div>
          </div>
-         
+
       </div>
    </div>
 </template>