From c7ee2cc600fed7541e6a46c0cb3fbca5aa96ce8b Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 10 Dec 2021 12:35:25 +0100
Subject: [PATCH] add entity 'user' to pills badge-entity

---
 .../public/vuejs/_components/BadgeEntity.vue  | 22 ++++++++++++-------
 .../Resources/public/chill/scss/badge.scss    |  9 ++++++--
 .../vuejs/_components/AddPersons/TypeUser.vue | 20 +++++++----------
 .../public/chill/chillthirdparty.scss         |  2 +-
 4 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/BadgeEntity.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/BadgeEntity.vue
index 3e2d8ab97..5dd770328 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/BadgeEntity.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/BadgeEntity.vue
@@ -1,13 +1,12 @@
 <template>
 
     <span v-if="entity.type === 'person'" class="badge rounded-pill bg-person">
-        {{ $t('renderbox.person') }}
+        {{ $t('person') }}
     </span>
 
     <span v-if="entity.type === 'thirdparty'" class="badge rounded-pill bg-thirdparty">
-
         <template v-if="options.displayLong !== true">
-            {{ $t('renderbox.type.thirdparty')}}
+            {{ $t('thirdparty.thirdparty')}}
         </template>
 
         <i class="fa fa-fw fa-user" v-if="entity.kind === 'child'"></i>
@@ -15,12 +14,16 @@
         <i class="fa fa-fw fa-user-md" v-else></i>
 
         <template v-if="options.displayLong === true">
-            <span v-if="entity.kind === 'child'">{{ $t('tparty.child')}}</span>
-            <span v-else-if="entity.kind === 'company'">{{ $t('tparty.company')}}</span>
-            <span v-else>{{ $t('tparty.contact')}}</span>
+            <span v-if="entity.kind === 'child'">{{ $t('thirdparty.child')}}</span>
+            <span v-else-if="entity.kind === 'company'">{{ $t('thirdparty.company')}}</span>
+            <span v-else>{{ $t('thirdparty.contact')}}</span>
         </template>
     </span>
 
+    <span v-if="entity.type === 'user'" class="badge rounded-pill bg-user">
+        {{ $t('user')}}
+    </span>
+
 </template>
 
 <script>
@@ -30,11 +33,14 @@ export default {
     i18n: {
         messages: {
             fr: {
-                tparty: {
+                person: "Usager",
+                thirdparty: {
+                    thirdparty: "Tiers",
                     child: "Personne de contact",
                     company: "Personne morale",
                     contact: "Personne physique",
-                }
+                },
+                user: 'TMS'
             }
         }
     }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss
index 984338663..0330900da 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss
@@ -1,5 +1,5 @@
 /*
-*  BADGES PERSON AND THIRDPARTY
+*  BADGES USER, PERSON AND THIRDPARTY
 */
 
 span.badge-user,
@@ -167,7 +167,7 @@ div[class*='activity-'] {
 }
 
 /*
-* Specific badge rounded-pill
+* Pill badge by entity
 */
 .badge {
     &.bg-person {
@@ -175,5 +175,10 @@ div[class*='activity-'] {
         background-color: $chill-ll-gray;
         color: $chill-green;
     }
+    &.bg-user {
+        //@extend .$chill-ll-gray;
+        background-color: $chill-ll-gray;
+        color: $chill-blue;
+    }
 }
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue
index c3ec308d3..7a8b302c7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue
@@ -7,26 +7,22 @@
       </div>
     </div>
     <div class="right_actions">
-      <span class="badge rounded-pill bg-secondary">
-        {{ $t('user')}}
-      </span>
+       <badge-entity
+          :entity="item.result"
+          :options="{ displayLong: true }">
+       </badge-entity>
     </div>
 </template>
 
 <script>
-
-const i18n = {
-  messages: {
-    fr: {
-      user: 'Utilisateur' // TODO how to define other translations?
-    }
-  }
-};
+import BadgeEntity from 'ChillMainAssets/vuejs/_components/BadgeEntity.vue';
 
 export default {
    name: 'SuggestionUser',
+   components: {
+      BadgeEntity
+   },
    props: ['item'],
-   i18n,
    computed: {
      hasParent() {
        return this.$props.item.result.parent !== null;
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/chill/chillthirdparty.scss b/src/Bundle/ChillThirdPartyBundle/Resources/public/chill/chillthirdparty.scss
index 976b5bcb9..b5b1b7a9e 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/chill/chillthirdparty.scss
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/chill/chillthirdparty.scss
@@ -1,6 +1,6 @@
 @import 'ChillMainAssets/module/bootstrap/shared';
 
-/// Specific badge rounded-pill
+/// Pill badge by entity
 .badge.rounded-pill {
     &.bg-thirdparty {
         //@extend .$chill-ll-gray;