Merge branch 'master' into 'issue427_returnPath'

# Conflicts:
#   CHANGELOG.md

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue

@@ -10,6 +10,7 @@
          :deselect-label="$t('create_address')"
          :selected-label="$t('multiselect.selected_label')"
          @search-change="listenInputSearch"
+         :internal-search="false"
          ref="addressSelector"
          @select="selectAddress"
          @remove="remove"

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue

@@ -18,6 +18,7 @@
          :selected-label="$t('multiselect.selected_label')"
          :taggable="true"
          :multiple="false"
+         :internal-search="false"
          @tag="addPostcode"
          :tagPlaceholder="$t('create_postal_code')"
          :loading="isLoading"

src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyAccompanyingCourses.vue

@@ -3,16 +3,38 @@
    <span v-if="noResults" class="chill-no-data-statement">{{ $t('no_data') }}</span>
    <tab-table v-else>
       <template v-slot:thead>
-         <th scope="col">id</th>
-         <th scope="col">Ouvert le</th>
-         <th scope="col">Usagers concernés</th>
+         <th scope="col">{{ $t('opening_date') }}</th>
+         <th scope="col">{{ $t('social_issues') }}</th>
+         <th scope="col">{{ $t('concerned_persons') }}</th>
+         <th scope="col"></th>
          <th scope="col"></th>
       </template>
       <template v-slot:tbody>
          <tr v-for="(c, i) in accompanyingCourses.results" :key="`course-${i}`">
-            <td>{{ c.id}}</td>
-            <td>{{ $d(c.openingDate.datetime, 'long') }}</td>
-            <td>{{ c.participations.length }}</td>
+            <td>{{ $d(c.openingDate.datetime, 'short') }}</td>
+            <td>
+               <span v-for="i in c.socialIssues"
+                  class="chill-entity entity-social-issue">
+                  <span class="badge bg-chill-l-gray text-dark">
+                     {{ i.title.fr }}
+                  </span>
+               </span>
+            </td>
+            <td>
+               <span v-for="p in c.participations" class="me-1" :key="p.person.id">
+                  <on-the-fly
+                     :type="p.person.type"
+                     :id="p.person.id"
+                     :buttonText="p.person.textAge"
+                     :displayBadge="'true' === 'true'"
+                     action="show">
+                  </on-the-fly>
+               </span>
+            </td>
+            <td>
+               <span v-if="c.emergency" class="badge rounded-pill bg-danger me-1">{{ $t('emergency') }}</span>
+               <span v-if="c.confidential" class="badge rounded-pill bg-danger">{{ $t('confidential') }}</span>
+            </td>
             <td>
                <a class="btn btn-sm btn-show" :href="getUrl(c)">
                   {{ $t('show_entity', { entity: $t('the_course') }) }}
@@ -26,11 +48,13 @@
 <script>
 import { mapState, mapGetters } from "vuex";
 import TabTable from "./TabTable";
