diff --git a/composer.json b/composer.json index 4181af68a..95074c18f 100644 --- a/composer.json +++ b/composer.json @@ -73,7 +73,8 @@ "symfony/web-profiler-bundle": "^5.0", "symfony/var-dumper": "4.*", "symfony/debug-bundle": "^5.1", - "symfony/phpunit-bridge": "^5.2" + "symfony/phpunit-bridge": "^5.2", + "nelmio/alice": "^3.8" }, "scripts": { "auto-scripts": { diff --git a/docs/source/development/api.rst b/docs/source/development/api.rst index 86eb6ff65..d6f63eea3 100644 --- a/docs/source/development/api.rst +++ b/docs/source/development/api.rst @@ -450,4 +450,39 @@ Full configuration example single-collection: single base_role: null +Maintaining an OpenApi +====================== + +.. note:: + + This is experimental and may change. Keep reading this part. + +Accessing swagger +----------------- + +The swagger UI is accessible through ``_ + +This is possible only in development mode. + +You must be authenticated with a valid user to access it. + +Maintaining specs +----------------- + +Each bundle should have an `open api 3.0 spec file `_ at the bundle's root, and name :code:`chill.api.specs.yaml`. + +.. warning:: + + Update the command :code:`specs-build` into `package.json` when adding a new api file. + +The specs may be compiled from the different bundles filed, and validated using docker node: + +.. code-block:: bash + + ./docker-node.sh + # build the openapi + yarn specs-build + # validate + yarn specs-validate + diff --git a/docs/source/installation/index.rst b/docs/source/installation/index.rst index 6aee5c526..1312480e3 100644 --- a/docs/source/installation/index.rst +++ b/docs/source/installation/index.rst @@ -82,7 +82,7 @@ Chill will be available at ``http://localhost:8001.`` Currently, there isn't any .. code-block:: bash - docker-compose exec --user $(id -u) php bin/console doctrine:fixtures:load + docker-compose exec --user $(id -u) php bin/console doctrine:fixtures:load --purge-with-truncate There are several users available: diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php index 5cc055f26..b5c935c76 100644 --- a/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php +++ b/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php @@ -25,12 +25,19 @@ class AbstractCRUDController extends AbstractController * * @param string $id * @return object + * @throw Symfony\Component\HttpKernel\Exception\NotFoundHttpException if the object is not found */ - protected function getEntity($action, $id, Request $request): ?object + protected function getEntity($action, $id, Request $request): object { - return $this->getDoctrine() + $e = $this->getDoctrine() ->getRepository($this->getEntityClass()) ->find($id); + + if (NULL === $e) { + throw $this->createNotFoundException(sprintf("The object %s for id %s is not found", $this->getEntityClass(), $id)); + } + + return $e; } /** diff --git a/src/Bundle/ChillMainBundle/Controller/SearchController.php b/src/Bundle/ChillMainBundle/Controller/SearchController.php index a44af8e7b..45390ceca 100644 --- a/src/Bundle/ChillMainBundle/Controller/SearchController.php +++ b/src/Bundle/ChillMainBundle/Controller/SearchController.php @@ -22,6 +22,7 @@ namespace Chill\MainBundle\Controller; +use Chill\MainBundle\Serializer\Model\Collection; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; use Chill\MainBundle\Search\UnknowSearchDomainException; @@ -34,6 +35,7 @@ use Symfony\Component\HttpFoundation\JsonResponse; use Chill\MainBundle\Search\SearchProvider; use Symfony\Contracts\Translation\TranslatorInterface; use Chill\MainBundle\Pagination\PaginatorFactory; +use Chill\MainBundle\Search\SearchApi; /** * Class SearchController @@ -42,32 +44,24 @@ use Chill\MainBundle\Pagination\PaginatorFactory; */ class SearchController extends AbstractController { - /** - * - * @var SearchProvider - */ - protected $searchProvider; + protected SearchProvider $searchProvider; - /** - * - * @var TranslatorInterface - */ - protected $translator; + protected TranslatorInterface $translator; - /** - * - * @var PaginatorFactory - */ - protected $paginatorFactory; + protected PaginatorFactory $paginatorFactory; + + protected SearchApi $searchApi; function __construct( SearchProvider $searchProvider, TranslatorInterface $translator, - PaginatorFactory $paginatorFactory + PaginatorFactory $paginatorFactory, + SearchApi $searchApi ) { $this->searchProvider = $searchProvider; $this->translator = $translator; $this->paginatorFactory = $paginatorFactory; + $this->searchApi = $searchApi; } @@ -152,6 +146,19 @@ class SearchController extends AbstractController array('results' => $results, 'pattern' => $pattern) ); } + + public function searchApi(Request $request, $_format): JsonResponse + { + //TODO this is an incomplete implementation + $query = $request->query->get('q', ''); + + $results = $this->searchApi->getResults($query, 0, 150); + $paginator = $this->paginatorFactory->create(count($results)); + + $collection = new Collection($results, $paginator); + + return $this->json($collection); + } public function advancedSearchListAction(Request $request) { diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCenters.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCenters.php index 1da1af2f3..a3c01fdf6 100644 --- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCenters.php +++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCenters.php @@ -55,11 +55,11 @@ class LoadCenters extends AbstractFixture implements OrderedFixtureInterface public function load(ObjectManager $manager) { foreach (static::$centers as $new) { - $centerA = new Center(); - $centerA->setName($new['name']); + $center = new Center(); + $center->setName($new['name']); - $manager->persist($centerA); - $this->addReference($new['ref'], $centerA); + $manager->persist($center); + $this->addReference($new['ref'], $center); static::$refs[] = $new['ref']; } diff --git a/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss index a27dcdc42..ed6d535e5 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss @@ -39,8 +39,17 @@ div.subheader { height: 130px; } -//// VUEJS //// +//// SCRATCH BUTTONS +.sc-button { + &.disabled { + cursor: default; + &.bt-remove { + background-color: #d9d9d9; + } + } +} +//// VUEJS //// div.vue-component { padding: 1.5em; margin: 2em 0; @@ -95,33 +104,47 @@ div.vue-component { } //// AddPersons modal -div.modal-body.up { - margin: auto 4em; - div.search { - position: relative; - input { - padding: 1.2em 1.5em 1.2em 2.5em; - margin: 1em 0; +div.body-head { + overflow-y: unset; + div.modal-body:first-child { + margin: auto 4em; + div.search { + position: relative; + input { + padding: 1.2em 1.5em 1.2em 2.5em; + margin: 1em 0; + } + i { + position: absolute; + opacity: 0.5; + padding: 0.65em 0; + top: 50%; + } + i.fa-search { + left: 0.5em; + } + i.fa-times { + right: 1em; + padding: 0.75em 0; + cursor: pointer; + } } - i { - position: absolute; - top: 50%; - left: 0.5em; - padding: 0.65em 0; - opacity: 0.5; - } - + } + div.modal-body:last-child { + padding-bottom: 0; } } -div.results { - div.count { - margin: -0.5em 0 0.7em; - display: flex; - justify-content: space-between; +div.count { + margin: -0.5em 0 0.7em; + display: flex; + justify-content: space-between; + a { + cursor: pointer; } +} +div.results { div.list-item { - line-height: 26pt; - padding: 0.3em 0.8em; + padding: 0.4em 0.8em; display: flex; flex-direction: row; &.checked { @@ -132,11 +155,20 @@ div.results { & > input { margin-right: 0.8em; } + span:not(.name) { + margin-left: 0.5em; + opacity: 0.5; + font-size: 90%; + font-style: italic; + } } div.right_actions { margin: 0 0 0 auto; + display: flex; + align-items: flex-end; & > * { margin-left: 0.5em; + align-self: baseline; } a.sc-button { border: 1px solid lightgrey; @@ -146,7 +178,6 @@ div.results { } } } - .discret { color: grey; margin-right: 1em; diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue index cbd2d0738..e6c1475e2 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue @@ -9,8 +9,8 @@ -
- +
+
diff --git a/src/Bundle/ChillMainBundle/Search/Model/Result.php b/src/Bundle/ChillMainBundle/Search/Model/Result.php new file mode 100644 index 000000000..a88c2f55f --- /dev/null +++ b/src/Bundle/ChillMainBundle/Search/Model/Result.php @@ -0,0 +1,36 @@ +relevance = $relevance; + $this->result = $result; + } + + public function getRelevance(): float + { + return $this->relevance; + } + + public function getResult() + { + return $this->result; + } + + + +} diff --git a/src/Bundle/ChillMainBundle/Search/SearchApi.php b/src/Bundle/ChillMainBundle/Search/SearchApi.php new file mode 100644 index 000000000..518edd31b --- /dev/null +++ b/src/Bundle/ChillMainBundle/Search/SearchApi.php @@ -0,0 +1,89 @@ +em = $em; + $this->search = $search; + } + + /** + * @return Model/Result[] + */ + public function getResults(string $query, int $offset, int $maxResult): array + { + // **warning again**: this is an incomplete implementation + $results = []; + + foreach ($this->getPersons($query) as $p) { + $results[] = new Model\Result((float)\rand(0, 100) / 100, $p); + } + foreach ($this->getThirdParties($query) as $t) { + $results[] = new Model\Result((float)\rand(0, 100) / 100, $t); + } + + \usort($results, function(Model\Result $a, Model\Result $b) { + return ($a->getRelevance() <=> $b->getRelevance()) * -1; + }); + + return $results; + } + + public function countResults(string $query): int + { + return 0; + } + + private function getThirdParties(string $query) + { + $thirdPartiesIds = $this->em->createQuery('SELECT t.id FROM '.ThirdParty::class.' t') + ->getScalarResult(); + $nbResults = rand(0, 15); + + if ($nbResults === 1) { + $nbResults++; + } elseif ($nbResults === 0) { + return []; + } + $ids = \array_map(function ($e) use ($thirdPartiesIds) { return $thirdPartiesIds[$e]['id'];}, + \array_rand($thirdPartiesIds, $nbResults)); + + $a = $this->em->getRepository(ThirdParty::class) + ->findById($ids); + return $a; + } + + private function getPersons(string $query) + { + $params = [ + SearchInterface::SEARCH_PREVIEW_OPTION => false + ]; + $search = $this->search->getResultByName($query, 'person_regular', 0, 50, $params, 'json'); + $ids = \array_map(function($r) { return $r['id']; }, $search['results']); + + + if (count($ids) === 0) { + return []; + } + + return $this->em->getRepository(Person::class) + ->findById($ids) + ; + } + +} diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php new file mode 100644 index 000000000..29d760b71 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php @@ -0,0 +1,29 @@ +getId(); + $data['text'] = $address->getStreet().', '.$address->getBuildingName(); + $data['postcode']['name'] = $address->getPostCode()->getName(); + + return $data; + } + + public function supportsNormalization($data, string $format = null) + { + return $data instanceof Address; + } + + +} diff --git a/src/Bundle/ChillMainBundle/chill.api.specs.yaml b/src/Bundle/ChillMainBundle/chill.api.specs.yaml new file mode 100644 index 000000000..ada65b08a --- /dev/null +++ b/src/Bundle/ChillMainBundle/chill.api.specs.yaml @@ -0,0 +1,59 @@ +--- +openapi: "3.0.0" +info: + version: "1.0.0" + title: "Chill api" + description: "Api documentation for chill. Currently, work in progress" +servers: + - url: "/api" + description: "Your current dev server" + +components: + parameters: + _format: + name: _format + in: path + required: true + schema: + type: string + enum: + - json + +paths: + /1.0/search.json: + get: + summary: perform a search across multiple entities + tags: + - search + - person + - thirdparty + description: > + **Warning**: This is currently a stub (not really implemented + + The search is performed across multiple entities. The entities must be listed into + `type` parameters. + + The results are ordered by relevance, from the most to the lowest relevant. + + parameters: + - name: q + in: query + required: true + description: the pattern to search + schema: + type: string + - name: type[] + in: query + required: true + description: the type entities amongst the search is performed + schema: + type: array + items: + type: string + enum: + - person + - thirdparty + responses: + 200: + description: "OK" + diff --git a/src/Bundle/ChillMainBundle/config/routes.yaml b/src/Bundle/ChillMainBundle/config/routes.yaml index 3fd7eafab..bc3187add 100644 --- a/src/Bundle/ChillMainBundle/config/routes.yaml +++ b/src/Bundle/ChillMainBundle/config/routes.yaml @@ -69,6 +69,13 @@ chill_main_search: requirements: _format: html|json +chill_main_search_global: + path: '/api/1.0/search.{_format}' + controller: Chill\MainBundle\Controller\SearchController::searchApi + format: 'json' + requirements: + _format: 'json' + chill_main_advanced_search: path: /{_locale}/search/advanced/{name} controller: Chill\MainBundle\Controller\SearchController::advancedSearchAction diff --git a/src/Bundle/ChillMainBundle/config/services/controller.yaml b/src/Bundle/ChillMainBundle/config/services/controller.yaml index 5fb542786..6021e3d72 100644 --- a/src/Bundle/ChillMainBundle/config/services/controller.yaml +++ b/src/Bundle/ChillMainBundle/config/services/controller.yaml @@ -16,6 +16,7 @@ services: $searchProvider: '@chill_main.search_provider' $translator: '@Symfony\Contracts\Translation\TranslatorInterface' $paginatorFactory: '@Chill\MainBundle\Pagination\PaginatorFactory' + $searchApi: '@Chill\MainBundle\Search\SearchApi' tags: ['controller.service_arguments'] Chill\MainBundle\Controller\PermissionsGroupController: diff --git a/src/Bundle/ChillMainBundle/config/services/search.yaml b/src/Bundle/ChillMainBundle/config/services/search.yaml index e8a457415..b7a1656b3 100644 --- a/src/Bundle/ChillMainBundle/config/services/search.yaml +++ b/src/Bundle/ChillMainBundle/config/services/search.yaml @@ -1,3 +1,10 @@ services: chill_main.search_provider: - class: Chill\MainBundle\Search\SearchProvider \ No newline at end of file + class: Chill\MainBundle\Search\SearchProvider + + Chill\MainBundle\Search\SearchProvider: '@chill_main.search_provider' + + Chill\MainBundle\Search\SearchApi: + arguments: + $em: '@Doctrine\ORM\EntityManagerInterface' + $search: '@Chill\MainBundle\Search\SearchProvider' diff --git a/src/Bundle/ChillMainBundle/config/services/serializer.yaml b/src/Bundle/ChillMainBundle/config/services/serializer.yaml index fb5f57b7e..fa30b876d 100644 --- a/src/Bundle/ChillMainBundle/config/services/serializer.yaml +++ b/src/Bundle/ChillMainBundle/config/services/serializer.yaml @@ -4,6 +4,10 @@ services: tags: - { name: 'serializer.normalizer', priority: 64 } + Chill\MainBundle\Serializer\Normalizer\AddressNormalizer: + tags: + - { name: 'serializer.normalizer', priority: 64 } + Chill\MainBundle\Serializer\Normalizer\DateNormalizer: tags: - { name: 'serializer.normalizer', priority: 64 } diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php index bbf2f399a..87c9a70df 100644 --- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php +++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php @@ -12,6 +12,8 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\Validator\Validator\ValidatorInterface; use Chill\PersonBundle\Privacy\AccompanyingPeriodPrivacyEvent; use Chill\PersonBundle\Entity\Person; +use Chill\ThirdPartyBundle\Entity\ThirdParty; +use Symfony\Component\Serializer\Exception\RuntimeException; class AccompanyingCourseApiController extends ApiController { @@ -64,6 +66,50 @@ class AccompanyingCourseApiController extends ApiController return $this->json($participation); } + public function requestorApi($id, Request $request, string $_format): Response + { + /** @var AccompanyingPeriod $accompanyingPeriod */ + $action = 'requestor'; + $accompanyingPeriod = $this->getEntity($action, $id, $request); + // a requestor may be a person or a thirdParty + + $this->checkACL($action, $request, $_format, $accompanyingPeriod); + $this->onPostCheckACL($action, $request, $_format, $accompanyingPeriod); + + if (Request::METHOD_DELETE === $request->getMethod()) { + $accompanyingPeriod->setRequestor(NULL); + } elseif (Request::METHOD_POST === $request->getMethod()) { + $requestor = null; + $exceptions = []; + foreach ([Person::class, ThirdParty::class] as $class) { + try { + $requestor = $this->getSerializer() + ->deserialize($request->getContent(), $class, $_format, []); + } catch (RuntimeException $e) { + $exceptions[] = $e; + } + } + if ($requestor === null) { + throw new BadRequestException('Could not find any person or requestor', 0, $exceptions[0]); + } + + $accompanyingPeriod->setRequestor($requestor); + } else { + throw new BadRequestException('method not supported'); + } + + $errors = $this->validator->validate($accompanyingPeriod); + + if ($errors->count() > 0) { + // only format accepted + return $this->json($errors); + } + + $this->getDoctrine()->getManager()->flush(); + + return $this->json($accompanyingPeriod->getRequestor()); + } + protected function onPostCheckACL(string $action, Request $request, string $_format, $entity): ?Response { $this->eventDispatcher->dispatch( diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php index 05a1934e6..8134f6938 100644 --- 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); diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php index 84b8bb397..6fa58adac 100644 --- a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php +++ b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php @@ -334,6 +334,18 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac Request::METHOD_POST => \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE, Request::METHOD_DELETE=> \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE ] + ], + 'requestor' => [ + 'methods' => [ + Request::METHOD_POST => true, + Request::METHOD_DELETE => true, + Request::METHOD_GET => false, + Request::METHOD_HEAD => false, + ], + 'roles' => [ + Request::METHOD_POST => \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE, + Request::METHOD_DELETE=> \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE + ] ] ] diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php index 9eec8e6fb..1a6a3faae 100644 --- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php @@ -515,9 +515,9 @@ class AccompanyingPeriod return $this->requestorPerson; } - public function setRequestorPerson(Person $requestorPerson): self + public function setRequestorPerson(Person $requestorPerson = null): self { - $this->requestorPerson = ($this->requestorThirdParty === null) ? $requestorPerson : null; + $this->requestorPerson = $requestorPerson; return $this; } @@ -527,9 +527,9 @@ class AccompanyingPeriod return $this->requestorThirdParty; } - public function setRequestorThirdParty(ThirdParty $requestorThirdParty): self + public function setRequestorThirdParty(ThirdParty $requestorThirdParty = null): self { - $this->requestorThirdParty = ($this->requestorPerson === null) ? $requestorThirdParty : null; + $this->requestorThirdParty = $requestorThirdParty; return $this; } @@ -542,6 +542,37 @@ class AccompanyingPeriod return $this->requestorPerson ?? $this->requestorThirdParty; } + + /** + * Set a requestor + * + * The requestor is either an instance of ThirdParty, or an + * instance of Person + * + * @param $requestor Person|ThirdParty + * @return self + * @throw UnexpectedValueException if the requestor is not a Person or ThirdParty + * + */ + public function setRequestor($requestor): self + { + if ($requestor instanceof Person) { + $this->setRequestorThirdParty(NULL); + $this->setRequestorPerson($requestor); + } elseif ($requestor instanceof ThirdParty) { + $this->setRequestorThirdParty($requestor); + $this->setRequestorPerson(NULL); + } elseif (NULL === $requestor) { + $this->setRequestorPerson(NULL); + $this->setRequestorThirdParty(NULL); + } else { + throw new \UnexpectedValueException("requestor is not an instance of Person or ThirdParty"); + } + + return $this; + } + + public function isRequestorAnonymous(): bool { return $this->requestorAnonymous; diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue index 480b882dc..8c3b24b9e 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue @@ -2,6 +2,8 @@ + + diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Interlocutors.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Interlocutors.vue new file mode 100644 index 000000000..0d2f0ccaf --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Interlocutors.vue @@ -0,0 +1,82 @@ + + + diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonItem.vue index 0d81d61c4..4fa2caf12 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonItem.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonItem.vue @@ -29,10 +29,12 @@
  • - +
    • diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue index 631534fcb..a01e4dc33 100644 --- 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 @@

    {{ $t('persons_associated.title')}}

    - +
    @@ -12,24 +12,26 @@ - - +
    {{ $t('persons_associated.firstname') }}{{ $t('action.actions') }}
    - -
      - -
    + + + +
    @@ -40,27 +42,44 @@ import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue' export default { name: 'PersonsAssociated', - components: { + components: { PersonItem, AddPersons }, + data() { + return { + addPersons: { + key: 'persons_associated', + options: { + type: ['person'], + priority: null, + uniq: false, + } + } + } + }, computed: mapState({ participations: state => state.accompanyingCourse.participations, counter: state => state.accompanyingCourse.participations.length }), methods: { removeParticipation(item) { - this.$store.dispatch('removeParticipation', item) + console.log('@@ CLICK remove participation: item', item); + this.$store.dispatch('removeParticipation', item); }, closeParticipation(item) { console.log('@@ CLICK close participation: item', item); - this.$store.dispatch('closeParticipation', item) + this.$store.dispatch('closeParticipation', item); }, - /* - savePersons() { - console.log('[wip] saving persons'); + addNewPersons({ selected, modal }) { + console.log('@@@ CLICK button addNewPersons', selected); + selected.forEach(function(item) { + this.$store.dispatch('addParticipation', item); + }, this + ); + this.$refs.addPersons.resetSearch(); // to cast child method + modal.showModal = false; } - */ } } diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue index 6086ab515..fc6fcc062 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue @@ -1,85 +1,116 @@ 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 045476686..25066f4bb 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js @@ -9,19 +9,50 @@ const appMessages = { closing_date: "Date de clôture", remark: "Commentaire", closing_motive: "Motif de clôture", + user: "TMS", + flags: "Indicateurs", + status: "État", + step: { + draft: "Brouillon", + open: "Ouvert", + active: "En file active" + }, + 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", + is_anonymous: "Le demandeur est 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é", }, + interlocutors: { + title: "Interlocuteurs privilégiés", + counter: "Pas d'interlocuteur | 1 interlocuteur | {count} interlocuteurs", + firstname: "Prénom", + lastname: "Nom", + add_interlocutors: "Ajouter des interlocuteurs", + } } }; 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 04785eca5..7c8bb05ef 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js @@ -1,11 +1,9 @@ import 'es6-promise/auto'; import { createStore } from 'vuex'; -import addPersons from './modules/addPersons' -import { getAccompanyingCourse, postParticipation } from '../api'; +import { getAccompanyingCourse, postParticipation, postRequestor } from '../api'; const debug = process.env.NODE_ENV !== 'production'; - -const id = window.accompanyingCourseId; //tmp +const id = window.accompanyingCourseId; let initPromise = getAccompanyingCourse(id) .then(accompanying_course => new Promise((resolve, reject) => { @@ -13,7 +11,6 @@ let initPromise = getAccompanyingCourse(id) const store = createStore({ strict: debug, modules: { - addPersons }, state: { accompanyingCourse: accompanying_course, @@ -23,30 +20,36 @@ let initPromise = getAccompanyingCourse(id) }, mutations: { removeParticipation(state, item) { - //console.log('mutation: remove item', item.id); + //console.log('### mutation: remove item', item.id); state.accompanyingCourse.participations = state.accompanyingCourse.participations.filter(participation => participation !== item); }, closeParticipation(state, { participation, payload }) { - console.log('### mutation: close item', { participation, payload }); - // trouve dans le state le payload et le supprime du state - state.accompanyingCourse.participations = state.accompanyingCourse.participations.filter(participation => participation !== payload); - // pousse la participation - state.accompanyingCourse.participations.push(participation); + //console.log('### mutation: close item', { participation, payload }); + // find row position and replace by closed participation + state.accompanyingCourse.participations.splice( + state.accompanyingCourse.participations.findIndex(element => element === payload), 1, participation + ); }, addParticipation(state, participation) { //console.log('### mutation: add participation', participation); state.accompanyingCourse.participations.push(participation); }, + removeRequestor(state) { + state.accompanyingCourse.requestor = null; + }, + addRequestor(state, requestor) { + console.log(requestor); + state.accompanyingCourse.requestor = requestor; + } }, actions: { removeParticipation({ commit }, payload) { commit('removeParticipation', payload); }, closeParticipation({ commit }, payload) { - //console.log('## action: fetch delete participation: payload', payload.person.id); - postParticipation(id, payload.person.id, 'DELETE') + console.log('## action: fetch delete participation: payload', payload); + postParticipation(id, payload.person.person_id, 'DELETE') .then(participation => new Promise((resolve, reject) => { - //console.log('payload', payload); commit('closeParticipation', { participation, payload }); resolve(); })) @@ -54,22 +57,43 @@ let initPromise = getAccompanyingCourse(id) state.errorMsg.push(error.message); }); }, - addParticipation(addPersons, payload) { - //console.log('## action: fetch post participation: payload', payload.id); - postParticipation(id, payload.id, 'POST') + addParticipation({ commit }, payload) { + console.log('## action: fetch post participation (select item): payload', payload); + postParticipation(id, payload.result.person_id, 'POST') .then(participation => new Promise((resolve, reject) => { - //console.log(participation, payload); - addPersons.commit('addParticipation', participation); - addPersons.commit('resetState', payload); + commit('addParticipation', participation); resolve(); })) .catch((error) => { state.errorMsg.push(error.message); }); }, + removeRequestor({ commit }) { + postRequestor(id, null, 'DELETE') + .then(requestor => new Promise((resolve, reject) => { + commit('removeRequestor'); + resolve(); + })) + .catch((error) => { + state.errorMsg.push(error.message); + }); + }, + addRequestor({ commit }, payload) { + console.log(payload); + postRequestor(id, payload, 'POST') + .then(requestor => new Promise((resolve, reject) => { + commit('addRequestor', requestor); + resolve(); + })) + .catch((error) => { + state.errorMsg.push(error.message); + }); + }, + requestorIsAnonymous({ commit }, payload) { + console.log('payload', payload); + } } }); - //console.log('store object', store.state.accompanyingCourse.id); resolve(store); })); diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/modules/addPersons.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/modules/addPersons.js deleted file mode 100644 index e65f94fa9..000000000 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/modules/addPersons.js +++ /dev/null @@ -1,76 +0,0 @@ -import { searchPersons } from 'ChillPersonAssets/vuejs/_api/AddPersons' -import { postParticipation } from '../../api'; - - -// initial state -const state = { - query: "", - suggested: [], - selected: [] -} - -// getters -const getters = { - selectedAndSuggested: state => { - const uniqBy = (a, key) => [ - ...new Map( - a.map(x => [key(x), x]) - ).values() - ]; - let union = [...new Set([ - ...state.suggested.slice().reverse(), - ...state.selected.slice().reverse(), - ])]; - return uniqBy(union, k => k.id); - } -} - -// mutations -const mutations = { - setQuery(state, query) { - //console.log('q=', query); - state.query = query; - }, - loadSuggestions(state, suggested) { - state.suggested = suggested; - }, - updateSelected(state, value) { - state.selected = value; - }, - resetState(state, selected) { - //console.log('avant', state.selected); - state.selected = state.selected.filter(value => value !== selected); - //console.log('après', state.selected); - state.query = ""; - state.suggested = []; - } -} - -// actions -const actions = { - setQuery({ commit }, payload) { - //console.log('## action: setquery: payload', payload); - commit('setQuery', payload.query); - if (payload.query.length >= 3) { - searchPersons(payload.query) - .then(suggested => new Promise((resolve, reject) => { - commit('loadSuggestions', suggested.results); - resolve(); - })); - } else { - commit('loadSuggestions', []); - } - }, - updateSelected({ commit }, payload) { - //console.log('## action: update selected values: payload', payload); - commit('updateSelected', payload); - } -} - -export default { - //namespaced: true, - state, - getters, - actions, - mutations -} diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/AddPersons.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/AddPersons.js index d5ac91ac5..cf2404288 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/AddPersons.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/AddPersons.js @@ -1,15 +1,23 @@ -const - locale = 'fr', - format = 'json' -; +/* +* Build query string with query and options +*/ +const parametersToString = ({ query, options }) => { + let types =''; + options.type.forEach(function(type) { + types += '&type[]=' + type; + }); + return 'q=' + query + types; +}; /* -* Endpoint chill_person_search, method GET, get a list of persons +* Endpoint chill_person_search +* method GET, get a list of persons * * @query string - the query to search for */ -let searchPersons = (query) => { - let url = `/${locale}/search.${format}?name=person_regular&q=${query}`; +const searchPersons = ({ query, options }) => { + let queryStr = parametersToString({ query, options }); + let url = `/fr/search.json?name=person_regular&${queryStr}`; return fetch(url) .then(response => { if (response.ok) { return response.json(); } @@ -17,4 +25,22 @@ let searchPersons = (query) => { }); }; -export { searchPersons }; +/* +* Endpoint v.2 chill_main_search_global +* method GET, get a list of persons and thirdparty +* +* NOTE: this is a temporary WIP endpoint, return inconsistent random results +* @query string - the query to search for +*/ +const searchPersons_2 = ({ query, options }) => { + let queryStr = parametersToString({ query, options }); + let url = `/api/1.0/search.json?${queryStr}`; + return fetch(url) + .then(response => { + if (response.ok) { return response.json(); } + throw Error('Error with request resource response'); + }); +}; + + +export { searchPersons, searchPersons_2 }; diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue index 53600da1c..5595c7944 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue @@ -1,73 +1,87 @@