From 109bf5ec5d5de3e14023d079b69cdb5ce0582131 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 10 May 2021 16:33:41 +0200
Subject: [PATCH] suggestions, flex position for little screens + thirdparty
 links

---
 .../Resources/public/scss/chillmain.scss        | 14 ++++++++------
 .../vuejs/_components/PersonSuggestion.vue      | 17 +++++++----------
 .../_components/PersonSuggestion/Person.vue     |  4 ++--
 .../_components/PersonSuggestion/ThirdParty.vue |  8 ++++----
 4 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss
index 17fab18f4..ed6d535e5 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss
@@ -142,20 +142,19 @@ div.count {
       cursor: pointer;
    }
 }
-div.results {
+div.results {   
    div.list-item {
-      line-height: 26pt;
-      padding: 0.3em 0.8em;
+      padding: 0.4em 0.8em;
       display: flex;
       flex-direction: row;
       &.checked {
          background-color: #ececec;
          border-bottom: 1px dotted #8b8b8b;
       }
-      & > input {
-         margin-right: 0.8em;
-      }
       div.container {
+         & > input {
+            margin-right: 0.8em;
+         }
          span:not(.name) {
             margin-left: 0.5em;
             opacity: 0.5;
@@ -165,8 +164,11 @@ div.results {
       }
       div.right_actions {
          margin: 0 0 0 auto;
+         display: flex;
+         align-items: flex-end;
          & > * {
             margin-left: 0.5em;
+            align-self: baseline;
          }
          a.sc-button {
             border: 1px solid lightgrey;
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/PersonSuggestion.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/PersonSuggestion.vue
index d8c9bbc54..649953903 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/PersonSuggestion.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/PersonSuggestion.vue
@@ -1,24 +1,21 @@
 <template>
    <div class="list-item" :class="{ checked: isChecked }">
          
-         <!--a class="discret" target="_blank" :href="url.show">{{ item.id }}</a-->
-         <input class="" 
-            type="checkbox" 
-            v-model="selected"
-            :value="item" />
+         <div class="container">
+            <input type="checkbox" 
+               v-model="selected"
+               :value="item" />
+         </div>
             
          <suggestion-person 
             v-if="item.result.type === 'person'"
-            v-bind:item="item"
-            >
+            v-bind:item="item">
          </suggestion-person>
          
          <suggestion-third-party 
             v-if="item.result.type === 'thirdparty'"
-            v-bind:item="item"
-            >
+            v-bind:item="item">
          </suggestion-third-party>
-         
 
    </div>
 </template>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/PersonSuggestion/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/PersonSuggestion/Person.vue
index 3b6f9c020..af5b13b16 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/PersonSuggestion/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/PersonSuggestion/Person.vue
@@ -11,10 +11,10 @@
    </div>
    <div class="right_actions">
       
-      <span class="badge badge-pill badge-secondary" :title="item.result.person_id">
+      <span class="badge badge-pill badge-secondary" :title="item.key">
          {{ $t('item.type_person') }}
       </span>
-      <a class="sc-button bt-show" target="_blank" :title="item.result.person_id" :href="url.show"></a>
+      <a class="sc-button bt-show" target="_blank" :title="item.key" :href="url.show"></a>
       
    </div>
 </template>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/PersonSuggestion/ThirdParty.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/PersonSuggestion/ThirdParty.vue
index 0f16640c4..37cee7852 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/PersonSuggestion/ThirdParty.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/PersonSuggestion/ThirdParty.vue
@@ -12,10 +12,10 @@
    </div>
    <div class="right_actions">
       
-      <span class="badge badge-pill badge-secondary" :title="item.result.thirdparty_id">
+      <span class="badge badge-pill badge-secondary" :title="item.key">
          {{ $t('item.type_thirdparty') }}
       </span>
-      <a class="sc-button bt-show" target="_blank" :title="item.result.thirdparty_id" :href="url.show"></a>
+      <a class="sc-button bt-show" target="_blank" :title="item.key" :href="url.show"></a>
       
    </div>
 </template>
@@ -27,8 +27,8 @@ export default {
    data() {
       return {
          url: {
-            show: '/fr/person/' + this.item.result.thirdparty_id + '/general',
-            edit: '/fr/person/' + this.item.result.thirdparty_id + '/general/edit'
+            show: '/fr/thirdparty/thirdparty/' + this.item.result.thirdparty_id + '/show',
+            edit: '/fr/thirdparty/thirdparty/' + this.item.result.thirdparty_id + '/edit'
          },
       }
    },