+import OnTheFly from 'ChillMainAssets/vuejs/OnTheFly/components/OnTheFly';
 
 export default {
    name: "MyAccompanyingCourses",
    components: {
-      TabTable
+      TabTable,
+      OnTheFly,
    },
    computed: {
       ...mapState([
@@ -56,5 +80,7 @@ export default {
 </script>
 
 <style scoped>
-
+span.badge.rounded-pill.bg-danger {
+   text-transform: uppercase;
+}
 </style>

src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyCustoms.vue

@@ -6,22 +6,34 @@
          <div class="custom1">
             <ul class="list-unstyled">
                <li v-if="counter.notifications > 0">
-                  <b>{{ counter.notifications }}</b> {{ $t('counter.unread_notifications') }}
+                  <i18n-t keypath="counter.unread_notifications" tag="span" :class="counterClass" :plural="counter.notifications">
+                     <template v-slot:n><span>{{ counter.notifications }}</span></template>
+                  </i18n-t>
                </li>
                <li v-if="counter.accompanyingCourses > 0">
-                  <b>{{ counter.accompanyingCourses }}</b> {{ $t('counter.assignated_courses') }}
+                  <i18n-t keypath="counter.assignated_courses" tag="span" :class="counterClass" :plural="counter.accompanyingCourses">
+                     <template v-slot:n><span>{{ counter.accompanyingCourses }}</span></template>
+                  </i18n-t>
                </li>
                <li v-if="counter.works > 0">
-                  <b>{{ counter.works }}</b> {{ $t('counter.assignated_actions') }}
+                  <i18n-t keypath="counter.assignated_actions" tag="span" :class="counterClass" :plural="counter.works">
+                     <template v-slot:n><span>{{ counter.works }}</span></template>
+                  </i18n-t>
                </li>
                <li v-if="counter.evaluations > 0">
-                  <b>{{ counter.evaluations }}</b> {{ $t('counter.assignated_evaluations') }}
+                  <i18n-t keypath="counter.assignated_evaluations" tag="span" :class="counterClass" :plural="counter.evaluations">
+                     <template v-slot:n><span>{{ counter.evaluations }}</span></template>
+                  </i18n-t>
                </li>
                <li v-if="counter.tasksAlert > 0">
-                  <b>{{ counter.tasksAlert }}</b> {{ $t('counter.alert_tasks') }}
+                  <i18n-t keypath="counter.alert_tasks" tag="span" :class="counterClass" :plural="counter.tasksAlert">
+                     <template v-slot:n><span>{{ counter.tasksAlert }}</span></template>
+                  </i18n-t>
                </li>
                <li v-if="counter.tasksWarning > 0">
-                  <b>{{ counter.tasksWarning }}</b> {{ $t('counter.warning_tasks') }}
+                  <i18n-t keypath="counter.warning_tasks" tag="span" :class="counterClass" :plural="counter.tasksWarning">
+                     <template v-slot:n><span>{{ counter.tasksWarning }}</span></template>
+                  </i18n-t>
                </li>
             </ul>
          </div>
@@ -54,6 +66,13 @@ import Masonry from 'masonry-layout/masonry';
 
 export default {
    name: "MyCustoms",
+   data() {
+      return {
+         counterClass: {
+            counter: true   //hack to pass class 'counter' in i18n-t
+         }
+      }
+   },
    computed: {
       ...mapGetters(['counter']),
       noResults() {
@@ -67,11 +86,16 @@ export default {
 }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 div.custom4,
 div.custom3,
 div.custom2 {
    font-style: italic;
    color: var(--bs-chill-gray);
 }
+span.counter {
+   & > span {
+      background-color: unset;
+   }
+}
 </style>

src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue

@@ -1,32 +1,71 @@
 <template>
+<div class="accompanying_course_work">
    <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>
-         <th scope="col">id</th>
+         <th scope="col">{{ $t('max_date') }}</th>
+         <th scope="col">{{ $t('evaluation') }}</th>
+         <th scope="col">{{ $t('SocialAction') }}</th>
          <th scope="col"></th>
       </template>
       <template v-slot:tbody>
          <tr v-for="(e, i) in evaluations.results" :key="`evaluation-${i}`">
-            <td>{{ e.id}}</td>
+            <td>{{ $d(e.maxDate.datetime, 'short') }}</td>
             <td>
-               <a class="btn btn-sm btn-show" :href="getUrl(e)">
-                  {{ $t('show_entity', { entity: $t('the_evaluation') }) }}
-               </a>
+               {{ e.evaluation.title.fr }}
+            </td>
+            <td>
+               <span class="chill-entity entity-social-issue">
+                  <span class="badge bg-chill-l-gray text-dark">
+                     {{ e.accompanyingPeriodWork.socialAction.issue.text }}
+                  </span>
+               </span>
+               <h4 class="badge-title">
+                  <span class="title_label"></span>
+                  <span class="title_action">
+                     {{ e.accompanyingPeriodWork.socialAction.text }}
+                  </span>
+               </h4>
+               <span v-for="person in e.accompanyingPeriodWork.persons" class="me-1" :key="person.id">
+                  <on-the-fly
+                     :type="person.type"
+                     :id="person.id"
+                     :buttonText="person.textAge"
+                     :displayBadge="'true' === 'true'"
+                     action="show">
+                  </on-the-fly>
+               </span>
+            </td>
+            <td>
+               <div class="btn-group-vertical" role="group" aria-label="Actions">
+                  <a class="btn btn-sm btn-show" :href="getUrl(e)">
+                     {{ $t('show_entity', { entity: $t('the_evaluation') }) }}
+                  </a>
+                  <a class="btn btn-sm btn-update" :href="getUrl(e.accompanyingPeriodWork)">
+                     {{ $t('show_entity', { entity: $t('the_action') }) }}
+                  </a>
+                  <a class="btn btn-sm btn-show" :href="getUrl(e.accompanyingPeriodWork.accompanyingPeriod)">
+                     {{ $t('show_entity', { entity: $t('the_course') }) }}
+                  </a>
+               </div>
             </td>
          </tr>
       </template>
    </tab-table>
+</div>
 </template>
 
 <script>
 import { mapState, mapGetters } from "vuex";
 import TabTable from "./TabTable";
+import OnTheFly from 'ChillMainAssets/vuejs/OnTheFly/components/OnTheFly';
 
 export default {
    name: "MyEvaluations",
    components: {
-      TabTable
+      TabTable,
+      OnTheFly,
    },
    computed: {
       ...mapState([
@@ -45,8 +84,17 @@ export default {
    },
    methods: {
       getUrl(e) {
-         let anchor = '#evaluations';
-         return `/fr/person/accompanying-period/work/${e.id}/edit${anchor}`
+         switch (e.type) {
+            case 'accompanying_period_work_evaluation':
+               let anchor = '#evaluations';
+               return `/fr/person/accompanying-period/work/${e.accompanyingPeriodWork.id}/edit${anchor}`;
+            case 'accompanying_period_work':
+               return `/fr/person/accompanying-period/work/${e.id}/edit`
+            case 'accompanying_period':
+               return `/fr/parcours/${e.id}`
+            default:
+               throw 'entity type unknown';
+         }
       }
    },
 }

src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyTasks.vue

@@ -1,15 +1,21 @@
 <template>
    
-   <div class="alert alert-light">{{ $t('my_tasks.description_alert') }}</div>
-   <span v-if="noResultsWarning" class="chill-no-data-statement">{{ $t('no_data') }}</span>
+   <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>
-         <th scope="col">id</th>
+         <th scope="col">{{ $t('warning_date') }}</th>
+         <th scope="col">{{ $t('max_date') }}</th>
+         <th scope="col">{{ $t('task') }}</th>
          <th scope="col"></th>
       </template>
       <template v-slot:tbody>
-         <tr v-for="(t, i) in tasks.warning" :key="`task-warning-${i}`">
-            <td>{{ t.id}}</td>
+         <tr v-for="(t, i) in tasks.alert.results" :key="`task-alert-${i}`">
+            <td>{{ $d(t.warningDate.datetime, 'short') }}</td>
+            <td>
+               <span class="outdated">{{ $d(t.endDate.datetime, 'short') }}</span>
+            </td>
+            <td>{{ t.title }}</td>
             <td>
                <a class="btn btn-sm btn-show" :href="getUrl(t)">
                   {{ $t('show_entity', { entity: $t('the_task') }) }}
@@ -19,16 +25,22 @@
       </template>
    </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>
+   <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>
-         <th scope="col">id</th>
+         <th scope="col">{{ $t('warning_date') }}</th>
+         <th scope="col">{{ $t('max_date') }}</th>
+         <th scope="col">{{ $t('task') }}</th>
          <th scope="col"></th>
       </template>
       <template v-slot:tbody>
-         <tr v-for="(t, i) in tasks.alert" :key="`task-alert-${i}`">
-            <td>{{ t.id}}</td>
+         <tr v-for="(t, i) in tasks.warning.results" :key="`task-warning-${i}`">
+            <td>
+               <span class="outdated">{{ $d(t.warningDate.datetime, 'short') }}</span>
+            </td>
+            <td>{{ $d(t.endDate.datetime, 'short') }}</td>
+            <td>{{ t.title }}</td>
             <td>
                <a class="btn btn-sm btn-show" :href="getUrl(t)">
                   {{ $t('show_entity', { entity: $t('the_task') }) }}
@@ -81,5 +93,8 @@ export default {
 </script>
 
 <style scoped>
-
+span.outdated {
+   font-weight: bold;
+   color: var(--bs-warning);
+}
 </style>

src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorks.vue

@@ -6,12 +6,18 @@
       <template v-slot:thead>
          <th scope="col">{{ $t('StartDate') }}</th>
          <th scope="col">{{ $t('SocialAction') }}</th>
+         <th scope="col">{{ $t('concerned_persons') }}</th>
          <th scope="col"></th>
       </template>
       <template v-slot:tbody>
          <tr v-for="(w, i) in works.results" :key="`works-${i}`">
             <td>{{ $d(w.startDate.datetime, 'short') }}</td>
             <td>
+               <span class="chill-entity entity-social-issue">
+                  <span class="badge bg-chill-l-gray text-dark">
+                     {{ w.socialAction.issue.text }}
+                  </span>
+               </span>
                <h4 class="badge-title">
                   <span class="title_label"></span>
                   <span class="title_action">
@@ -20,7 +26,18 @@
                </h4>
             </td>
             <td>
-               <div class="btn-group" role="group" aria-label="Actions">
+               <span v-for="person in w.persons" class="me-1" :key="person.id">
+                  <on-the-fly
+                     :type="person.type"
+                     :id="person.id"
+                     :buttonText="person.textAge"
+                     :displayBadge="'true' === 'true'"
+                     action="show">
+                  </on-the-fly>
+               </span>
+            </td>
+            <td>
+               <div class="btn-group-vertical" role="group" aria-label="Actions">
                   <a class="btn btn-sm btn-update" :href="getUrl(w)">
                      {{ $t('show_entity', { entity: $t('the_action') }) }}
                   </a>
@@ -38,11 +55,13 @@
 <script>
 import { mapState, mapGetters } from "vuex";
 import TabTable from "./TabTable";
+import OnTheFly from 'ChillMainAssets/vuejs/OnTheFly/components/OnTheFly';
 
 export default {
    name: "MyWorks",
    components: {
-      TabTable
+      TabTable,
+      OnTheFly,
    },
    computed: {
       ...mapState([

src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/TabCounter.vue

@@ -1,6 +1,6 @@
 <template>
    <span v-if="isCounterAvailable"
-         class="badge rounded-pill bg-danger counter">
+         class="badge rounded-pill bg-danger">
       {{ count }}
    </span>
 </template>

src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js

@@ -22,8 +22,15 @@ const appMessages = {
             tab: "Mes notifications",
             description: "Liste des notifications reçues et non lues.",
         },
+        opening_date: "Date d'ouverture",
+        social_issues: "Problématiques sociales",
+        concerned_persons: "Usagers concernés",
+        max_date: "Date d'échéance",
+        warning_date: "Date de rappel",
+        evaluation: "Évaluation",
+        task: "Tâche",
         Date: "Date",
-        From: "De",
+        From: "Expéditeur",
         Subject: "Objet",
         Entity: "Associé à",
         show_entity: "Voir {entity}",
@@ -37,13 +44,15 @@ const appMessages = {
         no_data: "Aucun résultats",
         no_dashboard: "Pas de tableaux de bord",
         counter: {
-            unread_notifications: "notifications non lues",
-            assignated_courses: "parcours récents assignés",
-            assignated_actions: "actions assignées",
-            assignated_evaluations: "évaluations assignées",
-            alert_tasks: "tâches en rappel",
-            warning_tasks: "tâches à échéances",
-        }
+            unread_notifications: "{n} notification non lue | {n} notifications non lues",
+            assignated_courses: "{n} parcours récent assigné | {n} parcours récents assignés",
+            assignated_actions: "{n} action assignée | {n} actions assignées",
+            assignated_evaluations: "{n} évaluation assignée | {n} évaluations assignées",
+            alert_tasks: "{n} tâche en rappel | {n} tâches en rappel",
+            warning_tasks: "{n} tâche à échéance | {n} tâches à échéance",
+        },
+        emergency: "Urgent",
+        confidential: "Confidentiel",
     }
 };
 

src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/store.js

@@ -62,27 +62,27 @@ const store = createStore({
     },
     mutations: {
         addWorks(state, works) {
-            console.log('addWorks', works);
+            //console.log('addWorks', works);
             state.works = works;
         },
         addEvaluations(state, evaluations) {
-            console.log('addEvaluations', evaluations);
+            //console.log('addEvaluations', evaluations);
             state.evaluations = evaluations;
         },
         addTasksWarning(state, tasks) {
-            console.log('addTasksWarning', tasks);
+            //console.log('addTasksWarning', tasks);
             state.tasks.warning = tasks;
         },
         addTasksAlert(state, tasks) {
-            console.log('addTasksAlert', tasks);
+            //console.log('addTasksAlert', tasks);
             state.tasks.alert = tasks;
         },
         addCourses(state, courses) {
-            console.log('addCourses', courses);
+            //console.log('addCourses', courses);
             state.accompanyingCourses = courses;
         },
         addNotifications(state, notifications) {
-            console.log('addNotifications', notifications);
+            //console.log('addNotifications', notifications);
             state.notifications = notifications;
         },
         setLoading(state, bool) {

src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue

@@ -90,7 +90,7 @@ export default {
       OnTheFlyThirdparty,
       OnTheFlyCreate
    },
-   props: ['type', 'id', 'action', 'buttonText', 'displayBadge', 'isDead', 'parent', 'canCloseModal'],
+   props: ['type', 'id', 'action', 'buttonText', 'displayBadge', 'isDead', 'parent'],
    emits: ['saveFormOnTheFly'],
    data() {
       return {
@@ -165,16 +165,6 @@ export default {
          return `?returnPath=${window.location.pathname}${window.location.search}${window.location.hash}`;
       },
    },
-   watch: {
-      canCloseModal: {
-         handler: function(val, oldVal) {
-            if (val) {
-               this.closeModal();
-            }
-         },
-         deep: true
-      }
-   },
    methods: {
       closeModal() {
          this.modal.showModal = false;

src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/i18n.js

@@ -1,4 +1,7 @@
 import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n';
+import { thirdpartyMessages } from 'ChillThirdPartyAssets/vuejs/_js/i18n';
+import { addressMessages } from 'ChillMainAssets/vuejs/Address/i18n';
+import { ontheflyMessages } from 'ChillMainAssets/vuejs/OnTheFly/i18n';
 
 const appMessages = {
     fr: {
@@ -12,6 +15,6 @@ const appMessages = {
     }
 }
 
-Object.assign(appMessages.fr, personMessages.fr);
+Object.assign(appMessages.fr, personMessages.fr, thirdpartyMessages.fr, addressMessages.fr, ontheflyMessages.fr );
 
 export { appMessages };

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

@@ -93,8 +93,9 @@ export default {
       },
       getPopTitle(step) {
          if (step.transitionPrevious != null) {
+            //console.log(step.transitionPrevious.text);
             let freezed = step.isFreezed ? `<i class="fa fa-snowflake-o fa-sm me-1"></i>` : ``;
-            return `${freezed}${step.currentStep.text}`;
+            return `${freezed}${step.transitionPrevious.text}`;
          }
       },
       getPopContent(step) {

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

@@ -47,7 +47,8 @@ export default {
             console.log('goToGenerateWorkflow', event, workflowName);
 
             if (!this.$props.preventDefaultMoveToGenerate) {
-                event.target.click();
+                console.log('to go generate');
+                window.location.assign(this.makeLink(workflowName));
             }
 
             this.$emit('goToGenerateWorkflow', {event, workflowName, link: this.makeLink(workflowName)});

src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js

@@ -91,11 +91,11 @@ export const multiSelectMessages = {
     multiselect: {
       placeholder: 'Choisir',
       tag_placeholder: 'Créer un nouvel élément',
-      select_label: 'Appuyer sur "Entrée" pour sélectionner',
-      deselect_label: 'Appuyer sur "Entrée" pour désélectionner',
+      select_label: '"Entrée" ou cliquez pour sélectionner',
+      deselect_label: '"Entrée" ou cliquez pour désélectionner',
       select_group_label: 'Appuyer sur "Entrée" pour sélectionner ce groupe',
       deselect_group_label: 'Appuyer sur "Entrée" pour désélectionner ce groupe',
       selected_label: 'Sélectionné'
     }
   }
-};
+};