requestor, just display datas

2025-06-07 18:44:08 +00:00 · 2021-05-07 19:53:08 +02:00 · 2021-05-07 19:53:08 +02:00 · 226f71ab2b
commit 226f71ab2b
parent a887326611
8 changed files with 115 additions and 59 deletions
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
@ -106,6 +106,11 @@ class AccompanyingCourseController extends Controller
            ])
        );

+        //$accompanyingCourse->getRequestorPerson();
+        //$accompanyingCourse->getRequestorThirdParty();
+        //$accompanyingCourse->isRequestorAnonymous();
+        //dump($accompanyingCourse); die;
+
        switch ($_format) {
            case 'json':
                return $this->json($accompanyingCourse);
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AccompanyingCourse.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AccompanyingCourse.vue
@ -4,14 +4,22 @@
      <dl>
         <dt>{{ $t('course.id') }}</dt>
            <dd>{{ accompanyingCourse.id }}</dd>
+         <dt>{{ $t('course.step') }}</dt>
+            <dd>{{ accompanyingCourse.step }}</dd>
+         <dt>{{ $t('course.emergency') }}</dt>
+            <dd>{{ accompanyingCourse.emergency }}</dd>
+         <dt>{{ $t('course.confidential') }}</dt>
+            <dd>{{ accompanyingCourse.confidential }}</dd>
         <dt>{{ $t('course.opening_date') }}</dt>
            <dd>{{ $d(accompanyingCourse.openingDate.datetime, 'short') }}</dd>
         <dt>{{ $t('course.closing_date') }}</dt>
-            <dd>{{ $d(accompanyingCourse.closingDate.datetime, 'short') }}</dd>
+            <dd v-if="accompanyingCourse.closingDate">{{ $d(accompanyingCourse.closingDate.datetime, 'short') }}</dd>
         <dt>{{ $t('course.remark') }}</dt>
            <dd>{{ accompanyingCourse.remark }}</dd>
         <dt>{{ $t('course.closing_motive') }}</dt>
-            <dd>{{ accompanyingCourse.closing_motive }}</dd>
+            <dd v-if="accompanyingCourse.closingMotive">{{ accompanyingCourse.closingMotive.name.fr }}</dd>
+         <dt>{{ $t('course.user') }}</dt>
+            <dd v-if="accompanyingCourse.user">{{ accompanyingCourse.user.username }}</dd>
      </dl>
   </div>
 </template>
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
@ -2,7 +2,7 @@
 <div class="vue-component">
   <h3>{{ $t('persons_associated.title')}}</h3>
   <label>{{ $tc('persons_associated.counter', counter) }}</label>
-   <table class="rounded"> 
+   <table class="rounded">
      <thead>
         <tr>
            <th class="chill-orange">{{ $t('persons_associated.firstname') }}</th>
@ -12,24 +12,19 @@
            <th class="chill-orange">{{ $t('action.actions') }}</th>
         </tr>
      </thead>
-      <tbody> 
-         <person-item 
-            v-for="participation in participations" 
-            v-bind:participation="participation" 
-            v-bind:key="participation.id" 
+      <tbody>
+         <person-item
+            v-for="participation in participations"
+            v-bind:participation="participation"
+            v-bind:key="participation.id"
            @remove="removeParticipation"
            @close="closeParticipation">
         </person-item>
      </tbody>
   </table>
-   <add-persons></add-persons>
-   <ul class="record_actions">
-      <!--li>
-         <button class="sc-button orange" @click="savePersons">
-            {{ $t('action.save') }}
-         </button>
-      </li-->
-   </ul>
+
+   <add-persons buttonTitle="persons_associated.add_persons"></add-persons>
+
 </div>
 </template>

@ -40,7 +35,7 @@ import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue'

 export default {
   name: 'PersonsAssociated',
-   components: { 
+   components: {
      PersonItem,
      AddPersons
   },
@ -55,12 +50,7 @@ export default {
      closeParticipation(item) {
         console.log('@@ CLICK close participation: item', item);
         this.$store.dispatch('closeParticipation', item)
-      },
-      /*
-      savePersons() {
-         console.log('[wip] saving persons');
      }
-      */
   }
 }
 </script>
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
@ -1,27 +1,58 @@
 <template>
 <div class="vue-component">
+   
   <h3>{{ $t('requestor.title') }}</h3>
-   {{ accompanyingCourse.id }}
-   {{ accompanyingCourse.remark }}<br><br>
   
+   <div v-if="accompanyingCourse.requestor">
+      <dt>{{ $t('requestor.person_id') }}</dt>   
+         <dd>{{ accompanyingCourse.requestor.person_id }}</dd>
+      <dt>{{ $t('requestor.type') }}</dt>   
+         <dd>{{ accompanyingCourse.requestor.type }}</dd>
+      <dt>{{ $t('requestor.text') }}</dt>   
+         <dd>{{ accompanyingCourse.requestor.text }}</dd>
+      <dt>{{ $t('requestor.firstName') }}</dt>   
+         <dd>{{ accompanyingCourse.requestor.firstName }}</dd>
+      <dt>{{ $t('requestor.lastName') }}</dt>   
+         <dd>{{ accompanyingCourse.requestor.lastName }}</dd>
+      <dt>{{ $t('requestor.phonenumber') }}</dt>   
+         <dd>{{ accompanyingCourse.requestor.phonenumber }}</dd>
+      <dt>{{ $t('requestor.mobilenumber') }}</dt>   
+         <dd>{{ accompanyingCourse.requestor.mobilenumber }}</dd>
+      <dt>{{ $t('requestor.altNames') }}</dt>   
+         <dd>{{ accompanyingCourse.requestor.altNames }}</dd>
+      <dt>{{ $t('requestor.anonymous') }}</dt>
+         <dd>{{ accompanyingCourse.requestorAnonymous }}</dd>
+         
+      <div v-if="accompanyingCourse.requestor.type === 'person'">
+         <dt>{{ $t('requestor.birthdate') }}</dt>   
+            <dd>{{ $d(accompanyingCourse.requestor.birthdate.datetime, 'short') }}</dd>
+         <dt>{{ $t('requestor.center') }}</dt>   
+            <dd>{{ accompanyingCourse.requestor.center.name }}</dd>
+      </div>
+      
+      <div v-if="accompanyingCourse.requestor.type === 'thirdparty'">
+         <dt>{{ $t('requestor.address') }}</dt>
+            <dd>{{ accompanyingCourse.requestor.address.text }}</dd>
+         <dt>{{ $t('requestor.location') }}</dt>
+            <dd>{{ accompanyingCourse.requestor.address.postcode.name }}</dd>
+      </div>
+   </div>
   
+   <add-persons buttonTitle="requestor.add_requestor"></add-persons>
+
 </div>
 </template>

 <script>
-import Modal from 'ChillMainAssets/vuejs/_components/Modal'
+import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue'

 export default {
   name: 'Requestor',
   components: {
-      Modal,
+      AddPersons,
   },
   data() {
      return {
-         modal: {
-            showModal: false,
-            modalDialogClass: "modal-dialog-scrollable modal-xl"  // modal-lg modal-md modal-sm
-         }
      }
   },
   computed: {
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
@ -9,18 +9,37 @@ const appMessages = {
         closing_date: "Date de clôture",
         remark: "Commentaire",
         closing_motive: "Motif de clôture",
+         user: "TMS",
+         step: "Statut",
+         emergency: "urgent",
+         confidential: "confidentiel",
      },
      persons_associated: {
         title: "Usagers concernés",
         counter: "Pas d'usager | 1 usager | {count} usagers",
-         firstname: "Prénom", 
-         lastname: "Nom", 
-         startdate: "Date d'entrée", 
+         firstname: "Prénom",
+         lastname: "Nom",
+         startdate: "Date d'entrée",
         enddate: "Date de sortie",
-         addPerson: "Ajouter un usager",
+         add_persons: "Ajouter des usagers",
      },
      requestor: {
         title: "Demandeur",
+         add_requestor: "Ajouter un demandeur",
+         //requestor: "Demandeur",
+         anonymous: "Anonyme",
+         type: "Type",
+         person_id: "id",
+         text: "Dénomination",
+         firstName: "Prénom",
+         lastName: "Nom",
+         birthdate: "Date de naissance",
+         center: "Centre",
+         phonenumber: "Téléphone",
+         mobilenumber: "Mobile",
+         altNames: "Autres noms",
+         address: "Adresse",
+         location: "Localité",
      },
   }
 };
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
@ -1,13 +1,13 @@
 <template>
   <button class="sc-button bt-create centered mt-4" @click="openModal">
-      {{ $t('add_persons.search_add_others_persons') }}
+      {{ $t(buttonTitle) }}
   </button>
-   
+
   <teleport to="body">
-      <modal v-if="modal.showModal" 
-         :modalDialogClass="modal.modalDialogClass" 
-         @close="modal.showModal = false">      
-            
+      <modal v-if="modal.showModal"
+         :modalDialogClass="modal.modalDialogClass"
+         @close="modal.showModal = false">
+
         <template v-slot:header>
            <h3 class="modal-title">{{ $t('add_persons.title') }}</h3>
         </template>
@ -17,16 +17,16 @@
               <label style="float: right;">
                  {{ $tc('add_persons.suggested_counter', suggestedCounter) }}
               </label>
-               
+
               <input id="search-persons"
-                  name="query" 
-                  v-model="query" 
-                  :placeholder="$t('add_persons.search_some_persons')" 
+                  name="query"
+                  v-model="query"
+                  :placeholder="$t('add_persons.search_some_persons')"
                  ref="search" />
               <i class="fa fa-search fa-lg"></i>
            </div>
         </template>
-               
+
         <template v-slot:body>
            <!--span class="discret">Selection: {{ selected }}</span-->
            <div class="results">
@ -34,32 +34,32 @@
                  <span>
                     <a  v-if="suggestedCounter > 0" href="#">
                        {{ $t('action.check_all')}}</a>
-                     <a  v-if="selectedCounter > 0" href="#"> 
+                     <a  v-if="selectedCounter > 0" href="#">
                        {{ $t('action.reset')}}</a>
                  </span>
                  <span v-if="selectedCounter > 0">
                     {{ $tc('add_persons.selected_counter', selectedCounter) }}
                  </span>
               </div>
-               
-               <person-suggestion 
+
+               <person-suggestion
                  v-for="item in this.selectedAndSuggested.slice().reverse()"
-                  v-bind:item="item" 
+                  v-bind:item="item"
                  v-bind:key="item.id">
               </person-suggestion>
-               
+
               <button v-if="query.length >= 3" class="sc-button bt-create ml-5 mt-2" name="createPerson">
                  {{ $t('action.create') }} "{{ query }}"
               </button>
            </div>
         </template>
-               
+
         <template v-slot:footer>
            <button class="sc-button green" @click="addNewPersons">
               <i class="fa fa-plus fa-fw"></i>{{ $t('action.add')}}
            </button>
         </template>
-         
+
      </modal>
   </teleport>
 </template>
@ -71,6 +71,7 @@ import PersonSuggestion from 'ChillPersonAssets/vuejs/_components/PersonSuggesti

 export default {
   name: 'AddPersons',
+   props: ['buttonTitle'],
   components: {
      Modal,
      PersonSuggestion,
@ -80,7 +81,8 @@ export default {
         modal: {
            showModal: false,
            modalDialogClass: "modal-dialog-scrollable modal-xl"
-         }
+         },
+         //button: this.buttonTitle
      }
   },
   computed: {
@ -100,10 +102,10 @@ export default {
      },
      suggestedCounter() {
         return this.addPersons.suggested.length;
-      }, 
+      },
      selected() {
         return this.addPersons.selected;
-      }, 
+      },
      selectedCounter() {
         return this.addPersons.selected.length;
      },
@ -121,7 +123,7 @@ export default {
      addNewPersons() {
         console.log('@@@ CLICK button addNewPersons')
         this.selected.forEach(function(item) {
-               //console.log('# dispatch action for each item', item); 
+               //console.log('# dispatch action for each item', item);
               this.$store.dispatch('addParticipation', item);
            }, this
         );
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
@ -1,7 +1,6 @@
 const personMessages = {
   fr: {
      add_persons: {
-         search_add_others_persons: "Rechercher et ajouter d'autres usagers",
         title: "Ajouter des usagers",
         suggested_counter: "Pas de résultats | 1 résultat | {count} résultats",
         selected_counter: " 1 sélectionné | {count} sélectionnés",
@ -9,9 +8,9 @@ const personMessages = {
      },
      item: {
         type_person: "Usager",
-         type_tms: "TMS",
+         type_user: "TMS",
         type_3rdparty: "Tiers",
-         type_menage: "Ménage"
+         type_household: "Ménage"
      }
   }
 };
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodNormalizer.php
@ -38,6 +38,8 @@ class AccompanyingPeriodNormalizer implements NormalizerInterface, NormalizerAwa
            'remark' => $period->getRemark(),
            'participations' => $this->normalizer->normalize($period->getParticipations(), $format),
            'closingMotive' => $this->normalizer->normalize($period->getClosingMotive(), $format),
+            'requestor' => $this->normalizer->normalize($period->getRequestor(), $format),
+            'requestorAnonymous' => $this->normalizer->normalize($period->isRequestorAnonymous(), $format),
            'user' => $this->normalizer->normalize($period->getUser(), $format),
            'step' => $period->getStep(),
            'origin' => $this->normalizer->normalize($period->getOrigin(), $format),