From 74e94637b9c2fb3efa4d5efafd439bbff2d394fd Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 19 Jan 2022 13:43:47 +0100
Subject: [PATCH] job in accompanying course: validation

---
 .../ChillPersonBundle/Entity/AccompanyingPeriod.php  |  1 +
 .../vuejs/AccompanyingCourse/components/Confirm.vue  |  7 ++++++-
 .../vuejs/AccompanyingCourse/components/Referrer.vue | 12 ++++++++----
 .../public/vuejs/AccompanyingCourse/js/i18n.js       |  4 +++-
 .../public/vuejs/AccompanyingCourse/store/index.js   |  4 ++++
 5 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
index 3d7d1a7b4..dedef0a17 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
@@ -204,6 +204,7 @@ class AccompanyingPeriod implements
      *     targetEntity=UserJob::class
      * )
      * @Groups({"read", "write"})
+     * @Assert\NotBlank(groups={AccompanyingPeriod::STEP_CONFIRMED})
      */
     private ?UserJob $job = null;
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
index 8c4aa2910..c69b202dc 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
@@ -110,7 +110,11 @@ export default {
             scopes: {
               msg: 'confirm.set_a_scope',
               anchor: '#section-70'
-            }
+            },
+            job: {
+               msg: 'confirm.job_not_valid',
+               anchor: '#section-80'
+            },
          }
       }
    },
@@ -124,6 +128,7 @@ export default {
          'isOriginValid',
          'isAdminLocationValid',
          'isLocationValid',
+         'isJobValid',
          'validationKeys',
          'isValidToBeConfirmed'
       ]),
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue
index f801ca355..699909cd5 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue
@@ -67,13 +67,17 @@
       </ul>
    </div>
 
+   <div v-if="!isJobValid" class="alert alert-warning to-confirm">
+      {{ $t('job.not_valid') }}
+   </div>
+
 </div>
 </template>
 
 <script>
 import VueMultiselect from 'vue-multiselect';
 import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods';
-import { mapState } from 'vuex';
+import { mapState, mapGetters } from 'vuex';
 import UserRenderBoxBadge from "ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge";
 
 export default {
@@ -101,11 +105,12 @@ export default {
            })
          },
       }),
+      ...mapGetters([
+         'isJobValid'
+      ])
    },
    mounted() {
       this.getJobs();
-      console.log(this.users)
-      console.log(this.jobs)
    },
    methods: {
       updateReferrer(value) {
@@ -130,7 +135,6 @@ export default {
             })
       },
       updateJob(value) {
-         console.log(value)
          this.$store.dispatch('updateJob', value)
             .catch(({name, violations}) => {
                if (name === 'ValidationException' || name === 'AccessException') {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
index 223a4526e..0b62e930c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
@@ -134,6 +134,7 @@ const appMessages = {
          location_not_valid: "indiquez au minimum une localisation temporaire du parcours",
          origin_not_valid: "Indiquez une origine à la demande",
          adminLocation_not_valid: "Indiquez une localisation administrative à la demande",
+         job_not_valid: "Indiquez un métier du référent",
          set_a_scope: "indiquez au moins un service",
          sure: "Êtes-vous sûr ?",
          sure_description: "Une fois le changement confirmé, il ne sera plus possible de le remettre à l'état de brouillon !",
@@ -142,7 +143,8 @@ const appMessages = {
       },
       job: {
          label: "Métier",
-         placeholder: "Choisir un métier"
+         placeholder: "Choisir un métier",
+         not_valid: "Sélectionnez un métier du référent"
       },
       // catch errors
       'Error while updating AccompanyingPeriod Course.': "Erreur du serveur lors de la mise à jour du parcours d'accompagnement.",
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
index 6767de6f8..71fcb1f97 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
@@ -55,6 +55,9 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
             isLocationValid(state) {
                return state.accompanyingCourse.location !== null;
             },
+            isJobValid(state) {
+               return state.accompanyingCourse.job !== null;
+            },
             isScopeValid(state) {
                //console.log('is scope valid', state.accompanyingCourse.scopes.length > 0);
                return state.accompanyingCourse.scopes.length > 0;
@@ -63,6 +66,7 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
                let keys = [];
                if (!getters.isParticipationValid) { keys.push('participation'); }
                if (!getters.isLocationValid) { keys.push('location'); }
+               if (!getters.isJobValid) { keys.push('job'); }
                if (!getters.isSocialIssueValid) { keys.push('socialIssue'); }
                if (!getters.isOriginValid) { keys.push('origin'); }
                if (!getters.isAdminLocationValid) { keys.push('adminLocation'); }