Merge branch 'issue345_internal_thirdparty_contact' into 'master'

Add contact to thirdparty from within modal

See merge request Chill-Projet/chill-bundles!284

src/Bundle/ChillMainBundle/Controller/CivilityApiController.php

@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\ApiController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class CivilityApiController extends ApiController
+{
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator, $_format)
+    {
+        return $query->addOrderBy('e.order', 'ASC');
+    }
+}

src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\MainBundle\DependencyInjection;
 
 use Chill\MainBundle\Controller\AddressApiController;
+use Chill\MainBundle\Controller\CivilityApiController;
 use Chill\MainBundle\Controller\LocationController;
 use Chill\MainBundle\Controller\LocationTypeController;
 use Chill\MainBundle\Controller\UserController;
@@ -559,6 +560,21 @@ class ChillMainExtension extends Extension implements
                         ],
                     ],
                 ],
+                [
+                    'class' => \Chill\MainBundle\Entity\Civility::class,
+                    'name' => 'civility',
+                    'base_path' => '/api/1.0/main/civility',
+                    'base_role' => 'ROLE_USER',
+                    'controller' => CivilityApiController::class,
+                    'actions' => [
+                        '_index' => [
+                            'methods' => [
+                                Request::METHOD_GET => true,
+                                Request::METHOD_HEAD => true,
+                            ],
+                        ],
+                    ],
+                ],
             ],
         ]);
     }

src/Bundle/ChillMainBundle/Entity/Civility.php

