Merge branch 'master' into 'deleteAccompanyingPeriodWork_234'

# Conflicts:
#   CHANGELOG.md

src/Bundle/ChillPersonBundle/CRUD/Controller/OneToOneEntityPersonCRUDController.php

@@ -1,20 +1,7 @@
 <?php
-/*
- * Copyright (C) 2016-2019 Champs-Libres <info@champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\CRUD\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
@@ -23,11 +10,8 @@ use Chill\PersonBundle\Entity\Person;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\RedirectResponse;
+use BadMethodCallException;
 
-/**
- * Controller for entities attached as one-to-on to a person
- * 
- */
 class OneToOneEntityPersonCRUDController extends CRUDController
 {
     protected function getTemplateFor($action, $entity, Request $request)
@@ -35,11 +19,11 @@ class OneToOneEntityPersonCRUDController extends CRUDController
         if (!empty($this->crudConfig[$action]['template'])) {
             return $this->crudConfig[$action]['template'];
         }
-        
+
         switch ($action) {
             case 'new':
                 return '@ChillPerson/CRUD/new.html.twig';
-            case 'edit': 
+            case 'edit':
                 return '@ChillPerson/CRUD/edit.html.twig';
             case 'index':
                 return '@ChillPerson/CRUD/index.html.twig';
@@ -49,41 +33,41 @@ class OneToOneEntityPersonCRUDController extends CRUDController
                     . "action");
         }
     }
-    
+
     protected function getEntity($action, $id, Request $request): ?object
     {
         $entity = parent::getEntity($action, $id, $request);
-        
+
         if (NULL === $entity) {
             $entity = $this->createEntity($action, $request);
             $person = $this->getDoctrine()
                 ->getManager()
                 ->getRepository(Person::class)
                 ->find($id);
-            
+
             $entity->setPerson($person);
         }
-        
+
         return $entity;
     }
-    
+
     protected function onPreFlush(string $action, $entity, FormInterface $form, Request $request)
     {
         $this->getDoctrine()->getManager()->persist($entity);
     }
-    
+
     protected function onPostFetchEntity($action, Request $request, $entity): ?Response
     {
         if (FALSE === $this->getDoctrine()->getManager()->contains($entity)) {
             return new RedirectResponse($this->generateRedirectOnCreateRoute($action, $request, $entity));
         }
-        
+
         return null;
     }
-    
+
     protected function generateRedirectOnCreateRoute($action, Request $request, $entity)
     {
-        throw new BadMethodCallException("not implemtented yet");
+        throw new BadMethodCallException('Not implemented yet.');
     }
 
 }

src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php

@@ -959,6 +959,8 @@ EOF
                 $table->setHeaders(array('#', 'label', 'value'));
                 $i = 0;
 
+                $matchingTableRowAnswer = [];
+
                 foreach($answers as $key => $answer) {
                     $table->addRow(array(
                         $i, $answer, $key

src/Bundle/ChillPersonBundle/Controller/PersonController.php

@@ -150,7 +150,7 @@ final class PersonController extends AbstractController
             ));
     }
 
