From c960745763672621f1e724a40a185c012d30c18d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 4 Apr 2018 09:46:30 +0200 Subject: [PATCH 01/64] advanced search (bis) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ce commit contient des modifications qui sont peut-être dans un autre commit d'une autre branche. --- Controller/AdminController.php | 7 +++++++ Controller/SearchController.php | 21 ++++++++++++++++++- Resources/config/routing.yml | 4 ++++ Resources/config/services/form.yml | 7 +++++++ Resources/translations/admin.fr.yml | 4 ++++ Resources/views/Admin/index.html.twig | 17 +++++++++++++++ .../views/Search/advanced_search.html.twig | 12 +++++++---- Search/SearchProvider.php | 13 ++++++++++++ 8 files changed, 80 insertions(+), 5 deletions(-) create mode 100644 Resources/translations/admin.fr.yml create mode 100644 Resources/views/Admin/index.html.twig diff --git a/Controller/AdminController.php b/Controller/AdminController.php index 2009ecf21..9852be7ab 100644 --- a/Controller/AdminController.php +++ b/Controller/AdminController.php @@ -42,4 +42,11 @@ class AdminController extends Controller { return $this->render('ChillMainBundle:Admin:layout_permissions.html.twig'); } + public function configurationWarningsAction() + { + $alertManager = $this->get('chill_main.configuration_alert_manager'); + + + } + } diff --git a/Controller/SearchController.php b/Controller/SearchController.php index 49a648f43..375429de1 100644 --- a/Controller/SearchController.php +++ b/Controller/SearchController.php @@ -106,6 +106,24 @@ class SearchController extends Controller ); } + public function advancedSearchListAction(Request $request) + { + /* @var $variable Chill\MainBundle\Search\SearchProvider */ + $searchProvider = $this->get('chill.main.search_provider'); + $advancedSearchProviders = $searchProvider + ->getHasAdvancedFormSearchServices(); + + if(\count($advancedSearchProviders) === 1) { + \reset($advancedSearchProviders); + + return $this->redirectToRoute('chill_main_advanced_search', [ + 'name' => \key($advancedSearchProviders) + ]); + } + + return $this->render('ChillMainBundle:Search:choose_list.html.twig'); + } + public function advancedSearchAction($name, Request $request) { try { @@ -144,7 +162,8 @@ class SearchController extends Controller return $this->render('ChillMainBundle:Search:advanced_search.html.twig', [ 'form' => $form->createView(), - 'name' => $name + 'name' => $name, + 'title' => $search->getAdvancedSearchTitle() ]); } diff --git a/Resources/config/routing.yml b/Resources/config/routing.yml index 3252e8f96..2b1562379 100644 --- a/Resources/config/routing.yml +++ b/Resources/config/routing.yml @@ -66,6 +66,10 @@ chill_main_search: chill_main_advanced_search: path: /{_locale}/search/advanced/{name} defaults: { _controller: ChillMainBundle:Search:advancedSearch } + +chill_main_advanced_search_list: + path: /{_locale}/search/advanced + defaults: { _controller: ChillMainBundle:Search:advancedSearchList } login: path: /login diff --git a/Resources/config/services/form.yml b/Resources/config/services/form.yml index e205292bd..30502a399 100644 --- a/Resources/config/services/form.yml +++ b/Resources/config/services/form.yml @@ -108,5 +108,12 @@ services: - "@security.token_storage" - "@chill.main.scope_repository" - "@chill.main.helper.translatable_string" + tags: + - { name: form.type } + + chill.main.form.advanced_search_type: + class: Chill\MainBundle\Form\AdvancedSearchType + arguments: + - "@chill.main.search_provider" tags: - { name: form.type } \ No newline at end of file diff --git a/Resources/translations/admin.fr.yml b/Resources/translations/admin.fr.yml new file mode 100644 index 000000000..c2d522a12 --- /dev/null +++ b/Resources/translations/admin.fr.yml @@ -0,0 +1,4 @@ +welcome_message_raw: | +

Dans l'interface d'administration, vous pouvez configurer votre instance selon vos besoins.

+ + diff --git a/Resources/views/Admin/index.html.twig b/Resources/views/Admin/index.html.twig new file mode 100644 index 000000000..999034392 --- /dev/null +++ b/Resources/views/Admin/index.html.twig @@ -0,0 +1,17 @@ +{% extends "ChillMainBundle::Admin/layoutWithVerticalMenu.html.twig" %} + +{% block admin_content %} +

{{ 'Administration interface'|trans }}

+ + {{ 'welcome_message_raw'|trans|raw }} + +
+

{{ 'Configuration alerts'|trans }}

+ +

{{ 'Here you can check the configuration of your instance.'|trans }}

+ + {{ chill_widget('configuration_warnings', {}) }} + +
+ +{% endblock %} \ No newline at end of file diff --git a/Resources/views/Search/advanced_search.html.twig b/Resources/views/Search/advanced_search.html.twig index 48c2bd230..e19d47496 100644 --- a/Resources/views/Search/advanced_search.html.twig +++ b/Resources/views/Search/advanced_search.html.twig @@ -17,10 +17,14 @@ {% extends "ChillMainBundle::layout.html.twig" %} -{% block title 'Advanced search for %name%'|trans({ '%name%' : name }) %} +{% block title title|trans %} {% block content %} +
+ +

{{ title|trans }}