@@ -17,6 +17,7 @@ use Symfony\Component\Serializer\Annotation as Serializer;
 /**
  * @ORM\Table(name="chill_main_civility")
  * @ORM\Entity
+ * @Serializer\DiscriminatorMap(typeProperty="type", mapping={"chill_main_civility": Civility::class})
  */
 class Civility
 {
@@ -29,6 +30,7 @@ class Civility
 
     /**
      * @ORM\Column(type="boolean")
+     * @Serializer\Groups({"read"})
      */
     private bool $active = true;
 

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

@@ -77,14 +77,11 @@ export default {
                return this.$refs.castPerson.$data.person;
             case 'thirdparty':
                let data = this.$refs.castThirdparty.$data.thirdparty;
-               data.name = data.text;
-               /*
                if (data.address !== undefined && data.address !== null) {
                    data.address = { id: data.address.address_id }
                } else {
                    data.address = null;
                }
-               */
 
                return data;
             default:

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

@@ -18,7 +18,8 @@
          @close="modal.showModal = false">
 
          <template v-slot:header>
-            <h3 class="modal-title">{{ $t(titleModal) }}</h3>
+            <h3 v-if="parent" class="modal-title">{{ $t(titleModal, {q: parent.text}) }}</h3>
+            <h3 v-else class="modal-title">{{ $t(titleModal) }}</h3>
          </template>
 
          <template v-slot:body v-if="type === 'person'">
@@ -29,10 +30,10 @@
                ref="castPerson">
             </on-the-fly-person>
             <div v-if="hasResourceComment">
-                <h3>{{ $t('onthefly.resource_comment_title') }}</h3>
-                <blockquote class="chill-user-quote">
-                    {{ parent.comment }}
-                </blockquote>
+               <h3>{{ $t('onthefly.resource_comment_title') }}</h3>
+               <blockquote class="chill-user-quote">
+                  {{ parent.comment }}
+               </blockquote>
             </div>
          </template>
 
@@ -44,13 +45,22 @@
                ref="castThirdparty">
             </on-the-fly-thirdparty>
             <div v-if="hasResourceComment">
-                <h3>{{ $t('onthefly.resource_comment_title') }}</h3>
-                <blockquote class="chill-user-quote">
-                    {{ parent.comment }}
-                </blockquote>
+               <h3>{{ $t('onthefly.resource_comment_title') }}</h3>
+               <blockquote class="chill-user-quote">
+                  {{ parent.comment }}
+               </blockquote>
             </div>
          </template>
 
+         <template v-slot:body v-else-if="parent">
+            <on-the-fly-thirdparty
+               :parent="parent"
+               :action="action"
+               type="thirdparty"
+               ref="castThirdparty">
+            </on-the-fly-thirdparty>
+         </template>
+
          <template v-slot:body v-else>
             <on-the-fly-create
                :action="action"
@@ -83,6 +93,7 @@ import Modal from 'ChillMainAssets/vuejs/_components/Modal.vue';
 import OnTheFlyCreate from './Create.vue';
 import OnTheFlyPerson from 'ChillPersonAssets/vuejs/_components/OnTheFly/Person.vue';
 import OnTheFlyThirdparty from 'ChillThirdPartyAssets/vuejs/_components/OnTheFly/ThirdParty.vue';
+import { postThirdparty } from "ChillThirdPartyAssets/vuejs/_api/OnTheFly";
 
 export default {
    name: 'OnTheFly',
@@ -105,11 +116,11 @@ export default {
    computed: {
       hasResourceComment() {
           //console.log('hasResourceComment', this.parent);
-          return (typeof this.parent !== 'undefined' && this.parent !== null)
-              && this.action === 'show'
-              && this.parent.type === 'accompanying_period_resource'
-              && (this.parent.comment !== null && this.parent.comment !== '')
-              ;
+         return (typeof this.parent !== 'undefined' && this.parent !== null)
+            && this.action === 'show'
+            && this.parent.type === 'accompanying_period_resource'
+            && (this.parent.comment !== null && this.parent.comment !== '')
+            ;
       },
       classAction() {
          switch (this.action) {
@@ -119,6 +130,8 @@ export default {
                return 'btn-update';
             case 'create':
                return 'btn-create';
+            case 'addContact':
+               return 'btn-tpchild';
          }
       },
       titleAction() {
@@ -129,6 +142,8 @@ export default {
                return 'action.edit';
             case 'create':
                return 'action.create';
+            case 'addContact':
+               return 'action.addContact';
          }
       },
       titleCreate() {
@@ -146,6 +161,8 @@ export default {
                return 'onthefly.edit.' + this.type;
             case 'create':
                return this.titleCreate;
+            case 'addContact':
+               return 'onthefly.addContact.title';
          }
       },
       titleMessage() {
@@ -179,8 +196,8 @@ export default {
          this.modal.showModal = false;
       },
       openModal() {
-         //console.log('## OPEN ON THE FLY MODAL');
-         //console.log('## type:', this.type, ', action:', this.action);
+         // console.log('## OPEN ON THE FLY MODAL');
+         // console.log('## type:', this.type, ', action:', this.action);
          this.modal.showModal = true;
          this.$nextTick(function() {
             //this.$refs.search.focus();
@@ -190,7 +207,7 @@ export default {
          this.$data.action = action;
       },
       saveAction() {
-         console.log('saveAction button: create/edit action with', this.type);
+         // console.log('saveAction button: create/edit action with', this.type);
          let
             type = this.type,
             data = {} ;
@@ -202,17 +219,28 @@ export default {
 
             case 'thirdparty':
                data = this.$refs.castThirdparty.$data.thirdparty;
+               /* never executed ? */
                break;
 
             default:
-               if (typeof this.type === 'undefined') { // action=create
-                  type = this.$refs.castNew.radioType;
-                  data = this.$refs.castNew.castDataByType();
+               if (typeof this.type === 'undefined') { // action=create or addContact
+                   console.log('will rewrite data');
+                  if (this.action === 'addContact') {
+                     type = 'thirdparty'
+                     data = this.$refs.castThirdparty.$data.thirdparty;
+                     console.log('data original', data);
+                     data.parent = {type: "thirdparty", id: this.parent.id};
+                  } else {
+                     type = this.$refs.castNew.radioType;
+                     data = this.$refs.castNew.castDataByType();
+                     console.log(data)
+                  }
                } else {
                   throw 'error with object type';
                }
          }
-
+         console.log('type', type);
+         console.log('data', data);
          // pass datas to parent
          this.$emit('saveFormOnTheFly', { type: type, data: data });
       },
@@ -232,4 +260,8 @@ export default {
 a {
    cursor: pointer;
 }
+
+/* .btn-add-contact {
+   background-color: pink;
+} */
 </style>

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

@@ -21,7 +21,13 @@ const ontheflyMessages = {
                 person: "un nouvel usager",
                 thirdparty: "un nouveau tiers professionnel"
             },
-            resource_comment_title: "Un commentaire est associé à cet interlocuteur"
+            addContact: {
+                title: "Créer un contact pour {q}"
+            },
+            resource_comment_title: "Un commentaire est associé à cet interlocuteur",
+            addContact: {
+                title: "Créer un contact pour {q}"
+            }
         }
     }
 }

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

@@ -46,7 +46,8 @@ const messages = {
             person: "Quitter la page et ouvrir la fiche de l'usager",
             thirdparty: "Quitter la page et voir le tiers",
          },
-         refresh: 'Rafraîchir'
+         refresh: 'Rafraîchir',
+         addContact: 'Ajouter un contact'
       },
       nav: {
          next: "Suivant",

src/Bundle/ChillMainBundle/chill.api.specs.yaml

@@ -788,6 +788,16 @@ paths:
                     description: "accepted"
                 403:
                     description: "unauthorized"
+    /1.0/main/civility.json:
+        get:
+            tags:
+            - civility
+            summary: Return all civility types
+            responses:
+                200:
+                    description: "ok"
+                401:
+                    description: "Unauthorized"
     /1.0/main/user-job.json:
         get:
             tags: