From 72cffd7a3d013490e3fcc6227df528a640765698 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 28 Jan 2022 09:56:20 +0100
Subject: [PATCH] minor changes

---
 .../public/vuejs/HomepageWidget/App.vue          | 16 ++++++++--------
 .../public/vuejs/HomepageWidget/MyCustoms.vue    | 15 +++++++++++++--
 .../vuejs/HomepageWidget/MyNotifications.vue     |  2 --
 .../public/vuejs/HomepageWidget/MyWorks.vue      |  2 --
 .../public/vuejs/HomepageWidget/js/i18n.js       |  3 ++-
 .../views/Homepage/sticky_button.html.twig       |  2 +-
 6 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue
index 8db9e7bd5..719e46670 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue
@@ -10,6 +10,14 @@
             <i class="fa fa-home"></i>
          </a>
       </li>
+      <li class="nav-item">
+         <a class="nav-link"
+            :class="{'active': activeTab === 'MyNotifications'}"
+            @click="selectTab('MyNotifications')">
+            {{ $t('my_notifications.tab') }}
+            <tab-counter :count="state.notifications.count"></tab-counter>
+         </a>
+      </li>
       <li class="nav-item">
          <a class="nav-link"
             :class="{'active': activeTab === 'MyAccompanyingCourses'}"
@@ -43,14 +51,6 @@
             <tab-counter :count="state.tasks.alert.count"></tab-counter>
          </a>
       </li>
-      <li class="nav-item">
-         <a class="nav-link"
-            :class="{'active': activeTab === 'MyNotifications'}"
-            @click="selectTab('MyNotifications')">
-            {{ $t('my_notifications.tab') }}
-            <tab-counter :count="state.notifications.count"></tab-counter>
-         </a>
-      </li>
       <li class="nav-item loading ms-auto py-2" v-if="loading">
          <i class="fa fa-circle-o-notch fa-spin fa-lg text-chill-gray" :title="$t('loading')"></i>
       </li>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyCustoms.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyCustoms.vue
index 28a2ec93b..8f974d0d8 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyCustoms.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyCustoms.vue
@@ -1,8 +1,14 @@
 <template>
-   <div id="dashboards" class="row g-3">
+   <span v-if="noResults" class="chill-no-data-statement">{{ $t('no_dashboard') }}</span>
+   <div v-else id="dashboards" class="row g-3">
       <div class="mbloc col col-sm-6 col-lg-4">
          <div class="custom1">
             Mon bloc personnalisé
+            
+            x notifications non lues
+            x tâches en rappel
+            x ...
+            
          </div>
       </div>
    </div>
@@ -10,7 +16,12 @@
 
 <script>
 export default {
-   name: "MyCustoms"
+   name: "MyCustoms",
+   computed: {
+      noResults() {
+         return true
+      },
+   }
 }
 </script>
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue
index 5ce9a3bfd..b6338219c 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue
@@ -3,7 +3,6 @@
    <span v-if="noResults" class="chill-no-data-statement">{{ $t('no_data') }}</span>
    <tab-table v-else>
       <template v-slot:thead>
-         <th scope="col">#</th>
          <th scope="col">{{ $t('Date') }}</th>
          <th scope="col">{{ $t('From') }}</th>
          <th scope="col">{{ $t('Subject') }}</th>
@@ -11,7 +10,6 @@
       </template>
       <template v-slot:tbody>
          <tr v-for="(n, i) in notifications.results" :key="`notify-${i}`">
-            <th scope="row">{{ i+1 }}</th>
             <td>{{ $d(n.date.datetime, 'long') }}</td>
             <td>{{ n.sender.text }}</td>
             <td>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorks.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorks.vue
index 1c8aff0fe..19e3a92be 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorks.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorks.vue
@@ -4,14 +4,12 @@
    <span v-if="noResults" class="chill-no-data-statement">{{ $t('no_data') }}</span>
    <tab-table v-else>
       <template v-slot:thead>
-         <th scope="col">#</th>
          <th scope="col">{{ $t('StartDate') }}</th>
          <th scope="col">{{ $t('SocialAction') }}</th>
          <th scope="col"></th>
       </template>
       <template v-slot:tbody>
          <tr v-for="(w, i) in works.results" :key="`works-${i}`">
-            <th scope="row">{{ i+1 }}</th>
             <td>{{ $d(w.startDate.datetime, 'short') }}</td>
             <td>
                <h4 class="badge-title">
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js
index 593ac87b9..60b473186 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js
@@ -32,7 +32,8 @@ const appMessages = {
         the_action: "l'action",
         StartDate: "Date d'ouverture",
         SocialAction: "Action d'accompagnement",
-        no_data: "Aucun résultats"
+        no_data: "Aucun résultats",
+        no_dashboard: "Pas de tableaux de bord"
     }
 };
 
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Homepage/sticky_button.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Homepage/sticky_button.html.twig
index 27dd4fe5d..a7ced8a21 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Homepage/sticky_button.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Homepage/sticky_button.html.twig
@@ -1,6 +1,6 @@
 <div class="sticky-buttons">
     <a class="btn btn-lg btn-circle btn-success" title="Appel téléphonique"
-       href="{{ path('chill_crud_aside_activity_new', {'type' : 7, 'duration' : '600', 'note' : 'Pas des remarques' }) }}">
+       href="{{ path('chill_crud_aside_activity_new', {'type' : 7, 'duration' : '600', 'note' : '' }) }}">
         <i class="fa fa-phone fa-lg"></i>
     </a>
     <a class="btn btn-lg btn-circle btn-success" title="Activité annexe"