From 41a6366efe199558e42ddc766f34d71f963f1eec Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 26 Jan 2022 10:13:58 +0100
Subject: [PATCH] vue homepage_widget: improve translations, titles, tabs
 order, add no data statement

---
 .../public/vuejs/HomepageWidget/App.vue       | 18 +++++++------
 .../HomepageWidget/MyAccompanyingCourses.vue  | 14 +++++++---
 .../vuejs/HomepageWidget/MyEvaluations.vue    | 14 +++++++---
 .../vuejs/HomepageWidget/MyNotifications.vue  | 14 +++++++---
 .../public/vuejs/HomepageWidget/MyTasks.vue   | 26 +++++++++++++++----
 .../public/vuejs/HomepageWidget/MyWorks.vue   | 14 +++++++---
 .../public/vuejs/HomepageWidget/js/i18n.js    | 26 +++++++++----------
 7 files changed, 88 insertions(+), 38 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue
index bee4fb62f..8db9e7bd5 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue
@@ -1,5 +1,7 @@
 <template>
    
+   <h2>{{ $t('main_title') }}</h2>
+   
    <ul class="nav nav-tabs">
       <li class="nav-item">
          <a class="nav-link"
@@ -8,6 +10,14 @@
             <i class="fa fa-home"></i>
          </a>
       </li>
+      <li class="nav-item">
+         <a class="nav-link"
+            :class="{'active': activeTab === 'MyAccompanyingCourses'}"
+            @click="selectTab('MyAccompanyingCourses')">
+            {{ $t('my_accompanying_courses.tab') }}
+            <tab-counter :count="state.accompanyingCourses.count"></tab-counter>
+         </a>
+      </li>
       <li class="nav-item">
          <a class="nav-link"
             :class="{'active': activeTab === 'MyWorks'}"
@@ -33,14 +43,6 @@
             <tab-counter :count="state.tasks.alert.count"></tab-counter>
          </a>
       </li>
-      <li class="nav-item">
-         <a class="nav-link"
-            :class="{'active': activeTab === 'MyAccompanyingCourses'}"
-            @click="selectTab('MyAccompanyingCourses')">
-            {{ $t('my_accompanying_courses.tab') }}
-            <tab-counter :count="state.accompanyingCourses.count"></tab-counter>
-         </a>
-      </li>
       <li class="nav-item">
          <a class="nav-link"
             :class="{'active': activeTab === 'MyNotifications'}"
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyAccompanyingCourses.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyAccompanyingCourses.vue
index fbd69fad9..04785f671 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyAccompanyingCourses.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyAccompanyingCourses.vue
@@ -1,6 +1,7 @@
 <template>
-   <h2>{{ $t('my_accompanying_courses.title') }}</h2>
-   <tab-table>
+   <div class="alert alert-light">{{ $t('my_accompanying_courses.description') }}</div>
+   <span v-if="noResults" class="chill-no-data-statement">{{ $t('no_data') }}</span>
+   <tab-table v-else>
       <template v-slot:thead>
       </template>
       <template v-slot:tbody>
@@ -24,7 +25,14 @@ export default {
       ]),
       ...mapGetters([
          'isAccompanyingCoursesLoaded',
-      ])
+      ]),
+      noResults() {
+         if (!this.isAccompanyingCoursesLoaded) {
+            return false;
+         } else {
+            return this.accompanyingCourses.count === 0;
+         }
+      }
    },
 }
 </script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue
index 67bef343c..35376c8ea 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue
@@ -1,6 +1,7 @@
 <template>
-   <h2>{{ $t('my_evaluations.title') }}</h2>
-   <tab-table>
+   <div class="alert alert-light">{{ $t('my_evaluations.description') }}</div>
+   <span v-if="noResults" class="chill-no-data-statement">{{ $t('no_data') }}</span>
+   <tab-table v-else>
       <template v-slot:thead>
       </template>
       <template v-slot:tbody>
@@ -24,7 +25,14 @@ export default {
       ]),
       ...mapGetters([
          'isEvaluationsLoaded',
-      ])
+      ]),
+      noResults() {
+         if (!this.isEvaluationsLoaded) {
+            return false;
+         } else {
+            return this.evaluations.count === 0;
+         }
+      }
    },
 }
 </script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue
index da2964b0e..4f744c876 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue
@@ -1,6 +1,7 @@
 <template>
