Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'master' into 'deleteAccompanyingPeriodWork_234'

Browse Source 
# Conflicts:
#   CHANGELOG.md
This commit is contained in:
Julien Fastré 2021-11-12 12:06:34 +00:00
commit 7482c709b3
44 changed files with 2311 additions and 668 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CHANGELOG.md
View File

@ -11,10 +11,15 @@ and this project adheres to
## Unreleased
<!-- write down unreleased development here -->
* unnecessary whitespace removed from person banner after person-id + double parentheses removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/290)
* [person]: delete accompanying period work, including related objects (cascade) (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/36)
## Test releases
### Test release 2021-11-08
* [person]: Display the name of a user when searching after a User (TMS)
>>>>>>> CHANGELOG.md
* [person]: Add civility to the person
* [person]: Various improvements on the edit person form
* [person]: Set available_languages and available_countries as parameters for use in the edit person form
@ -41,9 +46,7 @@ and this project adheres to
* [household]: household addresses ordered by ValidFrom date and by id to show the last created address on top.
* [socialWorkAction]: display of social issue and parent issues + banner context added.
* [DBAL dependencies] Upgrade to DBAL 3.1
## Test releases
* [person]: double parentheses removed around age in banner + whitespace
### Test release 2021-10-27

3
composer.json
View File

@ -54,6 +54,9 @@
"doctrine/doctrine-fixtures-bundle": "^3.3",
"fakerphp/faker": "^1.13",
"nelmio/alice": "^3.8",
"phpstan/extension-installer": "^1.1",
"phpstan/phpstan": "^1.0",
"phpstan/phpstan-strict-rules": "^1.0",
"phpunit/phpunit": "^7.0",
"symfony/debug-bundle": "^5.1",
"symfony/dotenv": "^5.1",

1542
phpstan-baseline.neon Normal file
View File

File diff suppressed because it is too large Load Diff

21
phpstan.neon.dist Normal file
View File