+ {{ form_start(form) }} {% for f in form %} @@ -28,9 +32,7 @@ {{ form_row(f) }} {% endif %} {% endfor %} - - - +
+ {% endblock %} diff --git a/Search/SearchProvider.php b/Search/SearchProvider.php index db8aec208..e1b602c0f 100644 --- a/Search/SearchProvider.php +++ b/Search/SearchProvider.php @@ -59,6 +59,19 @@ class SearchProvider return $this->searchServices; } + + public function getHasAdvancedFormSearchServices() + { + //sort the array + uasort($this->hasAdvancedFormSearchServices, function(SearchInterface $a, SearchInterface $b) { + if ($a->getOrder() == $b->getOrder()) { + return 0; + } + return ($a->getOrder() < $b->getOrder()) ? -1 : 1; + }); + + return $this->hasAdvancedFormSearchServices; + } /** * parse the search string to extract domain and terms From da9aecefa79baa7d4b873c1be57b90a5fb82dce6 Mon Sep 17 00:00:00 2001 From: nobohan Date: Fri, 13 Apr 2018 15:20:04 +0200 Subject: [PATCH 02/64] fix deprecations: replace last fqcn in add methods for forms --- Controller/PermissionsGroupController.php | 3 ++- Form/Type/AddressType.php | 9 ++++++--- Form/UserType.php | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Controller/PermissionsGroupController.php b/Controller/PermissionsGroupController.php index 911fff79b..336cab5d5 100644 --- a/Controller/PermissionsGroupController.php +++ b/Controller/PermissionsGroupController.php @@ -11,6 +11,7 @@ use Chill\MainBundle\Form\PermissionsGroupType; use Symfony\Component\Security\Core\Role\Role; use Symfony\Component\Security\Core\Role\RoleInterface; use Chill\MainBundle\Entity\Scope; +use Chill\MainBundle\Form\Type\ComposedRoleScopeType; /** * PermissionsGroup controller. @@ -491,7 +492,7 @@ class PermissionsGroupController extends Controller ->setAction($this->generateUrl('admin_permissionsgroup_add_role_scope', array('id' => $permissionsGroup->getId()))) ->setMethod('PUT') - ->add('composed_role_scope', 'composed_role_scope') + ->add('composed_role_scope', ComposedRoleScopeType::class) ->add('submit', SubmitType::class, array('label' => 'Add permission')) ->getForm() ; diff --git a/Form/Type/AddressType.php b/Form/Type/AddressType.php index 173bd9b70..fd4fe76be 100644 --- a/Form/Type/AddressType.php +++ b/Form/Type/AddressType.php @@ -23,6 +23,9 @@ use Symfony\Component\Form\AbstractType; use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\Extension\Core\Type\TextType; +use Symfony\Component\Form\Extension\Core\Type\DateType; + +use Chill\MainBundle\Form\Type\PostalCodeType; /** * A type to create/update Address entity @@ -46,9 +49,9 @@ class AddressType extends AbstractType 'placeholder' => 'Choose a postal code', 'required' => true )) - ->add('validFrom', 'date', array( - 'required' => true, - 'widget' => 'single_text', + ->add('validFrom', DateType::class, array( + 'required' => true, + 'widget' => 'single_text', 'format' => 'dd-MM-yyyy' ) ) diff --git a/Form/UserType.php b/Form/UserType.php index 404461423..1fd36d9e0 100644 --- a/Form/UserType.php +++ b/Form/UserType.php @@ -21,7 +21,7 @@ class UserType extends AbstractType ->add('username') ; if ($options['is_creation']) { - $builder->add('plainPassword', new UserPasswordType(), array( + $builder->add('plainPassword', UserPasswordType::class, array( 'mapped' => false )); From 7fb208450620914df0e909cb67cace0e5672605b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Mon, 16 Apr 2018 11:53:39 +0200 Subject: [PATCH 03/64] set doctrine type "date interval" using native postgresql date interval --- DependencyInjection/ChillMainExtension.php | 9 ++++++++ Doctrine/Type/NativeDateIntervalType.php | 27 ++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 Doctrine/Type/NativeDateIntervalType.php diff --git a/DependencyInjection/ChillMainExtension.php b/DependencyInjection/ChillMainExtension.php index c2f63761f..7a5766d4c 100644 --- a/DependencyInjection/ChillMainExtension.php +++ b/DependencyInjection/ChillMainExtension.php @@ -141,6 +141,15 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface, ) )); + //add dbal types (default entity_manager) + $container->prependExtensionConfig('doctrine', array( + 'dbal' => [ + 'types' => [ + 'dateinterval' => \Chill\MainBundle\Doctrine\Type\NativeDateIntervalType::class + ] + ] + )); + //add current route to chill main $container->prependExtensionConfig('chill_main', array( 'routing' => array( diff --git a/Doctrine/Type/NativeDateIntervalType.php b/Doctrine/Type/NativeDateIntervalType.php new file mode 100644 index 000000000..06143f229 --- /dev/null +++ b/Doctrine/Type/NativeDateIntervalType.php @@ -0,0 +1,27 @@ + + */ +class NativeDateIntervalType extends DateIntervalType +{ + + public function getName(): string + { + return \Doctrine\DBAL\Types\Type::DATEINTERVAL; + } + + public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform): string + { + return 'INTERVAL'; + } + +} From f5039cc36f325347ce39377862639a7e764285e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Mon, 16 Apr 2018 12:03:47 +0200 Subject: [PATCH 04/64] add UserPickerType --- Form/Type/UserPickerType.php | 12 ++++- Resources/config/services.yml | 1 + .../Authorization/AuthorizationHelper.php | 45 ++++++++++++++++++- .../Authorization/AuthorizationHelperTest.php | 16 +++++++ 4 files changed, 70 insertions(+), 4 deletions(-) diff --git a/Form/Type/UserPickerType.php b/Form/Type/UserPickerType.php index 9cade1ad2..fd7600bf9 100644 --- a/Form/Type/UserPickerType.php +++ b/Form/Type/UserPickerType.php @@ -25,6 +25,8 @@ use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; use Symfony\Bridge\Doctrine\Form\Type\EntityType; use Chill\MainBundle\Entity\User; +use Symfony\Component\Security\Core\Role\RoleHierarchyInterface; +use Symfony\Component\Security\Core\Role\Role; /** @@ -96,8 +98,14 @@ class UserPickerType extends AbstractType ->join('ug.permissionsGroup', 'pg') // role constraints ->join('pg.roleScopes', 'roleScope') - ->andWhere($qb->expr()->eq('roleScope.role', ':role')) - ->setParameter('role', $options['role']) + ->andWhere($qb->expr()->in('roleScope.role', ':roles')) + ->setParameter( + 'roles', + \array_map( + function(Role $role) { return $role->getRole(); }, + $this->authorizationHelper->getParentRoles($options['role']) + ) + ) // add active constraint ->andWhere('u.enabled = :enabled') ->setParameter('enabled', true) diff --git a/Resources/config/services.yml b/Resources/config/services.yml index 33b64df34..c0364f3cd 100644 --- a/Resources/config/services.yml +++ b/Resources/config/services.yml @@ -80,6 +80,7 @@ services: class: Chill\MainBundle\Security\Authorization\AuthorizationHelper arguments: - "@security.role_hierarchy" + - "%security.role_hierarchy.roles%" chill.main.role_provider: class: Chill\MainBundle\Security\RoleProvider diff --git a/Security/Authorization/AuthorizationHelper.php b/Security/Authorization/AuthorizationHelper.php index 4c749ad62..95552aa36 100644 --- a/Security/Authorization/AuthorizationHelper.php +++ b/Security/Authorization/AuthorizationHelper.php @@ -26,6 +26,7 @@ use Chill\MainBundle\Entity\HasScopeInterface; use Symfony\Component\Security\Core\Role\RoleHierarchyInterface; use Symfony\Component\Security\Core\Role\Role; use Chill\MainBundle\Entity\Scope; +use Chill\MainBundle\Security\RoleProvider; /** * Helper for authorizations. @@ -42,12 +43,23 @@ class AuthorizationHelper */ protected $roleHierarchy; + /** + * The role in a hierarchy, given by the parameter + * `security.role_hierarchy.roles` from the container. + * + * @var string[] + */ + protected $hierarchy; + protected $existingRoles = array('CHILL_MASTER_ROLE', 'CHILL_PERSON_SEE', 'CHILL_PERSON_UPDATE',); - public function __construct(RoleHierarchyInterface $roleHierarchy) - { + public function __construct( + RoleHierarchyInterface $roleHierarchy, + $hierarchy + ) { $this->roleHierarchy = $roleHierarchy; + $this->hierarchy = $hierarchy; } /** @@ -223,4 +235,33 @@ class AuthorizationHelper return in_array($childRole, $reachableRoles); } + + /** + * Return all the role which give access to the given role. Only the role + * which are registered into Chill are taken into account. + * + * @param Role $role + * @return Role[] the role which give access to the given $role + */ + public function getParentRoles(Role $role) + { + $parentRoles = []; + // transform the roles from role hierarchy from string to Role + $roles = \array_map( + function($string) { + return new Role($string); + }, + \array_keys($this->hierarchy) + ); + + foreach ($roles as $r) { + $childRoles = $this->roleHierarchy->getReachableRoles([$r]); + + if (\in_array($role, $childRoles)) { + $parentRoles[] = $r; + } + } + + return $parentRoles; + } } diff --git a/Tests/Security/Authorization/AuthorizationHelperTest.php b/Tests/Security/Authorization/AuthorizationHelperTest.php index abfc3c754..fb171de07 100644 --- a/Tests/Security/Authorization/AuthorizationHelperTest.php +++ b/Tests/Security/Authorization/AuthorizationHelperTest.php @@ -443,6 +443,22 @@ class AuthorizationHelperTest extends KernelTestCase ); } + public function testGetParentRoles() + { + $parentRoles = $this->getAuthorizationHelper() + ->getParentRoles(new Role('CHILL_INHERITED_ROLE_1')); + + $this->assertContains( + 'CHILL_MASTER_ROLE', + \array_map( + function(Role $role) { + return $role->getRole(); + }, + $parentRoles + ), + "Assert that `CHILL_MASTER_ROLE` is a parent of `CHILL_INHERITED_ROLE_1`"); + } + } From 53901e4681874e4b5ed30513cba1be147f9b96bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Mon, 16 Apr 2018 12:37:57 +0200 Subject: [PATCH 05/64] add ScopePickerType, which allow to pick scope depending or ACL --- Form/Type/ScopePickerType.php | 57 ++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 21 deletions(-) diff --git a/Form/Type/ScopePickerType.php b/Form/Type/ScopePickerType.php index 963cbb7b9..9525e81f0 100644 --- a/Form/Type/ScopePickerType.php +++ b/Form/Type/ScopePickerType.php @@ -26,6 +26,8 @@ use Symfony\Bridge\Doctrine\Form\Type\EntityType; use Chill\MainBundle\Entity\Scope; use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; use Chill\MainBundle\Templating\TranslatableStringHelper; +use Chill\MainBundle\Entity\Center; +use Symfony\Component\Security\Core\Role\Role; /** * Allow to pick amongst available scope for the current @@ -82,10 +84,10 @@ class ScopePickerType extends AbstractType $resolver // create `center` option ->setRequired('center') - ->setAllowedTypes('center', [\Chill\MainBundle\Entity\Center::class ]) + ->setAllowedTypes('center', [Center::class ]) // create ``role` option ->setRequired('role') - ->setAllowedTypes('role', ['string', \Symfony\Component\Security\Core\Role\Role::class ]) + ->setAllowedTypes('role', ['string', Role::class ]) ; $resolver @@ -95,25 +97,7 @@ class ScopePickerType extends AbstractType return $this->translatableStringHelper->localize($c->getName()); }) ->setNormalizer('query_builder', function(Options $options) { - $qb = $this->scopeRepository->createQueryBuilder('s'); - $qb - // jointure to center - ->join('s.roleScopes', 'rs') - ->join('rs.permissionsGroups', 'pg') - ->join('pg.groupCenters', 'gc') - //->join('gc.users', 'user') - // add center constraint - ->where($qb->expr()->eq('IDENTITY(gc.center)', ':center')) - ->setParameter('center', $options['center']->getId()) - // role constraints - ->andWhere($qb->expr()->eq('rs.role', ':role')) - ->setParameter('role', $options['role']) - // user contraint - ->andWhere(':user MEMBER OF gc.users') - ->setParameter('user', $this->tokenStorage->getToken()->getUser()) - ; - - return $qb; + return $this->buildAccessibleScopeQuery($options['center'], $options['role']); }) ; } @@ -122,4 +106,35 @@ class ScopePickerType extends AbstractType { return EntityType::class; } + + /** + * + * @return \Doctrine\ORM\QueryBuilder + */ + protected function buildAccessibleScopeQuery(Center $center, Role $role) + { + $qb = $this->scopeRepository->createQueryBuilder('s'); + $qb + // jointure to center + ->join('s.roleScopes', 'rs') + ->join('rs.permissionsGroups', 'pg') + ->join('pg.groupCenters', 'gc') + // add center constraint + ->where($qb->expr()->eq('IDENTITY(gc.center)', ':center')) + ->setParameter('center', $center->getId()) + // role constraints + ->andWhere($qb->expr()->in('rs.role', ':roles')) + ->setParameter('roles', \array_map( + function(Role $role) { + return $role->getRole(); + }, + $this->authorizationHelper->getParentRoles($role) + )) + // user contraint + ->andWhere(':user MEMBER OF gc.users') + ->setParameter('user', $this->tokenStorage->getToken()->getUser()) + ; + + return $qb; + } } From 96cd18563b442f0a8b2421a3b3d00575e274ca05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Mon, 16 Apr 2018 17:18:59 +0200 Subject: [PATCH 06/64] include current role in ScopePickerType and UserPickerType Previously, only the "parent" roles were takent into account in those two types. This commit fixe the bug by adding the current role to the query. --- Form/Type/ScopePickerType.php | 5 ++++- Form/Type/UserPickerType.php | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Form/Type/ScopePickerType.php b/Form/Type/ScopePickerType.php index 9525e81f0..dbbc28255 100644 --- a/Form/Type/ScopePickerType.php +++ b/Form/Type/ScopePickerType.php @@ -113,6 +113,9 @@ class ScopePickerType extends AbstractType */ protected function buildAccessibleScopeQuery(Center $center, Role $role) { + $roles = $this->authorizationHelper->getParentRoles($role); + $roles[] = $role; + $qb = $this->scopeRepository->createQueryBuilder('s'); $qb // jointure to center @@ -128,7 +131,7 @@ class ScopePickerType extends AbstractType function(Role $role) { return $role->getRole(); }, - $this->authorizationHelper->getParentRoles($role) + $roles )) // user contraint ->andWhere(':user MEMBER OF gc.users') diff --git a/Form/Type/UserPickerType.php b/Form/Type/UserPickerType.php index fd7600bf9..a9a0bf62e 100644 --- a/Form/Type/UserPickerType.php +++ b/Form/Type/UserPickerType.php @@ -88,6 +88,9 @@ class UserPickerType extends AbstractType return $u->getUsername(); }) ->setNormalizer('query_builder', function(Options $options) { + $roles = $this->authorizationHelper->getParentRoles($options['role']); + $roles[] = $options['role']; + $qb = $this->userRepository->createQueryBuilder('u'); $qb // add center constraint @@ -103,7 +106,7 @@ class UserPickerType extends AbstractType 'roles', \array_map( function(Role $role) { return $role->getRole(); }, - $this->authorizationHelper->getParentRoles($options['role']) + $roles ) ) // add active constraint From 190e2f48b3a112924b42aeae84950801355a5010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Mon, 16 Apr 2018 17:20:34 +0200 Subject: [PATCH 07/64] introducer UserCircleConsistency validator This validator allow to check that the entity is consistent between user associated with the entity, and the scope. The entity is consistent if the user associated can reach the scope for the ROLE "SEE/SHOW". This is a Constraint with scope Class. Example of utilisation: ``` @UserCircleConsistency( * "CHILL_TASK_TASK_SEE", * getUserFunction="getAssignee", * path="circle" * ) class MyEntity { // ... public function getAssignee() { // return user } } ``` --- DependencyInjection/ChillMainExtension.php | 1 + Resources/config/services/validator.yml | 7 +++ Resources/translations/messages.fr.yml | 1 + Resources/translations/validators.fr.yml | 5 +- .../Entity/UserCircleConsistency.php | 52 ++++++++++++++++ .../Entity/UserCircleConsistencyValidator.php | 62 +++++++++++++++++++ 6 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 Resources/config/services/validator.yml create mode 100644 Validator/Constraints/Entity/UserCircleConsistency.php create mode 100644 Validator/Constraints/Entity/UserCircleConsistencyValidator.php diff --git a/DependencyInjection/ChillMainExtension.php b/DependencyInjection/ChillMainExtension.php index 7a5766d4c..2bd1b3f25 100644 --- a/DependencyInjection/ChillMainExtension.php +++ b/DependencyInjection/ChillMainExtension.php @@ -92,6 +92,7 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface, $loader->load('services/pagination.yml'); $loader->load('services/export.yml'); $loader->load('services/form.yml'); + $loader->load('services/validator.yml'); } diff --git a/Resources/config/services/validator.yml b/Resources/config/services/validator.yml new file mode 100644 index 000000000..f09304375 --- /dev/null +++ b/Resources/config/services/validator.yml @@ -0,0 +1,7 @@ +services: + chill_main.validator_user_circle_consistency: + class: Chill\MainBundle\Validator\Constraints\Entity\UserCircleConsistencyValidator + arguments: + - "@chill.main.security.authorization.helper" + tags: + - { name: "validator.constraint_validator" } diff --git a/Resources/translations/messages.fr.yml b/Resources/translations/messages.fr.yml index 06e63ce31..bf082188f 100644 --- a/Resources/translations/messages.fr.yml +++ b/Resources/translations/messages.fr.yml @@ -31,6 +31,7 @@ not valid: non valide Confirm: Confirmer Cancel: Annuler Save: Enregistrer +This form contains errors: Ce formulaire contient des erreurs 'You are going to leave a page with unsubmitted data. Are you sure you want to leave ?': "Vous allez quitter la page alors que des données n'ont pas été enregistrées. Êtes vous sûr de vouloir partir ?" diff --git a/Resources/translations/validators.fr.yml b/Resources/translations/validators.fr.yml index 4307be2fb..ba260f2c6 100644 --- a/Resources/translations/validators.fr.yml +++ b/Resources/translations/validators.fr.yml @@ -5,4 +5,7 @@ The role "%role%" should not be associated with a scope.: Le rôle "%role%" ne d "The password must contains one letter, one capitalized letter, one number and one special character as *[@#$%!,;:+\"'-/{}~=µ()£]). Other characters are allowed.": "Le mot de passe doit contenir une majuscule, une minuscule, et au moins un caractère spécial parmi *[@#$%!,;:+\"'-/{}~=µ()£]). Les autres caractères sont autorisés." The password fields must match: Les mots de passe doivent correspondre -A permission is already present for the same role and scope: Une permission est déjà présente pour le même rôle et cercle. \ No newline at end of file +A permission is already present for the same role and scope: Une permission est déjà présente pour le même rôle et cercle. + +#UserCircleConsistency +"{{ username }} is not allowed to see entities published in this circle": "{{ username }} n'est pas autorisé à voir l'élément publié dans ce cercle." \ No newline at end of file diff --git a/Validator/Constraints/Entity/UserCircleConsistency.php b/Validator/Constraints/Entity/UserCircleConsistency.php new file mode 100644 index 000000000..238aa1a7f --- /dev/null +++ b/Validator/Constraints/Entity/UserCircleConsistency.php @@ -0,0 +1,52 @@ + + * + * 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 . + */ +namespace Chill\MainBundle\Validator\Constraints\Entity; + +use Symfony\Component\Validator\Constraint; + +/** + * + * + * @Annotation + */ +class UserCircleConsistency extends Constraint +{ + public $message = "{{ username }} is not allowed to see entities published in this circle"; + + public $role; + + public $getUserFunction = 'getUser'; + + public $path = 'circle'; + + public function getDefaultOption() + { + return 'role'; + } + + public function getRequiredOptions() + { + return [ 'role' ]; + } + + public function getTargets() + { + return self::CLASS_CONSTRAINT; + } + +} diff --git a/Validator/Constraints/Entity/UserCircleConsistencyValidator.php b/Validator/Constraints/Entity/UserCircleConsistencyValidator.php new file mode 100644 index 000000000..adba2d760 --- /dev/null +++ b/Validator/Constraints/Entity/UserCircleConsistencyValidator.php @@ -0,0 +1,62 @@ + + * + * 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 . + */ +namespace Chill\MainBundle\Validator\Constraints\Entity; + +use Chill\MainBundle\Security\Authorization\AuthorizationHelper; +use Symfony\Component\Validator\Constraint; +use Symfony\Component\Validator\ConstraintValidator; +use Chill\MainBundle\Entity\HasScopeInterface; + +/** + * + * + */ +class UserCircleConsistencyValidator extends ConstraintValidator +{ + /** + * + * @var AuthorizationHelper + */ + protected $autorizationHelper; + + function __construct(AuthorizationHelper $autorizationHelper) + { + $this->autorizationHelper = $autorizationHelper; + } + + + /** + * + * @param object $value + * @param UserCircleConsistency $constraint + */ + public function validate($value, Constraint $constraint) + { + /* @var $user \Chill\MainBundle\Entity\User */ + $user = \call_user_func([$value, $constraint->getUserFunction ]); + + if (FALSE === $this->autorizationHelper->userHasAccess($user, $value, $constraint->role)) { + $this->context + ->buildViolation($constraint->message) + ->setParameter('{{ username }}', $user->getUsername()) + ->atPath($constraint->path) + ->addViolation() + ; + } + } +} From 36c3e33cfa16316587db81ec8894dbd254192e2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 17 Apr 2018 11:32:39 +0200 Subject: [PATCH 08/64] add DateIntervalType --- .../DateIntervalTransformer.php | 92 +++++++++++++++++++ Form/Type/DateIntervalType.php | 57 ++++++++++++ 2 files changed, 149 insertions(+) create mode 100644 Form/Type/DataTransformer/DateIntervalTransformer.php create mode 100644 Form/Type/DateIntervalType.php diff --git a/Form/Type/DataTransformer/DateIntervalTransformer.php b/Form/Type/DataTransformer/DateIntervalTransformer.php new file mode 100644 index 000000000..29a81447c --- /dev/null +++ b/Form/Type/DataTransformer/DateIntervalTransformer.php @@ -0,0 +1,92 @@ + + * + * 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 . + */ +namespace Chill\MainBundle\Form\Type\DataTransformer; + +use Symfony\Component\Form\DataTransformerInterface; +use Symfony\Component\Form\Exception\TransformationFailedException; +use Symfony\Component\Form\Exception\UnexpectedTypeException; + +/** + * + * + * @author Julien Fastré + */ +class DateIntervalTransformer implements DataTransformerInterface +{ + /** + * + * @param \DateInterval $value + * @throws UnexpectedTypeException + */ + public function transform($value) + { + if (empty($value)) { + return null; + } + + if (!$value instanceof \DateInterval) { + throw new UnexpectedTypeException($value, \DateInterval::class); + } + + if ($value->d > 0) { + // we check for weeks (weeks are converted to 7 days) + if ($value->d % 7 === 0) { + return [ + 'n' => $value->d / 7, + 'unit' => 'W' + ]; + } else { + return [ + 'n' => $value->d, + 'unit' => 'D' + ]; + } + } elseif ($value->m > 0) { + return [ + 'n' => $value->m, + 'unit' => 'M' + ]; + } elseif ($value->y > 0) { + return [ + 'n' => $value->y, + 'unit' => 'Y' + ]; + } + + throw new TransformationFailedException('the date interval does not ' + . 'contains any days, months or years'); + } + + public function reverseTransform($value) + { + if (empty($value) or empty($value['n'])) { + return null; + } + + $string = 'P'.$value['n'].$value['unit']; + + try { + return new \DateInterval($string); + } catch (\Exception $e) { + throw new TransformationFailedException("Could not transform value " + . "into DateInterval", 1542, $e); + } + + + } +} diff --git a/Form/Type/DateIntervalType.php b/Form/Type/DateIntervalType.php new file mode 100644 index 000000000..499c61f93 --- /dev/null +++ b/Form/Type/DateIntervalType.php @@ -0,0 +1,57 @@ + + * + * 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 . + */ +namespace Chill\MainBundle\Form\Type; + +use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\Form\Extension\Core\Type\IntegerType; +use Symfony\Component\Form\Extension\Core\Type\ChoiceType; +use Chill\MainBundle\Form\Type\DataTransformer\DateIntervalTransformer; +use Symfony\Component\Validator\Constraints\GreaterThan; + +/** + * + * + */ +class DateIntervalType extends AbstractType +{ + public function buildForm(FormBuilderInterface $builder, array $options) + { + $builder + ->add('n', IntegerType::class, [ + 'scale' => 0, + 'constraints' => [ + new GreaterThan([ + 'value' => 0 + ]) + ] + ]) + ->add('unit', ChoiceType::class, [ + 'choices' => [ + 'Days' => 'D', + 'Weeks' => 'W', + 'Months' => 'M', + 'Years' => 'Y' + ], + 'choices_as_values' => true + ]) + ; + + $builder->addModelTransformer(new DateIntervalTransformer()); + } +} From 06bff38701a9a728d24cdeff4bfcf05ac3aee1d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 17 Apr 2018 21:58:37 +0200 Subject: [PATCH 09/64] [dateinterval doctrine type] parse correctly native date interval --- Doctrine/Type/NativeDateIntervalType.php | 67 ++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/Doctrine/Type/NativeDateIntervalType.php b/Doctrine/Type/NativeDateIntervalType.php index 06143f229..fc341b3ef 100644 --- a/Doctrine/Type/NativeDateIntervalType.php +++ b/Doctrine/Type/NativeDateIntervalType.php @@ -4,6 +4,7 @@ namespace Chill\MainBundle\Doctrine\Type; use Doctrine\DBAL\Types\DateIntervalType; use Doctrine\DBAL\Platforms\AbstractPlatform; +use Doctrine\DBAL\Types\ConversionException; /** * Re-declare the date interval to use the implementation of date interval in @@ -23,5 +24,71 @@ class NativeDateIntervalType extends DateIntervalType { return 'INTERVAL'; } + + public function convertToPHPValue($value, AbstractPlatform $platform) + { + if ($value === null || $value instanceof \DateInterval) { + return $value; + } + dump($value); + try { + $strings = explode(' ', $value); + + if (count($strings) === 0) { + return null; + } + $intervalSpec = 'P'; + \reset($strings); + + do { + $intervalSpec .= $this->convertEntry($strings); + } while (next($strings) !== FALSE); + + dump($intervalSpec); + + return new \DateInterval($intervalSpec); + } catch (\Exception $exception) { + throw $this->createConversionException($value); + } + } + + private function convertEntry(&$strings) + { + $current = \current($strings); + + if (is_numeric($current)) { + $next = \next($strings); + switch($next) { + case 'year': + $unit = 'Y'; + break; + case 'mon': + case 'mons': + $unit = 'M'; + break; + case 'days': + $unit = 'D'; + break; + default: + throw $this->createConversionException($value); + } + + return $current.$unit; + + } elseif (\preg_match('/([0-9]{2}\:[0-9]{2}:[0-9]{2})/', $v) === 1) { + $tExploded = explode(':', $v); + $intervalSpec = 'T'; + $intervalSpec.= $tExploded[0].'H'; + $intervalSpec.= $tExploded[1].'M'; + $intervalSpec.= $tExploded[2].'S'; + + return $intervalSpec; + } + } + + protected function createConversionException($value) + { + return ConversionException::conversionFailedFormat($value, $this->getName(), 'xx year xx mons xx days 01:02:03', $exception); + } } From 8456045088b29429622ecccc31cbeba2f8530d08 Mon Sep 17 00:00:00 2001 From: nobohan Date: Wed, 18 Apr 2018 11:40:28 +0200 Subject: [PATCH 10/64] add webpack config + export chill.js --- Resources/public/js/chill.js | 76 +++++++++++++++--------------- Resources/public/sass/_custom.scss | 30 ++++++------ Resources/views/layout.html.twig | 30 ++++++------ 3 files changed, 71 insertions(+), 65 deletions(-) diff --git a/Resources/public/js/chill.js b/Resources/public/js/chill.js index a7d661679..54d2ceb80 100644 --- a/Resources/public/js/chill.js +++ b/Resources/public/js/chill.js @@ -93,7 +93,7 @@ var chill = function() { * * @param{string} form_id An identification string of the form * @param{string} alert_message The alert message to display - * @param{boolean} check_unsaved_data If true display the alert message only when the form + * @param{boolean} check_unsaved_data If true display the alert message only when the form * contains some modified fields otherwise always display the alert when leaving * @return nothing */ @@ -123,12 +123,12 @@ var chill = function() { }); } - /** - * Mark the choices "not specified" as check by default. - * - * This function apply to `custom field choices` when the `required` + /** + * Mark the choices "not specified" as check by default. + * + * This function apply to `custom field choices` when the `required` * option is false and `expanded` is true (checkboxes or radio buttons). - * + * * @param{string} choice_name the name of the input */ function checkNullValuesInChoices(choice_name) { @@ -184,21 +184,21 @@ var chill = function() { * child) of a given form : each parent option has a category, the * child select only display options that have the same category of the * parent optionn - * - * The parent must have the class "chill-category-link-parent". - * + * + * The parent must have the class "chill-category-link-parent". + * * The children must have the class "chill-category-link-child". Each option * of the parent must have the attribute `data-link-category`, with the value of * the connected option in parent. - * + * * Example : - * + * * ```html * - * + * * * ``` - * + * * TODO ECRIRE LA DOC METTRE LES TESTS DANS git : * tester que init est ok : - quand vide @@ -224,7 +224,7 @@ var chill = function() { form.old_category = null; form.link_parent = $(form).find('.chill-category-link-parent'); form.link_child = $(form).find('.chill-category-link-child'); - + // check if the parent allow multiple or single results parent_multiple = $(form).find('.chill-category-link-parent').get(0).multiple; // if we use select2, parent_multiple will be `undefined` @@ -233,10 +233,10 @@ var chill = function() { // we suppose that multiple is false (old behaviour) parent_multiple = false } - + $(form.link_parent).addClass('select2'); $(form.link_parant).select2({allowClear: true}); // it is weird: when I fix the typo here, the whole stuff does not work anymore... - + if (parent_multiple == false) { form.old_category = null; @@ -279,9 +279,9 @@ var chill = function() { } }); } else { - var i=0, + var i=0, selected_items = $(form.link_parent).find(':selected'); - + form.old_categories = []; for (i=0;i < selected_items.length; i++) { form.old_categories.push(selected_items[i].value); @@ -314,13 +314,13 @@ var chill = function() { }); form.link_parent.change(function() { - var new_categories = [], + var new_categories = [], selected_items = $(form.link_parent).find(':selected'), visible; for (i=0;i < selected_items.length; i++) { new_categories.push(selected_items[i].value); } - + if(new_categories != form.old_categories) { $(form.link_child).find('option') .each(function(i,e) { @@ -352,16 +352,16 @@ var chill = function() { form.old_categories = new_categories; } }); - } + } }); } - + function _displayHideTargetWithCheckbox(checkbox) { var target = checkbox.dataset.displayTarget, hideableElements; - + hideableElements = document.querySelectorAll('[data-display-show-hide="' + target + '"]'); - + if (checkbox.checked) { for (let i=0; i < hideableElements.length; i = i+1) { hideableElements[i].style.display = "unset"; @@ -371,36 +371,36 @@ var chill = function() { hideableElements[i].style.display = "none"; } } - + } - + /** - * create an interaction between a checkbox and element to show if the + * create an interaction between a checkbox and element to show if the * checkbox is checked, or hide if the checkbox is not checked. - * - * The checkbox must have the data `data-display-target` with an id, + * + * The checkbox must have the data `data-display-target` with an id, * and the parts to show/hide must have the data `data-display-show-hide` * with the same value. - * - * Example : - * + * + * Example : + * * ``` * - * + * *
* *
* ``` - * + * * Hint: for forms in symfony, you could use the `id` of the form element, * accessible through `{{ form.vars.id }}`. This id should be unique. - * - * + * + * * @returns {undefined} */ function listenerDisplayCheckbox() { var elements = document.querySelectorAll("[data-display-target]"); - + for (let i=0; i < elements.length; i = i+1) { elements[i].addEventListener("change", function(e) { _displayHideTargetWithCheckbox(e.target); @@ -421,3 +421,5 @@ var chill = function() { listenerDisplayCheckbox: listenerDisplayCheckbox, }; } (); + +export { chill }; diff --git a/Resources/public/sass/_custom.scss b/Resources/public/sass/_custom.scss index 10f6d5e2e..b355a533e 100644 --- a/Resources/public/sass/_custom.scss +++ b/Resources/public/sass/_custom.scss @@ -1,4 +1,6 @@ // YOUR CUSTOM SCSS +@import 'custom/config/colors'; +@import 'custom/config/variables'; @import 'custom/timeline'; @import 'custom/mixins/entity'; @import 'custom/activity'; @@ -11,7 +13,7 @@ @import 'custom/flash_messages'; -html,body { +html,body { min-height:100%; font-family: 'Open Sans'; } @@ -83,9 +85,9 @@ ul.custom_fields.choice li { font-family: 'Open Sans'; font-weight: 300; } - - a { - color: white; + + a { + color: white; text-decoration: underline; } } @@ -97,7 +99,7 @@ ul.custom_fields.choice li { display: inline-block; text-align: center; } - + .separator { margin-left: 0.2em; margin-right: 0.2em; @@ -107,7 +109,7 @@ ul.custom_fields.choice li { .open_sansbold { font-family: 'Open Sans'; font-weight: bold; - + } @@ -140,21 +142,21 @@ div.input_with_post_text input { dl.chill_report_view_data, dl.chill_view_data { - + dt { margin-top: 1.5em; color: $chill-blue; } - + dd { padding-left: 1.5em; margin-top: 0.2em; - + ul { padding-left: 0; } } - + } @@ -164,13 +166,13 @@ blockquote.chill-user-quote { padding: 0.5em 10px; quotes: "\201C""\201D""\2018""\2019"; background-color: $chill-llight-gray; - - + + p { display: inline; } - + } .chill-no-data-statement { font-style: italic; - + } diff --git a/Resources/views/layout.html.twig b/Resources/views/layout.html.twig index e6d193894..effc1624e 100644 --- a/Resources/views/layout.html.twig +++ b/Resources/views/layout.html.twig @@ -1,5 +1,5 @@ {# - * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, + * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, / * * This program is free software: you can redistribute it and/or modify @@ -22,19 +22,19 @@ - + {{ installation.name }} - {% block title %}{% endblock %} - - {% stylesheets output="css/all.css" filter="cssrewrite" + + + {% block css%}{% endblock %} @@ -107,7 +107,7 @@ {% endfor %} - + {% for flashMessage in app.session.flashbag.get('error') %}
@@ -115,14 +115,14 @@
{% endfor %} - + {% for flashMessage in app.session.flashbag.get('notice') %}
{{ flashMessage|raw }}
- {% endfor %} + {% endfor %} {% block content %}
@@ -137,12 +137,12 @@
- +
{{ chill_widget('homepage', {} ) }}
{% endblock %} - + {% endblock %} @@ -150,8 +150,8 @@

{{ 'This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License'|trans|raw }}
{{ 'User manual'|trans }}

- - {% javascripts output="js/libs.js" + + + + + {% endspaceless %} {% endblock choice_widget_expanded %} @@ -90,7 +94,9 @@ {%- endif -%} {% endfor %} {% endspaceless %} {% endblock choice_with_other_widget %} diff --git a/chill.webpack.config.js b/chill.webpack.config.js index b14331e57..e6f4c8be8 100644 --- a/chill.webpack.config.js +++ b/chill.webpack.config.js @@ -18,10 +18,11 @@ import {chill} from './Resources/public/js/chill.js'; global.chill = chill; // css -require('./Resources/public/sass/_custom.scss'); +require('./Resources/public/sass/scratch.scss'); require('./Resources/public/css/chillmain.css'); require('./Resources/public/css/pikaday.css'); -require('./Resources/public/css/scratch.css'); +//require('./Resources/public/css/scratch.css'); //require('./Resources/public/css/select2/select2.css'); +require('select2/dist/css/select2.css'); // img From da821f50998114d3faa9765cdef9caea3bc73e5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 4 May 2018 22:49:04 +0200 Subject: [PATCH 31/64] enable fixtures with sf3 --- DependencyInjection/ChillMainExtension.php | 1 + Resources/config/services/fixtures.yml | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 Resources/config/services/fixtures.yml diff --git a/DependencyInjection/ChillMainExtension.php b/DependencyInjection/ChillMainExtension.php index ea6214ae5..44c2d2034 100644 --- a/DependencyInjection/ChillMainExtension.php +++ b/DependencyInjection/ChillMainExtension.php @@ -96,6 +96,7 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface, $loader->load('services/widget.yml'); $loader->load('services/controller.yml'); $loader->load('services/routing.yml'); + $loader->load('services/fixtures.yml'); } public function getConfiguration(array $config, ContainerBuilder $container) diff --git a/Resources/config/services/fixtures.yml b/Resources/config/services/fixtures.yml new file mode 100644 index 000000000..b3ef847e4 --- /dev/null +++ b/Resources/config/services/fixtures.yml @@ -0,0 +1,4 @@ +services: + Chill\MainBundle\DataFixtures\ORM\: + resource: ../../../DataFixtures/ORM + tags: [ 'doctrine.fixture.orm' ] From 50b079c67686995d7881dd2f2fec97550d6b9bf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 4 May 2018 22:58:06 +0200 Subject: [PATCH 32/64] adding knp to test fixtures --- Resources/test/Fixtures/App/app/AppKernel.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/test/Fixtures/App/app/AppKernel.php b/Resources/test/Fixtures/App/app/AppKernel.php index 4b9643491..7f7b0de1f 100644 --- a/Resources/test/Fixtures/App/app/AppKernel.php +++ b/Resources/test/Fixtures/App/app/AppKernel.php @@ -17,6 +17,7 @@ class AppKernel extends Kernel new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(), new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(), new Symfony\Bundle\MonologBundle\MonologBundle(), + new Knp\Bundle\MenuBundle\KnpMenuBundle(), ); } From d684851f36eec8c0682587aad2a0d0a6eb54d2ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 8 May 2018 10:06:58 +0200 Subject: [PATCH 33/64] add alias for AuthorizationHelper --- Resources/config/services.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/config/services.yml b/Resources/config/services.yml index b2013e5ee..c49265b41 100644 --- a/Resources/config/services.yml +++ b/Resources/config/services.yml @@ -60,6 +60,7 @@ services: arguments: - "@security.role_hierarchy" - "%security.role_hierarchy.roles%" + Chill\MainBundle\Security\Authorization\AuthorizationHelper: '@chill.main.security.authorization.helper' chill.main.role_provider: class: Chill\MainBundle\Security\RoleProvider From 6f73c9ee090e968ef97094fcd9ee4a9f2cd5a839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 8 May 2018 22:56:03 +0200 Subject: [PATCH 34/64] fix errors to user picker: add placeholder and allow empty --- Form/Type/UserPickerType.php | 2 +- .../Constraints/Entity/UserCircleConsistencyValidator.php | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Form/Type/UserPickerType.php b/Form/Type/UserPickerType.php index a9a0bf62e..b253ce393 100644 --- a/Form/Type/UserPickerType.php +++ b/Form/Type/UserPickerType.php @@ -83,7 +83,7 @@ class UserPickerType extends AbstractType $resolver ->setDefault('class', User::class) - ->setDefault('empty_data', $this->tokenStorage->getToken()->getUser()) + ->setDefault('placeholder', 'Choose an user') ->setDefault('choice_label', function(User $u) { return $u->getUsername(); }) diff --git a/Validator/Constraints/Entity/UserCircleConsistencyValidator.php b/Validator/Constraints/Entity/UserCircleConsistencyValidator.php index adba2d760..c8ec72b50 100644 --- a/Validator/Constraints/Entity/UserCircleConsistencyValidator.php +++ b/Validator/Constraints/Entity/UserCircleConsistencyValidator.php @@ -50,6 +50,10 @@ class UserCircleConsistencyValidator extends ConstraintValidator /* @var $user \Chill\MainBundle\Entity\User */ $user = \call_user_func([$value, $constraint->getUserFunction ]); + if ($user === null) { + return; + } + if (FALSE === $this->autorizationHelper->userHasAccess($user, $value, $constraint->role)) { $this->context ->buildViolation($constraint->message) From 42f17f11e00e242a9286feec472da7fd479da50c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 9 May 2018 00:05:29 +0200 Subject: [PATCH 35/64] set same layout to user menu and section menu --- .../sass/custom/modules/_navigation.scss | 116 ++++++++++++------ Resources/views/Menu/user.html.twig | 19 ++- 2 files changed, 90 insertions(+), 45 deletions(-) diff --git a/Resources/public/sass/custom/modules/_navigation.scss b/Resources/public/sass/custom/modules/_navigation.scss index dc5e889e0..be28d0348 100644 --- a/Resources/public/sass/custom/modules/_navigation.scss +++ b/Resources/public/sass/custom/modules/_navigation.scss @@ -1,52 +1,88 @@ .navigation { - background-color: $chill-blue; + background-color: $chill-blue; - a.more:after { - color: $chill-dark-gray; - } + a.more:after { + color: $chill-dark-gray; + } - li.nav-link2 { - a { - margin-bottom: 2px; - } + li.nav-link2 { + a { + margin-bottom: 2px; + } - &.lang-selection { - color: $chill-light-gray; - font-size: 0.7em; - - a.more:after { + &.lang-selection { color: $chill-light-gray; - } - } + font-size: 0.7em; - ul { - top: 58px; + a.more:after { + color: $chill-light-gray; + } + } - a { - padding-left: 0; - } - } - } + ul { + top: 58px; - div.nav, div.navigation-search { - float: right; + a { + padding-left: 0; + } + } + } - input[type=search] { - padding: 0.2em; - float: left; + div.nav, div.navigation-search { + float: right; - border: none; - } - - button { - color: $chill-light-gray; - background-color: $chill-blue; - padding: 0 0 0 7px; - top: inherit; - font-size: 1.2em; - position: unset; - float: left; - } - } + input[type=search] { + padding: 0.2em; + float: left; + + border: none; + } + + button { + color: $chill-light-gray; + background-color: $chill-blue; + padding: 0 0 0 7px; + top: inherit; + font-size: 1.2em; + position: unset; + float: left; + } + } + + li.user-menu { + min-width: 14rem; + } + + ul.user-menu-list { + + li.user-menu__entry { + display: block; + background-color: $chill-dark-gray; + border-bottom: 1px solid #FFF; + padding-top: 0; + padding-bottom: 0; + line-height: 2; + } + + li.user-menu__entry--warning-entry { + background-color: $chill-red; + font-weight: 700; + } + } + + span.notification-counter { + display: inline-block; + padding: .25em .6em .25rem .6em; + font-size: 100%; + line-height: 1; + text-align: center; + white-space: nowrap; + + border-radius: 10rem; + background-color: $chill-red; + color: $white; + font-weight: 700; + margin-left: .5rem; + } } \ No newline at end of file diff --git a/Resources/views/Menu/user.html.twig b/Resources/views/Menu/user.html.twig index f79b47e78..7f5156378 100644 --- a/Resources/views/Menu/user.html.twig +++ b/Resources/views/Menu/user.html.twig @@ -16,18 +16,27 @@ * along with this program. If not, see . #} -
  • +
  • {{ 'Welcome' | trans }}
    {{ app.user.username }}{{ render(controller('ChillMainBundle:UI:showNotificationUserCounter')) }}
    -
      + From 6fc9fa9833fe1105e445d006b700a48658bd918c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Mon, 14 May 2018 13:14:10 +0200 Subject: [PATCH 36/64] get notification also for UserInterface This will allow notification for admin --- Templating/UI/CountNotificationUser.php | 3 ++- Templating/UI/NotificationCounterInterface.php | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Templating/UI/CountNotificationUser.php b/Templating/UI/CountNotificationUser.php index e4d950cac..859cb673a 100644 --- a/Templating/UI/CountNotificationUser.php +++ b/Templating/UI/CountNotificationUser.php @@ -17,6 +17,7 @@ */ namespace Chill\MainBundle\Templating\UI; +use Symfony\Component\Security\Core\User\UserInterface; use Chill\MainBundle\Entity\User; /** @@ -37,7 +38,7 @@ class CountNotificationUser $this->counters[] = $counter; } - public function getSumNotification(User $u): int + public function getSumNotification(UserInterface $u): int { $sum = 0; diff --git a/Templating/UI/NotificationCounterInterface.php b/Templating/UI/NotificationCounterInterface.php index effb7ca71..f0621b81a 100644 --- a/Templating/UI/NotificationCounterInterface.php +++ b/Templating/UI/NotificationCounterInterface.php @@ -17,7 +17,7 @@ */ namespace Chill\MainBundle\Templating\UI; -use Chill\MainBundle\Entity\User; +use Symfony\Component\Security\Core\User\UserInterface; /** * @@ -28,5 +28,5 @@ interface NotificationCounterInterface /** * Add a number of notification */ - public function addNotification(User $u): int; + public function addNotification(UserInterface $u): int; } From be7949809b1b8a448ec65943c0f66b6f808f5f58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Mon, 14 May 2018 14:14:02 +0200 Subject: [PATCH 37/64] add a menu builder for user menu --- DependencyInjection/ChillMainExtension.php | 1 + Resources/config/routing.yml | 8 +--- Resources/test/Fixtures/App/app/AppKernel.php | 1 + Routing/MenuBuilder/UserMenuBuilder.php | 46 +++++++++++++++++++ 4 files changed, 49 insertions(+), 7 deletions(-) create mode 100644 Routing/MenuBuilder/UserMenuBuilder.php diff --git a/DependencyInjection/ChillMainExtension.php b/DependencyInjection/ChillMainExtension.php index 44c2d2034..613fe048e 100644 --- a/DependencyInjection/ChillMainExtension.php +++ b/DependencyInjection/ChillMainExtension.php @@ -97,6 +97,7 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface, $loader->load('services/controller.yml'); $loader->load('services/routing.yml'); $loader->load('services/fixtures.yml'); + $loader->load('services/menu.yml'); } public function getConfiguration(array $config, ContainerBuilder $container) diff --git a/Resources/config/routing.yml b/Resources/config/routing.yml index 2b1562379..989a5e8f3 100644 --- a/Resources/config/routing.yml +++ b/Resources/config/routing.yml @@ -79,10 +79,4 @@ login_check: path: /login_check logout: - path: /logout - options: - menus: - user: - order: 10 - label: Logout - icon: power-off \ No newline at end of file + path: /logout \ No newline at end of file diff --git a/Resources/test/Fixtures/App/app/AppKernel.php b/Resources/test/Fixtures/App/app/AppKernel.php index 7f7b0de1f..10886518a 100644 --- a/Resources/test/Fixtures/App/app/AppKernel.php +++ b/Resources/test/Fixtures/App/app/AppKernel.php @@ -18,6 +18,7 @@ class AppKernel extends Kernel new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(), new Symfony\Bundle\MonologBundle\MonologBundle(), new Knp\Bundle\MenuBundle\KnpMenuBundle(), + new Symfony\Bundle\DebugBundle\DebugBundle() ); } diff --git a/Routing/MenuBuilder/UserMenuBuilder.php b/Routing/MenuBuilder/UserMenuBuilder.php new file mode 100644 index 000000000..131e4c00f --- /dev/null +++ b/Routing/MenuBuilder/UserMenuBuilder.php @@ -0,0 +1,46 @@ + + * + * 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 . + */ +namespace Chill\MainBundle\Routing\MenuBuilder; + +use Chill\MainBundle\Routing\LocalMenuBuilderInterface; + +/** + * + * + * @author Julien Fastré + */ +class UserMenuBuilder implements LocalMenuBuilderInterface +{ + public function buildMenu($menuId, \Knp\Menu\MenuItem $menu, array $parameters) + { + $menu->addChild( + 'Logout', + [ + 'route' => 'logout' + ]) + ->setExtras([ + 'order'=> 10, + 'icon' => 'power-off' + ]); + } + + public static function getMenuIds(): array + { + return [ 'user' ]; + } +} From 4cac0ea56fef90d7b0b0ca608ea32bf411cbb641 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Mon, 14 May 2018 14:15:53 +0200 Subject: [PATCH 38/64] fix missingfile --- Resources/config/services/menu.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Resources/config/services/menu.yml diff --git a/Resources/config/services/menu.yml b/Resources/config/services/menu.yml new file mode 100644 index 000000000..ac8cf51b1 --- /dev/null +++ b/Resources/config/services/menu.yml @@ -0,0 +1,4 @@ +services: + Chill\MainBundle\Routing\MenuBuilder\UserMenuBuilder: + tags: + - { name: 'chill.menu_builder' } From a7871ecbdb4ee6ff680bc50fb3f9011292ff6241 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Thu, 17 May 2018 21:11:45 +0200 Subject: [PATCH 39/64] adding alias for services --- Resources/config/services.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/config/services.yml b/Resources/config/services.yml index c49265b41..6cd323c56 100644 --- a/Resources/config/services.yml +++ b/Resources/config/services.yml @@ -20,6 +20,7 @@ services: arguments: - "@request_stack" - "@translator.default" + Chill\MainBundle\Templating\TranslatableStringHelper: '@chill.main.helper.translatable_string' chill.main.twig.translatable_string: class: Chill\MainBundle\Templating\TranslatableStringTwig From 9a7df1089376a7710376c064bbdd96678c9886a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 18 May 2018 17:53:10 +0200 Subject: [PATCH 40/64] add data_class to form --- Form/Type/AddressType.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Form/Type/AddressType.php b/Form/Type/AddressType.php index fd4fe76be..ee15e3d20 100644 --- a/Form/Type/AddressType.php +++ b/Form/Type/AddressType.php @@ -24,7 +24,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\Extension\Core\Type\DateType; - +use Chill\MainBundle\Entity\Address; use Chill\MainBundle\Form\Type\PostalCodeType; /** @@ -57,4 +57,9 @@ class AddressType extends AbstractType ) ; } + + public function configureOptions(OptionsResolver $resolver) + { + $resolver->setDefault('data_class', Address::class); + } } From 4f7e350945a59eab53b07d4225b5a0bbb5fad376 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 18 May 2018 17:54:12 +0200 Subject: [PATCH 41/64] adding a collection type for chill --- Form/Type/ChillCollectionType.php | 53 ++++++++++++ Resources/public/js/collection/collections.js | 81 +++++++++++++++++++ Resources/views/Form/fields.html.twig | 16 ++++ chill.webpack.config.js | 1 + 4 files changed, 151 insertions(+) create mode 100644 Form/Type/ChillCollectionType.php create mode 100644 Resources/public/js/collection/collections.js diff --git a/Form/Type/ChillCollectionType.php b/Form/Type/ChillCollectionType.php new file mode 100644 index 000000000..d653794c7 --- /dev/null +++ b/Form/Type/ChillCollectionType.php @@ -0,0 +1,53 @@ + + * + * 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 . + */ +namespace Chill\MainBundle\Form\Type; + +use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\FormView; +use Symfony\Component\OptionsResolver\OptionsResolver; +use Symfony\Component\Form\FormInterface; + +/** + * + * + * @author Julien Fastré + */ +class ChillCollectionType extends AbstractType +{ + public function configureOptions(OptionsResolver $resolver) + { + $resolver + ->setDefaults([ + 'button_add_label' => 'Add an entry', + 'button_remove_label' => 'Remove entry' + ]); + } + + public function buildView(FormView $view, FormInterface $form, array $options) + { + $view->vars['button_add_label'] = $options['button_add_label']; + $view->vars['button_remove_label'] = $options['button_remove_label']; + $view->vars['allow_delete'] = (int) $options['allow_delete']; + $view->vars['allow_add'] = (int) $options['allow_add']; + } + + public function getParent() + { + return \Symfony\Component\Form\Extension\Core\Type\CollectionType::class; + } +} diff --git a/Resources/public/js/collection/collections.js b/Resources/public/js/collection/collections.js new file mode 100644 index 000000000..820df1efd --- /dev/null +++ b/Resources/public/js/collection/collections.js @@ -0,0 +1,81 @@ +/** + * Exemple d'utilisation + * + * ```html + *
        + * {% for formation in form.formations %} + *
      • + *
        + * {{ form_row(formation) }} + *
        + *
        • + * {% endfor %} + *
      + * + * + * ``` + * + * Le javascript est initialisé dans `forms.js` + * + */ +var handleAdd = function(button) { + var + form_name = button.dataset.collectionAddTarget, + prototype = button.dataset.formPrototype, + collection = document.querySelector('ul[data-collection-name="'+form_name+'"]'), + entry = document.createElement('li'), + counter = collection.childNodes.length, + content + ; + content = prototype.replace(new RegExp('__name__', 'g'), counter); + entry.innerHTML = content; + initializeRemove(collection, entry); + collection.appendChild(entry); +}; + +var initializeRemove = function(collection, entry) { + var + button = document.createElement('button'), + content = collection.dataset.collectionButtonRemoveLabel, + allowDelete = collection.dataset.collectionAllowDelete + ; + + if (allowDelete == '0') { + return; + } + + button.textContent = content; + + button.addEventListener('click', function(e) { + e.preventDefault(); + entry.remove(); + console.log('click remove'); + }); + + entry.appendChild(button); +}; + +window.addEventListener('load', function() { + var + addButtons = document.querySelectorAll("button[data-collection-add-target]"), + collections = document.querySelectorAll("ul[data-collection-name]") + ; + + for (let i = 0; i < addButtons.length; i ++) { + let addButton = addButtons[i]; + addButton.addEventListener('click', function(e) { + e.preventDefault(); + console.log('click'); + handleAdd(e.target); + }); + } + + for (let i = 0; i < collections.length; i ++) { + let entries = collections[i].querySelectorAll('li'), entry; + + for (let j = 0; j < entries.length; j ++) { + initializeRemove(collections[i], entries[j]); + } + } +}); + diff --git a/Resources/views/Form/fields.html.twig b/Resources/views/Form/fields.html.twig index c7efe69ff..324aa41bd 100644 --- a/Resources/views/Form/fields.html.twig +++ b/Resources/views/Form/fields.html.twig @@ -158,3 +158,19 @@ {{ form_row(form.order) }} {% endblock %} + +{% block chill_collection_widget %} +
        +
      • +
        + {% for entry in form %} + {{ form_widget(entry) }} + {% endfor %} +
        +
        • +
      + + {% if form.vars.allow_add == 1 %} + + {% endif %} +{% endblock %} \ No newline at end of file diff --git a/chill.webpack.config.js b/chill.webpack.config.js index e6f4c8be8..8481e4011 100644 --- a/chill.webpack.config.js +++ b/chill.webpack.config.js @@ -21,6 +21,7 @@ global.chill = chill; require('./Resources/public/sass/scratch.scss'); require('./Resources/public/css/chillmain.css'); require('./Resources/public/css/pikaday.css'); +require('./Resources/public/js/collection/collections.js'); //require('./Resources/public/css/scratch.css'); //require('./Resources/public/css/select2/select2.css'); require('select2/dist/css/select2.css'); From 49812d43c4fe1ef69750a6c4fce139768a4c707b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 23 May 2018 12:46:25 +0200 Subject: [PATCH 42/64] add a method to duplicate address --- Entity/Address.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Entity/Address.php b/Entity/Address.php index 792535a17..49951e48f 100644 --- a/Entity/Address.php +++ b/Entity/Address.php @@ -141,6 +141,15 @@ class Address return $this; } + public static function createFromAddress(Address $original) : Address + { + return (new Address()) + ->setPostcode($original->getPostcode()) + ->setStreetAddress1($original->getStreetAddress1()) + ->setStreetAddress2($original->getStreetAddress2()) + ->setValidFrom($original->getValidFrom()) + ; + } } From d3d8f27c6de39990e974384f864b1b28d10f5b2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 25 May 2018 00:58:20 +0200 Subject: [PATCH 43/64] =?UTF-8?q?Collection:=20am=C3=A9lioration=20+=20lan?= =?UTF-8?q?cement=20d'=C3=A9v=C3=A9nements?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Form/Type/ChillCollectionType.php | 10 ++- .../public/js/collection/collection.scss | 23 ++++++ Resources/public/js/collection/collections.js | 72 ++++++++++++++----- .../public/sass/custom/config/_colors.scss | 35 ++++++++- Resources/views/Form/fields.html.twig | 26 +++---- 5 files changed, 132 insertions(+), 34 deletions(-) create mode 100644 Resources/public/js/collection/collection.scss diff --git a/Form/Type/ChillCollectionType.php b/Form/Type/ChillCollectionType.php index d653794c7..1068522c9 100644 --- a/Form/Type/ChillCollectionType.php +++ b/Form/Type/ChillCollectionType.php @@ -23,6 +23,12 @@ use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\Form\FormInterface; /** + * Available options : + * + * - `button_add_label` + * - `button_remove_label` + * - `identifier`: an identifier to identify the kind of collecton. Useful if some + * javascript should be launched associated to `add_entry`, `remove_entry` events. * * * @author Julien Fastré @@ -34,7 +40,8 @@ class ChillCollectionType extends AbstractType $resolver ->setDefaults([ 'button_add_label' => 'Add an entry', - 'button_remove_label' => 'Remove entry' + 'button_remove_label' => 'Remove entry', + 'identifier' => '' ]); } @@ -44,6 +51,7 @@ class ChillCollectionType extends AbstractType $view->vars['button_remove_label'] = $options['button_remove_label']; $view->vars['allow_delete'] = (int) $options['allow_delete']; $view->vars['allow_add'] = (int) $options['allow_add']; + $view->vars['identifier'] = $options['identifier']; } public function getParent() diff --git a/Resources/public/js/collection/collection.scss b/Resources/public/js/collection/collection.scss new file mode 100644 index 000000000..13fc4a528 --- /dev/null +++ b/Resources/public/js/collection/collection.scss @@ -0,0 +1,23 @@ +div.chill-collection { + ul.chill-collection__list { + list-style: none; + padding: 0; + margin-bottom: 1.5rem; + + li.chill-collection__list__entry:nth-child(2n) { + background-color: var(--chill-light-gray); + padding: 0.5rem 0; + } + + // all entries, except the last one + li.chill-collection__list__entry:nth-last-child(1n+2) { + margin-bottom: 1rem; + } + } + + button.chill-collection__button--add { + + + } +} + diff --git a/Resources/public/js/collection/collections.js b/Resources/public/js/collection/collections.js index 820df1efd..5a42162e6 100644 --- a/Resources/public/js/collection/collections.js +++ b/Resources/public/js/collection/collections.js @@ -1,22 +1,46 @@ /** - * Exemple d'utilisation + * Javascript file which handle ChillCollectionType + * + * Two events are emitted by this module, both on window and on collection / ul. + * + * Collection (an UL element) and entry (a li element) are associated with those + * events. * - * ```html - *
        - * {% for formation in form.formations %} - *
      • - *
        - * {{ form_row(formation) }} - *
        - *
        • - * {% endfor %} - *
      - * - * * ``` + * window.addEventListener('collection-add-entry', function(e) { + * console.log(e.detail.collection); + * console.log(e.detail.entry); + * }); * - * Le javascript est initialisé dans `forms.js` + * window.addEventListener('collection-remove-entry', function(e) { + * console.log(e.detail.collection); + * console.log(e.detail.entry); + * }); * + * collection.addEventListener('collection-add-entry', function(e) { + * console.log(e.detail.collection); + * console.log(e.detail.entry); + * }); + * + * collection.addEventListener('collection-remove-entry', function(e) { + * console.log(e.detail.collection); + * console.log(e.detail.entry); + * }); + * ``` + */ +require('./collection.scss'); + +class CollectionEvent { + constructor(collection, entry) { + this.collection = collection; + this.entry = entry; + } +} + +/** + * + * @param {type} button + * @returns {handleAdd} */ var handleAdd = function(button) { var @@ -24,32 +48,41 @@ var handleAdd = function(button) { prototype = button.dataset.formPrototype, collection = document.querySelector('ul[data-collection-name="'+form_name+'"]'), entry = document.createElement('li'), + event = new CustomEvent('collection-add-entry', { detail: { collection: collection, entry: entry } }), counter = collection.childNodes.length, content ; content = prototype.replace(new RegExp('__name__', 'g'), counter); entry.innerHTML = content; + entry.classList.add('chill-collection__list__entry'); initializeRemove(collection, entry); collection.appendChild(entry); + + collection.dispatchEvent(event); + window.dispatchEvent(event); }; var initializeRemove = function(collection, entry) { var button = document.createElement('button'), + isPersisted = entry.dataset.collectionIsPersisted, content = collection.dataset.collectionButtonRemoveLabel, - allowDelete = collection.dataset.collectionAllowDelete + allowDelete = collection.dataset.collectionAllowDelete, + event = new CustomEvent('collection-remove-entry', { detail: { collection: collection, entry: entry } }) ; - if (allowDelete == '0') { + if (allowDelete === '0' && isPersisted === '1') { return; } + button.classList.add('sc-button', 'bt-delete'); button.textContent = content; button.addEventListener('click', function(e) { e.preventDefault(); entry.remove(); - console.log('click remove'); + collection.dispatchEvent(event); + window.dispatchEvent(event); }); entry.appendChild(button); @@ -65,13 +98,12 @@ window.addEventListener('load', function() { let addButton = addButtons[i]; addButton.addEventListener('click', function(e) { e.preventDefault(); - console.log('click'); handleAdd(e.target); }); } for (let i = 0; i < collections.length; i ++) { - let entries = collections[i].querySelectorAll('li'), entry; + let entries = collections[i].querySelectorAll('li'); for (let j = 0; j < entries.length; j ++) { initializeRemove(collections[i], entries[j]); @@ -79,3 +111,5 @@ window.addEventListener('load', function() { } }); + + diff --git a/Resources/public/sass/custom/config/_colors.scss b/Resources/public/sass/custom/config/_colors.scss index f19899f6c..967c9b7a5 100644 --- a/Resources/public/sass/custom/config/_colors.scss +++ b/Resources/public/sass/custom/config/_colors.scss @@ -6,8 +6,8 @@ $chill-yellow: #eec84a; $chill-orange: #e2793d; $chill-red: #df4949; $chill-gray: #ececec; -$chill-beige :#cabb9f; -$chill-pink :#dd506d; +$chill-beige: #cabb9f; +$chill-pink: #dd506d; $chill-dark-gray: #333333; $chill-light-gray: #b2b2b2; $chill-llight-gray: $chill-light-gray; @@ -32,3 +32,34 @@ $yellow: $chill-yellow; $black: #111111; $white: #ffffff; $light-grey: $chill-light-gray; + +/* + due to a bug in sass, we must re-declare the variable in css + (use of a sass variable after -- does not work) +*/ +:root { + --chill-blue: #334d5c; + --chill-green: #43b29d; + --chill-green-dark: #328474; + --chill-yellow: #eec84a; + --chill-orange: #e2793d; + --chill-red: #df4949; + --chill-gray: #ececec; + --chill-beige: #cabb9f; + --chill-pink: #dd506d; + --chill-dark-gray: #333333; + --chill-light-gray: #b2b2b2; + --chill-llight-gray: #b2b2b2; + + --dark-grey: #333333; + + --orange: #e2793d; + --red: #df4949; + --green: #43b29d; + --blue: #334d5c; + --yellow: #eec84a; + + --black: #111111; + --white: #ffffff; + --light-grey: #b2b2b2; +} diff --git a/Resources/views/Form/fields.html.twig b/Resources/views/Form/fields.html.twig index 324aa41bd..441519bc7 100644 --- a/Resources/views/Form/fields.html.twig +++ b/Resources/views/Form/fields.html.twig @@ -160,17 +160,19 @@ {% endblock %} {% block chill_collection_widget %} -
        -
      • -
        - {% for entry in form %} - {{ form_widget(entry) }} - {% endfor %} -
        -
        • -
      - - {% if form.vars.allow_add == 1 %} - +
      +
        + {% for entry in form %} +
      • +
        + {{ form_widget(entry) }} +
        +
        • + {% endfor %} +
      + + {% if form.vars.allow_add == 1 %} + +
      {% endif %} {% endblock %} \ No newline at end of file From ead3e23e16d7fa18fd48de37c66132d8ff91034c Mon Sep 17 00:00:00 2001 From: nobohan Date: Fri, 1 Jun 2018 10:24:37 +0200 Subject: [PATCH 44/64] add value for color chill-llight-gray --- Resources/public/sass/custom/config/_colors.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/public/sass/custom/config/_colors.scss b/Resources/public/sass/custom/config/_colors.scss index 967c9b7a5..d34daddb7 100644 --- a/Resources/public/sass/custom/config/_colors.scss +++ b/Resources/public/sass/custom/config/_colors.scss @@ -10,7 +10,7 @@ $chill-beige: #cabb9f; $chill-pink: #dd506d; $chill-dark-gray: #333333; $chill-light-gray: #b2b2b2; -$chill-llight-gray: $chill-light-gray; +$chill-llight-gray: #e6e6e6; $dark-grey: $chill-dark-gray; @@ -33,7 +33,7 @@ $black: #111111; $white: #ffffff; $light-grey: $chill-light-gray; -/* +/* due to a bug in sass, we must re-declare the variable in css (use of a sass variable after -- does not work) */ From 4c5aa5f01ac634a7342db52e792f4f027717efbd Mon Sep 17 00:00:00 2001 From: nobohan Date: Fri, 1 Jun 2018 10:25:59 +0200 Subject: [PATCH 45/64] add value for color chill-llight-gray - also for css variables --- Resources/public/sass/custom/config/_colors.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/public/sass/custom/config/_colors.scss b/Resources/public/sass/custom/config/_colors.scss index d34daddb7..91e4ebae0 100644 --- a/Resources/public/sass/custom/config/_colors.scss +++ b/Resources/public/sass/custom/config/_colors.scss @@ -49,7 +49,7 @@ $light-grey: $chill-light-gray; --chill-pink: #dd506d; --chill-dark-gray: #333333; --chill-light-gray: #b2b2b2; - --chill-llight-gray: #b2b2b2; + --chill-llight-gray: #e6e6e6; --dark-grey: #333333; From f6f1b504bd2925445fd2ff9a000b510db0a69f9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 5 Jun 2018 09:42:31 +0200 Subject: [PATCH 46/64] fix bug when date interval for 1 day or multiple years --- Doctrine/Type/NativeDateIntervalType.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Doctrine/Type/NativeDateIntervalType.php b/Doctrine/Type/NativeDateIntervalType.php index 12e8b789b..bc4938e97 100644 --- a/Doctrine/Type/NativeDateIntervalType.php +++ b/Doctrine/Type/NativeDateIntervalType.php @@ -74,13 +74,15 @@ class NativeDateIntervalType extends DateIntervalType if (is_numeric($current)) { $next = \next($strings); switch($next) { - case 'year': + case 'year': + case 'years': $unit = 'Y'; break; case 'mon': case 'mons': $unit = 'M'; break; + case 'day': case 'days': $unit = 'D'; break; From a6496884e1c3ebd0718f40e7124e66a94abdcbaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 5 Jun 2018 09:43:58 +0200 Subject: [PATCH 47/64] fix scope of "remove button" on collection --- Resources/public/js/collection/collections.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/public/js/collection/collections.js b/Resources/public/js/collection/collections.js index 5a42162e6..6c8fa1131 100644 --- a/Resources/public/js/collection/collections.js +++ b/Resources/public/js/collection/collections.js @@ -103,7 +103,7 @@ window.addEventListener('load', function() { } for (let i = 0; i < collections.length; i ++) { - let entries = collections[i].querySelectorAll('li'); + let entries = collections[i].querySelectorAll(':scope > li'); for (let j = 0; j < entries.length; j ++) { initializeRemove(collections[i], entries[j]); From 514b619f8a4597d0b958f0761d3ed1a0471ae058 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 5 Jun 2018 09:45:02 +0200 Subject: [PATCH 48/64] add breadcrumb module --- Resources/public/modules/breadcrumb/index.js | 3 +++ .../public/modules/breadcrumb/layout.scss | 21 +++++++++++++++++++ chill.webpack.config.js | 1 + 3 files changed, 25 insertions(+) create mode 100644 Resources/public/modules/breadcrumb/index.js create mode 100644 Resources/public/modules/breadcrumb/layout.scss diff --git a/Resources/public/modules/breadcrumb/index.js b/Resources/public/modules/breadcrumb/index.js new file mode 100644 index 000000000..40173696d --- /dev/null +++ b/Resources/public/modules/breadcrumb/index.js @@ -0,0 +1,3 @@ +require("./layout.scss"); + + diff --git a/Resources/public/modules/breadcrumb/layout.scss b/Resources/public/modules/breadcrumb/layout.scss new file mode 100644 index 000000000..0a611da67 --- /dev/null +++ b/Resources/public/modules/breadcrumb/layout.scss @@ -0,0 +1,21 @@ +nav.chill-breadcrumb { + ul.list.on-left { + li { + border-right: 10px solid var(--chill-red); + } + li.active { + border-right: 10px solid var(--chill-green); + } + li.past { + border-right: 10px solid var(--chill-blue); + } + li.no-jump{ + border-right: 10px solid var(--chill-light-gray); + background-color: var(--chill-yellow); + padding: 0.3em 0.3em 0.3em 0.6em; + color: var(--chill-dark-gray); + } + } + + +} diff --git a/chill.webpack.config.js b/chill.webpack.config.js index 8481e4011..ae87294e0 100644 --- a/chill.webpack.config.js +++ b/chill.webpack.config.js @@ -22,6 +22,7 @@ require('./Resources/public/sass/scratch.scss'); require('./Resources/public/css/chillmain.css'); require('./Resources/public/css/pikaday.css'); require('./Resources/public/js/collection/collections.js'); +require('./Resources/public/modules/breadcrumb/index.js'); //require('./Resources/public/css/scratch.css'); //require('./Resources/public/css/select2/select2.css'); require('select2/dist/css/select2.css'); From 13dbaa0b7858536b25566b94161e2af589fb6f48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 5 Jun 2018 09:45:22 +0200 Subject: [PATCH 49/64] improve userPicker: delegate query to authorization helper --- Form/Type/UserPickerType.php | 30 ++---------- Resources/config/services.yml | 5 +- Resources/translations/messages.fr.yml | 2 +- .../Authorization/AuthorizationHelper.php | 49 +++++++++++++++++-- .../Authorization/AuthorizationHelperTest.php | 16 +++++- 5 files changed, 67 insertions(+), 35 deletions(-) diff --git a/Form/Type/UserPickerType.php b/Form/Type/UserPickerType.php index b253ce393..0d0a44fdd 100644 --- a/Form/Type/UserPickerType.php +++ b/Form/Type/UserPickerType.php @@ -87,34 +87,10 @@ class UserPickerType extends AbstractType ->setDefault('choice_label', function(User $u) { return $u->getUsername(); }) - ->setNormalizer('query_builder', function(Options $options) { - $roles = $this->authorizationHelper->getParentRoles($options['role']); - $roles[] = $options['role']; + ->setNormalizer('choices', function(Options $options) { - $qb = $this->userRepository->createQueryBuilder('u'); - $qb - // add center constraint - ->join('u.groupCenters', 'ug') - ->where($qb->expr()->eq('ug.center', ':center')) - ->setParameter('center', $options['center']) - // link to permission groups - ->join('ug.permissionsGroup', 'pg') - // role constraints - ->join('pg.roleScopes', 'roleScope') - ->andWhere($qb->expr()->in('roleScope.role', ':roles')) - ->setParameter( - 'roles', - \array_map( - function(Role $role) { return $role->getRole(); }, - $roles - ) - ) - // add active constraint - ->andWhere('u.enabled = :enabled') - ->setParameter('enabled', true) - ; - - return $qb; + return $this->authorizationHelper + ->findUsersReaching($options['role'], $options['center']); }) ; } diff --git a/Resources/config/services.yml b/Resources/config/services.yml index 6cd323c56..c60212df5 100644 --- a/Resources/config/services.yml +++ b/Resources/config/services.yml @@ -59,8 +59,9 @@ services: chill.main.security.authorization.helper: class: Chill\MainBundle\Security\Authorization\AuthorizationHelper arguments: - - "@security.role_hierarchy" - - "%security.role_hierarchy.roles%" + $roleHierarchy: "@security.role_hierarchy" + $hierarchy: "%security.role_hierarchy.roles%" + $em: '@Doctrine\ORM\EntityManagerInterface' Chill\MainBundle\Security\Authorization\AuthorizationHelper: '@chill.main.security.authorization.helper' chill.main.role_provider: diff --git a/Resources/translations/messages.fr.yml b/Resources/translations/messages.fr.yml index bf082188f..543031d15 100644 --- a/Resources/translations/messages.fr.yml +++ b/Resources/translations/messages.fr.yml @@ -32,7 +32,7 @@ Confirm: Confirmer Cancel: Annuler Save: Enregistrer This form contains errors: Ce formulaire contient des erreurs - +Choose an user: Choisir un utilisateur 'You are going to leave a page with unsubmitted data. Are you sure you want to leave ?': "Vous allez quitter la page alors que des données n'ont pas été enregistrées. Êtes vous sûr de vouloir partir ?" Edit: Modifier diff --git a/Security/Authorization/AuthorizationHelper.php b/Security/Authorization/AuthorizationHelper.php index 95552aa36..f786e38f3 100644 --- a/Security/Authorization/AuthorizationHelper.php +++ b/Security/Authorization/AuthorizationHelper.php @@ -27,6 +27,9 @@ use Symfony\Component\Security\Core\Role\RoleHierarchyInterface; use Symfony\Component\Security\Core\Role\Role; use Chill\MainBundle\Entity\Scope; use Chill\MainBundle\Security\RoleProvider; +use Doctrine\ORM\EntityManagerInterface; +use Chill\MainBundle\Entity\GroupCenter; +use Chill\MainBundle\Entity\RoleScope; /** * Helper for authorizations. @@ -51,15 +54,20 @@ class AuthorizationHelper */ protected $hierarchy; - protected $existingRoles = array('CHILL_MASTER_ROLE', 'CHILL_PERSON_SEE', - 'CHILL_PERSON_UPDATE',); + /** + * + * @var EntityManagerInterface + */ + protected $em; public function __construct( RoleHierarchyInterface $roleHierarchy, - $hierarchy + $hierarchy, + EntityManagerInterface $em ) { $this->roleHierarchy = $roleHierarchy; $this->hierarchy = $hierarchy; + $this->em = $em; } /** @@ -219,7 +227,40 @@ class AuthorizationHelper return $scopes; } - + /** + * + * @param Role $role + * @param Center $center + * @param Scope $circle + * @return Users + */ + public function findUsersReaching(Role $role, Center $center, Scope $circle = null) + { + $parents = $this->getParentRoles($role); + $parents[] = $role; + $parentRolesString = \array_map(function(Role $r) { return $r->getRole(); }, $parents); + + $qb = $this->em->createQueryBuilder(); + $qb + ->select('u') + ->from(User::class, 'u') + ->join('u.groupCenters', 'gc') + ->join('gc.permissionsGroup', 'pg') + ->join('pg.roleScopes', 'rs') + ->where('gc.center = :center') + ->andWhere($qb->expr()->in('rs.role', $parentRolesString)) + ; + + $qb->setParameter('center', $center); + + if ($circle !== null) { + $qb->andWhere('rs.scope = :circle') + ->setParameter('circle', $circle) + ; + } + + return $qb->getQuery()->getResult(); + } /** * Test if a parent role may give access to a given child role diff --git a/Tests/Security/Authorization/AuthorizationHelperTest.php b/Tests/Security/Authorization/AuthorizationHelperTest.php index fb171de07..3ed9a4b6f 100644 --- a/Tests/Security/Authorization/AuthorizationHelperTest.php +++ b/Tests/Security/Authorization/AuthorizationHelperTest.php @@ -459,6 +459,20 @@ class AuthorizationHelperTest extends KernelTestCase "Assert that `CHILL_MASTER_ROLE` is a parent of `CHILL_INHERITED_ROLE_1`"); } - + public function testFindUsersReaching() + { + $centerA = static::$kernel->getContainer() + ->get('doctrine.orm.entity_manager') + ->getRepository(Center::class) + ->findOneByName('Center A'); + + $users = $this->getAuthorizationHelper() + ->findUsersReaching(new Role('CHILL_PERSON_SEE'), + $centerA); + + $usernames = \array_map(function(User $u) { return $u->getUsername(); }, $users); + + $this->assertContains('center a_social', $usernames); + } } From 0c4a27e75952adb723d79f3f6d5b121c10ce95b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Thu, 7 Jun 2018 21:51:13 +0200 Subject: [PATCH 50/64] improve menucomposer to handle parameters and translation in old api --- Resources/config/services/routing.yml | 1 + Resources/translations/messages.fr.yml | 2 ++ Routing/MenuComposer.php | 18 ++++++++++++++---- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/Resources/config/services/routing.yml b/Resources/config/services/routing.yml index fcb71ddc7..c935f1a4d 100644 --- a/Resources/config/services/routing.yml +++ b/Resources/config/services/routing.yml @@ -4,6 +4,7 @@ services: arguments: - '@Symfony\Component\Routing\RouterInterface' - '@Knp\Menu\FactoryInterface' + - '@Symfony\Component\Translation\TranslatorInterface' Chill\MainBundle\Routing\MenuComposer: '@chill.main.menu_composer' chill.main.routes_loader: diff --git a/Resources/translations/messages.fr.yml b/Resources/translations/messages.fr.yml index 543031d15..e8e0edcaf 100644 --- a/Resources/translations/messages.fr.yml +++ b/Resources/translations/messages.fr.yml @@ -64,7 +64,9 @@ Advanced search: Recherche avancée #admin Create: Créer show: voir +Show: Voir edit: modifier +Edit: Modifier Main admin menu: Menu d'administration principal Actions: Actions Users and permissions: Utilisateurs et permissions diff --git a/Routing/MenuComposer.php b/Routing/MenuComposer.php index 405ed5071..e03f61ba2 100644 --- a/Routing/MenuComposer.php +++ b/Routing/MenuComposer.php @@ -6,6 +6,7 @@ use Symfony\Component\Routing\RouteCollection; use Symfony\Component\Routing\RouterInterface; use Knp\Menu\FactoryInterface; use Knp\Menu\ItemInterface; +use Symfony\Component\Translation\TranslatorInterface; /** @@ -31,6 +32,12 @@ class MenuComposer */ private $menuFactory; + /** + * + * @var TranslatorInterface + */ + private $translator; + /** * * @var @@ -40,10 +47,12 @@ class MenuComposer function __construct( RouterInterface $router, - FactoryInterface $menuFactory + FactoryInterface $menuFactory, + TranslatorInterface $translator ) { $this->router = $router; $this->menuFactory = $menuFactory; + $this->translator = $translator; } /** @@ -74,6 +83,7 @@ class MenuComposer foreach ($routeCollection->all() as $routeKey => $route) { if ($route->hasOption('menus')) { + if (array_key_exists($menuId, $route->getOption('menus'))) { $route = $route->getOption('menus')[$menuId]; @@ -99,9 +109,9 @@ class MenuComposer // build menu from routes foreach ($routes as $order => $route) { - $menu->addChild($route['label'], [ + $menu->addChild($this->translator->trans($route['label']), [ 'route' => $route['key'], - 'routeParameters' => $parameters, + 'routeParameters' => $parameters['args'], 'order' => $order ]) ->setExtras([ @@ -114,7 +124,7 @@ class MenuComposer if ($this->hasLocalMenuBuilder($menuId)) { foreach ($this->localMenuBuilders[$menuId] as $builder) { /* @var $builder LocalMenuBuilderInterface */ - $builder->buildMenu($menuId, $menu, $parameters); + $builder->buildMenu($menuId, $menu, $parameters['args']); } } From dd05fa0be7df000ba55401d08fda0deb404ce6fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 8 Jun 2018 17:52:20 +0200 Subject: [PATCH 51/64] remove dump --- Form/Type/Export/ExportType.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/Form/Type/Export/ExportType.php b/Form/Type/Export/ExportType.php index 36a72d0c2..c8410f231 100644 --- a/Form/Type/Export/ExportType.php +++ b/Form/Type/Export/ExportType.php @@ -79,8 +79,6 @@ class ExportType extends AbstractType $filters = $this->exportManager->getFiltersApplyingOn($export, $options['picked_centers']); $filterBuilder = $builder->create(self::FILTER_KEY, FormType::class, array('compound' => true)); - dump($this->exportManager); - foreach($filters as $alias => $filter) { $filterBuilder->add($alias, FilterType::class, array( 'filter_alias' => $alias, From 587b248549fb0ba67203aea9eb72f2bcdddc157f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 12 Jun 2018 17:58:02 +0200 Subject: [PATCH 52/64] improve script for downloading exports --- Controller/ExportController.php | 26 ++++++- Export/ExportManager.php | 6 +- .../download-report/download-report.js | 67 +++++++++++++++++++ .../public/modules/download-report/index.js | 18 +++++ Resources/views/Export/download.html.twig | 46 +------------ chill.webpack.config.js | 1 + 6 files changed, 114 insertions(+), 50 deletions(-) create mode 100644 Resources/public/modules/download-report/download-report.js create mode 100644 Resources/public/modules/download-report/index.js diff --git a/Controller/ExportController.php b/Controller/ExportController.php index c25a25e03..b29849585 100644 --- a/Controller/ExportController.php +++ b/Controller/ExportController.php @@ -412,9 +412,29 @@ class ExportController extends Controller } public function downloadResultAction(Request $request, $alias) - { - return $this->render("ChillMainBundle:Export:download.html.twig", [ + { + /* @var $exportManager \Chill\MainBundle\Export\ExportManager */ + $exportManager = $this->get('chill.main.export_manager'); + $formCenters = $this->createCreateFormExport($alias, 'generate_centers'); + $formCenters->handleRequest($request); + $dataCenters = $formCenters->getData(); + + $formExport = $this->createCreateFormExport($alias, 'generate_export', $dataCenters); + $formExport->handleRequest($request); + $dataExport = $formExport->getData(); + dump($dataExport); + $formatterAlias = $exportManager->getFormatterAlias($dataExport['export']); + $formater = $exportManager->getFormatter($formatterAlias); + + $viewVariables = [ 'alias' => $alias - ]); + ]; + + if ($formater instanceof \Chill\MainBundle\Export\Formatter\CSVListFormatter) { + // due to a bug in php, we add the mime type in the download view + $viewVariables['mime_type'] = 'text/csv'; + } + + return $this->render("ChillMainBundle:Export:download.html.twig", $viewVariables); } } diff --git a/Export/ExportManager.php b/Export/ExportManager.php index 85c2b4280..3db2d138c 100644 --- a/Export/ExportManager.php +++ b/Export/ExportManager.php @@ -437,16 +437,16 @@ class ExportManager $result = $export->getResult($query, $data[ExportType::EXPORT_KEY]); - if (!is_array($result)) { + if (!is_iterable($result)) { throw new \UnexpectedValueException( sprintf( - 'The result of the export should be an array, %s given', + 'The result of the export should be an iterable, %s given', gettype($result) ) ); } - /* @var $formatter Formatter\CSVFormatter */ + /* @var $formatter FormatterInterface */ $formatter = $this->getFormatter($this->getFormatterAlias($data)); $filtersData = array(); $aggregatorsData = array(); diff --git a/Resources/public/modules/download-report/download-report.js b/Resources/public/modules/download-report/download-report.js new file mode 100644 index 000000000..1900c04cf --- /dev/null +++ b/Resources/public/modules/download-report/download-report.js @@ -0,0 +1,67 @@ +/* + * Copyright (C) 2018 Champs Libres Cooperative + * + * 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 . + */ + +var mime = require('mime-types') + +var download_report = (url, container) => { + var download_text = container.dataset.downloadText, + alias = container.dataset.alias; + + window.fetch(url, { credentials: 'same-origin' }) + .then(response => { + if (!response.ok) { + throw Error(response.statusText); + } + + return response.blob(); + }).then(blob => { + + var content = URL.createObjectURL(blob), + link = document.createElement("a"), + type = blob.type, + hasForcedType = 'mimeType' in container.dataset, + extension; + + if (hasForcedType) { + // force a type + type = container.dataset.mimeType; + blob = new Blob([ blob ], { 'type': type }); + content = URL.createObjectURL(blob); + } + + extension = mime.extension(type); + + link.appendChild(document.createTextNode(download_text)); + link.classList.add("sc-button", "btn-action"); + link.href = content; + link.download = alias; + if (extension !== false) { + link.download = link.download + '.' + extension; + } + container.innerHTML = ""; + container.appendChild(link); + }).catch(function(error) { + console.log(error); + var problem_text = + document.createTextNode("Problem during download"); + + container + .replaceChild(problem_text, container.firstChild); + }); +}; + +module.exports = download_report; \ No newline at end of file diff --git a/Resources/public/modules/download-report/index.js b/Resources/public/modules/download-report/index.js new file mode 100644 index 000000000..1b519e6c2 --- /dev/null +++ b/Resources/public/modules/download-report/index.js @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2018 Champs Libres Cooperative + * + * 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 . + */ + +chill.download_report = require("./download-report.js"); diff --git a/Resources/views/Export/download.html.twig b/Resources/views/Export/download.html.twig index d1f670d74..87c8b7989 100644 --- a/Resources/views/Export/download.html.twig +++ b/Resources/views/Export/download.html.twig @@ -27,50 +27,8 @@ window.addEventListener("DOMContentLoaded", function(e) { query = window.location.search, container = document.querySelector("#download_container") ; - - window.fetch(url+query, { credentials: 'same-origin' }) - .then(function(response) { - if (!response.ok) { - throw Error(response.statusText); - } - - return response.blob(); - }).then(function(blob) { - var content = URL.createObjectURL(blob), - link = document.createElement("a"), - suffix_file; - - switch (blob.type) { - case 'application/vnd.oasis.opendocument.spreadsheet': - suffix_file = '.ods'; - break; - case 'text/csv': - suffix_file = '.csv'; - break; - case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': - suffix_file = '.xlsx'; - break; - default: - suffix_file = ''; - } - - link.appendChild(document.createTextNode("{{ "Download your report"|trans }}")); - link.classList.add("sc-button", "btn-action"); - link.href = content; - link.download = "{{ alias }}"+suffix_file; - let waiting_text = container.querySelector("#waiting_text"); - container.removeChild(waiting_text); - container.appendChild(link); - }).catch(function(error) { - var problem_text = - document.createTextNode("{{ "Problem during download"|trans }}"); - - container - .replaceChild(problem_text, container.firstChild); - }) - ; - + chill.download_report(url+query, container); }); {% endblock %} @@ -79,6 +37,6 @@ window.addEventListener("DOMContentLoaded", function(e) {

      {{ "Download export"|trans }}

      -
      {{ "Waiting for your report"|trans }}...
      +
      {{ "Waiting for your report"|trans }}...
      {% endblock %} \ No newline at end of file diff --git a/chill.webpack.config.js b/chill.webpack.config.js index ae87294e0..13bb15998 100644 --- a/chill.webpack.config.js +++ b/chill.webpack.config.js @@ -23,6 +23,7 @@ require('./Resources/public/css/chillmain.css'); require('./Resources/public/css/pikaday.css'); require('./Resources/public/js/collection/collections.js'); require('./Resources/public/modules/breadcrumb/index.js'); +require('./Resources/public/modules/download-report/index.js'); //require('./Resources/public/css/scratch.css'); //require('./Resources/public/css/select2/select2.css'); require('select2/dist/css/select2.css'); From 16a93711c240930b3fe78360f77880363d817ac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 13 Jun 2018 16:43:09 +0200 Subject: [PATCH 53/64] remove dump --- Controller/ExportController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Controller/ExportController.php b/Controller/ExportController.php index b29849585..6d9e79199 100644 --- a/Controller/ExportController.php +++ b/Controller/ExportController.php @@ -422,7 +422,7 @@ class ExportController extends Controller $formExport = $this->createCreateFormExport($alias, 'generate_export', $dataCenters); $formExport->handleRequest($request); $dataExport = $formExport->getData(); - dump($dataExport); + $formatterAlias = $exportManager->getFormatterAlias($dataExport['export']); $formater = $exportManager->getFormatter($formatterAlias); From c059fe8a95b01a67bf1d8db8529c5d2e14749717 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 13 Jun 2018 16:44:22 +0200 Subject: [PATCH 54/64] add exportElementProvider to provide elements dynamically to export manager --- .../CompilerPass/ExportsCompilerPass.php | 32 +++++++++++++++++ Export/ExportElementsProviderInterface.php | 35 +++++++++++++++++++ Export/ExportManager.php | 20 +++++++++++ 3 files changed, 87 insertions(+) create mode 100644 Export/ExportElementsProviderInterface.php diff --git a/DependencyInjection/CompilerPass/ExportsCompilerPass.php b/DependencyInjection/CompilerPass/ExportsCompilerPass.php index dc4d1805d..3b4b2069e 100644 --- a/DependencyInjection/CompilerPass/ExportsCompilerPass.php +++ b/DependencyInjection/CompilerPass/ExportsCompilerPass.php @@ -31,6 +31,7 @@ use Symfony\Component\DependencyInjection\Definition; * - chill.export_formatter * - chill.export_aggregator * - chill.export_filter + * - chill.export_elements_provider * * * @author Julien Fastré @@ -53,6 +54,7 @@ class ExportsCompilerPass implements CompilerPassInterface $this->compileFilters($chillManagerDefinition, $container); $this->compileAggregators($chillManagerDefinition, $container); $this->compileFormatters($chillManagerDefinition, $container); + $this->compileExportElementsProvider($chillManagerDefinition, $container); } private function compileExports(Definition $chillManagerDefinition, @@ -174,5 +176,35 @@ class ExportsCompilerPass implements CompilerPassInterface } } } + + private function compileExportElementsProvider(Definition $chillManagerDefinition, + ContainerBuilder $container) + { + $taggedServices = $container->findTaggedServiceIds( + 'chill.export_elements_provider' + ); + + $knownAliases = array(); + + foreach ($taggedServices as $id => $tagAttributes) { + foreach ($tagAttributes as $attributes) { + if (!isset($attributes["prefix"])) { + throw new \LogicException("the 'prefix' attribute is missing in your ". + "service '$id' definition"); + } + + if (array_search($attributes["prefix"], $knownAliases)) { + throw new \LogicException("There is already a chill.export_elements_provider service with prefix " + .$attributes["prefix"].". Choose another prefix."); + } + $knownAliases[] = $attributes["prefix"]; + + $chillManagerDefinition->addMethodCall( + 'addExportElementsProvider', + array(new Reference($id), $attributes["prefix"]) + ); + } + } + } } diff --git a/Export/ExportElementsProviderInterface.php b/Export/ExportElementsProviderInterface.php new file mode 100644 index 000000000..077272c9b --- /dev/null +++ b/Export/ExportElementsProviderInterface.php @@ -0,0 +1,35 @@ + + * + * 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 . + */ +namespace Chill\MainBundle\Export; + +/** + * Interface to provide export elements dynamically. + * + * The typical use case is providing exports or aggregators depending on + * dynamic data. Example: providing exports for reports, reports depending + * on data stored in database. + * + * @author Julien Fastré + */ +interface ExportElementsProviderInterface +{ + /** + * @return ExportElementInterface[] + */ + public function getExportElements(); +} diff --git a/Export/ExportManager.php b/Export/ExportManager.php index 3db2d138c..a46054352 100644 --- a/Export/ExportManager.php +++ b/Export/ExportManager.php @@ -169,6 +169,26 @@ class ExportManager $this->formatters[$alias] = $formatter; } + public function addExportElementsProvider(ExportElementsProviderInterface $provider, $prefix) + { + foreach ($provider->getExportElements() as $suffix => $element) { + $alias = $prefix.'_'.$suffix; + + if ($element instanceof ExportInterface) { + $this->addExport($element, $alias); + } elseif ($element instanceof FilterInterface) { + $this->addFilter($element, $alias); + } elseif ($element instanceof AggregatorInterface) { + $this->addAggregator($element, $alias); + } elseif ($element instanceof FormatterInterface) { + $this->addFormatter($element, $alias); + } else { + throw new \LogicException("This element ".\get_class($element)." " + . "is not an instance of export element"); + } + } + } + /** * * @return string[] the existing type for known exports From 8624b3f941ee8913b99bbe25eb614934ac64340f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 22 Jun 2018 10:09:04 +0200 Subject: [PATCH 55/64] improve money type rendering + DQL "jsonbexistsInArray" --- DependencyInjection/ChillMainExtension.php | 6 ++- Doctrine/DQL/JsonbExistsInArray.php | 41 +++++++++++++++++++ .../public/sass/custom/modules/_forms.scss | 12 ++++++ Resources/views/Form/fields.html.twig | 7 ++++ 4 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 Doctrine/DQL/JsonbExistsInArray.php diff --git a/DependencyInjection/ChillMainExtension.php b/DependencyInjection/ChillMainExtension.php index 613fe048e..5de39b272 100644 --- a/DependencyInjection/ChillMainExtension.php +++ b/DependencyInjection/ChillMainExtension.php @@ -29,6 +29,7 @@ use Chill\MainBundle\DependencyInjection\Configuration; use Chill\MainBundle\Doctrine\DQL\GetJsonFieldByKey; use Chill\MainBundle\Doctrine\DQL\Unaccent; use Chill\MainBundle\Doctrine\DQL\JsonAggregate; +use Chill\MainBundle\Doctrine\DQL\JsonbExistsInArray; /** * This class load config for chillMainExtension. @@ -141,7 +142,10 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface, 'unaccent' => Unaccent::class, 'GET_JSON_FIELD_BY_KEY' => GetJsonFieldByKey::class, 'AGGREGATE' => JsonAggregate::class - ) + ), + 'numeric_functions' => [ + 'JSONB_EXISTS_IN_ARRAY' => JsonbExistsInArray::class + ] ) ) )); diff --git a/Doctrine/DQL/JsonbExistsInArray.php b/Doctrine/DQL/JsonbExistsInArray.php new file mode 100644 index 000000000..6c4eaa5c3 --- /dev/null +++ b/Doctrine/DQL/JsonbExistsInArray.php @@ -0,0 +1,41 @@ + + */ +class JsonbExistsInArray extends FunctionNode +{ + private $expr1; + private $expr2; + + public function getSql(SqlWalker $sqlWalker): string + { + return sprintf( + 'jsonb_exists(%s, %s)', + $this->expr1->dispatch($sqlWalker), + $sqlWalker->walkInputParameter($this->expr2) + ); + } + + public function parse(Parser $parser): void + { + $parser->match(Lexer::T_IDENTIFIER); + $parser->match(Lexer::T_OPEN_PARENTHESIS); + $this->expr1 = $parser->StringPrimary(); + $parser->match(Lexer::T_COMMA); + $this->expr2 = $parser->InputParameter(); + $parser->match(Lexer::T_CLOSE_PARENTHESIS); + } +} diff --git a/Resources/public/sass/custom/modules/_forms.scss b/Resources/public/sass/custom/modules/_forms.scss index 75b0e46a3..6676680cc 100644 --- a/Resources/public/sass/custom/modules/_forms.scss +++ b/Resources/public/sass/custom/modules/_forms.scss @@ -6,4 +6,16 @@ textarea { span.force-inline-label label { display: inline; +} + + +.chill-form-money { + display: flex; + flex-direction: row; + justify-content: flex-end; + + span.chill-form-money__money { + align-self: center; + margin-left: 1em; + } } \ No newline at end of file diff --git a/Resources/views/Form/fields.html.twig b/Resources/views/Form/fields.html.twig index 441519bc7..33b42c6e8 100644 --- a/Resources/views/Form/fields.html.twig +++ b/Resources/views/Form/fields.html.twig @@ -101,6 +101,13 @@ {% endspaceless %} {% endblock choice_with_other_widget %} +{% block money_widget %} +
      + {{ block('form_widget_simple') }} + {{ money_pattern|form_encode_currency }} +
      +{% endblock money_widget %} + {% block date_widget %} {% spaceless %} From 86a814cfb57be99f049df394dc09c0568a712f93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 29 Jun 2018 00:08:09 +0200 Subject: [PATCH 56/64] init pickaday when collection entry is added --- Resources/public/js/collection/collections.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/public/js/collection/collections.js b/Resources/public/js/collection/collections.js index 6c8fa1131..60b34fb17 100644 --- a/Resources/public/js/collection/collections.js +++ b/Resources/public/js/collection/collections.js @@ -57,6 +57,7 @@ var handleAdd = function(button) { entry.classList.add('chill-collection__list__entry'); initializeRemove(collection, entry); collection.appendChild(entry); + chill.initPikaday('fr'); collection.dispatchEvent(event); window.dispatchEvent(event); From 26a4d80ce6642e466c46c89db86715757e9032b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Thu, 5 Jul 2018 13:02:21 +0200 Subject: [PATCH 57/64] load postal codes dynamically --- Controller/PostalCodeController.php | 89 +++++++++++++++++++ Form/ChoiceLoader/PostalCodeChoiceLoader.php | 85 ++++++++++++++++++ Form/Type/PostalCodeType.php | 56 ++++++++++-- Repository/PostalCodeRepository.php | 28 ++++++ Resources/config/doctrine/PostalCode.orm.yml | 3 + Resources/config/routing.yml | 4 + Resources/config/routing/postal-code.yml | 4 + Resources/config/services/controller.yml | 2 + Resources/config/services/form.yml | 8 ++ Resources/config/services/repositories.yml | 11 ++- .../migrations/Version20180703191509.php | 33 +++++++ Resources/public/modules/postal-code/index.js | 36 ++++++++ .../public/sass/custom/modules/_forms.scss | 7 ++ Resources/translations/messages.fr.yml | 7 +- Resources/views/Form/fields.html.twig | 4 +- chill.webpack.config.js | 1 + 16 files changed, 368 insertions(+), 10 deletions(-) create mode 100644 Controller/PostalCodeController.php create mode 100644 Form/ChoiceLoader/PostalCodeChoiceLoader.php create mode 100644 Repository/PostalCodeRepository.php create mode 100644 Resources/config/routing/postal-code.yml create mode 100644 Resources/migrations/Version20180703191509.php create mode 100644 Resources/public/modules/postal-code/index.js diff --git a/Controller/PostalCodeController.php b/Controller/PostalCodeController.php new file mode 100644 index 000000000..cd7dd9ace --- /dev/null +++ b/Controller/PostalCodeController.php @@ -0,0 +1,89 @@ + + * + * 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 . + */ +namespace Chill\MainBundle\Controller; + +use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Component\HttpFoundation\Request; +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; +use Chill\MainBundle\Entity\PostalCode; +use Symfony\Component\HttpFoundation\JsonResponse; +use Chill\MainBundle\Templating\TranslatableStringHelper; +use Doctrine\ORM\Query; + +/** + * + * + * @author Julien Fastré + */ +class PostalCodeController extends Controller +{ + /** + * + * @var TranslatableStringHelper + */ + protected $translatableStringHelper; + + public function __construct(TranslatableStringHelper $translatableStringHelper) + { + $this->translatableStringHelper = $translatableStringHelper; + } + + + /** + * + * @Route( + * "{_locale}/postalcode/search" + * ) + * @param Request $request + * @return JsonResponse + */ + public function searchAction(Request $request) + { + $pattern = $request->query->getAlnum('q', ''); + + if (empty($pattern)) { + return new JsonResponse(["results" => [], "pagination" => [ "more" => false]]); + } + + $query = $this->getDoctrine()->getManager() + ->createQuery(sprintf( + "SELECT p.id AS id, p.name AS name, p.code AS code, " + . "country.name AS country_name, " + . "country.countryCode AS country_code " + . "FROM %s p " + . "JOIN p.country country " + . "WHERE LOWER(p.name) LIKE LOWER(:pattern) OR LOWER(p.code) LIKE LOWER(:pattern) " + . "ORDER BY code" + , PostalCode::class) + ) + ->setParameter('pattern', '%'.$pattern.'%') + ->setMaxResults(30) + ; + + $results = \array_map(function($row) { + $row['country_name'] = $this->translatableStringHelper->localize($row['country_name']); + $row['text'] = $row['code']." ".$row["name"]." (".$row['country_name'].")"; + + return $row; + }, $query->getResult(Query::HYDRATE_ARRAY)); + + return new JsonResponse([ 'results' => $results, "pagination" => [ "more" => false ] ]); + } +} diff --git a/Form/ChoiceLoader/PostalCodeChoiceLoader.php b/Form/ChoiceLoader/PostalCodeChoiceLoader.php new file mode 100644 index 000000000..71ebbd919 --- /dev/null +++ b/Form/ChoiceLoader/PostalCodeChoiceLoader.php @@ -0,0 +1,85 @@ + + * + * 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 . + */ +namespace Chill\MainBundle\Form\ChoiceLoader; + +use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface; +use Symfony\Component\Form\ChoiceList\ChoiceListInterface; +use Chill\MainBundle\Repository\PostalCodeRepository; +use Symfony\Component\Form\ChoiceList\LazyChoiceList; +use Chill\MainBundle\Entity\PostalCode; + +/** + * + * + * @author Julien Fastré + */ +class PostalCodeChoiceLoader implements ChoiceLoaderInterface +{ + /** + * + * @var PostalCodeRepository + */ + protected $postalCodeRepository; + + protected $lazyLoadedPostalCodes = []; + + public function __construct(PostalCodeRepository $postalCodeRepository) + { + $this->postalCodeRepository = $postalCodeRepository; + } + + public function loadChoiceList($value = null): ChoiceListInterface + { + $list = new \Symfony\Component\Form\ChoiceList\ArrayChoiceList( + $this->lazyLoadedPostalCodes, + function(PostalCode $pc) use ($value) { + return \call_user_func($value, $pc); + }); + + return $list; + } + + public function loadChoicesForValues(array $values, $value = null) + { + $choices = []; + + foreach($values as $value) { + $choices[] = $this->postalCodeRepository->find($value); + } + + return $choices; + } + + public function loadValuesForChoices(array $choices, $value = null) + { + $values = []; + + foreach ($choices as $choice) { + if (NULL === $choice) { + $values[] = null; + continue; + } + + $id = \call_user_func($value, $choice); + $values[] = $id; + $this->lazyLoadedPostalCodes[$id] = $choice; + } + + return $values; + } +} diff --git a/Form/Type/PostalCodeType.php b/Form/Type/PostalCodeType.php index bdaae6bc9..1cbbc549d 100644 --- a/Form/Type/PostalCodeType.php +++ b/Form/Type/PostalCodeType.php @@ -21,10 +21,14 @@ namespace Chill\MainBundle\Form\Type; use Symfony\Component\Form\AbstractType; use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Component\Form\FormBuilderInterface; use Symfony\Bridge\Doctrine\Form\Type\EntityType; use Chill\MainBundle\Templating\TranslatableStringHelper; use Chill\MainBundle\Entity\PostalCode; +use Symfony\Component\Form\FormInterface; +use Symfony\Component\Form\FormView; +use Symfony\Component\Routing\Generator\UrlGeneratorInterface; +use Chill\MainBundle\Form\ChoiceLoader\PostalCodeChoiceLoader; +use Symfony\Component\Translation\TranslatorInterface; /** * A form to pick between PostalCode @@ -39,10 +43,35 @@ class PostalCodeType extends AbstractType * @var TranslatableStringHelper */ protected $translatableStringHelper; + + /** + * + * @var UrlGeneratorInterface + */ + protected $urlGenerator; + + /** + * + * @var PostalCodeChoiceLoader + */ + protected $choiceLoader; + + /** + * + * @var TranslatorInterface + */ + protected $translator; - public function __construct(TranslatableStringHelper $helper) - { + public function __construct( + TranslatableStringHelper $helper, + UrlGeneratorInterface $urlGenerator, + PostalCodeChoiceLoader $choiceLoader, + TranslatorInterface $translator + ) { $this->translatableStringHelper = $helper; + $this->urlGenerator = $urlGenerator; + $this->choiceLoader = $choiceLoader; + $this->translator = $translator; } @@ -55,11 +84,26 @@ class PostalCodeType extends AbstractType { // create a local copy for usage in Closure $helper = $this->translatableStringHelper; - $resolver->setDefault('class', PostalCode::class) + $resolver + ->setDefault('class', PostalCode::class) ->setDefault('choice_label', function(PostalCode $code) use ($helper) { return $code->getCode().' '.$code->getName().' ['. $helper->localize($code->getCountry()->getName()).']'; - } - ); + }) + ->setDefault('choice_loader', $this->choiceLoader) + ->setDefault('placeholder', 'Select a postal code') + ; } + + public function buildView(FormView $view, FormInterface $form, array $options) + { + $view->vars['attr']['data-postal-code'] = 'data-postal-code'; + $view->vars['attr']['data-search-url'] = $this->urlGenerator + ->generate('chill_main_postal_code_search'); + $view->vars['attr']['data-placeholder'] = $this->translator->trans($options['placeholder']); + $view->vars['attr']['data-no-results-label'] = $this->translator->trans('select2.no_results'); + $view->vars['attr']['data-error-load-label'] = $this->translator->trans('select2.error_loading'); + $view->vars['attr']['data-searching-label'] = $this->translator->trans('select2.searching'); + } + } diff --git a/Repository/PostalCodeRepository.php b/Repository/PostalCodeRepository.php new file mode 100644 index 000000000..5b8ab8423 --- /dev/null +++ b/Repository/PostalCodeRepository.php @@ -0,0 +1,28 @@ + + * + * 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 . + */ +namespace Chill\MainBundle\Repository; + +/** + * + * + * @author Julien Fastré + */ +class PostalCodeRepository extends \Doctrine\ORM\EntityRepository +{ + +} diff --git a/Resources/config/doctrine/PostalCode.orm.yml b/Resources/config/doctrine/PostalCode.orm.yml index 09381d465..59d74ddf3 100644 --- a/Resources/config/doctrine/PostalCode.orm.yml +++ b/Resources/config/doctrine/PostalCode.orm.yml @@ -1,6 +1,9 @@ Chill\MainBundle\Entity\PostalCode: type: entity table: chill_main_postal_code + repositoryClass: Chill\MainBundle\Repository\PostalCodeRepository + indexes: + - { name: search_name_code, columns: [ "code", "label" ] } id: id: type: integer diff --git a/Resources/config/routing.yml b/Resources/config/routing.yml index 989a5e8f3..231580c49 100644 --- a/Resources/config/routing.yml +++ b/Resources/config/routing.yml @@ -17,6 +17,10 @@ chill_main_admin: chill_main_exports: resource: "@ChillMainBundle/Resources/config/routing/exports.yml" prefix: "{_locale}/exports" + +chill_postal_code: + resource: "@ChillMainBundle/Resources/config/routing/postal-code.yml" + prefix: "{_locale}/postal-code" root: path: / diff --git a/Resources/config/routing/postal-code.yml b/Resources/config/routing/postal-code.yml new file mode 100644 index 000000000..d8892c098 --- /dev/null +++ b/Resources/config/routing/postal-code.yml @@ -0,0 +1,4 @@ +chill_main_postal_code_search: + path: /search + defaults: { _controller: ChillMainBundle:PostalCode:search } + \ No newline at end of file diff --git a/Resources/config/services/controller.yml b/Resources/config/services/controller.yml index 6f5bbd751..7ead910ec 100644 --- a/Resources/config/services/controller.yml +++ b/Resources/config/services/controller.yml @@ -1,4 +1,6 @@ services: + Chill\MainBundle\Controller\: + autowire: true resource: '../../../Controller' tags: ['controller.service_arguments'] diff --git a/Resources/config/services/form.yml b/Resources/config/services/form.yml index 30502a399..78bfa0280 100644 --- a/Resources/config/services/form.yml +++ b/Resources/config/services/form.yml @@ -54,9 +54,17 @@ services: class: Chill\MainBundle\Form\Type\PostalCodeType arguments: - "@chill.main.helper.translatable_string" + - '@Symfony\Component\Routing\Generator\UrlGeneratorInterface' + - '@chill.main.form.choice_loader.postal_code' + - '@Symfony\Component\Translation\TranslatorInterface' tags: - { name: form.type } + chill.main.form.choice_loader.postal_code: + class: Chill\MainBundle\Form\ChoiceLoader\PostalCodeChoiceLoader + arguments: + - '@Chill\MainBundle\Repository\PostalCodeRepository' + chill.main.form.type.export: class: Chill\MainBundle\Form\Type\Export\ExportType arguments: diff --git a/Resources/config/services/repositories.yml b/Resources/config/services/repositories.yml index 3f40e82dc..56ea84656 100644 --- a/Resources/config/services/repositories.yml +++ b/Resources/config/services/repositories.yml @@ -15,4 +15,13 @@ services: class: Doctrine\ORM\EntityRepository factory: ["@doctrine.orm.entity_manager", getRepository] arguments: - - "Chill\\MainBundle\\Entity\\Scope" \ No newline at end of file + - "Chill\\MainBundle\\Entity\\Scope" + + chill.main.postalcode_repository: + class: Doctrine\ORM\EntityRepository + factory: ["@doctrine.orm.entity_manager", getRepository] + arguments: + - "Chill\\MainBundle\\Entity\\PostalCode" + + Chill\MainBundle\Repository\PostalCodeRepository: '@chill.main.postalcode_repository' + \ No newline at end of file diff --git a/Resources/migrations/Version20180703191509.php b/Resources/migrations/Version20180703191509.php new file mode 100644 index 000000000..82117de9d --- /dev/null +++ b/Resources/migrations/Version20180703191509.php @@ -0,0 +1,33 @@ +abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.'); + + try { + $this->addSql('CREATE EXTENSION IF NOT EXISTS pg_trgm'); + $this->addSql('CREATE INDEX search_name_code ON chill_main_postal_code USING GIN (LOWER(code) gin_trgm_ops, LOWER(label) gin_trgm_ops)'); + } catch (\Exception $e) { + $this->skipIf(true, "Could not create extension pg_trgm"); + } + + } + + public function down(Schema $schema) : void + { + $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.'); + + $this->addSql('DROP INDEX search_name_code'); + + } +} diff --git a/Resources/public/modules/postal-code/index.js b/Resources/public/modules/postal-code/index.js new file mode 100644 index 000000000..ba81fba90 --- /dev/null +++ b/Resources/public/modules/postal-code/index.js @@ -0,0 +1,36 @@ + +window.addEventListener('load', function (e) { + var + postalCodes = document.querySelectorAll('[data-postal-code]') + ; + + for (let i = 0; i < postalCodes.length; i++) { + let + searchUrl = postalCodes[i].dataset.searchUrl, + noResultsLabel = postalCodes[i].dataset.noResultsLabel, + errorLoadLabel = postalCodes[i].dataset.errorLoadLabel, + searchingLabel = postalCodes[i].dataset.searchingLabel + ; + + + $(postalCodes[i]).select2({ + allowClear: true, + language: { + errorLoading: function () { + return errorLoadLabel; + }, + noResults: function () { + return noResultsLabel; + }, + searching: function () { + return searchingLabel; + } + }, + ajax: { + url: searchUrl, + dataType: 'json', + delay: 250 + } + }); + } +}); diff --git a/Resources/public/sass/custom/modules/_forms.scss b/Resources/public/sass/custom/modules/_forms.scss index 6676680cc..0e5099ef0 100644 --- a/Resources/public/sass/custom/modules/_forms.scss +++ b/Resources/public/sass/custom/modules/_forms.scss @@ -18,4 +18,11 @@ span.force-inline-label label { align-self: center; margin-left: 1em; } +} + + +.chill-form__errors { + .chill-form_errors__entry.chill-form__errors__entry--warning { + color: var(--chill-green-dark); + } } \ No newline at end of file diff --git a/Resources/translations/messages.fr.yml b/Resources/translations/messages.fr.yml index e8e0edcaf..24c4eb710 100644 --- a/Resources/translations/messages.fr.yml +++ b/Resources/translations/messages.fr.yml @@ -182,4 +182,9 @@ column: colonne Comma separated values (CSV): Valeurs séparées par des virgules (CSV - tableur) # spreadsheet formatter -Choose the format: Choisir le format \ No newline at end of file +Choose the format: Choisir le format + +# select2 +'select2.no_results': Aucun résultat +'select2.error_loading': Erreur de chargement des résultats +'select2.searching': Recherche en cours... \ No newline at end of file diff --git a/Resources/views/Form/fields.html.twig b/Resources/views/Form/fields.html.twig index 33b42c6e8..841dd72e2 100644 --- a/Resources/views/Form/fields.html.twig +++ b/Resources/views/Form/fields.html.twig @@ -141,9 +141,9 @@ {% block form_errors %} {% spaceless %} {% if errors|length > 0 %} -
        +
          {% for error in errors %} -
        • {{ error.message }}
          • +
        • {{ error.message }}
          • {% endfor %}
        {% endif %} diff --git a/chill.webpack.config.js b/chill.webpack.config.js index 13bb15998..bf4ebf8b4 100644 --- a/chill.webpack.config.js +++ b/chill.webpack.config.js @@ -27,5 +27,6 @@ require('./Resources/public/modules/download-report/index.js'); //require('./Resources/public/css/scratch.css'); //require('./Resources/public/css/select2/select2.css'); require('select2/dist/css/select2.css'); +require('./Resources/public/modules/postal-code/index.js'); // img From 6ab86ac4fda77a92176b5f9edf70879fbface26a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Sun, 8 Jul 2018 16:56:49 +0200 Subject: [PATCH 58/64] move security services to dedicated file --- DependencyInjection/ChillMainExtension.php | 1 + Resources/config/services.yml | 13 +------------ Resources/config/services/security.yml | 12 ++++++++++++ 3 files changed, 14 insertions(+), 12 deletions(-) create mode 100644 Resources/config/services/security.yml diff --git a/DependencyInjection/ChillMainExtension.php b/DependencyInjection/ChillMainExtension.php index 5de39b272..df0686f34 100644 --- a/DependencyInjection/ChillMainExtension.php +++ b/DependencyInjection/ChillMainExtension.php @@ -99,6 +99,7 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface, $loader->load('services/routing.yml'); $loader->load('services/fixtures.yml'); $loader->load('services/menu.yml'); + $loader->load('services/security.yml'); } public function getConfiguration(array $config, ContainerBuilder $container) diff --git a/Resources/config/services.yml b/Resources/config/services.yml index c60212df5..05807258b 100644 --- a/Resources/config/services.yml +++ b/Resources/config/services.yml @@ -55,18 +55,7 @@ services: - "@doctrine.orm.entity_manager" calls: - [ setContainer, ["@service_container"]] - - chill.main.security.authorization.helper: - class: Chill\MainBundle\Security\Authorization\AuthorizationHelper - arguments: - $roleHierarchy: "@security.role_hierarchy" - $hierarchy: "%security.role_hierarchy.roles%" - $em: '@Doctrine\ORM\EntityManagerInterface' - Chill\MainBundle\Security\Authorization\AuthorizationHelper: '@chill.main.security.authorization.helper' - - chill.main.role_provider: - class: Chill\MainBundle\Security\RoleProvider - + chill.main.validator.role_scope_scope_presence: class: Chill\MainBundle\Validation\Validator\RoleScopeScopePresence arguments: diff --git a/Resources/config/services/security.yml b/Resources/config/services/security.yml new file mode 100644 index 000000000..e9e3d03fd --- /dev/null +++ b/Resources/config/services/security.yml @@ -0,0 +1,12 @@ +services: + chill.main.security.authorization.helper: + class: Chill\MainBundle\Security\Authorization\AuthorizationHelper + arguments: + $roleHierarchy: "@security.role_hierarchy" + $hierarchy: "%security.role_hierarchy.roles%" + $em: '@Doctrine\ORM\EntityManagerInterface' + Chill\MainBundle\Security\Authorization\AuthorizationHelper: '@chill.main.security.authorization.helper' + + chill.main.role_provider: + class: Chill\MainBundle\Security\RoleProvider + \ No newline at end of file From 2bb3b332f3570f277783ef120031db6e03bf8c1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Mon, 9 Jul 2018 19:09:26 +0200 Subject: [PATCH 59/64] fix authentication error message --- Controller/LoginController.php | 18 ++++++++++++++---- Resources/views/Login/login.html.twig | 6 ++++-- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Controller/LoginController.php b/Controller/LoginController.php index 75fef45ec..046b78678 100644 --- a/Controller/LoginController.php +++ b/Controller/LoginController.php @@ -5,10 +5,21 @@ namespace Chill\MainBundle\Controller; use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Security\Core\SecurityContextInterface; +use Symfony\Component\Security\Http\Authentication\AuthenticationUtils; class LoginController extends Controller { + /** + * + * @var AuthenticationUtils + */ + protected $helper; + + public function __construct(AuthenticationUtils $helper) + { + $this->helper = $helper; + } + /** * Show a login form * @@ -17,11 +28,10 @@ class LoginController extends Controller */ public function loginAction(Request $request) { - $helper = $this->get('security.authentication_utils'); return $this->render('ChillMainBundle:Login:login.html.twig', array( - 'last_username' => $helper->getLastUsername(), - 'error' => $helper->getLastAuthenticationError() + 'last_username' => $this->helper->getLastUsername(), + 'error' => $this->helper->getLastAuthenticationError() )); } diff --git a/Resources/views/Login/login.html.twig b/Resources/views/Login/login.html.twig index a4c3d622c..1ed31eac7 100644 --- a/Resources/views/Login/login.html.twig +++ b/Resources/views/Login/login.html.twig @@ -41,6 +41,7 @@ background-color: #333; color: white; text-align: center; + font-family: 'Open Sans'; } #content { @@ -69,7 +70,6 @@ width : 15em; text-align: right; display: inline-block; - font-family: 'Open Sans'; font-weight: 300; padding-right: 5px; } @@ -97,7 +97,9 @@
        -

        {{ error|trans }}

        + {% if error is not null %} +

        {{ error.message|trans }}

        + {% endif %}
        From 45a9937dbb66e9d056ddb5c274e09c525bac4788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Mon, 9 Jul 2018 19:12:11 +0200 Subject: [PATCH 60/64] set "logout" entry in user menu at the end of the menu --- Routing/MenuBuilder/UserMenuBuilder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Routing/MenuBuilder/UserMenuBuilder.php b/Routing/MenuBuilder/UserMenuBuilder.php index 131e4c00f..aaa9e82e8 100644 --- a/Routing/MenuBuilder/UserMenuBuilder.php +++ b/Routing/MenuBuilder/UserMenuBuilder.php @@ -34,7 +34,7 @@ class UserMenuBuilder implements LocalMenuBuilderInterface 'route' => 'logout' ]) ->setExtras([ - 'order'=> 10, + 'order'=> 99999999999, 'icon' => 'power-off' ]); } From 25d00877ae2e1660f4c330512c649ef13856fca8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 10 Jul 2018 12:53:44 +0200 Subject: [PATCH 61/64] add email to user and allow to connect through email or username --- Entity/User.php | 56 +++++++++++ Form/UserType.php | 1 + Resources/config/doctrine/User.orm.yml | 15 +++ Resources/config/services/security.yml | 5 + Resources/config/services/validator.yml | 6 ++ Resources/config/validation.yml | 3 + .../migrations/Version20180709181423.php | 87 +++++++++++++++++ Resources/views/User/edit.html.twig | 1 + Resources/views/User/new.html.twig | 1 + Security/UserProvider/UserProvider.php | 83 ++++++++++++++++ .../UserUniqueEmailAndUsernameConstraint.php | 42 ++++++++ .../Validator/UserUniqueEmailAndUsername.php | 95 +++++++++++++++++++ 12 files changed, 395 insertions(+) create mode 100644 Resources/migrations/Version20180709181423.php create mode 100644 Security/UserProvider/UserProvider.php create mode 100644 Validation/Constraint/UserUniqueEmailAndUsernameConstraint.php create mode 100644 Validation/Validator/UserUniqueEmailAndUsername.php diff --git a/Entity/User.php b/Entity/User.php index 13f49b59e..c814d7a01 100644 --- a/Entity/User.php +++ b/Entity/User.php @@ -22,6 +22,24 @@ class User implements AdvancedUserInterface { */ private $username; + /** + * + * @var string + */ + private $usernameCanonical; + + /** + * + * @var string + */ + private $email; + + /** + * + * @var string + */ + private $emailCanonical; + /** * * @var string @@ -115,9 +133,47 @@ class User implements AdvancedUserInterface { return $this->username; } + public function getUsernameCanonical() + { + return $this->usernameCanonical; + } + + public function getEmail() + { + return $this->email; + } + + public function getEmailCanonical() + { + return $this->emailCanonical; + } + + public function setUsernameCanonical($usernameCanonical) + { + $this->usernameCanonical = $usernameCanonical; + + return $this; + } + + public function setEmail($email) + { + $this->email = $email; + + return $this; + } + + public function setEmailCanonical($emailCanonical) + { + $this->emailCanonical = $emailCanonical; + + return $this; + } + + function setPassword($password) { $this->password = $password; + return $this; } diff --git a/Form/UserType.php b/Form/UserType.php index 1fd36d9e0..cbb027c25 100644 --- a/Form/UserType.php +++ b/Form/UserType.php @@ -19,6 +19,7 @@ class UserType extends AbstractType { $builder ->add('username') + ->add('email') ; if ($options['is_creation']) { $builder->add('plainPassword', UserPasswordType::class, array( diff --git a/Resources/config/doctrine/User.orm.yml b/Resources/config/doctrine/User.orm.yml index 05b434260..08d8064d3 100644 --- a/Resources/config/doctrine/User.orm.yml +++ b/Resources/config/doctrine/User.orm.yml @@ -14,6 +14,21 @@ Chill\MainBundle\Entity\User: username: type: string length: 80 + usernameCanonical: + name: username_canonical + type: string + length: 80 + unique: true + email: + type: string + length: 150 + nullable: true + emailCanonical: + name: email_canonical + type: string + length: 150 + nullable: true + unique: true password: type: string length: 255 diff --git a/Resources/config/services/security.yml b/Resources/config/services/security.yml index e9e3d03fd..a4b3f112f 100644 --- a/Resources/config/services/security.yml +++ b/Resources/config/services/security.yml @@ -9,4 +9,9 @@ services: chill.main.role_provider: class: Chill\MainBundle\Security\RoleProvider + + chill.main.user_provider: + class: Chill\MainBundle\Security\UserProvider\UserProvider + arguments: + $em: '@Doctrine\ORM\EntityManagerInterface' \ No newline at end of file diff --git a/Resources/config/services/validator.yml b/Resources/config/services/validator.yml index f09304375..c15b2181e 100644 --- a/Resources/config/services/validator.yml +++ b/Resources/config/services/validator.yml @@ -5,3 +5,9 @@ services: - "@chill.main.security.authorization.helper" tags: - { name: "validator.constraint_validator" } + + Chill\MainBundle\Validation\Validator\UserUniqueEmailAndUsername: + arguments: + $em: '@Doctrine\ORM\EntityManagerInterface' + tags: + - { name: "validator.constraint_validator" } diff --git a/Resources/config/validation.yml b/Resources/config/validation.yml index cd94af646..141d489fc 100644 --- a/Resources/config/validation.yml +++ b/Resources/config/validation.yml @@ -16,9 +16,12 @@ Chill\MainBundle\Entity\User: - Length: max: 70 min: 3 + email: + - Email: ~ constraints: - Callback: callback: isGroupCenterPresentOnce + - \Chill\MainBundle\Validation\Constraint\UserUniqueEmailAndUsernameConstraint: ~ Chill\MainBundle\Entity\RoleScope: constraints: diff --git a/Resources/migrations/Version20180709181423.php b/Resources/migrations/Version20180709181423.php new file mode 100644 index 000000000..93ca04e12 --- /dev/null +++ b/Resources/migrations/Version20180709181423.php @@ -0,0 +1,87 @@ +abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.'); + + $this->addSql('ALTER TABLE users ADD usernameCanonical VARCHAR(80) DEFAULT NULL'); + $this->addSql('UPDATE users SET usernameCanonical=LOWER(UNACCENT(username))'); + $this->addSql('ALTER TABLE users ALTER usernameCanonical DROP NOT NULL'); + $this->addSql('ALTER TABLE users ALTER usernameCanonical SET DEFAULT NULL'); + $this->addSql('ALTER TABLE users ADD email VARCHAR(150) DEFAULT NULL'); + $this->addSql('ALTER TABLE users ADD emailCanonical VARCHAR(150) DEFAULT NULL'); + $this->addSql('CREATE UNIQUE INDEX UNIQ_1483A5E9F5A5DC32 ON users (usernameCanonical)'); + $this->addSql('CREATE UNIQUE INDEX UNIQ_1483A5E9885281E ON users (emailCanonical)'); + + $this->addSql(<<<'SQL' + CREATE OR REPLACE FUNCTION canonicalize_user_on_update() RETURNS TRIGGER AS + $BODY$ + BEGIN + IF NEW.username <> OLD.username OR NEW.email <> OLD.email OR OLD.emailcanonical IS NULL OR OLD.usernamecanonical IS NULL THEN + UPDATE users SET usernamecanonical=LOWER(UNACCENT(NEW.username)), emailcanonical=LOWER(UNACCENT(NEW.email)) WHERE id=NEW.id; + END IF; + + RETURN NEW; + END; + $BODY$ LANGUAGE PLPGSQL +SQL + ); + + $this->addSql(<<addSql(<<<'SQL' + CREATE OR REPLACE FUNCTION canonicalize_user_on_insert() RETURNS TRIGGER AS + $BODY$ + BEGIN + UPDATE users SET usernamecanonical=LOWER(UNACCENT(NEW.username)), emailcanonical=LOWER(UNACCENT(NEW.email)) WHERE id=NEW.id; + + RETURN NEW; + END; + $BODY$ LANGUAGE PLPGSQL; +SQL + ); + + $this->addSql(<<abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.'); + + $this->addSql('DROP INDEX UNIQ_1483A5E9F5A5DC32'); + $this->addSql('DROP INDEX UNIQ_1483A5E9885281E'); + $this->addSql('ALTER TABLE users DROP usernameCanonical'); + $this->addSql('ALTER TABLE users DROP email'); + $this->addSql('ALTER TABLE users DROP emailCanonical'); + $this->addSql('DROP TRIGGER canonicalize_user_on_insert ON users'); + $this->addSql('DROP FUNCTION canonicalize_user_on_insert()'); + $this->addSql('DROP TRIGGER canonicalize_user_on_update ON users'); + $this->addSql('DROP FUNCTION canonicalize_user_on_update()'); + + } +} diff --git a/Resources/views/User/edit.html.twig b/Resources/views/User/edit.html.twig index c52caec2d..1f9a48ce1 100644 --- a/Resources/views/User/edit.html.twig +++ b/Resources/views/User/edit.html.twig @@ -8,6 +8,7 @@ {{ form_start(edit_form) }} {{ form_row(edit_form.username) }} + {{ form_row(edit_form.email) }} {{ form_row(edit_form.enabled, { 'label': "User'status"}) }} {{ form_widget(edit_form.submit, { 'attr': { 'class' : 'sc-button green center' } } ) }} diff --git a/Resources/views/User/new.html.twig b/Resources/views/User/new.html.twig index 87398d973..2b25bcbc5 100644 --- a/Resources/views/User/new.html.twig +++ b/Resources/views/User/new.html.twig @@ -7,6 +7,7 @@ {{ form_start(form) }} {{ form_row(form.username) }} + {{ form_row(form.email) }} {{ form_row(form.plainPassword.password) }} {{ form_widget(form.submit, { 'attr' : { 'class': 'sc-button blue' } }) }} {{ form_end(form) }} diff --git a/Security/UserProvider/UserProvider.php b/Security/UserProvider/UserProvider.php new file mode 100644 index 000000000..e3377d225 --- /dev/null +++ b/Security/UserProvider/UserProvider.php @@ -0,0 +1,83 @@ + + * + * 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 . + */ +namespace Chill\MainBundle\Security\UserProvider; + +use Symfony\Component\Security\Core\User\UserProviderInterface; +use Symfony\Component\Security\Core\User\UserInterface; +use Doctrine\ORM\EntityManagerInterface; +use Chill\MainBundle\Entity\User; +use Symfony\Component\Security\Core\Exception\UsernameNotFoundException; +use Symfony\Component\Security\Core\Exception\UnsupportedUserException; + +/** + * + * + * @author Julien Fastré + */ +class UserProvider implements UserProviderInterface +{ + /** + * + * @var EntityManagerInterface + */ + protected $em; + + public function __construct(EntityManagerInterface $em) + { + $this->em = $em; + } + + + public function loadUserByUsername($username): UserInterface + { + $user = $this->em->createQuery(sprintf( + "SELECT u FROM %s u " + . "WHERE u.usernameCanonical = UNACCENT(LOWER(:pattern)) " + . "OR " + . "u.emailCanonical = UNACCENT(LOWER(:pattern))", + User::class)) + ->setParameter('pattern', $username) + ->getSingleResult(); + + if (NULL === $user) { + throw new UsernameNotFoundException(sprintf('Username "%s" does not exist.', $username)); + } + + return $user; + } + + public function refreshUser(UserInterface $user): UserInterface + { + if (!$user instanceof User) { + throw new UnsupportedUserException("Unsupported user class: cannot reload this user"); + } + + $reloadedUser = $this->em->getRepository(User::class)->find($user->getId()); + + if (NULL === $reloadedUser) { + throw new UsernameNotFoundException(sprintf('User with ID "%s" could not be reloaded.', $user->getId())); + } + + return $reloadedUser; + } + + public function supportsClass($class): bool + { + return $class === User::class; + } +} diff --git a/Validation/Constraint/UserUniqueEmailAndUsernameConstraint.php b/Validation/Constraint/UserUniqueEmailAndUsernameConstraint.php new file mode 100644 index 000000000..1cd481dd7 --- /dev/null +++ b/Validation/Constraint/UserUniqueEmailAndUsernameConstraint.php @@ -0,0 +1,42 @@ + + * + * 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 . + */ +namespace Chill\MainBundle\Validation\Constraint; + +use Symfony\Component\Validator\Constraint; +use Chill\MainBundle\Validation\Validator\UserUniqueEmailAndUsername; + +/** + * + * + * @author Julien Fastré + */ +class UserUniqueEmailAndUsernameConstraint extends Constraint +{ + public $messageDuplicateUsername = "A user with the same or a close username already exists"; + public $messageDuplicateEmail = "A user with the same or a close email already exists"; + + public function validatedBy() + { + return UserUniqueEmailAndUsername::class; + } + + public function getTargets() + { + return [ self::CLASS_CONSTRAINT ]; + } +} diff --git a/Validation/Validator/UserUniqueEmailAndUsername.php b/Validation/Validator/UserUniqueEmailAndUsername.php new file mode 100644 index 000000000..637cdc563 --- /dev/null +++ b/Validation/Validator/UserUniqueEmailAndUsername.php @@ -0,0 +1,95 @@ + + * + * 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 . + */ +namespace Chill\MainBundle\Validation\Validator; + +use Symfony\Component\Validator\ConstraintValidator; +use Symfony\Component\Validator\Constraint; +use Chill\MainBundle\Entity\User; +use Doctrine\ORM\EntityManagerInterface; + +/** + * + * + * @author Julien Fastré + */ +class UserUniqueEmailAndUsername extends ConstraintValidator +{ + /** + * + * @var EntityManagerInterface + */ + protected $em; + + public function __construct(EntityManagerInterface $em) + { + $this->em = $em; + } + + + public function validate($value, Constraint $constraint) + { + if (!$value instanceof User) { + throw new \UnexpectedValueException("This validation should happens " + . "only on class ".User::class); + } + + $countUsersByUsername = $this->em->createQuery( + sprintf( + "SELECT COUNT(u) FROM %s u " + . "WHERE u.usernameCanonical = LOWER(UNACCENT(:username)) " + . "AND u != :user", + User::class) + ) + ->setParameter('username', $value->getUsername()) + ->setParameter('user', $value) + ->getSingleScalarResult(); + + if ($countUsersByUsername > 0) { + $this->context + ->buildViolation($constraint->messageDuplicateUsername) + ->setParameters([ + '%username%' => $value->getUsername() + ]) + ->atPath('username') + ->addViolation() + ; + } + + $countUsersByEmail = $this->em->createQuery( + sprintf( + "SELECT COUNT(u) FROM %s u " + . "WHERE u.emailCanonical = LOWER(UNACCENT(:email)) " + . "AND u != :user", + User::class) + ) + ->setParameter('email', $value->getEmail()) + ->setParameter('user', $value) + ->getSingleScalarResult(); + + if ($countUsersByEmail > 0) { + $this->context + ->buildViolation($constraint->messageDuplicateEmail) + ->setParameters([ + '%email%' => $value->getEmail() + ]) + ->atPath('email') + ->addViolation() + ; + } + } +} From 4f9626e65f9dc5be5dc793fe059a471ca5c80a35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 17 Jul 2018 16:49:45 +0200 Subject: [PATCH 62/64] Build section menu using knp menu builder --- Resources/config/routing.yml | 6 -- Resources/config/routing/exports.yml | 6 -- Resources/config/services/menu.yml | 6 ++ Resources/config/services/security.yml | 6 ++ Resources/views/Menu/section.html.twig | 8 ++- Routing/MenuBuilder/SectionMenuBuilder.php | 68 +++++++++++++++++++++ Security/Authorization/ChillExportVoter.php | 62 +++++++++++++++++++ 7 files changed, 147 insertions(+), 15 deletions(-) create mode 100644 Routing/MenuBuilder/SectionMenuBuilder.php create mode 100644 Security/Authorization/ChillExportVoter.php diff --git a/Resources/config/routing.yml b/Resources/config/routing.yml index 231580c49..88d8df4ce 100644 --- a/Resources/config/routing.yml +++ b/Resources/config/routing.yml @@ -36,12 +36,6 @@ chill_main_homepage_without_locale: chill_main_homepage: path: /{_locale}/homepage defaults: { _controller: ChillMainBundle:Default:index } - options: - menus: - section: - order: 10 - label: Homepage - icons: [home] chill_main_admin_central: diff --git a/Resources/config/routing/exports.yml b/Resources/config/routing/exports.yml index 82eb981c3..966902952 100644 --- a/Resources/config/routing/exports.yml +++ b/Resources/config/routing/exports.yml @@ -1,12 +1,6 @@ chill_main_export_index: path: / defaults: { _controller: ChillMainBundle:Export:index } - options: - menus: - section: - order: 20 - label: Export Menu - icons: [upload] chill_main_export_new: path: /new/{alias} diff --git a/Resources/config/services/menu.yml b/Resources/config/services/menu.yml index ac8cf51b1..0de492e3e 100644 --- a/Resources/config/services/menu.yml +++ b/Resources/config/services/menu.yml @@ -2,3 +2,9 @@ services: Chill\MainBundle\Routing\MenuBuilder\UserMenuBuilder: tags: - { name: 'chill.menu_builder' } + + Chill\MainBundle\Routing\MenuBuilder\SectionMenuBuilder: + arguments: + $authorizationChecker: '@Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface' + tags: + - { name: 'chill.menu_builder' } diff --git a/Resources/config/services/security.yml b/Resources/config/services/security.yml index a4b3f112f..a5c5471f5 100644 --- a/Resources/config/services/security.yml +++ b/Resources/config/services/security.yml @@ -14,4 +14,10 @@ services: class: Chill\MainBundle\Security\UserProvider\UserProvider arguments: $em: '@Doctrine\ORM\EntityManagerInterface' + + Chill\MainBundle\Security\Authorization\ChillExportVoter: + arguments: + $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper' + tags: + - { name: security.voter } \ No newline at end of file diff --git a/Resources/views/Menu/section.html.twig b/Resources/views/Menu/section.html.twig index 7d909ca17..db6db3b1a 100644 --- a/Resources/views/Menu/section.html.twig +++ b/Resources/views/Menu/section.html.twig @@ -21,16 +21,18 @@ Sections
          - {% for route in routes %} + {% for menu in menus %}
        • {% spaceless %} - {% for icon in route.icons %} + {% if menu.extras.icons is defined %} + {% for icon in menu.extras.icons %} {% endfor %} + {% endif %} {% endspaceless %}
          • diff --git a/Routing/MenuBuilder/SectionMenuBuilder.php b/Routing/MenuBuilder/SectionMenuBuilder.php new file mode 100644 index 000000000..3269e8549 --- /dev/null +++ b/Routing/MenuBuilder/SectionMenuBuilder.php @@ -0,0 +1,68 @@ + + * + * 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 . + */ +namespace Chill\MainBundle\Routing\MenuBuilder; + +use Chill\MainBundle\Routing\LocalMenuBuilderInterface; +use Knp\Menu\MenuItem; +use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface; +use Chill\MainBundle\Security\Authorization\ChillExportVoter; + +/** + * + * + * @author Julien Fastré + */ +class SectionMenuBuilder implements LocalMenuBuilderInterface +{ + /** + * + * @var AuthorizationCheckerInterface + */ + protected $authorizationChecker; + + public function __construct(AuthorizationCheckerInterface $authorizationChecker) + { + $this->authorizationChecker = $authorizationChecker; + } + + public function buildMenu($menuId, MenuItem $menu, array $parameters) + { + $menu->addChild('Homepage', [ + 'route' => 'chill_main_homepage' + ]) + ->setExtras([ + 'icons' => ['home'], + 'order' => 0 + ]); + + if ($this->authorizationChecker->isGranted(ChillExportVoter::EXPORT)) { + $menu->addChild('Export Menu', [ + 'route' => 'chill_main_export_index' + ]) + ->setExtras([ + 'icons' => ['upload'], + 'order' => 20 + ]); + } + } + + public static function getMenuIds(): array + { + return [ 'section' ]; + } +} diff --git a/Security/Authorization/ChillExportVoter.php b/Security/Authorization/ChillExportVoter.php new file mode 100644 index 000000000..39af35706 --- /dev/null +++ b/Security/Authorization/ChillExportVoter.php @@ -0,0 +1,62 @@ + + * + * 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 . + */ +namespace Chill\MainBundle\Security\Authorization; + +use Symfony\Component\Security\Core\Authorization\Voter\Voter; +use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; +use Chill\MainBundle\Security\Authorization\AuthorizationHelper; +use Chill\MainBundle\Entity\User; +use Symfony\Component\Security\Core\Role\Role; + +/** + * + * + * @author Julien Fastré + */ +class ChillExportVoter extends Voter +{ + const EXPORT = 'chill_export'; + + /** + * + * @var AuthorizationHelper + */ + protected $authorizationHelper; + + public function __construct(AuthorizationHelper $authorizationHelper) + { + $this->authorizationHelper = $authorizationHelper; + } + + protected function supports($attribute, $subject): bool + { + return $attribute === self::EXPORT; + } + + protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool + { + if (!$token->getUser() instanceof User) { + return false; + } + + $centers = $this->authorizationHelper + ->getReachableCenters($token->getUser(), new Role($attribute)); + + return count($centers) > 0; + } +} From 0a0a7e7c2459a5824cc4b3a5bb6adbd00ec35468 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 18 Jul 2018 16:06:00 +0200 Subject: [PATCH 63/64] fix error when creating user with username / email validation --- .../Validator/UserUniqueEmailAndUsername.php | 62 +++++++++++++------ 1 file changed, 42 insertions(+), 20 deletions(-) diff --git a/Validation/Validator/UserUniqueEmailAndUsername.php b/Validation/Validator/UserUniqueEmailAndUsername.php index 637cdc563..0dafa0b98 100644 --- a/Validation/Validator/UserUniqueEmailAndUsername.php +++ b/Validation/Validator/UserUniqueEmailAndUsername.php @@ -48,16 +48,27 @@ class UserUniqueEmailAndUsername extends ConstraintValidator . "only on class ".User::class); } - $countUsersByUsername = $this->em->createQuery( - sprintf( - "SELECT COUNT(u) FROM %s u " - . "WHERE u.usernameCanonical = LOWER(UNACCENT(:username)) " - . "AND u != :user", - User::class) - ) - ->setParameter('username', $value->getUsername()) - ->setParameter('user', $value) - ->getSingleScalarResult(); + if ($value->getId() !== null) { + $countUsersByUsername = $this->em->createQuery( + sprintf( + "SELECT COUNT(u) FROM %s u " + . "WHERE u.usernameCanonical = LOWER(UNACCENT(:username)) " + . "AND u != :user", + User::class) + ) + ->setParameter('username', $value->getUsername()) + ->setParameter('user', $value) + ->getSingleScalarResult(); + } else { + $countUsersByUsername = $this->em->createQuery( + sprintf( + "SELECT COUNT(u) FROM %s u " + . "WHERE u.usernameCanonical = LOWER(UNACCENT(:username)) ", + User::class) + ) + ->setParameter('username', $value->getUsername()) + ->getSingleScalarResult(); + } if ($countUsersByUsername > 0) { $this->context @@ -70,16 +81,27 @@ class UserUniqueEmailAndUsername extends ConstraintValidator ; } - $countUsersByEmail = $this->em->createQuery( - sprintf( - "SELECT COUNT(u) FROM %s u " - . "WHERE u.emailCanonical = LOWER(UNACCENT(:email)) " - . "AND u != :user", - User::class) - ) - ->setParameter('email', $value->getEmail()) - ->setParameter('user', $value) - ->getSingleScalarResult(); + if ($value->getId() !== null) { + $countUsersByEmail = $this->em->createQuery( + sprintf( + "SELECT COUNT(u) FROM %s u " + . "WHERE u.emailCanonical = LOWER(UNACCENT(:email)) " + . "AND u != :user", + User::class) + ) + ->setParameter('email', $value->getEmail()) + ->setParameter('user', $value) + ->getSingleScalarResult(); + } else { + $countUsersByEmail = $this->em->createQuery( + sprintf( + "SELECT COUNT(u) FROM %s u " + . "WHERE u.emailCanonical = LOWER(UNACCENT(:email))", + User::class) + ) + ->setParameter('email', $value->getEmail()) + ->getSingleScalarResult(); + } if ($countUsersByEmail > 0) { $this->context From 7bf090b75325cc15bec41a62369a7efc86bca24c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Thu, 19 Jul 2018 10:42:36 +0200 Subject: [PATCH 64/64] load open sans from css, background image from css and create login css --- Resources/public/css/scratch.css | 1 - .../OpenSans/{OpenSans.css => OpenSans.scss} | 0 Resources/public/modules/login_page/index.js | 3 + .../public/modules/login_page/login.scss | 63 ++++++++++++++++ Resources/public/sass/_custom.scss | 3 +- Resources/public/sass/custom/_fonts.scss | 2 + Resources/views/Login/login.html.twig | 73 +------------------ Resources/views/layout.html.twig | 23 +----- chill.webpack.config.js | 3 + 9 files changed, 78 insertions(+), 93 deletions(-) rename Resources/public/fonts/OpenSans/{OpenSans.css => OpenSans.scss} (100%) create mode 100644 Resources/public/modules/login_page/index.js create mode 100644 Resources/public/modules/login_page/login.scss create mode 100644 Resources/public/sass/custom/_fonts.scss diff --git a/Resources/public/css/scratch.css b/Resources/public/css/scratch.css index a66373576..31d1f0ab1 100644 --- a/Resources/public/css/scratch.css +++ b/Resources/public/css/scratch.css @@ -4585,7 +4585,6 @@ header { right: 0; top: 0; z-index: -1; - background-image: url("/bundles/chillmain/img/background/desert.jpg"); background-attachment: fixed; background-repeat: no-repeat; background-size: cover; diff --git a/Resources/public/fonts/OpenSans/OpenSans.css b/Resources/public/fonts/OpenSans/OpenSans.scss similarity index 100% rename from Resources/public/fonts/OpenSans/OpenSans.css rename to Resources/public/fonts/OpenSans/OpenSans.scss diff --git a/Resources/public/modules/login_page/index.js b/Resources/public/modules/login_page/index.js new file mode 100644 index 000000000..1e6676d8f --- /dev/null +++ b/Resources/public/modules/login_page/index.js @@ -0,0 +1,3 @@ +require('./login.scss'); + + diff --git a/Resources/public/modules/login_page/login.scss b/Resources/public/modules/login_page/login.scss new file mode 100644 index 000000000..4c764bdcc --- /dev/null +++ b/Resources/public/modules/login_page/login.scss @@ -0,0 +1,63 @@ +@import './../../fonts/OpenSans/OpenSans'; + +html, body { + height: 100%; + margin: 0; + padding: 0; +} + +body { + background-color: #333; + color: white; + text-align: center; + font-family: 'Open Sans'; +} + +#content { + position: relative; + height: 90%; + padding-top: 10%; +} + +#content:before { + bottom: 0; + content: ""; + left: 0; + opacity: 0.2; + position: absolute; + right: 0; + top: 0; + z-index: -1; + background-image: url('./../../img/background/desert.jpg'); + background-attachment: fixed; + background-repeat: no-repeat; + background-size: cover; + background-position: center; +} + +label { + width : 15em; + text-align: right; + display: inline-block; + font-weight: 300; + padding-right: 5px; +} +input { + +} +form { + +} +button { + margin-left: 15em; + margin-top: 1em; + background-color: #df4949; + border: medium none; + border-radius: 0; + box-shadow: none; + color: #fff; + padding: 4px 8px; + font-family: 'Open Sans'; + font-weight: 300; +} + diff --git a/Resources/public/sass/_custom.scss b/Resources/public/sass/_custom.scss index ffcca26d4..393d16e75 100644 --- a/Resources/public/sass/_custom.scss +++ b/Resources/public/sass/_custom.scss @@ -1,6 +1,7 @@ // YOUR CUSTOM SCSS @import 'custom/config/colors'; @import 'custom/config/variables'; +@import 'custom/fonts'; @import 'custom/timeline'; @import 'custom/mixins/entity'; @import 'custom/activity'; @@ -36,7 +37,7 @@ header { right: 0; top: 0; z-index: -1; - background-image: url("/bundles/chillmain/img/background/desert.jpg"); + background-image: url('./../../img/background/desert.jpg'); background-attachment: fixed; background-repeat: no-repeat; background-size: cover; diff --git a/Resources/public/sass/custom/_fonts.scss b/Resources/public/sass/custom/_fonts.scss new file mode 100644 index 000000000..a129d32bc --- /dev/null +++ b/Resources/public/sass/custom/_fonts.scss @@ -0,0 +1,2 @@ + +@import './../../fonts/OpenSans/OpenSans'; \ No newline at end of file diff --git a/Resources/views/Login/login.html.twig b/Resources/views/Login/login.html.twig index 1ed31eac7..248ea0e5d 100644 --- a/Resources/views/Login/login.html.twig +++ b/Resources/views/Login/login.html.twig @@ -23,79 +23,12 @@ {{ 'Login to %installation_name%' | trans({ '%installation_name%' : installation.name } ) }} - - {% stylesheets output="css/login.css" filter="cssrewrite" - - "bundles/chillmain/fonts/OpenSans/OpenSans.css" %} - - {% endstylesheets %} - - + +
          - + {% if error is not null %}

          {{ error.message|trans }}

          diff --git a/Resources/views/layout.html.twig b/Resources/views/layout.html.twig index d971b2107..5c58ab23d 100644 --- a/Resources/views/layout.html.twig +++ b/Resources/views/layout.html.twig @@ -27,16 +27,7 @@ {{ installation.name }} - {% block title %}{% endblock %} - - - + {% block css%}{% endblock %} @@ -46,7 +37,7 @@
          - +
          @@ -154,16 +145,6 @@
          {{ 'User manual'|trans }}

          - -