-   <h2>{{ $t('my_notifications.title') }}</h2>
-   <tab-table>
+   <div class="alert alert-light">{{ $t('my_notifications.description') }}</div>
+   <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>
@@ -45,7 +46,14 @@ export default {
       ]),
       ...mapGetters([
          'isNotificationsLoaded',
-      ])
+      ]),
+      noResults() {
+         if (!this.isNotificationsLoaded) {
+            return false;
+         } else {
+            return this.notifications.count === 0;
+         }
+      }
    },
    methods: {
       getEntityName(n) {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyTasks.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyTasks.vue
index 2f34ca35d..29e910a6f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyTasks.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyTasks.vue
@@ -1,7 +1,8 @@
 <template>
-   <h2>{{ $t('my_tasks.title_warning') }}</h2>
    
-   <tab-table>
+   <div class="alert alert-light">{{ $t('my_tasks.description_alert') }}</div>
+   <span v-if="noResultsWarning" class="chill-no-data-statement">{{ $t('no_data') }}</span>
+   <tab-table v-else>
       <template v-slot:thead>
       </template>
       <template v-slot:tbody>
@@ -9,8 +10,9 @@
       </template>
    </tab-table>
    
-   <h2>{{ $t('my_tasks.title_alert') }}</h2>
-   <tab-table>
+   <div class="alert alert-light">{{ $t('my_tasks.description_warning') }}</div>
+   <span v-if="noResultsAlert" class="chill-no-data-statement">{{ $t('no_data') }}</span>
+   <tab-table v-else>
       <template v-slot:thead>
       </template>
       <template v-slot:tbody>
@@ -36,7 +38,21 @@ export default {
       ...mapGetters([
          'isTasksWarningLoaded',
          'isTasksAlertLoaded',
-      ])
+      ]),
+      noResultsAlert() {
+         if (!this.isTasksAlertLoaded) {
+            return false;
+         } else {
+            return this.tasks.alert.count === 0;
+         }
+      },
+      noResultsWarning() {
+         if (!this.isTasksWarningLoaded) {
+            return false;
+         } else {
+            return this.tasks.warning.count === 0;
+         }
+      }
    },
 }
 </script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorks.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorks.vue
index 267663e6a..fed72d0bd 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorks.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorks.vue
@@ -1,7 +1,8 @@
 <template>
 <div class="accompanying_course_work">
-   <h2>{{ $t('my_works.title') }}</h2>
-   <tab-table>
+   <div class="alert alert-light">{{ $t('my_works.description') }}</div>
+   <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>
@@ -48,7 +49,14 @@ export default {
       ]),
       ...mapGetters([
          'isWorksLoaded',
-      ])
+      ]),
+      noResults() {
+         if (!this.isWorksLoaded) {
+            return false;
+         } else {
+            return this.works.count === 0;
+         }
+      }
    },
    methods: {
       getEntityName(w) {
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 38ea5487a..d830e29fe 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js
@@ -1,25 +1,26 @@
 const appMessages = {
     fr: {
+        main_title: "Vue d'ensemble",
         my_works: {
-            tab: "Actions d'accompagnement",
-            title: "Mes actions d'accompagnement qui arrivent à échéance",
+            tab: "Mes actions",
+            description: "Liste des actions d'accompagnement dont je suis référent et qui arrivent à échéance.",
         },
         my_evaluations: {
-            tab: "Évaluations",
-            title: "Mes évaluations qui arrivent à échéance",
+            tab: "Mes évaluations",
+            description: "Liste des évaluations dont je suis référent et qui arrivent à échéance.",
         },
         my_tasks: {
-            tab: "Tâches",
-            title_warning: "Mes tâches avec date d'échéance dépassée",
-            title_alert: "Mes tâches avec date de rappel dépassée",
+            tab: "Mes tâches",
+            description_alert: "Liste des tâches auxquelles je suis assigné et dont la date de rappel est dépassée.",
+            description_warning: "Liste des tâches auxquelles je suis assigné et dont la date d'échéance est dépassée.",
         },
         my_accompanying_courses: {
-            tab: "Parcours",
-            title: "Les parcours que l'on vient de m'attribuer",
+            tab: "Mes parcours",
+            description: "Liste des parcours d'accompagnement que l'on vient de m'attribuer.",
         },
         my_notifications: {
-            tab: "Notifications",
-            title: "Mes notifications reçues (et non lues)",
+            tab: "Mes notifications",
+            description: "Liste des notifications reçues et non lues.",
         },
         Date: "Date",
         Subject: "Objet",
@@ -30,8 +31,7 @@ const appMessages = {
         the_action: "l'action",
         StartDate: "Date d'ouverture",
         SocialAction: "Action d'accompagnement",
-
-
+        no_data: "Aucun résultats"
     }
 };