-    public function editAction($person_id)
+    public function editAction($person_id, Request $request)
     {
         $person = $this->_getPerson($person_id);
 
@@ -163,57 +163,33 @@ final class PersonController extends AbstractController
 
         $form = $this->createForm(PersonType::class, $person,
             array(
-                "action" => $this->generateUrl('chill_person_general_update',
-                    array("person_id" => $person_id)),
                 "cFGroup" => $this->getCFGroup()
             )
         );
 
-        return $this->render('ChillPersonBundle:Person:edit.html.twig',
-            array('person' => $person, 'form' => $form->createView()));
-    }
-
-    public function updateAction($person_id, Request $request)
-    {
-        $person = $this->_getPerson($person_id);
-
-        if ($person === null) {
-            return $this->createNotFoundException();
-        }
-
-        $this->denyAccessUnlessGranted('CHILL_PERSON_UPDATE', $person,
-                'You are not allowed to edit this person');
-
-        $form = $this->createForm(PersonType::class, $person,
-            array("cFGroup" => $this->getCFGroup()));
-
-        if ($request->getMethod() === 'POST') {
-            $form->handleRequest($request);
-
-            if ( ! $form->isValid() ) {
-                $this->get('session')
-                        ->getFlashBag()->add('error', $this->translator
-                            ->trans('This form contains errors'));
-
-                return $this->render('ChillPersonBundle:Person:edit.html.twig',
-                        array('person' => $person,
-                            'form' => $form->createView()));
-            }
+        $form->handleRequest($request);
 
+        if ($form->isSubmitted() && !$form->isValid()) {
+            $this->get('session')
+                ->getFlashBag()->add('error', $this->translator
+                    ->trans('This form contains errors'));
+        } elseif ($form->isSubmitted() && $form->isValid()) {
             $this->get('session')->getFlashBag()
-                    ->add('success',
-                            $this->get('translator')
-                            ->trans('The person data has been updated')
-                            );
+                ->add('success',
+                    $this->get('translator')
+                        ->trans('The person data has been updated')
+                );
 
             $this->em->flush();
 
-            $url = $this->generateUrl('chill_person_view', array(
+            return $this->redirectToRoute('chill_person_view',  [
                 'person_id' => $person->getId()
-            ));
-
-            return $this->redirect($url);
+            ]);
         }
+
+
+        return $this->render('ChillPersonBundle:Person:edit.html.twig',
+            array('person' => $person, 'form' => $form->createView()));
     }
 
     /**

src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php

@@ -161,8 +161,10 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
         \shuffle($this->personIds);
     }
 
-    private function getRandomPersons(int $min, int $max)
+    private function getRandomPersons(int $min, int $max): array
     {
+        $persons = [];
+
         $nb = \random_int($min, $max);
 
         for ($i=0; $i < $nb; $i++) {
@@ -172,7 +174,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
                 ;
         }
 
-        return $persons ?? [];
+        return $persons;
     }
 
     public function getDependencies()

src/Bundle/ChillPersonBundle/Export/Aggregator/CountryOfBirthAggregator.php

@@ -143,6 +143,8 @@ final class CountryOfBirthAggregator implements AggregatorInterface, ExportEleme
 
     public function getLabels($key, array $values, $data)
     {
+        $labels = [];
+
         if ($data['group_by_level'] === 'country') {
             $qb = $this->countriesRepository->createQueryBuilder('c');
 
@@ -153,15 +155,17 @@ final class CountryOfBirthAggregator implements AggregatorInterface, ExportEleme
                     ->getResult(\Doctrine\ORM\Query::HYDRATE_SCALAR);
 
             // initialize array and add blank key for null values
-            $labels[''] = $this->translator->trans('without data');
-            $labels['_header'] = $this->translator->trans('Country of birth');
+            $labels = [
+                '' => $this->translator->trans('without data'),
+                '_header' => $this->translator->trans('Country of birth'),
+            ];
+
             foreach($countries as $row) {
                 $labels[$row['c_countryCode']] = $this->translatableStringHelper->localize($row['c_name']);
             }
+        }
 
-
-        } elseif ($data['group_by_level'] === 'continent') {
-
+        if ($data['group_by_level'] === 'continent') {
             $labels = array(
                 'EU' => $this->translator->trans('Europe'),
                 'AS' => $this->translator->trans('Asia'),
@@ -170,13 +174,12 @@ final class CountryOfBirthAggregator implements AggregatorInterface, ExportEleme
                 'SA' => $this->translator->trans('South America'),
                 'NA' => $this->translator->trans('North America'),
                 'OC' => $this->translator->trans('Oceania'),
-                ''   => $this->translator->trans('without data'),
+                '' => $this->translator->trans('without data'),
                 '_header' => $this->translator->trans('Continent of birth')
              );
         }
 
-
-        return function($value) use ($labels) {
+        return function(string $value) use ($labels): string {
             return $labels[$value];
         };
 

src/Bundle/ChillPersonBundle/Export/Aggregator/NationalityAggregator.php

@@ -144,6 +144,8 @@ final class NationalityAggregator implements AggregatorInterface, ExportElementV
 
     public function getLabels($key, array $values, $data)
     {
+        $labels = [];
+
         if ($data['group_by_level'] === 'country') {
             $qb = $this->countriesRepository->createQueryBuilder('c');
 
@@ -154,15 +156,17 @@ final class NationalityAggregator implements AggregatorInterface, ExportElementV
                     ->getResult(\Doctrine\ORM\Query::HYDRATE_SCALAR);
 
             // initialize array and add blank key for null values
-            $labels[''] = $this->translator->trans('without data');
-            $labels['_header'] = $this->translator->trans('Nationality');
+            $labels = [
+                '' => $this->translator->trans('without data'),
+                '_header' => $this->translator->trans('Nationality'),
+            ];
+
             foreach($countries as $row) {
                 $labels[$row['c_countryCode']] = $this->translatableStringHelper->localize($row['c_name']);
             }
+        }
 
-
-        } elseif ($data['group_by_level'] === 'continent') {
-
+        if ($data['group_by_level'] === 'continent') {
             $labels = array(
                 'EU' => $this->translator->trans('Europe'),
                 'AS' => $this->translator->trans('Asia'),
@@ -176,8 +180,7 @@ final class NationalityAggregator implements AggregatorInterface, ExportElementV
              );
         }
 
-
-        return function($value) use ($labels) {
+        return function(string $value) use ($labels): string {
             return $labels[$value];
         };
 

src/Bundle/ChillPersonBundle/Repository/Household/HouseholdMembersRepository.php

@@ -1,8 +1,10 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Repository\Household;
 
-use Chill\PersonBundle\Entity\Household\HouseholdMembers;
+use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 
@@ -12,6 +14,6 @@ final class HouseholdMembersRepository
 
     public function __construct(EntityManagerInterface $entityManager)
     {
-        $this->repository = $entityManager->getRepository(HouseholdMembers::class);
+        $this->repository = $entityManager->getRepository(HouseholdMember::class);
     }
 }

src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue

@@ -20,18 +20,25 @@
             v-bind:item="item">
          </suggestion-third-party>
 
+         <suggestion-user
+            v-if="item.result.type === 'user'"
+            v-bind:item="item">
+         </suggestion-user>
+
    </div>
 </template>
 
 <script>
 import SuggestionPerson from './TypePerson';
 import SuggestionThirdParty from './TypeThirdParty';
+import SuggestionUser from './TypeUser';
 
 export default {
    name: 'PersonSuggestion',
    components: {
       SuggestionPerson,
       SuggestionThirdParty,
+      SuggestionUser,
    },
    props: [
       'item', 

src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue

@@ -0,0 +1,47 @@
+<template>
+    <div class="container usercontainer">
+      <div class="user-identification">
+        <span class="name">
+           {{ item.result.text }}
+        </span>
+      </div>
+    </div>
+    <div class="right_actions">
+      <span class="badge rounded-pill bg-secondary">
+        {{ $t('user')}}
+      </span>
+    </div>
+</template>
+
+<script>
+
+const i18n = {
+  messages: {
+    fr: {
+      user: 'Utilisateur' // TODO how to define other translations?
+    }
+  }
+};
+
+export default {
+   name: 'SuggestionUser',
+   props: ['item'],
+   i18n,
+   computed: {
+     hasParent() {
+       return this.$props.item.result.parent !== null;
+     },
+   }
+}
+</script>
+
+<style lang="scss" scoped>
+.usercontainer {
+ .userparent {
+    .name {
+      font-weight: bold;
+      font-variant: all-small-caps;
+    }
+ }
+}
+</style>

src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig

@@ -62,7 +62,7 @@
             {%- endif -%}
             {%- if options['addId'] -%}
                 <span class="id-number" title="{{ 'Person'|trans ~ ' n° ' ~ person.id }}">
-                    {{ person.id|upper }}
+                    {{ person.id|upper -}}
                 </span>
             {%- endif -%}
         </div>
@@ -95,7 +95,7 @@
                 </time>
                 {%- if options['addAge'] -%}
                     <span class="age">
-                        ({{ 'years_old'|trans({ 'age': person.age }) }})
+                        {{- 'years_old'|trans({ 'age': person.age }) -}}
                     </span>
                 {%- endif -%}
             {%- endif -%}

src/Bundle/ChillPersonBundle/Search/PersonSearch.php

@@ -263,8 +263,9 @@ class PersonSearch extends AbstractSearch implements HasAdvancedSearchFormInterf
 
     public function convertTermsToFormData(array $terms)
     {
-        foreach(['firstname', 'lastname', 'gender', '_default']
-            as $key) {
+        $data = [];
+
+        foreach(['firstname', 'lastname', 'gender', '_default'] as $key) {
             $data[$key] = $terms[$key] ?? null;
         }
 

src/Bundle/ChillPersonBundle/Templating/Entity/SocialActionRender.php

@@ -38,7 +38,7 @@ class SocialActionRender implements ChillEntityRenderInterface
     {
         /** @var $socialAction SocialAction */
         $options = \array_merge(self::DEFAULT_ARGS, $options);
-        $titles[] = $this->translatableStringHelper->localize($socialAction->getTitle());
+        $titles = [$this->translatableStringHelper->localize($socialAction->getTitle())];
 
         while ($socialAction->hasParent()) {
             $socialAction = $socialAction->getParent();

src/Bundle/ChillPersonBundle/Templating/Entity/SocialIssueRender.php

@@ -38,8 +38,7 @@ final class SocialIssueRender implements ChillEntityRenderInterface
         /** @var $socialIssue SocialIssue */
         $options = array_merge(self::DEFAULT_ARGS, $options);
 
-        $titles[] = $this->translatableStringHelper
-            ->localize($socialIssue->getTitle());
+        $titles = [$this->translatableStringHelper->localize($socialIssue->getTitle())];
 
         // loop to parent, until root
         while ($socialIssue->hasParent()) {