@ -0,0 +1,21 @@
parameters:
level: 1
paths:
- src/
excludePaths:
- src/Bundle/*/Tests/*
- src/Bundle/*/Test/*
- src/Bundle/*/config/*
- src/Bundle/*/migrations/*
- src/Bundle/*/translations/*
- src/Bundle/*/Resources/*
- src/Bundle/*/src/Tests/*
- src/Bundle/*/src/Test/*
- src/Bundle/*/src/config/*
- src/Bundle/*/src/migrations/*
- src/Bundle/*/src/translations/*
- src/Bundle/*/src/Resources/*
includes:
- phpstan-baseline.neon

9
src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
View File

@ -105,12 +105,12 @@ class ActivityTypeAggregator implements AggregatorInterface
return new Role(ActivityStatsVoter::STATS);
}
public function getLabels($key, array $values, $data)
public function getLabels($key, array $values, $data): \Closure
{
// for performance reason, we load data from db only once
$this->typeRepository->findBy(array('id' => $values));
return function($value) use ($data) {
return function($value): string {
if ($value === '_header') {
return 'Activity type';
}
@ -120,12 +120,11 @@ class ActivityTypeAggregator implements AggregatorInterface
return $this->stringHelper->localize($t->getName());
};
}
public function getQueryKeys($data)
public function getQueryKeys($data): array
{
return array(self::KEY);
return [self::KEY];
}
}

24
src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig
View File

@ -40,7 +40,6 @@
},
{ 'title': 'Users concerned'|trans,
'items': entity.users,
'path' : 'admin_user_show',
'key' : 'id'
},
] %}
@ -58,6 +57,7 @@
<ul class="list-content">
{% for item in bloc.items %}
<li>
{% if bloc.path is defined %}
<a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
<span class="{% if (badge_person is defined and badge_person == true) %}badge-person{% else %}badge bg-primary{% endif %}">
{{ item|chill_entity_render_box({
@ -66,6 +66,14 @@
}) }}
</span>
</a>
{% else %}
<span class="{% if (badge_person is defined and badge_person == true) %}badge-person{% else %}badge bg-primary{% endif %}">
{{ item|chill_entity_render_box({
'render': 'raw',
'addAltNames': false
}) }}
</span>
{% endif %}
</li>
{% endfor %}
</ul>
@ -85,6 +93,7 @@
<ul class="list-content">
{% for item in bloc.items %}
<li>
{% if bloc.path is defined %}
<a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
<span class="{% if (badge_person is defined and badge_person == true) %}badge-person{% else %}badge bg-primary{% endif %}">
{{ item|chill_entity_render_box({
@ -93,6 +102,12 @@
}) }}
</span>
</a>
{% else %}
{{ item|chill_entity_render_box({
'render': 'raw',
'addAltNames': false
}) }}
{% endif %}
</li>
{% endfor %}
</ul>
@ -114,12 +129,19 @@
{% for item in bloc.items %}
<span class="wl-item {% if (badge_person is defined and badge_person == true) %}badge-person{% else %}badge bg-primary{% endif %}">
{% if bloc.path is defined %}
<a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
{{ item|chill_entity_render_box({
'render': 'raw',
'addAltNames': false
}) }}
</a>
{% else %}
{{ item|chill_entity_render_box({
'render': 'raw',
'addAltNames': false
}) }}
{% endif %}
</span>
{% endfor %}

2
src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php
View File

@ -19,8 +19,6 @@ final class ChillAsideActivityExtension extends Extension implements PrependExte
{
/**
* {@inheritdoc}
*
* @phpstan-ignore-next-line
*/
public function load(array $configs, ContainerBuilder $container): void
{

4
src/Bundle/ChillAsideActivityBundle/src/Templating/Entity/CategoryRender.php
View File

@ -30,7 +30,9 @@ final class CategoryRender implements ChillEntityRenderInterface
{
$options = array_merge(self::DEFAULT_ARGS, $options);
$titles[] = $this->translatableStringHelper->localize($asideActivityCategory->getTitle());
$titles = [
$this->translatableStringHelper->localize($asideActivityCategory->getTitle()),
];
while ($asideActivityCategory->hasParent()) {
$asideActivityCategory = $asideActivityCategory->getParent();

6
src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
View File

@ -97,9 +97,9 @@ class CalendarController extends AbstractController
'calendarItems' => $calendarItems,
'user' => $user
]);
}
} elseif ($accompanyingPeriod instanceof AccompanyingPeriod) {
if ($accompanyingPeriod instanceof AccompanyingPeriod) {
$total = $this->calendarRepository->countByAccompanyingPeriod($accompanyingPeriod);
$paginator = $this->paginator->create($total);
$calendarItems = $this->calendarRepository->findBy(
@ -117,6 +117,8 @@ class CalendarController extends AbstractController
'paginator' => $paginator
]);
}
throw new \Exception('Unable to list actions.');
}
/**

6
src/Bundle/ChillCustomFieldsBundle/DependencyInjection/ChillCustomFieldsExtension.php
View File

@ -46,7 +46,11 @@ class ChillCustomFieldsExtension extends Extension implements PrependExtensionIn
public function prepend(ContainerBuilder $container)
{
// add form layout to twig resources
$twigConfig['form_themes'][] = 'ChillCustomFieldsBundle:Form:fields.html.twig';
$twigConfig = [
'form_themes' => [
'ChillCustomFieldsBundle:Form:fields.html.twig',
],
];
$container->prependExtensionConfig('twig', $twigConfig);
//add routes for custom bundle

2
src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
View File

@ -145,5 +145,7 @@ class DocGeneratorTemplateController extends AbstractController
} catch (TransferException $e) {
throw $e;
}
throw new \Exception('Unable to generate document.');
}
}

6
src/Bundle/ChillDocStoreBundle/EntityRepository/AccompanyingCourseDocumentRepository.php
View File

@ -1,8 +1,10 @@
<?php
namespace Chill\DocStoreBundle\Repository;
declare(strict_types=1);
use App\Entity\AccompanyingCourseDocument;
namespace Chill\DocStoreBundle\EntityRepository;
use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
use Doctrine\Persistence\ManagerRegistry;

31
src/Bundle/ChillEventBundle/Controller/ParticipationController.php
View File

@ -181,7 +181,7 @@ class ParticipationController extends AbstractController
protected function newMultiple(Request $request)
{
$participations = $this->handleRequest($request, new Participation(), true);
$ignoredParticipations = $newParticipations = [];
foreach ($participations as $i => $participation) {
// check for authorization
@ -209,7 +209,7 @@ class ParticipationController extends AbstractController
// this is where the function redirect depending on valid participation
if (!isset($newParticipations)) {
if ([] === $newParticipations) {
// if we do not have nay participants, redirect to event view
$this->addFlash('error', $this->get('translator')->trans(
'None of the requested people may participate '
@ -222,22 +222,27 @@ class ParticipationController extends AbstractController
// if we have multiple participations, show a form with multiple participations
$form = $this->createCreateFormMultiple($newParticipations);
return $this->render('ChillEventBundle:Participation:new-multiple.html.twig', array(
return $this->render(
'ChillEventBundle:Participation:new-multiple.html.twig',
[
'form' => $form->createView(),
'participations' => $newParticipations,
'ignored_participations' => isset($ignoredParticipations) ? $ignoredParticipations : array()
));
} else {
// if we have only one participation, show the same form than for single participation
$form = $this->createCreateForm($participation);
'ignored_participations' => $ignoredParticipations
]
);
}
return $this->render('ChillEventBundle:Participation:new.html.twig', array(
// if we have only one participation, show the same form than for single participation
$form = $this->createCreateForm($participation);
return $this->render(
'ChillEventBundle:Participation:new.html.twig',
[
'form' => $form->createView(),
'participation' => $participation,
'ignored_participations' => isset($ignoredParticipations) ? $ignoredParticipations : array()
));
}
'ignored_participations' => $ignoredParticipations,
]
);
}
/**

2
src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
View File

@ -504,6 +504,8 @@ class ApiController extends AbstractCRUDController
$this->getContextForSerializationPostAlter($action, $request, $_format, $entity, [$postedData])
);
}
throw new \Exception('Unable to handle such request method.');
}
/**

1
src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php
View File

@ -72,6 +72,7 @@ class LoadCountriesCommand extends Command
public static function prepareCountryList($languages)
{
$regionBundle = Intl::getRegionBundle();
$countries = [];
foreach ($languages as $language) {
$countries[$language] = $regionBundle->getCountryNames($language);

7
src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php
View File

@ -63,12 +63,13 @@ class LoadLanguages extends AbstractFixture implements ContainerAwareInterface,
}
/**
* prepare names for languages
* Prepare names for languages.
*
* @param string $languageCode
* @return string[] languages name indexed by available language code
*/
private function prepareName($languageCode) {
private function prepareName(string $languageCode): array {
$names = [];
foreach ($this->container->getParameter('chill_main.available_languages') as $lang) {
$names[$lang] = Intl::getLanguageBundle()->getLanguageName($languageCode);
}

13
src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ACLFlagsCompilerPass.php
View File

@ -1,18 +1,15 @@
<?php
/*
*/
declare(strict_types=1);
namespace Chill\MainBundle\DependencyInjection\CompilerPass;
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Chill\MainBundle\Form\PermissionsGroupType;
use Symfony\Component\DependencyInjection\Reference;
use LogicException;
/**
*
*
* @author Julien Fastré <julien.fastre@champs-libres.coop>
*/
class ACLFlagsCompilerPass implements CompilerPassInterface
{
public function process(ContainerBuilder $container)
@ -29,7 +26,7 @@ class ACLFlagsCompilerPass implements CompilerPassInterface
$permissionGroupType->addMethodCall('addFlagProvider', [ $reference ]);
break;
default:
throw new \LogicalException(sprintf(
throw new LogicException(sprintf(
"This tag 'scope' is not implemented: %s, on service with id %s", $tag['scope'], $id)
);
}

9
src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
View File

@ -19,14 +19,11 @@ class Configuration implements ConfigurationInterface
use AddWidgetConfigurationTrait;
/**
*
* @var ContainerBuilder
*/
private $containerBuilder;
private ContainerBuilder $containerBuilder;
public function __construct(array $widgetFactories = array(),
public function __construct(
array $widgetFactories,
ContainerBuilder $containerBuilder)
{
$this->setWidgetFactories($widgetFactories);

11
src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
View File

@ -124,11 +124,12 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
* @param string $containerWidgetConfigParameterName the key under which we can use the widget configuration
* @throws \LogicException
* @throws \UnexpectedValueException if the given extension does not implement HasWidgetExtensionInterface
* @throws \InvalidConfigurationException if there are errors in the config
*/
public function doProcess(ContainerBuilder $container, $extension,
$containerWidgetConfigParameterName)
{
public function doProcess(
ContainerBuilder $container,
$extension,
$containerWidgetConfigParameterName
) {
if (!$container->hasDefinition(self::WIDGET_MANAGER)) {
throw new \LogicException("the service ".self::WIDGET_MANAGER." should".
" be present. It is required by ".self::class);
@ -171,7 +172,7 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
// check that the widget is allowed at this place
if (!$this->isPlaceAllowedForWidget($place, $alias, $container)) {
throw new \InvalidConfigurationException(sprintf(
throw new InvalidConfigurationException(sprintf(
"The widget with alias %s is not allowed at place %s",
$alias,
$place

56
src/Bundle/ChillMainBundle/Doctrine/Model/Point.php
View File

@ -4,13 +4,9 @@ namespace Chill\MainBundle\Doctrine\Model;
use \JsonSerializable;
/**
* Description of Point
*
*/
class Point implements JsonSerializable {
private ?float $lat = null;
private ?float $lon = null;
private ?float $lat;
private ?float $lon;
public static string $SRID = '4326';
private function __construct(?float $lon, ?float $lat)
@ -22,6 +18,7 @@ class Point implements JsonSerializable {
public function toGeoJson(): string
{
$array = $this->toArrayGeoJson();
return \json_encode($array);
}
@ -33,60 +30,53 @@ class Point implements JsonSerializable {
public function toArrayGeoJson(): array
{
return [
"type" => "Point",
"coordinates" => [ $this->lon, $this->lat ]
'type' => 'Point',
'coordinates' => [$this->lon, $this->lat],
];
}
/**
*
* @return string
*/
public function toWKT(): string
{
return 'SRID='.self::$SRID.';POINT('.$this->lon.' '.$this->lat.')';
return sprintf("SRID=%s;POINT(%s %s)", self::$SRID, $this->lon, $this->lat);
}
/**
*
* @param type $geojson
* @return Point
*/
public static function fromGeoJson(string $geojson): Point
public static function fromGeoJson(string $geojson): self
{
$a = json_decode($geojson);
//check if the geojson string is correct
if (NULL === $a or !isset($a->type) or !isset($a->coordinates)){
if (null === $a) {
throw PointException::badJsonString($geojson);
}
if ($a->type != 'Point'){
if (null === $a->type || null === $a->coordinates) {
throw PointException::badJsonString($geojson);
}
if ($a->type !== 'Point'){
throw PointException::badGeoType();
}
$lat = $a->coordinates[1];
$lon = $a->coordinates[0];
[$lon, $lat] = $a->coordinates;
return Point::fromLonLat($lon, $lat);
}
public static function fromLonLat(float $lon, float $lat): Point
public static function fromLonLat(float $lon, float $lat): self
{
if (($lon > -180 && $lon < 180) && ($lat > -90 && $lat < 90))
{
if (($lon > -180 && $lon < 180) && ($lat > -90 && $lat < 90)) {
return new Point($lon, $lat);
} else {
throw PointException::badCoordinates($lon, $lat);
}
throw PointException::badCoordinates($lon, $lat);
}
public static function fromArrayGeoJson(array $array): Point
public static function fromArrayGeoJson(array $array): self
{
if ($array['type'] == 'Point' &&
isset($array['coordinates']))
{
if ($array['type'] === 'Point' && isset($array['coordinates'])) {
return self::fromLonLat($array['coordinates'][0], $array['coordinates'][1]);
}
throw new \Exception('Unable to build a point from input data.');
}
public function getLat(): float

8
src/Bundle/ChillMainBundle/Form/Type/DataTransformer/CenterTransformer.php
View File

@ -51,8 +51,10 @@ class CenterTransformer implements DataTransformerInterface
}
}
$ids = [];
if ($this->multiple) {
$ids = \explode(',', $id);
$ids = explode(',', $id);
} else {
$ids[] = (int) $id;
}
@ -68,9 +70,9 @@ class CenterTransformer implements DataTransformerInterface
if ($this->multiple) {
return new ArrayCollection($centers);
} else {
return $centers[0];
}
return $centers[0];
}
public function transform($center)

1
src/Bundle/ChillMainBundle/Repository/UserRepository.php
View File

@ -4,6 +4,7 @@ declare(strict_types=1);
namespace Chill\MainBundle\Repository;
use Chill\MainBundle\Entity\GroupCenter;
use Chill\MainBundle\Entity\User;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\EntityRepository;

8
src/Bundle/ChillMainBundle/Search/SearchApi.php
View File

@ -139,7 +139,7 @@ class SearchApi
return $nq->getResult();
}
private function prepareProviders($rawResults)
private function prepareProviders(array $rawResults)
{
$metadatas = [];
foreach ($rawResults as $r) {
@ -156,8 +156,10 @@ class SearchApi
}
}
private function buildResults($rawResults)
private function buildResults(array $rawResults): array
{
$items = [];
foreach ($rawResults as $r) {
foreach ($this->providers as $k => $p) {
if ($p->supportsResult($r['key'], $r['metadata'])) {
@ -170,6 +172,6 @@ class SearchApi
}
}
return $items ?? [];
return $items;
}
}

2
src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverVoter.php
View File

@ -98,5 +98,7 @@ class PasswordRecoverVoter extends Voter
return true;
}
return false;
}
}

58
src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
View File

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Chill\MainBundle\Serializer\Normalizer;
use Chill\MainBundle\Entity\Address;
@ -12,31 +14,41 @@ class AddressNormalizer implements NormalizerAwareInterface, NormalizerInterface
{
use NormalizerAwareTrait;
/**
* @param Address $address
*/
public function normalize($address, string $format = null, array $context = [])
{
/** @var Address $address */
$data['address_id'] = $address->getId();
$data['text'] = $address->isNoAddress() ? '' : $address->getStreetNumber().', '.$address->getStreet();
$data['street'] = $address->getStreet();
$data['streetNumber'] = $address->getStreetNumber();
$data['postcode']['id'] = $address->getPostCode()->getId();
$data['postcode']['name'] = $address->getPostCode()->getName();
$data['postcode']['code'] = $address->getPostCode()->getCode();
$data['country']['id'] = $address->getPostCode()->getCountry()->getId();
$data['country']['name'] = $address->getPostCode()->getCountry()->getName();
$data['country']['code'] = $address->getPostCode()->getCountry()->getCountryCode();
$data['floor'] = $address->getFloor();
$data['corridor'] = $address->getCorridor();
$data['steps'] = $address->getSteps();
$data['flat'] = $address->getFlat();
$data['buildingName'] = $address->getBuildingName();
$data['distribution'] = $address->getDistribution();
$data['extra'] = $address->getExtra();
$data['validFrom'] = $address->getValidFrom();
$data['validTo'] = $address->getValidTo();
$data['addressReference'] = $this->normalizer->normalize($address->getAddressReference(), $format, [
AbstractNormalizer::GROUPS => ['read']
]);
$data = [
'address_id' => $address->getId(),
'text' => $address->isNoAddress() ? '' : $address->getStreetNumber().', '.$address->getStreet(),
'street' => $address->getStreet(),
'streetNumber' => $address->getStreetNumber(),
'postcode' => [
'id' => $address->getPostCode()->getId(),
'name' => $address->getPostCode()->getName(),
'code' => $address->getPostCode()->getCode(),
],
'country' => [
'id' => $address->getPostCode()->getCountry()->getId(),
'name' => $address->getPostCode()->getCountry()->getName(),
'code' => $address->getPostCode()->getCountry()->getCountryCode(),
],
'floor' => $address->getFloor(),
'corridor' => $address->getCorridor(),
'steps' => $address->getSteps(),
'flat' => $address->getFlat(),
'buildingName' => $address->getBuildingName(),
'distribution' => $address->getDistribution(),
'extra' => $address->getExtra(),
'validFrom' => $address->getValidFrom(),
'validTo' => $address->getValidTo(),
'addressReference' => $this->normalizer->normalize(
$address->getAddressReference(),
$format,
[AbstractNormalizer::GROUPS => ['read']]
),
];
return $data;
}

42
src/Bundle/ChillMainBundle/Serializer/Normalizer/CollectionNormalizer.php
View File

@ -11,30 +11,28 @@ class CollectionNormalizer implements NormalizerInterface, NormalizerAwareInterf
{
use NormalizerAwareTrait;
/**
* @param Collection $collection
*/
public function normalize($collection, string $format = null, array $context = [])
{
$paginator = $collection->getPaginator();
return [
'count' => $paginator->getTotalItems(),
'pagination' => [
'first' => $paginator->getCurrentPageFirstItemNumber(),
'items_per_page' => $paginator->getItemsPerPage(),
'next' => $paginator->hasNextPage() ? $paginator->getNextPage()->generateUrl() : null,
'previous' => $paginator->hasPreviousPage() ? $paginator->getPreviousPage()->generateUrl() : null,
'more' => $paginator->hasNextPage(),
],
'results' => $this->normalizer->normalize($collection->getItems(), $format, $context),
];
}
public function supportsNormalization($data, string $format = null): bool
{
return $data instanceof Collection;
}
public function normalize($collection, string $format = null, array $context = [])
{
/** @var $collection Collection */
$paginator = $collection->getPaginator();
$data['count'] = $paginator->getTotalItems();
$pagination['first'] = $paginator->getCurrentPageFirstItemNumber();
$pagination['items_per_page'] = $paginator->getItemsPerPage();
$pagination['next'] = $paginator->hasNextPage() ?
$paginator->getNextPage()->generateUrl() : null;
$pagination['previous'] = $paginator->hasPreviousPage() ?
$paginator->getPreviousPage()->generateUrl() : null;
$pagination['more'] = $paginator->hasNextPage();
$data['pagination'] = $pagination;
// normalize results
$data['results'] = $this->normalizer->normalize($collection->getItems(),
$format, $context);
return $data;
}
}

9
src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
View File

@ -291,11 +291,12 @@ class TimelineBuilder implements ContainerAwareInterface
$entitiesByType[$result['type']][$result['id']], //the entity
$context,
$args);
$timelineEntry['date'] = new \DateTime($result['date']);
$timelineEntry['template'] = $data['template'];
$timelineEntry['template_data'] = $data['template_data'];
$timelineEntries[] = $timelineEntry;
$timelineEntries[] = [
'date' => new \DateTime($result['date']),
'template' => $data['template'],
'template_data' => $data['template_data']
];
}
return $this->container->get('templating')

4
src/Bundle/ChillMainBundle/Util/DateRangeCovering.php
View File

@ -205,7 +205,7 @@ class DateRangeCovering
{
if (!$this->computed) {
throw new \LogicException(sprintf("You cannot call the method %s before ".
"'process'", __METHOD));
"'process'", __METHOD__));
}
return count($this->intersections) > 0;
@ -215,7 +215,7 @@ class DateRangeCovering
{
if (!$this->computed) {
throw new \LogicException(sprintf("You cannot call the method %s before ".
"'process'", __METHOD));
"'process'", __METHOD__));
}
return $this->intersections;

26
src/Bundle/ChillPersonBundle/CRUD/Controller/OneToOneEntityPersonCRUDController.php
View File

@ -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)
@ -83,7 +67,7 @@ class OneToOneEntityPersonCRUDController extends CRUDController
protected function generateRedirectOnCreateRoute($action, Request $request, $entity)
{
throw new BadMethodCallException("not implemtented yet");
throw new BadMethodCallException('Not implemented yet.');
}
}

2
src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
View File

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

58
src/Bundle/ChillPersonBundle/Controller/PersonController.php
View File

@ -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()));
}
/**

6
src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php
View File

@ -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()

19
src/Bundle/ChillPersonBundle/Export/Aggregator/CountryOfBirthAggregator.php
View File

@ -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];
};

17
src/Bundle/ChillPersonBundle/Export/Aggregator/NationalityAggregator.php
View File

@ -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];
};

6
src/Bundle/ChillPersonBundle/Repository/Household/HouseholdMembersRepository.php
View File

@ -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);
}
}

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

@ -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',

47
src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue Normal file
View File

@ -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>

4
src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
View File

@ -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 -%}

5
src/Bundle/ChillPersonBundle/Search/PersonSearch.php
View File

@ -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;
}

2
src/Bundle/ChillPersonBundle/Templating/Entity/SocialActionRender.php
View File

@ -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();

3
src/Bundle/ChillPersonBundle/Templating/Entity/SocialIssueRender.php
View File

@ -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()) {

14
src/Bundle/ChillReportBundle/Export/Export/ReportList.php
View File

@ -196,9 +196,8 @@ class ReportList implements ListInterface, ExportElementValidatedInterface
* @param type $key
* @param array $values
* @param type $data
* @return type
*/
public function getLabels($key, array $values, $data)
public function getLabels($key, array $values, $data): \Closure
{
switch ($key) {
case 'person_birthdate':
@ -237,12 +236,13 @@ class ReportList implements ListInterface, ExportElementValidatedInterface
;
$rows = $qb->getQuery()->getResult(Query::HYDRATE_ARRAY);
$scopes = [];
foreach($rows as $row) {
$scopes[$row['id']] = $this->translatableStringHelper
->localize($row['name']);
$scopes[$row['id']] = $this->translatableStringHelper->localize($row['name']);
}
return function($value) use ($scopes) {
return function($value) use ($scopes): string {
if ($value === '_header') {
return 'circle';
}
@ -258,11 +258,13 @@ class ReportList implements ListInterface, ExportElementValidatedInterface
;
$rows = $qb->getQuery()->getResult(Query::HYDRATE_ARRAY);
$users = [];
foreach($rows as $row) {
$users[$row['id']] = $row['username'];
}
return function($value) use ($users) {
return function($value) use ($users): string {
if ($value === '_header') {
return 'user';
}

2
src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
View File

@ -157,7 +157,7 @@ class TaskLifeCycleEventTimelineProvider implements TimelineProviderInterface
// the parameters
$parameters = [];
$parameters = $circleIds = [];
// the clause that we will fill
$clause = "{person}.{person_id} = ? AND {task}.{circle} IN ({circle_ids})";

33
src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
View File

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Chill\ThirdPartyBundle\Serializer\Normalizer;
use Chill\ThirdPartyBundle\Entity\ThirdParty;
@ -20,23 +22,24 @@ class ThirdPartyNormalizer implements NormalizerInterface, NormalizerAwareInterf
$this->thirdPartyRender = $thirdPartyRender;
}
/**
* @param ThirdParty $thirdParty
*/
public function normalize($thirdParty, string $format = null, array $context = [])
{
/** @var $thirdParty ThirdParty */
$data['type'] = 'thirdparty';
$data['text'] = $this->thirdPartyRender->renderString($thirdParty, []);
$data['id'] = $thirdParty->getId();
$data['kind'] = $thirdParty->getKind();
$data['address'] = $this->normalizer->normalize($thirdParty->getAddress(), $format,
[ 'address_rendering' => 'short' ]);
$data['phonenumber'] = $thirdParty->getTelephone();
$data['email'] = $thirdParty->getEmail();
$data['isChild'] = $thirdParty->isChild();
$data['parent'] = $this->normalizer->normalize($thirdParty->getParent(), $format, $context);
$data['civility'] = $this->normalizer->normalize($thirdParty->getCivility(), $format, $context);
$data['contactDataAnonymous'] = $thirdParty->isContactDataAnonymous();
return $data;
return [
'type' => 'thirdparty',
'text' => $this->thirdPartyRender->renderString($thirdParty, []),
'id' => $thirdParty->getId(),
'kind' => $thirdParty->getKind(),
'address' => $this->normalizer->normalize($thirdParty->getAddress(), $format, [ 'address_rendering' => 'short' ]),
'phonenumber' => $thirdParty->getTelephone(),
'email' => $thirdParty->getEmail(),
'isChild' => $thirdParty->isChild(),
'parent' => $this->normalizer->normalize($thirdParty->getParent(), $format, $context),
'civility' => $this->normalizer->normalize($thirdParty->getCivility(), $format, $context),
'contactDataAnonymous' => $thirdParty->isContactDataAnonymous(),
];
}
public function supportsNormalization($data, string $format = null)