From 3cc282f4a387a9e19eb7347375774eb06702df19 Mon Sep 17 00:00:00 2001 From: Mathieu Date: Tue, 11 Jun 2019 11:24:39 +0200 Subject: [PATCH 01/20] Ajout de README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 000000000..930d48953 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ + +Manage Third Party contact categories From 98ecd72beaa33b9b256d90a75e3a9385f02663af Mon Sep 17 00:00:00 2001 From: Tchama Date: Tue, 11 Jun 2019 11:49:27 +0200 Subject: [PATCH 02/20] initial commit'n push --- .gitignore | 11 + .gitlab-ci.yml | 64 ++ CHANGELOG.md | 6 + ChillThirdPartyBundle.php | 16 + Controller/ThirdPartyController.php | 207 ++++++ .../ChillThirdPartyExtension.php | 58 ++ .../ThirdPartyTypeCompilerPass.php | 38 + DependencyInjection/Configuration.php | 29 + Entity/ThirdParty.php | 316 +++++++++ Form/ChoiceLoader/ThirdPartyChoiceLoader.php | 86 +++ Form/ThirdPartyType.php | 144 ++++ Form/Type/PickThirdPartyType.php | 112 +++ LICENSE | 661 ++++++++++++++++++ Menu/MenuBuilder.php | 76 ++ README.md | 22 +- Repository/ThirdPartyRepository.php | 145 ++++ Resources/config/routing.yml | 3 + Resources/config/services.yml | 7 + Resources/config/services/3partytype.yml | 2 + Resources/config/services/controller.yml | 7 + Resources/config/services/form.yml | 17 + Resources/config/services/menu.yml | 7 + Resources/config/services/search.yml | 9 + Resources/config/services/security.yml | 7 + .../migrations/Version20190307111314.php | 35 + .../migrations/Version20190307131650.php | 29 + .../migrations/Version20190418090842.php | 32 + .../migrations/Version20190429171109.php | 26 + .../migrations/Version20190502144206.php | 31 + Resources/public/index.js | 3 + Resources/public/sass/thirdparty.scss | 51 ++ Resources/translations/messages.fr.yml | 26 + Resources/views/Contact/macro.html.twig | 49 ++ Resources/views/ThirdParty/index.html.twig | 61 ++ Resources/views/ThirdParty/new.html.twig | 34 + Resources/views/ThirdParty/show.html.twig | 67 ++ Resources/views/ThirdParty/update.html.twig | 37 + Search/ThirdPartySearch.php | 103 +++ Security/Voter/ThirdPartyVoter.php | 95 +++ Tests/Controller/ThirdPartyControllerTest.php | 30 + ThirdPartyType/ThirdPartyTypeManager.php | 56 ++ .../ThirdPartyTypeProviderInterface.php | 17 + chill.webpack.config.js | 6 + composer.json | 43 ++ 44 files changed, 2880 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 .gitlab-ci.yml create mode 100644 CHANGELOG.md create mode 100644 ChillThirdPartyBundle.php create mode 100644 Controller/ThirdPartyController.php create mode 100644 DependencyInjection/ChillThirdPartyExtension.php create mode 100644 DependencyInjection/CompilerPass/ThirdPartyTypeCompilerPass.php create mode 100644 DependencyInjection/Configuration.php create mode 100644 Entity/ThirdParty.php create mode 100644 Form/ChoiceLoader/ThirdPartyChoiceLoader.php create mode 100644 Form/ThirdPartyType.php create mode 100644 Form/Type/PickThirdPartyType.php create mode 100644 LICENSE create mode 100644 Menu/MenuBuilder.php create mode 100644 Repository/ThirdPartyRepository.php create mode 100644 Resources/config/routing.yml create mode 100644 Resources/config/services.yml create mode 100644 Resources/config/services/3partytype.yml create mode 100644 Resources/config/services/controller.yml create mode 100644 Resources/config/services/form.yml create mode 100644 Resources/config/services/menu.yml create mode 100644 Resources/config/services/search.yml create mode 100644 Resources/config/services/security.yml create mode 100644 Resources/migrations/Version20190307111314.php create mode 100644 Resources/migrations/Version20190307131650.php create mode 100644 Resources/migrations/Version20190418090842.php create mode 100644 Resources/migrations/Version20190429171109.php create mode 100644 Resources/migrations/Version20190502144206.php create mode 100644 Resources/public/index.js create mode 100644 Resources/public/sass/thirdparty.scss create mode 100644 Resources/translations/messages.fr.yml create mode 100644 Resources/views/Contact/macro.html.twig create mode 100644 Resources/views/ThirdParty/index.html.twig create mode 100644 Resources/views/ThirdParty/new.html.twig create mode 100644 Resources/views/ThirdParty/show.html.twig create mode 100644 Resources/views/ThirdParty/update.html.twig create mode 100644 Search/ThirdPartySearch.php create mode 100644 Security/Voter/ThirdPartyVoter.php create mode 100644 Tests/Controller/ThirdPartyControllerTest.php create mode 100644 ThirdPartyType/ThirdPartyTypeManager.php create mode 100644 ThirdPartyType/ThirdPartyTypeProviderInterface.php create mode 100644 chill.webpack.config.js create mode 100644 composer.json diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..f443cb81e --- /dev/null +++ b/.gitignore @@ -0,0 +1,11 @@ +composer.lock +vendor/* +parameters.yml +*~ +*.DS_Store +*.sass-cache +Resources/node_modules/ +Tests/Fixtures/App/app/config/parameters.yml +/nbproject/private/ +Resources/test/Fixtures/App/bootstrap.php.cache + diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 000000000..cfbaa42e3 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,64 @@ +.test_definition: &test_definition + services: + - chill/database:latest + before_script: + - if [ -z ${GITHUB_TOKEN+x} ]; then composer config github-oauth.github.com $GITHUB_TOKEN; fi + - php -d memory_limit=-1 /usr/local/bin/composer install --no-interaction + - cp Resources/test/Fixtures/App/app/config/parameters.gitlab-ci.yml Resources/test/Fixtures/App/app/config/parameters.yml + - php Resources/test/Fixtures/App/app/console --env=test cache:warmup + - php Resources/test/Fixtures/App/app/console doctrine:migrations:migrate --env=test --no-interaction + - php Resources/test/Fixtures/App/app/console doctrine:fixtures:load --env=test --no-interaction + +stages: + - deploy + - test + - build-doc + - deploy-doc + +test:php-7.2: + image: chill/ci-image:php-7.2 + stage: test + <<: *test_definition + script: APP_ENV=test php vendor/bin/phpunit + +deploy-packagist: + stage: deploy + image: chill/ci-image:php-7.2 + before_script: + # test that PACKAGIST USERNAME and PACKAGIST_TOKEN variable are set + - if [ -z ${PACKAGIST_USERNAME+x} ]; then echo "Please set PACKAGIST_USERNAME variable"; exit -1; fi + - if [ -z ${PACKAGIST_TOKEN+x} ]; then echo "Please set PACKAGIST_TOKEN variable"; exit -1; fi + script: + - STATUSCODE=$(curl -XPOST -H'content-type:application/json' "https://packagist.org/api/update-package?username=$PACKAGIST_USERNAME&apiToken=$PACKAGIST_TOKEN" -d"{\"repository\":{\"url\":\"$CI_PROJECT_URL.git\"}}" --silent --output /dev/stderr --write-out "%{http_code}") + - if [ $STATUSCODE = "202" ]; then exit 0; else exit $STATUSCODE; fi + +# deploy documentation +api-doc-build: + stage: build-doc + environment: api-doc + image: chill/ci-image:php-7.2 + before_script: + - mkdir api-doc + script: apigen generate --destination api-doc/$CI_BUILD_REF_NAME/$CI_PROJECT_NAME + artifacts: + paths: + - "api-doc/" + name: api + expire_in: '2h' + only: + - master + - tags + +api-doc-deploy: + stage: deploy-doc + image: pallet/swiftclient:latest + before_script: + # test that CONTAINER_API variable is set + - if [ -z ${CONTAINER_API+x} ]; then echo "Please set CONTAINER_API variable"; exit -1; fi + # go to api-doc to have and url with PROJECT/BUILD + - cd api-doc + # upload, and keep files during 1 year + script: "swift upload --header \"X-Delete-After: 31536000\" $CONTAINER_API $CI_BUILD_REF_NAME/$CI_PROJECT_NAME" + only: + - master + - tags diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 000000000..96703acad --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,6 @@ + +branch master +============= + +* initial commit + diff --git a/ChillThirdPartyBundle.php b/ChillThirdPartyBundle.php new file mode 100644 index 000000000..ba184292a --- /dev/null +++ b/ChillThirdPartyBundle.php @@ -0,0 +1,16 @@ +addCompilerPass(new ThirdPartyTypeCompilerPass()); + } + +} diff --git a/Controller/ThirdPartyController.php b/Controller/ThirdPartyController.php new file mode 100644 index 000000000..dd03bf5a0 --- /dev/null +++ b/Controller/ThirdPartyController.php @@ -0,0 +1,207 @@ +authorizationHelper = $authorizationHelper; + $this->translator = $translator; + $this->paginatorFactory = $paginatorFactory; + } + + + /** + * @Route("/index", name="chill_3party_3party_index") + */ + public function indexAction() + { + $this->denyAccessUnlessGranted(ThirdPartyVoter::SHOW); + $repository = $this->getDoctrine()->getManager() + ->getRepository(ThirdParty::class); + + $centers = $this->authorizationHelper + ->getReachableCenters( + $this->getUser(), + new Role(ThirdPartyVoter::SHOW) + ); + + $nbThirdParties = $repository->countByMemberOfCenters($centers); + $pagination = $this->paginatorFactory->create($nbThirdParties); + + $thirdParties = $repository->findByMemberOfCenters($centers, + $pagination->getCurrentPage()->getFirstItemNumber(), + $pagination->getItemsPerPage()); + + return $this->render('ChillThirdPartyBundle:ThirdParty:index.html.twig', array( + 'third_parties' => $thirdParties + )); + } + + /** + * @Route("/new", name="chill_3party_3party_new") + */ + public function newAction(Request $request) + { + $this->denyAccessUnlessGranted(ThirdPartyVoter::CREATE); + + $centers = $this->authorizationHelper + ->getReachableCenters( + $this->getUser(), + new Role(ThirdPartyVoter::CREATE) + ); + + if (count($centers) === 0) { + throw new \LogicException("There should be at least one center reachable " + . "if role ".ThirdPartyVoter::CREATE." is granted"); + } + + $thirdParty = new ThirdParty(); + $thirdParty->setCenters(new ArrayCollection($centers)); + + $form = $this->createForm(ThirdPartyType::class, $thirdParty, [ + 'usage' => 'create' + ]); + $form->add('submit', SubmitType::class); + + $form->handleRequest($request); + + if ($form->isSubmitted() && $form->isValid()) { + $em = $this->getDoctrine()->getManager(); + $em->persist($thirdParty); + $em->flush(); + + $this->addFlash('success', + $this->translator->trans("Third party created") + ); + + return $this->redirectToRoute('chill_3party_3party_show', [ + 'thirdparty_id' => $thirdParty->getId() + ]); + + } elseif ($form->isSubmitted()) { + $msg = $this->translator->trans('This form contains errors'); + $this->addFlash('error', $msg); + } + + return $this->render('@ChillThirdParty/ThirdParty/new.html.twig', [ + 'form' => $form->createView(), + 'thirdParty' => $thirdParty + ]); + } + + /** + * @Route("/{thirdparty_id}/update", name="chill_3party_3party_update") + * @ParamConverter("thirdParty", options={"id": "thirdparty_id"}) + */ + public function updateAction(ThirdParty $thirdParty, Request $request) + { + $this->denyAccessUnlessGranted(ThirdPartyVoter::CREATE); + + $centers = $this->authorizationHelper + ->getReachableCenters( + $this->getUser(), + new Role(ThirdPartyVoter::CREATE) + ); + + if (count($centers) === 0) { + throw new \LogicException("There should be at least one center reachable " + . "if role ".ThirdPartyVoter::CREATE." is granted"); + } + + // we want to keep centers the users has no access to. So we will add them + // later if they are removed. (this is a ugly hack but it will works + $centersAssociatedNotForUsers = \array_diff( + $thirdParty->getCenters()->toArray(), + $centers); + + $form = $this->createForm(ThirdPartyType::class, $thirdParty, [ + 'usage' => 'create' + ]); + $form->add('submit', SubmitType::class); + + $form->handleRequest($request); + + if ($form->isSubmitted() && $form->isValid()) { + // re-add centers the user has no accesses: + foreach ($centersAssociatedNotForUsers as $c) { + $thirdParty->addCenter($c); + } + + $em = $this->getDoctrine()->getManager(); + $em->flush(); + + $this->addFlash('success', + $this->translator->trans("Third party updated") + ); + + return $this->redirectToRoute('chill_3party_3party_show', [ + 'thirdparty_id' => $thirdParty->getId() + ]); + + } elseif ($form->isSubmitted()) { + $msg = $this->translator->trans('This form contains errors'); + $this->addFlash('error', $msg); + } + + return $this->render('@ChillThirdParty/ThirdParty/update.html.twig', [ + 'form' => $form->createView(), + 'thirdParty' => $thirdParty + ]); + } + + /** + * @Route("/{thirdparty_id}/show", name="chill_3party_3party_show") + * @ParamConverter("thirdParty", options={"id": "thirdparty_id"}) + */ + public function showAction(ThirdParty $thirdParty, Request $request) + { + $this->denyAccessUnlessGranted(ThirdPartyVoter::SHOW, $thirdParty); + + return $this->render('@ChillThirdParty/ThirdParty/show.html.twig', [ + 'thirdParty' => $thirdParty + ]); + } + +} diff --git a/DependencyInjection/ChillThirdPartyExtension.php b/DependencyInjection/ChillThirdPartyExtension.php new file mode 100644 index 000000000..79eb7c007 --- /dev/null +++ b/DependencyInjection/ChillThirdPartyExtension.php @@ -0,0 +1,58 @@ +processConfiguration($configuration, $configs); + + $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); + $loader->load('services.yml'); + } + + public function prepend(ContainerBuilder $container) + { + $this->preprendRoutes($container); + $this->prependRoleHierarchy($container); + } + + protected function preprendRoutes(ContainerBuilder $container) + { + //declare routes for 3party bundle + $container->prependExtensionConfig('chill_main', array( + 'routing' => array( + 'resources' => array( + '@ChillThirdPartyBundle/Resources/config/routing.yml' + ) + ) + )); + } + + protected function prependRoleHierarchy(ContainerBuilder $container) + { + $container->prependExtensionConfig('security', array( + 'role_hierarchy' => array( + ThirdPartyVoter::CREATE => [ThirdPartyVoter::SHOW], + ThirdPartyVoter::UPDATE => [ThirdPartyVoter::SHOW], + ) + )); + } +} diff --git a/DependencyInjection/CompilerPass/ThirdPartyTypeCompilerPass.php b/DependencyInjection/CompilerPass/ThirdPartyTypeCompilerPass.php new file mode 100644 index 000000000..e15510a5b --- /dev/null +++ b/DependencyInjection/CompilerPass/ThirdPartyTypeCompilerPass.php @@ -0,0 +1,38 @@ +getDefinition(ThirdPartyTypeManager::class); + $usedKeys = []; + + foreach ($container->findTaggedServiceIds(self::TAG) as $id => $tags) { + $taggedService = $container->getDefinition($id); + // check forr keys already in use : + $key = $taggedService->getClass()::getKey(); + if (\in_array($key, $usedKeys)) { + throw new \LogicException(sprintf("Tag with key \"%s\" is already in used", + $key)); + } + $usedKeys[] = $key; + // alter the service definition of manager + $definition->addMethodCall('addProvider', [ new Reference($id) ]); + } + } +} diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php new file mode 100644 index 000000000..99c6c46c4 --- /dev/null +++ b/DependencyInjection/Configuration.php @@ -0,0 +1,29 @@ +root('chill_third_party'); + + // Here you should define the parameters that are allowed to + // configure your bundle. See the documentation linked above for + // more information on that topic. + + return $treeBuilder; + } +} diff --git a/Entity/ThirdParty.php b/Entity/ThirdParty.php new file mode 100644 index 000000000..9c3a52ab5 --- /dev/null +++ b/Entity/ThirdParty.php @@ -0,0 +1,316 @@ +, + * + * 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\ThirdPartyBundle\Entity; + +use Doctrine\ORM\Mapping as ORM; +use Doctrine\Common\Collections\Collection; +use Chill\MainBundle\Entity\Center; +use Symfony\Component\Validator\Constraints as Assert; +use Chill\MainBundle\Entity\Address; + +/** + * ThirdParty is a party recorded in the database. + * + * A party may be attached to multiple centers. Being attach to a center allow + * all users with the right 'CHILL_3PARTY_3PARTY_SEE', 'CHILL_3PARTY_3 to see, select and edit parties for this + * center. + * + * @ORM\Table(name="chill_3party.third_party") + * @ORM\Entity(repositoryClass="Chill\ThirdPartyBundle\Repository\ThirdPartyRepository") + * + */ +class ThirdParty +{ + /** + * @var int + * + * @ORM\Column(name="id", type="integer") + * @ORM\Id + * @ORM\GeneratedValue(strategy="AUTO") + */ + private $id; + + /** + * @var string + * + * @ORM\Column(name="name", type="string", length=255) + * @Assert\Length(min="2") + */ + private $name; + + /** + * @var string|null + * + * @ORM\Column(name="telephone", type="string", length=64, nullable=true) + * @Assert\Regex("/^([\+{1}])([0-9\s*]{4,20})$/", + * message="Invalid phone number: it should begin with the international prefix starting with ""+"", hold only digits and be smaller than 20 characters. Ex: +33123456789" + * ) + */ + private $telephone; + + /** + * @var string|null + * + * @ORM\Column(name="email", type="string", length=255, nullable=true) + * @Assert\Email(checkMX=true) + */ + private $email; + + /** + * @var string|null + * + * @ORM\Column(name="comment", type="text", nullable=true) + */ + private $comment; + + /** + * @var array|null + * + * @ORM\Column(name="types", type="json", nullable=true) + * @Assert\Count(min=1) + */ + private $type; + + /** + * + * @var boolean + * @ORM\Column(name="active", type="boolean", options={"defaut": true}) + */ + private $active = true; + + /** + * + * @var Collection instances of Center + * @ORM\ManyToMany(targetEntity="\Chill\MainBundle\Entity\Center") + * @ORM\JoinTable(name="chill_3party.party_center") + * @Assert\Count(min=1) + */ + private $centers; + + /** + * + * @var Address|null + * @ORM\ManyToOne(targetEntity="\Chill\MainBundle\Entity\Address", + * cascade={"persist", "remove"}) + * + */ + private $address; + + public function __construct() + { + $this->centers = new \Doctrine\Common\Collections\ArrayCollection(); + } + + /** + * Get id. + * + * @return int + */ + public function getId() + { + return $this->id; + } + + /** + * Set name. + * + * @param string $name + * + * @return ThirdParty + */ + public function setName($name) + { + $this->name = $name; + + return $this; + } + + /** + * Get name. + * + * @return string + */ + public function getName() + { + return $this->name; + } + + /** + * Set telephone. + * + * @param string|null $telephone + * + * @return ThirdParty + */ + public function setTelephone($telephone = null) + { + $this->telephone = $telephone; + + return $this; + } + + /** + * Get telephone. + * + * @return string|null + */ + public function getTelephone() + { + return $this->telephone; + } + + /** + * Set email. + * + * @param string|null $email + * + * @return ThirdParty + */ + public function setEmail($email = null) + { + $this->email = $email; + + return $this; + } + + /** + * Get email. + * + * @return string|null + */ + public function getEmail() + { + return $this->email; + } + + /** + * Set comment. + * + * @param string|null $comment + * + * @return ThirdParty + */ + public function setComment($comment = null) + { + $this->comment = $comment; + + return $this; + } + + /** + * Get comment. + * + * @return string|null + */ + public function getComment() + { + return $this->comment; + } + + /** + * Set type. + * + * @param array|null $type + * + * @return ThirdParty + */ + public function setType(array $type = null) + { + // remove all keys from the input data + $this->type = \array_values($type); + + return $this; + } + + /** + * Get type. + * + * @return array|null + */ + public function getType() + { + return $this->type; + } + + public function getActive(): bool + { + return $this->active; + } + + public function getCenters(): Collection + { + return $this->centers; + } + + public function setActive(bool $active) + { + $this->active = $active; + return $this; + } + + public function addCenter(Center $center) + { + if (FALSE === $this->centers->contains($center)) { + $this->centers->add($center); + } + } + + public function removeCenter(Center $center) + { + if ($this->centers->contains($center)) { + $this->centers->removeElement($center); + } + } + + public function setCenters(Collection $centers) + { + foreach ($centers as $center) { + $this->addCenter($center); + } + + foreach ($this->centers as $center) { + if (FALSE === $centers->contains($center)) { + $this->removeCenter($center); + } + } + + return $this; + } + + public function getAddress(): ?Address + { + return $this->address; + } + + public function setAddress(Address $address) + { + $this->address = $address; + + return $this; + } + + public function __toString() + { + return $this->getName(); + } +} diff --git a/Form/ChoiceLoader/ThirdPartyChoiceLoader.php b/Form/ChoiceLoader/ThirdPartyChoiceLoader.php new file mode 100644 index 000000000..a3c7e154b --- /dev/null +++ b/Form/ChoiceLoader/ThirdPartyChoiceLoader.php @@ -0,0 +1,86 @@ +center = $center; + $this->partyRepository = $partyRepository; + } + + + public function loadChoiceList($value = null): ChoiceListInterface + { + return new ArrayChoiceList($this->lazyLoadedParties, $value); + } + + public function loadChoicesForValues($values, $value = null) + { + $choices = []; + + foreach($values as $value) { + if (empty($value)) { + continue; + } + + $party = $this->partyRepository->find($value); + + if (FALSE === \in_array($this->center, $party->getCenters()->toArray())) { + throw new \RuntimeException("the party's center is not authorized"); + } + + $choices[] = $party; + } + + 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->lazyLoadedParties[$id] = $choice; + } + + return $values; + } +} diff --git a/Form/ThirdPartyType.php b/Form/ThirdPartyType.php new file mode 100644 index 000000000..e6ecb4b26 --- /dev/null +++ b/Form/ThirdPartyType.php @@ -0,0 +1,144 @@ +authorizationHelper = $authorizationHelper; + $this->tokenStorage = $tokenStorage; + $this->typesManager = $typesManager; + } + + /** + * {@inheritdoc} + */ + public function buildForm(FormBuilderInterface $builder, array $options) + { + $types = []; + foreach ($this->typesManager->getProviders() as $key => $provider) { + $types['chill_3party.key_label.'.$key] = $key; + } + + $builder + ->add('name', TextType::class, [ + 'required' => true + ]) + ->add('telephone', TextType::class, [ + 'label' => 'Phonenumber', + 'required' => false + ]) + ->add('email', EmailType::class, [ + 'required' => false + ]) + ->add('comment', TextareaType::class, [ + 'required' => false + ]) + ->add('type', ChoiceType::class, [ + 'choices' => $types, + 'expanded' => true, + 'multiple' => true, + 'label' => 'thirdparty.Type' + ]) + ->add('active', ChoiceType::class, [ + 'choices' => [ + 'Active, shown to users' => true, + 'Inactive, not shown to users' => false + ], + 'expanded' => true, + 'multiple' => false + ]) + ->add('centers', EntityType::class, [ + 'choices' => $this->getReachableCenters($options), + 'class' => \Chill\MainBundle\Entity\Center::class, + 'multiple' => true, + 'expanded' => true + ]) + ->add('address', AddressType::class, [ + 'has_valid_from' => false, + 'null_if_empty' => true, + 'required' => false + ]) + ; + } + + /** + * + * @param array $options + * @return \Chill\MainBundle\Entity\Center[] + */ + protected function getReachableCenters(array $options) + { + switch($options['usage']) { + case 'create': $role = new Role(ThirdPartyVoter::CREATE); + break; + case 'update': $role = new Role(ThirdPartyVoter::UPDATE); + break; + } + + return $this->authorizationHelper->getReachableCenters( + $this->tokenStorage->getToken()->getUser(), $role); + } + + /** + * {@inheritdoc} + */ + public function configureOptions(OptionsResolver $resolver) + { + $resolver->setDefaults(array( + 'data_class' => 'Chill\ThirdPartyBundle\Entity\ThirdParty' + )); + + $resolver->setRequired('usage') + ->setAllowedValues('usage', ['create', 'update']) + ; + } + + /** + * {@inheritdoc} + */ + public function getBlockPrefix() + { + return 'chill_thirdpartybundle_thirdparty'; + } + + +} diff --git a/Form/Type/PickThirdPartyType.php b/Form/Type/PickThirdPartyType.php new file mode 100644 index 000000000..adccdaef7 --- /dev/null +++ b/Form/Type/PickThirdPartyType.php @@ -0,0 +1,112 @@ +em = $em; + $this->urlGenerator = $urlGenerator; + $this->translator = $translator; + $this->typesManager = $typesManager; + } + + + public function configureOptions(OptionsResolver $resolver) + { + $resolver + ->setRequired('center') + ->setAllowedTypes('center', [ \Chill\MainBundle\Entity\Center::class ]) + ->setDefined('types') + ->setRequired('types') + ->setAllowedValues('types', function($types) { + if (FALSE === \is_array($types)) { + return false; + } + // return false if one element is not contained in allowed types + return count(\array_diff($this->typesManager->getTypes(), $types)); + }) + ; + + $resolver + ->setDefault('class', ThirdParty::class) + ->setDefault('choice_label', function(ThirdParty $tp) { + return $tp->getName(); + }) + ->setDefault('choice_loader', function(Options $options) { + return new ThirdPartyChoiceLoader($options['center'], + $this->em->getRepository(ThirdParty::class)); + }) + ; + } + + public function getParent(): string + { + return EntityType::class; + } + + public function buildView(\Symfony\Component\Form\FormView $view, \Symfony\Component\Form\FormInterface $form, array $options) + { + $view->vars['attr']['class'] = \array_merge(['select2 '], $view->vars['attr']['class'] ?? []); + $view->vars['attr']['data-3party-picker'] = true; + $view->vars['attr']['data-select-interactive-loading'] = true; + $view->vars['attr']['data-search-url'] = $this->urlGenerator + ->generate('chill_main_search', [ + 'name' => ThirdPartySearch::NAME, + SearchInterface::REQUEST_QUERY_KEY_ADD_PARAMETERS => ['t' => $options['types']], + '_format' => 'json' ] + ); + $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/LICENSE b/LICENSE new file mode 100644 index 000000000..ddfcbd34e --- /dev/null +++ b/LICENSE @@ -0,0 +1,661 @@ +GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + +Copyright (C) 2007 Free Software Foundation, Inc. +Everyone is permitted to copy and distribute verbatim copies +of this license document, but changing it is not allowed. + + Preamble + +The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + +The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + +When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + +Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + +A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + +The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + +An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + +The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + +0. Definitions. + +"This License" refers to version 3 of the GNU Affero General Public License. + +"Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + +"The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + +To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + +A "covered work" means either the unmodified Program or a work based +on the Program. + +To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + +To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + +An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + +1. Source Code. + +The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + +A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + +The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + +The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + +The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + +The Corresponding Source for a work in source code form is that +same work. + +2. Basic Permissions. + +All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + +You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + +Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + +3. Protecting Users' Legal Rights From Anti-Circumvention Law. + +No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + +When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + +4. Conveying Verbatim Copies. + +You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + +You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + +5. Conveying Modified Source Versions. + +You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + +a) The work must carry prominent notices stating that you modified +it, and giving a relevant date. + +b) The work must carry prominent notices stating that it is +released under this License and any conditions added under section +7. This requirement modifies the requirement in section 4 to +"keep intact all notices". + +c) You must license the entire work, as a whole, under this +License to anyone who comes into possession of a copy. This +License will therefore apply, along with any applicable section 7 +additional terms, to the whole of the work, and all its parts, +regardless of how they are packaged. This License gives no +permission to license the work in any other way, but it does not +invalidate such permission if you have separately received it. + +d) If the work has interactive user interfaces, each must display +Appropriate Legal Notices; however, if the Program has interactive +interfaces that do not display Appropriate Legal Notices, your +work need not make them do so. + +A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + +6. Conveying Non-Source Forms. + +You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + +a) Convey the object code in, or embodied in, a physical product +(including a physical distribution medium), accompanied by the +Corresponding Source fixed on a durable physical medium +customarily used for software interchange. + +b) Convey the object code in, or embodied in, a physical product +(including a physical distribution medium), accompanied by a +written offer, valid for at least three years and valid for as +long as you offer spare parts or customer support for that product +model, to give anyone who possesses the object code either (1) a +copy of the Corresponding Source for all the software in the +product that is covered by this License, on a durable physical +medium customarily used for software interchange, for a price no +more than your reasonable cost of physically performing this +conveying of source, or (2) access to copy the +Corresponding Source from a network server at no charge. + +c) Convey individual copies of the object code with a copy of the +written offer to provide the Corresponding Source. This +alternative is allowed only occasionally and noncommercially, and +only if you received the object code with such an offer, in accord +with subsection 6b. + +d) Convey the object code by offering access from a designated +place (gratis or for a charge), and offer equivalent access to the +Corresponding Source in the same way through the same place at no +further charge. You need not require recipients to copy the +Corresponding Source along with the object code. If the place to +copy the object code is a network server, the Corresponding Source +may be on a different server (operated by you or a third party) +that supports equivalent copying facilities, provided you maintain +clear directions next to the object code saying where to find the +Corresponding Source. Regardless of what server hosts the +Corresponding Source, you remain obligated to ensure that it is +available for as long as needed to satisfy these requirements. + +e) Convey the object code using peer-to-peer transmission, provided +you inform other peers where the object code and Corresponding +Source of the work are being offered to the general public at no +charge under subsection 6d. + +A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + +A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + +"Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + +If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + +The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + +Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + +7. Additional Terms. + +"Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + +When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + +Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + +a) Disclaiming warranty or limiting liability differently from the +terms of sections 15 and 16 of this License; or + +b) Requiring preservation of specified reasonable legal notices or +author attributions in that material or in the Appropriate Legal +Notices displayed by works containing it; or + +c) Prohibiting misrepresentation of the origin of that material, or +requiring that modified versions of such material be marked in +reasonable ways as different from the original version; or + +d) Limiting the use for publicity purposes of names of licensors or +authors of the material; or + +e) Declining to grant rights under trademark law for use of some +trade names, trademarks, or service marks; or + +f) Requiring indemnification of licensors and authors of that +material by anyone who conveys the material (or modified versions of +it) with contractual assumptions of liability to the recipient, for +any liability that these contractual assumptions directly impose on +those licensors and authors. + +All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + +If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + +Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + +8. Termination. + +You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + +However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + +Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + +Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + +9. Acceptance Not Required for Having Copies. + +You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + +10. Automatic Licensing of Downstream Recipients. + +Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + +An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + +You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + +11. Patents. + +A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + +A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + +Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + +In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + +If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + +If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + +A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + +Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + +12. No Surrender of Others' Freedom. + +If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + +13. Remote Network Interaction; Use with the GNU General Public License. + +Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + +Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + +14. Revised Versions of this License. + +The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + +If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + +Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + +15. Disclaimer of Warranty. + +THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +16. Limitation of Liability. + +IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + +17. Interpretation of Sections 15 and 16. + +If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + +END OF TERMS AND CONDITIONS + +How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + +Copyright (C) + +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 . + +Also add information on how to contact you by electronic and paper mail. + +If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + +You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. diff --git a/Menu/MenuBuilder.php b/Menu/MenuBuilder.php new file mode 100644 index 000000000..654c47e86 --- /dev/null +++ b/Menu/MenuBuilder.php @@ -0,0 +1,76 @@ +, + * + * 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\ThirdPartyBundle\Menu; + +use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface; +use Symfony\Component\Translation\TranslatorInterface; +use Knp\Menu\MenuItem; +use Chill\MainBundle\Routing\LocalMenuBuilderInterface; +use Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter; + +/** + * Add an entry in section to go to third party index page + * + */ +class MenuBuilder implements LocalMenuBuilderInterface +{ + /** + * + * @var AuthorizationCheckerInterface + */ + protected $authorizationChecker; + + /** + * + * @var TranslatorInterface + */ + protected $translator; + + public function __construct( + AuthorizationCheckerInterface $authorizationChecker, + TranslatorInterface $translator + ) { + $this->authorizationChecker = $authorizationChecker; + $this->translator = $translator; + } + + + public function buildMenu($menuId, MenuItem $menu, array $parameters) + { + if ($this->authorizationChecker->isGranted(ThirdPartyVoter::SHOW)) { + $menu + ->addChild( + $this->translator->trans('Third parties'), + [ + 'route' => 'chill_3party_3party_index', + ]) + ->setExtras([ + 'order' => 112 + ]) + ; + } + } + + public static function getMenuIds(): array + { + return ['section']; + } +} diff --git a/README.md b/README.md index 930d48953..a979755d6 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,22 @@ +ThirdParty Module +================= + +This module add third parties to chill. + +Those parties are elements which can be handled in other entities: people, contacts, etc. + +Each third party is associated to multiple types, which can help to filter parties in element form. Exemple: do not show list of an hospital where you should display only doctors. + +How to add a third party type +----------------------------- + +Create a service which implements `Chill\ThirdPartyBundle\ThirdPartyType\ThirdPartyProviderInterface` and tag it with: `chill_3party.provider`: + +```yaml +services: + Cire\CireBundle\ThirdPartyType\NotarisType: + tags: + - { name: chill_3party.provider } +``` + -Manage Third Party contact categories diff --git a/Repository/ThirdPartyRepository.php b/Repository/ThirdPartyRepository.php new file mode 100644 index 000000000..c961b3601 --- /dev/null +++ b/Repository/ThirdPartyRepository.php @@ -0,0 +1,145 @@ +buildQuery($centers, $terms); + $qb->select('COUNT(tp)'); + + return $qb->getQuery()->getSingleScalarResult(); + } + + /** + * Search amongst parties associated to $centers, with $terms parameters + * + * Different format for return: + * - ['entity']: return the entity hydrated as objects + * - ['array', [ DQL ]: return objects hydrated as entity, with + * an array describing the fields as DQL. + * + * supported terms: + * + * - name or _default: containing the name (name LIKE %string%) + * - is_active: is active = true / false + * - types: an array of types + * + * @param array $centers + * @param int $firstResult + * @param int $maxResults + * @param array $terms + * @param string[] $returnFormat a format for returning + * @return array + */ + public function findByMemberOfCenters(array $centers, $firstResult = 0, $maxResults = 20, $terms = [], $returnFormat = ['entity']): array + { + $qb = $this->buildQuery($centers, $terms); + switch($returnFormat[0]) { + case 'entity': + $qb->select('tp'); + $hydrate = Query::HYDRATE_OBJECT; + break; + case 'array': + $hydrate = Query::HYDRATE_ARRAY; + $first = true; + foreach ($returnFormat[1] as $dql) { + if ($first) { + $qb->select($dql); + $first = false; + } else { + $qb->addSelect($dql); + } + } + break; + default: + throw new \DomainException("This return format is invalid"); + } + $qb->setFirstResult($firstResult) + ->setMaxResults($maxResults); + + return $qb->getQuery()->getResult(); + } + + protected function createMemberOfCentersQuery($centers): QueryBuilder + { + $qb = $this->createQueryBuilder('tp'); + + $or = $qb->expr()->orX(); + + foreach ($centers as $center) { + $or->add($qb->expr()->isMemberOf(':center_'.$center->getId(), 'tp.centers')); + $qb->setParameter('center_'.$center->getId(), $center); + } + + $qb->where($or); + + return $qb; + } + + protected function buildQuery($centers, $terms): QueryBuilder + { + $qb = $this->createMemberOfCentersQuery($centers); + $this->setNameCondition($qb, $terms); + $this->setTypesCondition($qb, $terms); + $this->setIsActiveCondition($qb, $terms); + + return $qb; + } + + /** + * Add parameters to filter by containing $terms["name"] or + * $terms["_default"] + * + * @param QueryBuilder $qb + * @param array $terms + */ + protected function setNameCondition(QueryBuilder $qb, array $terms) + { + if (\array_key_exists('name', $terms) || \array_key_exists('_default', $terms)) { + $term = $terms['name'] ?? $terms['_default']; + if (empty($term)) { + return; + } + $qb->andWhere($qb->expr()->like('UNACCENT(LOWER(tp.name))', 'UNACCENT(LOWER(:name))')); + $qb->setParameter('name', '%'.$term.'%'); + } + } + + protected function setTypesCondition(QueryBuilder $qb, array $terms) + { + if (\array_key_exists('types', $terms)) { + $orx = $qb->expr()->orX(); + foreach ($terms['types'] as $type) { + $orx->add('JSONB_EXISTS_IN_ARRAY(tp.type, :type_'.$type.') = \'TRUE\''); + $qb->setParameter('type_'.$type, $type); + } + $qb->andWhere($orx); + } + } + + protected function setIsActiveCondition(QueryBuilder $qb, array $terms) + { + if (\array_key_exists('is_active', $terms)) { + $qb->andWhere( + $terms['is_active'] ? $qb->expr()->eq('tp.active', "'TRUE'") : + $qb->expr()->eq('tp.active', "'FALSE'") + ); + } + } +} diff --git a/Resources/config/routing.yml b/Resources/config/routing.yml new file mode 100644 index 000000000..e8edbb3a9 --- /dev/null +++ b/Resources/config/routing.yml @@ -0,0 +1,3 @@ +chill_3party_controllers: + resource: "@ChillThirdPartyBundle/Controller" + type: annotation \ No newline at end of file diff --git a/Resources/config/services.yml b/Resources/config/services.yml new file mode 100644 index 000000000..d66403324 --- /dev/null +++ b/Resources/config/services.yml @@ -0,0 +1,7 @@ +imports: + - { resource: './services/controller.yml' } + - { resource: './services/form.yml' } + - { resource: './services/security.yml' } + - { resource: './services/3partytype.yml' } + - { resource: './services/search.yml' } + - { resource: './services/menu.yml' } diff --git a/Resources/config/services/3partytype.yml b/Resources/config/services/3partytype.yml new file mode 100644 index 000000000..35f07d15d --- /dev/null +++ b/Resources/config/services/3partytype.yml @@ -0,0 +1,2 @@ +services: + Chill\ThirdPartyBundle\ThirdPartyType\ThirdPartyTypeManager: ~ diff --git a/Resources/config/services/controller.yml b/Resources/config/services/controller.yml new file mode 100644 index 000000000..14742d406 --- /dev/null +++ b/Resources/config/services/controller.yml @@ -0,0 +1,7 @@ +services: + Chill\ThirdPartyBundle\Controller\ThirdPartyController: + arguments: + $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper' + $translator: '@Symfony\Component\Translation\TranslatorInterface' + $paginatorFactory: '@Chill\MainBundle\Pagination\PaginatorFactory' + tags: ['controller.service_arguments'] \ No newline at end of file diff --git a/Resources/config/services/form.yml b/Resources/config/services/form.yml new file mode 100644 index 000000000..489a2bbb6 --- /dev/null +++ b/Resources/config/services/form.yml @@ -0,0 +1,17 @@ +services: + Chill\ThirdPartyBundle\Form\ThirdPartyType: + arguments: + $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper' + $tokenStorage: '@Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface' + $typesManager: '@Chill\ThirdPartyBundle\ThirdPartyType\ThirdPartyTypeManager' + tags: + - { name: form.type } + + Chill\ThirdPartyBundle\Form\Type\PickThirdPartyType: + arguments: + $em: '@Doctrine\ORM\EntityManagerInterface' + $urlGenerator: '@Symfony\Component\Routing\Generator\UrlGeneratorInterface' + $translator: '@Symfony\Component\Translation\TranslatorInterface' + $typesManager: '@Chill\ThirdPartyBundle\ThirdPartyType\ThirdPartyTypeManager' + tags: + - { name: form.type } \ No newline at end of file diff --git a/Resources/config/services/menu.yml b/Resources/config/services/menu.yml new file mode 100644 index 000000000..21f271b58 --- /dev/null +++ b/Resources/config/services/menu.yml @@ -0,0 +1,7 @@ +services: + Chill\ThirdPartyBundle\Menu\MenuBuilder: + arguments: + $translator: '@Symfony\Component\Translation\TranslatorInterface' + $authorizationChecker: '@Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface' + tags: + - { name: 'chill.menu_builder' } diff --git a/Resources/config/services/search.yml b/Resources/config/services/search.yml new file mode 100644 index 000000000..f4ff72db9 --- /dev/null +++ b/Resources/config/services/search.yml @@ -0,0 +1,9 @@ +services: + Chill\ThirdPartyBundle\Search\ThirdPartySearch: + arguments: + $em: '@Doctrine\ORM\EntityManagerInterface' + $tokenStorage: '@Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface' + $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper' + $paginatorFactory: '@Chill\MainBundle\Pagination\PaginatorFactory' + tags: + - { name: 'chill.search', alias: '3party' } diff --git a/Resources/config/services/security.yml b/Resources/config/services/security.yml new file mode 100644 index 000000000..ccc47fcd2 --- /dev/null +++ b/Resources/config/services/security.yml @@ -0,0 +1,7 @@ +services: + Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter: + arguments: + $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper' + tags: + - { name: security.voter } + - { name: chill.role } diff --git a/Resources/migrations/Version20190307111314.php b/Resources/migrations/Version20190307111314.php new file mode 100644 index 000000000..afcf0e8c2 --- /dev/null +++ b/Resources/migrations/Version20190307111314.php @@ -0,0 +1,35 @@ +abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.'); + + $this->addSql('CREATE SEQUENCE chill_third_party_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); + $this->addSql('CREATE TABLE chill_third_party (id INT NOT NULL, name VARCHAR(255) NOT NULL, telephone VARCHAR(64) DEFAULT NULL, email VARCHAR(255) DEFAULT NULL, comment TEXT DEFAULT NULL, type JSON DEFAULT NULL, PRIMARY KEY(id))'); + $this->addSql('COMMENT ON COLUMN chill_third_party.type IS \'(DC2Type:json_array)\''); + + } + + public function down(Schema $schema) : void + { + // this down() migration is auto-generated, please modify it to your needs + $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.'); + + $this->addSql('DROP SEQUENCE chill_third_party_id_seq CASCADE'); + $this->addSql('DROP TABLE chill_third_party'); + + } +} diff --git a/Resources/migrations/Version20190307131650.php b/Resources/migrations/Version20190307131650.php new file mode 100644 index 000000000..178035944 --- /dev/null +++ b/Resources/migrations/Version20190307131650.php @@ -0,0 +1,29 @@ +addSql("CREATE SCHEMA chill_3party"); + $this->addSql("ALTER TABLE chill_third_party SET SCHEMA chill_3party"); + $this->addSql("ALTER TABLE chill_3party.chill_third_party RENAME TO third_party"); + $this->addSql("ALTER SEQUENCE chill_third_party_id_seq SET SCHEMA chill_3party"); + $this->addSql("ALTER SEQUENCE chill_3party.chill_third_party_id_seq RENAME TO third_party_id_seq"); + } + + public function down(Schema $schema) : void + { + // this down() migration is auto-generated, please modify it to your needs + $this->throwIrreversibleMigrationException("The down version of this migration is " + . "not written"); + } +} diff --git a/Resources/migrations/Version20190418090842.php b/Resources/migrations/Version20190418090842.php new file mode 100644 index 000000000..42d463653 --- /dev/null +++ b/Resources/migrations/Version20190418090842.php @@ -0,0 +1,32 @@ +abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.'); + + $this->addSql('CREATE TABLE chill_3party.party_center (thirdparty_id INT NOT NULL, center_id INT NOT NULL, PRIMARY KEY(thirdparty_id, center_id))'); + $this->addSql('CREATE INDEX IDX_C65D4397C7D3A8E6 ON chill_3party.party_center (thirdparty_id)'); + $this->addSql('CREATE INDEX IDX_C65D43975932F377 ON chill_3party.party_center (center_id)'); + $this->addSql('ALTER TABLE chill_3party.party_center ADD CONSTRAINT FK_C65D4397C7D3A8E6 FOREIGN KEY (thirdparty_id) REFERENCES chill_3party.third_party (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_3party.party_center ADD CONSTRAINT FK_C65D43975932F377 FOREIGN KEY (center_id) REFERENCES centers (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_3party.third_party ADD active BOOLEAN NOT NULL'); + } + + public function down(Schema $schema) : void + { + $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.'); + + $this->addSql('DROP TABLE chill_3party.party_center'); + $this->addSql('ALTER TABLE chill_3party.third_party DROP active'); + } +} diff --git a/Resources/migrations/Version20190429171109.php b/Resources/migrations/Version20190429171109.php new file mode 100644 index 000000000..6eb06bf33 --- /dev/null +++ b/Resources/migrations/Version20190429171109.php @@ -0,0 +1,26 @@ +addSql("ALTER TABLE chill_3party.third_party RENAME COLUMN type " + . "TO types"); + $this->addSql("ALTER TABLE chill_3party.third_party ALTER COLUMN types " + . "SET DATA TYPE jsonb"); + + } + + public function down(Schema $schema) : void + { + $this->throwIrreversibleMigrationException("not implemented"); + } +} diff --git a/Resources/migrations/Version20190502144206.php b/Resources/migrations/Version20190502144206.php new file mode 100644 index 000000000..75e024a9c --- /dev/null +++ b/Resources/migrations/Version20190502144206.php @@ -0,0 +1,31 @@ +abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.'); + + $this->addSql('ALTER TABLE chill_3party.third_party ADD address_id INT DEFAULT NULL'); + $this->addSql('COMMENT ON COLUMN chill_3party.third_party.types IS NULL'); + $this->addSql('ALTER TABLE chill_3party.third_party ADD CONSTRAINT FK_D952467BF5B7AF75 FOREIGN KEY (address_id) REFERENCES chill_main_address (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('CREATE INDEX IDX_D952467BF5B7AF75 ON chill_3party.third_party (address_id)'); + + } + + public function down(Schema $schema) : void + { + $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.'); + + $this->addSql('ALTER TABLE chill_3party.third_party DROP CONSTRAINT FK_D952467BF5B7AF75'); + $this->addSql('ALTER TABLE chill_3party.third_party DROP address_id'); + } +} diff --git a/Resources/public/index.js b/Resources/public/index.js new file mode 100644 index 000000000..9f205177f --- /dev/null +++ b/Resources/public/index.js @@ -0,0 +1,3 @@ +// sass/css +require('./sass/thirdparty.scss'); + diff --git a/Resources/public/sass/thirdparty.scss b/Resources/public/sass/thirdparty.scss new file mode 100644 index 000000000..7bc35322b --- /dev/null +++ b/Resources/public/sass/thirdparty.scss @@ -0,0 +1,51 @@ + +div.chill_contact { + border: 1px solid black; + background-color: rgba(255, 255, 255, 0.65); + padding: 1em; + margin: 1em 0; + max-width: 500px; + div.chill_contact_name { + font-variant: small-caps; + } + div.chill_contact_category { + margin: 0.5em 0; + font-size: 85%; + span.category { + font-style: italic; + } + span::before { + margin-left: 0.5em; + margin-right: 0.5em; + font-family: 'FontAwesome'; + content: '\f02e'; + font-style: normal; + } + } + div.chill_contact_comment { + font-size: 85%; + font-style: italic; + } + div.chill_address { + div.chill_address_address::before { + margin-left: 0.5em; + margin-right: 0.5em; + font-family: 'FontAwesome'; + content: '\f015'; + } + } + div.chill_contact_contact { + font-variant: small-caps; + span::before { + margin-left: 0.5em; + margin-right: 0.5em; + font-family: 'FontAwesome'; + } + span.email::before { + content: '\f1fa'; + } + span.telephone::before { + content: '\f095'; + } + } +} \ No newline at end of file diff --git a/Resources/translations/messages.fr.yml b/Resources/translations/messages.fr.yml new file mode 100644 index 000000000..c66f3ee48 --- /dev/null +++ b/Resources/translations/messages.fr.yml @@ -0,0 +1,26 @@ +Third party: Tiers +Third parties: Tiers +name: Nom +telephone: Téléphone +adress: Adresse +email: Courriel +comment: Commentaire +thirdparty.type: type +thirdparty.Type: Type +thirdparty.No_phonenumber: Aucun numéro de téléphone +thirdparty.No_email: Aucun email +thirdparty.No_comment: Aucun commentaire + +New third party: Nouveau tiers +Show third party %name%: Tiers "%name%" +Create third party: Créer un tiers +Update third party %name%: Mettre à jour "%name%" +List of third parties: Liste des tiers +Third party updated: Le tiers a été mis à jour +Third party created: Le tiers a été créé +Active, shown to users: Actif, visible par les utilisateurs +Inactive, not shown to users: Inactif, invisible par les utilisateurs + + +The party is visible in those centers: Le tiers est visible dans ces centres +No third parties: Aucun tiers \ No newline at end of file diff --git a/Resources/views/Contact/macro.html.twig b/Resources/views/Contact/macro.html.twig new file mode 100644 index 000000000..9a7cb9343 --- /dev/null +++ b/Resources/views/Contact/macro.html.twig @@ -0,0 +1,49 @@ +{%- macro _render(contact, options) -%} + {%- set options = { 'with_valid_from' : true }|merge(options|default({})) -%} +
+ +
+ {{ contact.name }} +
+
+ {% for type in contact.type %} + + {{ ('chill_3party.key_label.'~type)|trans }} + + {% endfor %} +
+ {% if contact.comment is not empty %} +
+ {{ contact.comment }} +
+ {% endif %} + {% if contact.address %} +
+
+ + {% if contact.address.streetAddress1 %}

{{ contact.address.streetAddress1 }}

{% endif %} + {% if contact.address.streetAddress2 is not empty %}

{{ contact.address.streetAddress2 }}

{% endif %} + {% if contact.address.postCode is not empty %} +

{{ contact.address.postCode.code }} {{ contact.address.postCode.name }}

+

{{ contact.address.postCode.country.name|localize_translatable_string }}

+ {% endif %} +
+ {%- if options['with_valid_from'] == true -%} + {{ 'Since %date%'|trans( { '%date%' : contact.address.validFrom|localizeddate('long', 'none') } ) }} + {%- endif -%} +
+ {% endif %} + {% if contact.email or contact.telephone is not empty %} +
+ + + {{ contact.telephone }} + +
+ {% endif %} +
+{%- endmacro -%} + + diff --git a/Resources/views/ThirdParty/index.html.twig b/Resources/views/ThirdParty/index.html.twig new file mode 100644 index 000000000..bd3d58f55 --- /dev/null +++ b/Resources/views/ThirdParty/index.html.twig @@ -0,0 +1,61 @@ +{% extends "@ChillMain/layout.html.twig" %} + +{% block title 'List of third parties'|trans %} + +{% block content %} +
+

{{ 'List of third parties'|trans }}

+ + {% if third_parties|length == 0 %} +

{{ 'No third parties'|trans }}

+ {% else %} + + + + + + + + + + + + + {% for tp in third_parties %} + + + + {% set types = [] %} + {% for t in tp.type %} + {% set types = types|merge( [ ('chill_3party.key_label.'~t)|trans ] ) %} + {% endfor %} + + + + {% endfor %} + +
{{ 'Name'|trans }}{{ 'Active'|trans }}{{ 'type'|trans }} 
{{ tp.name }}{{ (tp.active ? '' : '')|raw }}{{ types|join(', ') }} +
    + {% if is_granted('CHILL_3PARTY_3PARTY_UPDATE', tp) %} +
  • + +
    • + {% endif %} + {% if is_granted('CHILL_3PARTY_3PARTY_SHOW', tp) %} +
  • + +
    • + {% endif %} +
+
+ {% endif %} + + {% if is_granted('CHILL_3PARTY_3PARTY_CREATE') %} +
+{% endblock %} diff --git a/Resources/views/ThirdParty/new.html.twig b/Resources/views/ThirdParty/new.html.twig new file mode 100644 index 000000000..12fe160a0 --- /dev/null +++ b/Resources/views/ThirdParty/new.html.twig @@ -0,0 +1,34 @@ +{% extends "@ChillMain/layout.html.twig" %} + +{% block title 'Create third party'|trans %} + +{% block content %} +
+

{{ 'Create third party'|trans }}

+ + {{ form_start(form) }} + {{ form_row(form.name) }} + {{ form_row(form.type) }} + {{ form_row(form.telephone) }} + {{ form_row(form.email) }} + {{ form_row(form.address) }} + + {{ form_row(form.active) }} + {{ form_row(form.centers) }} + {{ form_row(form.comment) }} + + + + + {{ form_end(form) }} +
+{% endblock %} diff --git a/Resources/views/ThirdParty/show.html.twig b/Resources/views/ThirdParty/show.html.twig new file mode 100644 index 000000000..2191d0c69 --- /dev/null +++ b/Resources/views/ThirdParty/show.html.twig @@ -0,0 +1,67 @@ +{% extends "@ChillMain/layout.html.twig" %} + +{% import '@ChillMain/Address/macro.html.twig' as address %} + +{% set title_ = 'Show third party %name%'|trans({'%name%' : thirdParty.name }) %} + +{% block title title_ %} + +{% block content %} +
+

+ {{ title_ }} + {{ (thirdParty.active ? 'Active, shown to users' : 'Inactive, not shown to users')|trans }} +

+ +
+
{{ 'Name'|trans }}
+
{{ thirdParty.name }}
+ +
{{ 'Type'|trans }}
+ {% set types = [] %} + {% for t in thirdParty.type %} + {% set types = types|merge( [ ('chill_3party.key_label.'~t)|trans ] ) %} + {% endfor %} +
{{ types|join(', ') }}
+ +
{{ 'Centers'|trans }}
+
{{ 'The party is visible in those centers'|trans }} : {{ thirdParty.centers|join(', ') }}
+ +
{{ 'Phonenumber'|trans }}
+
{{ thirdParty.telephone|chill_print_or_message("thirdparty.No_phonenumber") }}
+ +
{{ 'email'|trans }}
+
{{ thirdParty.email|chill_print_or_message("thirdparty.No_email") }}
+ +
{{ 'Address'|trans }}
+
+ {% if thirdParty.address == null %} + {{ 'No address given'|trans }} + {% else %} + {{ address._render(thirdParty.address, {'with_valid_from': false }) }} + {% endif %} +
+ +
{{ 'Comment'|trans }}
+
{{ thirdParty.comment|chill_print_or_message("thirdparty.No_comment") }}
+ +
+ + + +
+{% endblock %} \ No newline at end of file diff --git a/Resources/views/ThirdParty/update.html.twig b/Resources/views/ThirdParty/update.html.twig new file mode 100644 index 000000000..7e3244e32 --- /dev/null +++ b/Resources/views/ThirdParty/update.html.twig @@ -0,0 +1,37 @@ +{% extends "@ChillMain/layout.html.twig" %} + +{% block title 'Update third party %name%'|trans({ '%name%': thirdParty.name }) %} + +{% block content %} +
+

+ {{ 'Update third party %name%'|trans({ '%name%': thirdParty.name }) }} + {{ (thirdParty.active ? 'Active, shown to users' : 'Inactive, not shown to users')|trans }} + +

+ + {{ form_start(form) }} + {{ form_row(form.name) }} + {{ form_row(form.type) }} + {{ form_row(form.telephone) }} + {{ form_row(form.email) }} + {{ form_row(form.address) }} + + {{ form_row(form.active) }} + {{ form_row(form.centers) }} + {{ form_row(form.comment) }} + + + + + {{ form_end(form) }} +
+{% endblock %} diff --git a/Search/ThirdPartySearch.php b/Search/ThirdPartySearch.php new file mode 100644 index 000000000..16984ea68 --- /dev/null +++ b/Search/ThirdPartySearch.php @@ -0,0 +1,103 @@ +em = $em; + $this->tokenStorage = $tokenStorage; + $this->authorizationHelper = $authorizationHelper; + $this->paginatorFactory = $paginatorFactory; + } + + + public function getOrder(): int + { + return 59866; + } + + public function isActiveByDefault(): bool + { + return false; + } + + public function renderResult(array $terms, $start = 0, $limit = 50, $options = array(), $format = 'html') + { + $centers = $this->authorizationHelper + ->getReachableCenters( + $this->tokenStorage->getToken()->getUser(), + new Role(ThirdPartyVoter::SHOW) + ); + $total = $this->count($centers, $terms); + $paginator = $this->paginatorFactory->create($total); + // replace types in terms by types in query + $terms['types'] = $options[SearchInterface::REQUEST_QUERY_PARAMETERS]['t']; + $terms['is_active'] = true; + + if ($format === 'json') { + return [ + 'results' => $this->em->getRepository(ThirdParty::class) + ->findByMemberOfCenters($centers, $start, $limit, $terms, + ['array', ['tp.id', 'tp.name AS text']]), + 'more' => $paginator->hasNextPage() + ]; + } + } + + public function supports($domain, $format): bool + { + return self::NAME === $domain and $format === 'json'; + } + + protected function count($centers, $terms): int + { + return $this->em->getRepository(ThirdParty::class) + ->countByMemberOfCenters($centers, $terms); + } +} diff --git a/Security/Voter/ThirdPartyVoter.php b/Security/Voter/ThirdPartyVoter.php new file mode 100644 index 000000000..a1ce94e25 --- /dev/null +++ b/Security/Voter/ThirdPartyVoter.php @@ -0,0 +1,95 @@ +authorizationHelper = $authorizationHelper; + } + + + protected function supports($attribute, $subject) + { + if ($subject instanceof ThirdParty) { + return \in_array($attribute, $this->getRoles()); + } elseif ($subject === NULL) { + return $attribute === self::CREATE || $attribute === self::SHOW ; + } + + return false; + } + + /** + * + * @param string $attribute + * @param ThirdParty|null $subject + * @param TokenInterface $token + * @return type + */ + protected function voteOnAttribute($attribute, $subject, TokenInterface $token) + { + $user = $token->getUser(); + + if (!$user instanceof User) { + return false; + } + + $centers = $this->authorizationHelper + ->getReachableCenters($user, new Role($attribute)); + + if ($subject === NULL) { + return count($centers) > 0; + } elseif ($subject instanceof ThirdParty) { + return count(\array_intersect($centers, $subject->getCenters()->toArray())) > 0; + } + + return false; + } + + public function getRoles(): array + { + return [ + self::CREATE, self::UPDATE, self::SHOW + ]; + } + + public function getRolesWithHierarchy(): array + { + return [ + 'Third Party' => $this->getRoles() + ]; + } + + public function getRolesWithoutScope(): array + { + return $this->getRoles(); + } +} diff --git a/Tests/Controller/ThirdPartyControllerTest.php b/Tests/Controller/ThirdPartyControllerTest.php new file mode 100644 index 000000000..9c3e187fc --- /dev/null +++ b/Tests/Controller/ThirdPartyControllerTest.php @@ -0,0 +1,30 @@ +request('GET', '/index'); + } + + public function testNew() + { + $client = static::createClient(); + + $crawler = $client->request('GET', '/new'); + } + + public function testUpdate() + { + $client = static::createClient(); + + $crawler = $client->request('GET', '/update'); + } + +} diff --git a/ThirdPartyType/ThirdPartyTypeManager.php b/ThirdPartyType/ThirdPartyTypeManager.php new file mode 100644 index 000000000..87208bdcf --- /dev/null +++ b/ThirdPartyType/ThirdPartyTypeManager.php @@ -0,0 +1,56 @@ +providers[$provider->getKey()] = $provider; + + return $this; + } + + /** + * Get all providers + * + * @return array + */ + public function getProviders(): array + { + return $this->providers; + } + + /** + * Get a list of types + * + * @return string[] + */ + public function getTypes(): array + { + return \array_keys($this->providers); + } +} diff --git a/ThirdPartyType/ThirdPartyTypeProviderInterface.php b/ThirdPartyType/ThirdPartyTypeProviderInterface.php new file mode 100644 index 000000000..d544255e9 --- /dev/null +++ b/ThirdPartyType/ThirdPartyTypeProviderInterface.php @@ -0,0 +1,17 @@ + Date: Tue, 11 Jun 2019 11:59:42 +0200 Subject: [PATCH 03/20] correct composer.json --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index c45cf48e6..831e10995 100644 --- a/composer.json +++ b/composer.json @@ -4,9 +4,9 @@ "type": "symfony-bundle", "description": "A bundle to manage Third Party contact categories", "keywords" : ["chill", "social work", "contacts"], - "homepage" : "https://github.com/Chill-project/Person", + "homepage" : "https://github.com/Chill-project/Chill-ThirdParty", "autoload": { - "psr-4": { "Chill\\PersonBundle\\": "" } + "psr-4": { "Chill\\ThirdPartyBundle\\": "" } }, "autoload-dev": { "classmap": [ "Resources/test/Fixtures/App/app/AppKernel.php" ] From 3f3bbc92d9aecefdb19f0a00698ecbbae9ecc08b Mon Sep 17 00:00:00 2001 From: Tchama Date: Tue, 11 Jun 2019 12:02:05 +0200 Subject: [PATCH 04/20] correct --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 831e10995..476776123 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "type": "symfony-bundle", "description": "A bundle to manage Third Party contact categories", "keywords" : ["chill", "social work", "contacts"], - "homepage" : "https://github.com/Chill-project/Chill-ThirdParty", + "homepage" : "https://framagit.org/Chill-project/Chill-ThirdParty", "autoload": { "psr-4": { "Chill\\ThirdPartyBundle\\": "" } }, From 1781bd31a054c6c4a7686cd76c97ffd0bf1d80f2 Mon Sep 17 00:00:00 2001 From: Tchama Date: Thu, 5 Dec 2019 15:36:06 +0100 Subject: [PATCH 05/20] patch bundle changes --- Controller/ThirdPartyController.php | 14 ++++++++++---- Resources/views/ThirdParty/index.html.twig | 13 +++++++++---- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/Controller/ThirdPartyController.php b/Controller/ThirdPartyController.php index dd03bf5a0..7e98b93f5 100644 --- a/Controller/ThirdPartyController.php +++ b/Controller/ThirdPartyController.php @@ -70,12 +70,18 @@ class ThirdPartyController extends Controller $nbThirdParties = $repository->countByMemberOfCenters($centers); $pagination = $this->paginatorFactory->create($nbThirdParties); - $thirdParties = $repository->findByMemberOfCenters($centers, - $pagination->getCurrentPage()->getFirstItemNumber(), - $pagination->getItemsPerPage()); + $pagination->setItemsPerPage(20); + + $thirdParties = $repository->findByMemberOfCenters( + $centers, + $pagination->getCurrentPage()->getFirstItemNumber(), + $pagination->getItemsPerPage() + ); + dump($pagination); return $this->render('ChillThirdPartyBundle:ThirdParty:index.html.twig', array( - 'third_parties' => $thirdParties + 'third_parties' => $thirdParties, + 'pagination' => $pagination )); } diff --git a/Resources/views/ThirdParty/index.html.twig b/Resources/views/ThirdParty/index.html.twig index bd3d58f55..89b62f567 100644 --- a/Resources/views/ThirdParty/index.html.twig +++ b/Resources/views/ThirdParty/index.html.twig @@ -14,17 +14,17 @@ + - - + {% for tp in third_parties %} + - {% set types = [] %} {% for t in tp.type %} {% set types = types|merge( [ ('chill_3party.key_label.'~t)|trans ] ) %} @@ -48,8 +48,13 @@ {% endfor %}
{{ 'Name'|trans }}{{ 'Active'|trans }}{{ 'type'|trans }}{{ 'Category'|trans }}  
{{ (tp.active ? '' : '')|raw }} {{ tp.name }}{{ (tp.active ? '' : '')|raw }}
+ + {% if third_parties|length < pagination.getTotalItems %} + {{ chill_pagination(pagination) }} + {% endif %} + {% endif %} - + {% if is_granted('CHILL_3PARTY_3PARTY_CREATE') %}
  • From 5bc1a1a7b256d22232f5c87832751d805ebc35ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 14 Jan 2020 22:48:38 +0100 Subject: [PATCH 06/20] fix test for types option validity --- Form/Type/PickThirdPartyType.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Form/Type/PickThirdPartyType.php b/Form/Type/PickThirdPartyType.php index adccdaef7..98d3e585b 100644 --- a/Form/Type/PickThirdPartyType.php +++ b/Form/Type/PickThirdPartyType.php @@ -72,7 +72,7 @@ class PickThirdPartyType extends AbstractType return false; } // return false if one element is not contained in allowed types - return count(\array_diff($this->typesManager->getTypes(), $types)); + return count(\array_diff($types, $this->typesManager->getTypes())) === 0; }) ; From b761c8a21dd38e364ea8b1cef1c50af76be10a0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Thu, 23 Jan 2020 21:10:33 +0100 Subject: [PATCH 07/20] add a render template for entity ThirdParty --- CHANGELOG.md | 2 +- Entity/ThirdParty.php | 2 +- Resources/config/services.yml | 1 + Resources/config/services/templating.yml | 6 ++ Resources/views/Contact/macro.html.twig | 46 +---------- Resources/views/ThirdParty/_render.html.twig | 45 +++++++++++ Templating/Entity/ThirdPartyRender.php | 82 ++++++++++++++++++++ 7 files changed, 137 insertions(+), 47 deletions(-) create mode 100644 Resources/config/services/templating.yml create mode 100644 Resources/views/ThirdParty/_render.html.twig create mode 100644 Templating/Entity/ThirdPartyRender.php diff --git a/CHANGELOG.md b/CHANGELOG.md index 96703acad..38c4e1703 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,4 +3,4 @@ branch master ============= * initial commit - +* add a render template for entity ThirdParty ; diff --git a/Entity/ThirdParty.php b/Entity/ThirdParty.php index 9c3a52ab5..2d01ff442 100644 --- a/Entity/ThirdParty.php +++ b/Entity/ThirdParty.php @@ -72,7 +72,7 @@ class ThirdParty * @var string|null * * @ORM\Column(name="email", type="string", length=255, nullable=true) - * @Assert\Email(checkMX=true) + * @Assert\Email(checkMX=false) */ private $email; diff --git a/Resources/config/services.yml b/Resources/config/services.yml index d66403324..c1c8fa77d 100644 --- a/Resources/config/services.yml +++ b/Resources/config/services.yml @@ -4,4 +4,5 @@ imports: - { resource: './services/security.yml' } - { resource: './services/3partytype.yml' } - { resource: './services/search.yml' } + - { resource: './services/templating.yml' } - { resource: './services/menu.yml' } diff --git a/Resources/config/services/templating.yml b/Resources/config/services/templating.yml new file mode 100644 index 000000000..690f6008d --- /dev/null +++ b/Resources/config/services/templating.yml @@ -0,0 +1,6 @@ +services: + Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender: + arguments: + $templating: '@templating.engine.twig' + tags: + - 'chill.render_entity' \ No newline at end of file diff --git a/Resources/views/Contact/macro.html.twig b/Resources/views/Contact/macro.html.twig index 9a7cb9343..6bcc6f553 100644 --- a/Resources/views/Contact/macro.html.twig +++ b/Resources/views/Contact/macro.html.twig @@ -1,49 +1,5 @@ {%- macro _render(contact, options) -%} - {%- set options = { 'with_valid_from' : true }|merge(options|default({})) -%} -
    - -
    - {{ contact.name }} -
    -
    - {% for type in contact.type %} - - {{ ('chill_3party.key_label.'~type)|trans }} - - {% endfor %} -
    - {% if contact.comment is not empty %} -
    - {{ contact.comment }} -
    - {% endif %} - {% if contact.address %} -
    -
    - - {% if contact.address.streetAddress1 %}

    {{ contact.address.streetAddress1 }}

    {% endif %} - {% if contact.address.streetAddress2 is not empty %}

    {{ contact.address.streetAddress2 }}

    {% endif %} - {% if contact.address.postCode is not empty %} -

    {{ contact.address.postCode.code }} {{ contact.address.postCode.name }}

    -

    {{ contact.address.postCode.country.name|localize_translatable_string }}

    - {% endif %} -
    - {%- if options['with_valid_from'] == true -%} - {{ 'Since %date%'|trans( { '%date%' : contact.address.validFrom|localizeddate('long', 'none') } ) }} - {%- endif -%} -
    - {% endif %} - {% if contact.email or contact.telephone is not empty %} -
    - - - {{ contact.telephone }} - -
    - {% endif %} -
    + {{ contact|chill_entity_render_box(options|default({})) }} {%- endmacro -%} diff --git a/Resources/views/ThirdParty/_render.html.twig b/Resources/views/ThirdParty/_render.html.twig new file mode 100644 index 000000000..e05fd2031 --- /dev/null +++ b/Resources/views/ThirdParty/_render.html.twig @@ -0,0 +1,45 @@ +{# template to render a person #} +
    + +
    + {{ contact.name }} +
    +
    + {% for type in contact.type %} + + {{ ('chill_3party.key_label.'~type)|trans }} + + {% endfor %} +
    + {% if contact.comment is not empty %} +
    + {{ contact.comment }} +
    + {% endif %} + {% if contact.address %} +
    +
    + + {% if contact.address.streetAddress1 %}

    {{ contact.address.streetAddress1 }}

    {% endif %} + {% if contact.address.streetAddress2 is not empty %}

    {{ contact.address.streetAddress2 }}

    {% endif %} + {% if contact.address.postCode is not empty %} +

    {{ contact.address.postCode.code }} {{ contact.address.postCode.name }}

    +

    {{ contact.address.postCode.country.name|localize_translatable_string }}

    + {% endif %} +
    + {%- if options['with_valid_from'] == true -%} + {{ 'Since %date%'|trans( { '%date%' : contact.address.validFrom|localizeddate('long', 'none') } ) }} + {%- endif -%} +
    + {% endif %} + {% if contact.email or contact.telephone is not empty %} +
    + + + {{ contact.telephone|chill_format_phonenumber }} + +
    + {% endif %} +
    diff --git a/Templating/Entity/ThirdPartyRender.php b/Templating/Entity/ThirdPartyRender.php new file mode 100644 index 000000000..be2f82cb5 --- /dev/null +++ b/Templating/Entity/ThirdPartyRender.php @@ -0,0 +1,82 @@ + + * + * 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\ThirdPartyBundle\Templating\Entity; + +use Chill\MainBundle\Templating\Entity\AbstractChillEntityRender; +use Chill\ThirdPartyBundle\Entity\ThirdParty; +use Symfony\Bridge\Twig\TwigEngine; + +/** + * + * + */ +class ThirdPartyRender extends AbstractChillEntityRender +{ + /** + * + * @var TwigEngine + */ + protected $templating; + + public function __construct(TwigEngine $templating) + { + $this->templating = $templating; + } + + /** + * + * @param ThirdParty $entity + * @param array $options + * @return string + */ + public function renderBox($entity, array $options): string + { + $params = \array_merge( + [ 'with_valid_from' => true ], + $options + ); + + return + $this->getDefaultOpeningBox('_3party'). + $this->templating->render('@ChillThirdParty/ThirdParty/_render.html.twig', [ + 'contact' => $entity, + 'options' => $params + ]). + $this->getDefaultClosingBox(); + + } + + /** + * + * @param ThirdParty $entity + * @param array $options + * @return string + */ + public function renderString($entity, array $options): string + { + return $entity->getName(); + } + + public function supports($entity, array $options): bool + { + return $entity instanceof ThirdParty; + } +} From d70a64dbca0812ac4bc38f1efdd32e70f5820df3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 3 Apr 2020 11:57:33 +0200 Subject: [PATCH 08/20] remove dump messages --- CHANGELOG.md | 2 ++ Controller/ThirdPartyController.php | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 38c4e1703..5653415df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,3 +4,5 @@ branch master * initial commit * add a render template for entity ThirdParty ; +* remove dump messages ; + diff --git a/Controller/ThirdPartyController.php b/Controller/ThirdPartyController.php index 7e98b93f5..e5e41b42f 100644 --- a/Controller/ThirdPartyController.php +++ b/Controller/ThirdPartyController.php @@ -77,7 +77,6 @@ class ThirdPartyController extends Controller $pagination->getCurrentPage()->getFirstItemNumber(), $pagination->getItemsPerPage() ); - dump($pagination); return $this->render('ChillThirdPartyBundle:ThirdParty:index.html.twig', array( 'third_parties' => $thirdParties, From ae26f72057588ba8f7ac761e61eb68ea9d07b7f7 Mon Sep 17 00:00:00 2001 From: Tchama Date: Wed, 22 Jul 2020 10:17:18 +0200 Subject: [PATCH 09/20] fix sf4 deprecated: exclude entities from autowired services --- Resources/config/services.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Resources/config/services.yml b/Resources/config/services.yml index c1c8fa77d..044500dbd 100644 --- a/Resources/config/services.yml +++ b/Resources/config/services.yml @@ -1,3 +1,8 @@ +services: + Chill\ThirdPartyBundle\: + resource: '../..' + exclude: '../../{Entity,Resources/migrations}' + imports: - { resource: './services/controller.yml' } - { resource: './services/form.yml' } From 4dc2aefb5b87eb76d8cacdcd71a5a12e644b7b52 Mon Sep 17 00:00:00 2001 From: Tchama Date: Thu, 23 Jul 2020 15:21:14 +0200 Subject: [PATCH 10/20] fix sf4 deprecated: remove sensio_framework messages --- Controller/ThirdPartyController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Controller/ThirdPartyController.php b/Controller/ThirdPartyController.php index e5e41b42f..59a56af28 100644 --- a/Controller/ThirdPartyController.php +++ b/Controller/ThirdPartyController.php @@ -3,7 +3,7 @@ namespace Chill\ThirdPartyBundle\Controller; use Symfony\Bundle\FrameworkBundle\Controller\Controller; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; +use Symfony\Component\Routing\Annotation\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; use Symfony\Component\HttpFoundation\Request; use Chill\ThirdPartyBundle\Entity\ThirdParty; From 8933d7c61d4c69b56cc7597970abd47f75c0a008 Mon Sep 17 00:00:00 2001 From: Tchama Date: Fri, 24 Jul 2020 18:17:55 +0200 Subject: [PATCH 11/20] sf4 deprecated, adding annotations in Entity --- Entity/ThirdParty.php | 53 +++++++++++++++++++++++++++++++------------ 1 file changed, 39 insertions(+), 14 deletions(-) diff --git a/Entity/ThirdParty.php b/Entity/ThirdParty.php index 2d01ff442..62d12694b 100644 --- a/Entity/ThirdParty.php +++ b/Entity/ThirdParty.php @@ -24,6 +24,7 @@ namespace Chill\ThirdPartyBundle\Entity; use Doctrine\ORM\Mapping as ORM; use Doctrine\Common\Collections\Collection; +use Doctrine\Common\Collections\ArrayCollection; use Chill\MainBundle\Entity\Center; use Symfony\Component\Validator\Constraints as Assert; use Chill\MainBundle\Entity\Address; @@ -92,14 +93,12 @@ class ThirdParty private $type; /** - * * @var boolean * @ORM\Column(name="active", type="boolean", options={"defaut": true}) */ private $active = true; /** - * * @var Collection instances of Center * @ORM\ManyToMany(targetEntity="\Chill\MainBundle\Entity\Center") * @ORM\JoinTable(name="chill_3party.party_center") @@ -108,17 +107,18 @@ class ThirdParty private $centers; /** - * * @var Address|null * @ORM\ManyToOne(targetEntity="\Chill\MainBundle\Entity\Address", * cascade={"persist", "remove"}) - * */ private $address; + /** + * ThirdParty constructor. + */ public function __construct() { - $this->centers = new \Doctrine\Common\Collections\ArrayCollection(); + $this->centers = new ArrayCollection(); } /** @@ -135,7 +135,6 @@ class ThirdParty * Set name. * * @param string $name - * * @return ThirdParty */ public function setName($name) @@ -159,7 +158,6 @@ class ThirdParty * Set telephone. * * @param string|null $telephone - * * @return ThirdParty */ public function setTelephone($telephone = null) @@ -183,7 +181,6 @@ class ThirdParty * Set email. * * @param string|null $email - * * @return ThirdParty */ public function setEmail($email = null) @@ -207,7 +204,6 @@ class ThirdParty * Set comment. * * @param string|null $comment - * * @return ThirdParty */ public function setComment($comment = null) @@ -231,7 +227,6 @@ class ThirdParty * Set type. * * @param array|null $type - * * @return ThirdParty */ public function setType(array $type = null) @@ -252,22 +247,35 @@ class ThirdParty return $this->type; } + /** + * @return bool + */ public function getActive(): bool { return $this->active; } - + + /** + * @return Collection + */ public function getCenters(): Collection { return $this->centers; } - + + /** + * @param bool $active + * @return $this + */ public function setActive(bool $active) { $this->active = $active; return $this; } + /** + * @param Center $center + */ public function addCenter(Center $center) { if (FALSE === $this->centers->contains($center)) { @@ -275,13 +283,20 @@ class ThirdParty } } + /** + * @param Center $center + */ public function removeCenter(Center $center) { if ($this->centers->contains($center)) { $this->centers->removeElement($center); } } - + + /** + * @param Collection $centers + * @return $this + */ public function setCenters(Collection $centers) { foreach ($centers as $center) { @@ -297,11 +312,18 @@ class ThirdParty return $this; } + /** + * @return Address|null + */ public function getAddress(): ?Address { return $this->address; } - + + /** + * @param Address $address + * @return $this + */ public function setAddress(Address $address) { $this->address = $address; @@ -309,6 +331,9 @@ class ThirdParty return $this; } + /** + * @return string + */ public function __toString() { return $this->getName(); From a2c12b41a91997d152f4b76f812380537a7fc43b Mon Sep 17 00:00:00 2001 From: Tchama Date: Tue, 28 Jul 2020 16:44:36 +0200 Subject: [PATCH 12/20] upgrade to symfony4, reset all requires into modules --- composer.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/composer.json b/composer.json index 476776123..d54112504 100644 --- a/composer.json +++ b/composer.json @@ -19,12 +19,8 @@ } ], "require": { - "chill-project/main": "~1.5" }, "require-dev": { - "symfony/phpunit-bridge": "~3", - "fzaninotto/faker": "~1", - "phpunit/phpunit": "~5.6" }, "scripts": { "post-install-cmd": [ From 2fc3bb9c2552b89f6dbb0cba8769a295f6d161c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 31 Jul 2020 15:52:06 +0200 Subject: [PATCH 13/20] adapt migrations files to flex --- .../migrations => migrations}/Version20190307111314.php | 4 ++-- .../migrations => migrations}/Version20190307131650.php | 4 ++-- .../migrations => migrations}/Version20190418090842.php | 4 ++-- .../migrations => migrations}/Version20190429171109.php | 4 ++-- .../migrations => migrations}/Version20190502144206.php | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) rename {Resources/migrations => migrations}/Version20190307111314.php (93%) rename {Resources/migrations => migrations}/Version20190307131650.php (91%) rename {Resources/migrations => migrations}/Version20190418090842.php (94%) rename {Resources/migrations => migrations}/Version20190429171109.php (86%) rename {Resources/migrations => migrations}/Version20190502144206.php (92%) diff --git a/Resources/migrations/Version20190307111314.php b/migrations/Version20190307111314.php similarity index 93% rename from Resources/migrations/Version20190307111314.php rename to migrations/Version20190307111314.php index afcf0e8c2..82b2fc8f4 100644 --- a/Resources/migrations/Version20190307111314.php +++ b/migrations/Version20190307111314.php @@ -12,7 +12,7 @@ use Doctrine\Migrations\AbstractMigration; */ final class Version20190307111314 extends AbstractMigration { - public function up(Schema $schema) : void + public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.'); @@ -23,7 +23,7 @@ final class Version20190307111314 extends AbstractMigration } - public function down(Schema $schema) : void + public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.'); diff --git a/Resources/migrations/Version20190307131650.php b/migrations/Version20190307131650.php similarity index 91% rename from Resources/migrations/Version20190307131650.php rename to migrations/Version20190307131650.php index 178035944..b09ad28bb 100644 --- a/Resources/migrations/Version20190307131650.php +++ b/migrations/Version20190307131650.php @@ -10,7 +10,7 @@ use Doctrine\Migrations\AbstractMigration; */ final class Version20190307131650 extends AbstractMigration { - public function up(Schema $schema) : void + public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs $this->addSql("CREATE SCHEMA chill_3party"); @@ -20,7 +20,7 @@ final class Version20190307131650 extends AbstractMigration $this->addSql("ALTER SEQUENCE chill_3party.chill_third_party_id_seq RENAME TO third_party_id_seq"); } - public function down(Schema $schema) : void + public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs $this->throwIrreversibleMigrationException("The down version of this migration is " diff --git a/Resources/migrations/Version20190418090842.php b/migrations/Version20190418090842.php similarity index 94% rename from Resources/migrations/Version20190418090842.php rename to migrations/Version20190418090842.php index 42d463653..c4726d0cd 100644 --- a/Resources/migrations/Version20190418090842.php +++ b/migrations/Version20190418090842.php @@ -10,7 +10,7 @@ use Doctrine\Migrations\AbstractMigration; */ final class Version20190418090842 extends AbstractMigration { - public function up(Schema $schema) : void + public function up(Schema $schema): void { $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.'); @@ -22,7 +22,7 @@ final class Version20190418090842 extends AbstractMigration $this->addSql('ALTER TABLE chill_3party.third_party ADD active BOOLEAN NOT NULL'); } - public function down(Schema $schema) : void + public function down(Schema $schema): void { $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.'); diff --git a/Resources/migrations/Version20190429171109.php b/migrations/Version20190429171109.php similarity index 86% rename from Resources/migrations/Version20190429171109.php rename to migrations/Version20190429171109.php index 6eb06bf33..0a4c82d29 100644 --- a/Resources/migrations/Version20190429171109.php +++ b/migrations/Version20190429171109.php @@ -10,7 +10,7 @@ use Doctrine\Migrations\AbstractMigration; */ final class Version20190429171109 extends AbstractMigration { - public function up(Schema $schema) : void + public function up(Schema $schema): void { $this->addSql("ALTER TABLE chill_3party.third_party RENAME COLUMN type " . "TO types"); @@ -19,7 +19,7 @@ final class Version20190429171109 extends AbstractMigration } - public function down(Schema $schema) : void + public function down(Schema $schema): void { $this->throwIrreversibleMigrationException("not implemented"); } diff --git a/Resources/migrations/Version20190502144206.php b/migrations/Version20190502144206.php similarity index 92% rename from Resources/migrations/Version20190502144206.php rename to migrations/Version20190502144206.php index 75e024a9c..a5149f2a2 100644 --- a/Resources/migrations/Version20190502144206.php +++ b/migrations/Version20190502144206.php @@ -10,7 +10,7 @@ use Doctrine\Migrations\AbstractMigration; */ final class Version20190502144206 extends AbstractMigration { - public function up(Schema $schema) : void + public function up(Schema $schema): void { $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.'); @@ -21,7 +21,7 @@ final class Version20190502144206 extends AbstractMigration } - public function down(Schema $schema) : void + public function down(Schema $schema): void { $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.'); From eb506475fa9c4327788b833df83271ec1dba0f54 Mon Sep 17 00:00:00 2001 From: Tchama Date: Mon, 3 Aug 2020 11:10:39 +0200 Subject: [PATCH 14/20] install twig intl-extra, replace localizeddate filter by format_date --- Resources/views/ThirdParty/_render.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/views/ThirdParty/_render.html.twig b/Resources/views/ThirdParty/_render.html.twig index e05fd2031..c73b16a59 100644 --- a/Resources/views/ThirdParty/_render.html.twig +++ b/Resources/views/ThirdParty/_render.html.twig @@ -28,7 +28,7 @@ {% endif %} {%- if options['with_valid_from'] == true -%} - {{ 'Since %date%'|trans( { '%date%' : contact.address.validFrom|localizeddate('long', 'none') } ) }} + {{ 'Since %date%'|trans( { '%date%' : contact.address.validFrom|format_date('long', 'none') } ) }} {%- endif -%} {% endif %} From dbd8023885d92da994719a54c035997599c425ca Mon Sep 17 00:00:00 2001 From: Tchama Date: Tue, 4 Aug 2020 13:55:59 +0200 Subject: [PATCH 15/20] add thirdparty bundle, fix errors, set new path for all config yaml files --- DependencyInjection/ChillThirdPartyExtension.php | 13 ++++++++++--- DependencyInjection/Configuration.php | 4 ++-- Resources/config/services.yml | 13 ------------- Resources/config/routing.yml => config/routes.yaml | 0 config/services.yaml | 1 + .../services/3partytype.yaml | 0 .../services/controller.yaml | 0 .../services/form.yml => config/services/form.yaml | 0 .../services/menu.yml => config/services/menu.yaml | 0 .../search.yml => config/services/search.yaml | 0 .../security.yml => config/services/security.yaml | 0 .../services/templating.yaml | 0 12 files changed, 13 insertions(+), 18 deletions(-) delete mode 100644 Resources/config/services.yml rename Resources/config/routing.yml => config/routes.yaml (100%) create mode 100644 config/services.yaml rename Resources/config/services/3partytype.yml => config/services/3partytype.yaml (100%) rename Resources/config/services/controller.yml => config/services/controller.yaml (100%) rename Resources/config/services/form.yml => config/services/form.yaml (100%) rename Resources/config/services/menu.yml => config/services/menu.yaml (100%) rename Resources/config/services/search.yml => config/services/search.yaml (100%) rename Resources/config/services/security.yml => config/services/security.yaml (100%) rename Resources/config/services/templating.yml => config/services/templating.yaml (100%) diff --git a/DependencyInjection/ChillThirdPartyExtension.php b/DependencyInjection/ChillThirdPartyExtension.php index 79eb7c007..28e3c19df 100644 --- a/DependencyInjection/ChillThirdPartyExtension.php +++ b/DependencyInjection/ChillThirdPartyExtension.php @@ -24,8 +24,15 @@ class ChillThirdPartyExtension extends Extension implements PrependExtensionInte $configuration = new Configuration(); $config = $this->processConfiguration($configuration, $configs); - $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); - $loader->load('services.yml'); + $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config')); + $loader->load('services.yaml'); + $loader->load('services/controller.yaml'); + $loader->load('services/form.yaml'); + $loader->load('services/security.yaml'); + $loader->load('services/3partytype.yaml'); + $loader->load('services/search.yaml'); + $loader->load('services/templating.yaml'); + $loader->load('services/menu.yaml'); } public function prepend(ContainerBuilder $container) @@ -40,7 +47,7 @@ class ChillThirdPartyExtension extends Extension implements PrependExtensionInte $container->prependExtensionConfig('chill_main', array( 'routing' => array( 'resources' => array( - '@ChillThirdPartyBundle/Resources/config/routing.yml' + '@ChillThirdPartyBundle/config/routes.yaml' ) ) )); diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index 99c6c46c4..ad5aac291 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -17,8 +17,8 @@ class Configuration implements ConfigurationInterface */ public function getConfigTreeBuilder() { - $treeBuilder = new TreeBuilder(); - $rootNode = $treeBuilder->root('chill_third_party'); + $treeBuilder = new TreeBuilder('chill_third_party'); + $rootNode = $treeBuilder->getRootNode('chill_third_party'); // Here you should define the parameters that are allowed to // configure your bundle. See the documentation linked above for diff --git a/Resources/config/services.yml b/Resources/config/services.yml deleted file mode 100644 index 044500dbd..000000000 --- a/Resources/config/services.yml +++ /dev/null @@ -1,13 +0,0 @@ -services: - Chill\ThirdPartyBundle\: - resource: '../..' - exclude: '../../{Entity,Resources/migrations}' - -imports: - - { resource: './services/controller.yml' } - - { resource: './services/form.yml' } - - { resource: './services/security.yml' } - - { resource: './services/3partytype.yml' } - - { resource: './services/search.yml' } - - { resource: './services/templating.yml' } - - { resource: './services/menu.yml' } diff --git a/Resources/config/routing.yml b/config/routes.yaml similarity index 100% rename from Resources/config/routing.yml rename to config/routes.yaml diff --git a/config/services.yaml b/config/services.yaml new file mode 100644 index 000000000..0baad4766 --- /dev/null +++ b/config/services.yaml @@ -0,0 +1 @@ +services: diff --git a/Resources/config/services/3partytype.yml b/config/services/3partytype.yaml similarity index 100% rename from Resources/config/services/3partytype.yml rename to config/services/3partytype.yaml diff --git a/Resources/config/services/controller.yml b/config/services/controller.yaml similarity index 100% rename from Resources/config/services/controller.yml rename to config/services/controller.yaml diff --git a/Resources/config/services/form.yml b/config/services/form.yaml similarity index 100% rename from Resources/config/services/form.yml rename to config/services/form.yaml diff --git a/Resources/config/services/menu.yml b/config/services/menu.yaml similarity index 100% rename from Resources/config/services/menu.yml rename to config/services/menu.yaml diff --git a/Resources/config/services/search.yml b/config/services/search.yaml similarity index 100% rename from Resources/config/services/search.yml rename to config/services/search.yaml diff --git a/Resources/config/services/security.yml b/config/services/security.yaml similarity index 100% rename from Resources/config/services/security.yml rename to config/services/security.yaml diff --git a/Resources/config/services/templating.yml b/config/services/templating.yaml similarity index 100% rename from Resources/config/services/templating.yml rename to config/services/templating.yaml From f5ca681dbce833bfec0ab2eb06fce252e346df88 Mon Sep 17 00:00:00 2001 From: Tchama Date: Tue, 4 Aug 2020 16:28:07 +0200 Subject: [PATCH 16/20] move files from Resources/translations/ to translations/ --- {Resources/translations => translations}/messages.fr.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {Resources/translations => translations}/messages.fr.yml (100%) diff --git a/Resources/translations/messages.fr.yml b/translations/messages.fr.yml similarity index 100% rename from Resources/translations/messages.fr.yml rename to translations/messages.fr.yml From aa121d6dae7988271340374fe4159f7d71750c8a Mon Sep 17 00:00:00 2001 From: Tchama Date: Thu, 10 Sep 2020 16:41:15 +0200 Subject: [PATCH 17/20] twig filter format_date need only one argument --- Resources/views/ThirdParty/_render.html.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/views/ThirdParty/_render.html.twig b/Resources/views/ThirdParty/_render.html.twig index c73b16a59..9ed68bfb6 100644 --- a/Resources/views/ThirdParty/_render.html.twig +++ b/Resources/views/ThirdParty/_render.html.twig @@ -28,14 +28,14 @@ {% endif %} {%- if options['with_valid_from'] == true -%} - {{ 'Since %date%'|trans( { '%date%' : contact.address.validFrom|format_date('long', 'none') } ) }} + {{ 'Since %date%'|trans( { '%date%' : contact.address.validFrom|format_date('long') } ) }} {%- endif -%} {% endif %} {% if contact.email or contact.telephone is not empty %}
    {{ contact.telephone|chill_format_phonenumber }} From 37f4adc2fc342fb90144392bdb188a847483d22e Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Tue, 26 Jan 2021 15:21:21 +0100 Subject: [PATCH 18/20] translating all roles in admin interface --- translations/messages.fr.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/translations/messages.fr.yml b/translations/messages.fr.yml index c66f3ee48..5ca560f88 100644 --- a/translations/messages.fr.yml +++ b/translations/messages.fr.yml @@ -23,4 +23,9 @@ Inactive, not shown to users: Inactif, invisible par les utilisateurs The party is visible in those centers: Le tiers est visible dans ces centres -No third parties: Aucun tiers \ No newline at end of file +No third parties: Aucun tiers + +# ROLES +CHILL_3PARTY_3PARTY_CREATE: Ajouter un Tiers +CHILL_3PARTY_3PARTY_SHOW: Voir un Tiers +CHILL_3PARTY_3PARTY_UPDATE: Modifier un Tiers \ No newline at end of file From 49c8cc5cdb563f65b0a5af10ef7f035562f6e207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 2 Mar 2021 17:15:56 +0100 Subject: [PATCH 19/20] change migration namespace --- migrations/Version20190307111314.php | 2 +- migrations/Version20190307131650.php | 2 +- migrations/Version20190418090842.php | 2 +- migrations/Version20190429171109.php | 2 +- migrations/Version20190502144206.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/migrations/Version20190307111314.php b/migrations/Version20190307111314.php index 82b2fc8f4..0b7ab562f 100644 --- a/migrations/Version20190307111314.php +++ b/migrations/Version20190307111314.php @@ -1,6 +1,6 @@ Date: Thu, 18 Mar 2021 12:46:43 +0100 Subject: [PATCH 20/20] Prepare for moving into monorepo --- .gitignore => src/Bundle/ChillThirdParty/.gitignore | 0 .gitlab-ci.yml => src/Bundle/ChillThirdParty/.gitlab-ci.yml | 0 CHANGELOG.md => src/Bundle/ChillThirdParty/CHANGELOG.md | 0 .../Bundle/ChillThirdParty/ChillThirdPartyBundle.php | 0 .../Bundle/ChillThirdParty/Controller}/ThirdPartyController.php | 0 .../DependencyInjection}/ChillThirdPartyExtension.php | 0 .../CompilerPass/ThirdPartyTypeCompilerPass.php | 0 .../Bundle/ChillThirdParty/DependencyInjection}/Configuration.php | 0 {Entity => src/Bundle/ChillThirdParty/Entity}/ThirdParty.php | 0 .../ChillThirdParty/Form}/ChoiceLoader/ThirdPartyChoiceLoader.php | 0 {Form => src/Bundle/ChillThirdParty/Form}/ThirdPartyType.php | 0 .../Bundle/ChillThirdParty/Form}/Type/PickThirdPartyType.php | 0 LICENSE => src/Bundle/ChillThirdParty/LICENSE | 0 {Menu => src/Bundle/ChillThirdParty/Menu}/MenuBuilder.php | 0 README.md => src/Bundle/ChillThirdParty/README.md | 0 .../Bundle/ChillThirdParty/Repository}/ThirdPartyRepository.php | 0 .../Bundle/ChillThirdParty/Resources}/public/index.js | 0 .../Bundle/ChillThirdParty/Resources}/public/sass/thirdparty.scss | 0 .../ChillThirdParty/Resources}/views/Contact/macro.html.twig | 0 .../ChillThirdParty/Resources}/views/ThirdParty/_render.html.twig | 0 .../ChillThirdParty/Resources}/views/ThirdParty/index.html.twig | 0 .../ChillThirdParty/Resources}/views/ThirdParty/new.html.twig | 0 .../ChillThirdParty/Resources}/views/ThirdParty/show.html.twig | 0 .../ChillThirdParty/Resources}/views/ThirdParty/update.html.twig | 0 .../Bundle/ChillThirdParty/Search}/ThirdPartySearch.php | 0 .../Bundle/ChillThirdParty/Security}/Voter/ThirdPartyVoter.php | 0 .../ChillThirdParty/Templating}/Entity/ThirdPartyRender.php | 0 .../Tests}/Controller/ThirdPartyControllerTest.php | 0 .../ChillThirdParty/ThirdPartyType}/ThirdPartyTypeManager.php | 0 .../ThirdPartyType}/ThirdPartyTypeProviderInterface.php | 0 .../Bundle/ChillThirdParty/chill.webpack.config.js | 0 composer.json => src/Bundle/ChillThirdParty/composer.json | 0 {config => src/Bundle/ChillThirdParty/config}/routes.yaml | 0 {config => src/Bundle/ChillThirdParty/config}/services.yaml | 0 .../Bundle/ChillThirdParty/config}/services/3partytype.yaml | 0 .../Bundle/ChillThirdParty/config}/services/controller.yaml | 0 {config => src/Bundle/ChillThirdParty/config}/services/form.yaml | 0 {config => src/Bundle/ChillThirdParty/config}/services/menu.yaml | 0 .../Bundle/ChillThirdParty/config}/services/search.yaml | 0 .../Bundle/ChillThirdParty/config}/services/security.yaml | 0 .../Bundle/ChillThirdParty/config}/services/templating.yaml | 0 .../Bundle/ChillThirdParty/migrations}/Version20190307111314.php | 0 .../Bundle/ChillThirdParty/migrations}/Version20190307131650.php | 0 .../Bundle/ChillThirdParty/migrations}/Version20190418090842.php | 0 .../Bundle/ChillThirdParty/migrations}/Version20190429171109.php | 0 .../Bundle/ChillThirdParty/migrations}/Version20190502144206.php | 0 .../Bundle/ChillThirdParty/translations}/messages.fr.yml | 0 47 files changed, 0 insertions(+), 0 deletions(-) rename .gitignore => src/Bundle/ChillThirdParty/.gitignore (100%) rename .gitlab-ci.yml => src/Bundle/ChillThirdParty/.gitlab-ci.yml (100%) rename CHANGELOG.md => src/Bundle/ChillThirdParty/CHANGELOG.md (100%) rename ChillThirdPartyBundle.php => src/Bundle/ChillThirdParty/ChillThirdPartyBundle.php (100%) rename {Controller => src/Bundle/ChillThirdParty/Controller}/ThirdPartyController.php (100%) rename {DependencyInjection => src/Bundle/ChillThirdParty/DependencyInjection}/ChillThirdPartyExtension.php (100%) rename {DependencyInjection => src/Bundle/ChillThirdParty/DependencyInjection}/CompilerPass/ThirdPartyTypeCompilerPass.php (100%) rename {DependencyInjection => src/Bundle/ChillThirdParty/DependencyInjection}/Configuration.php (100%) rename {Entity => src/Bundle/ChillThirdParty/Entity}/ThirdParty.php (100%) rename {Form => src/Bundle/ChillThirdParty/Form}/ChoiceLoader/ThirdPartyChoiceLoader.php (100%) rename {Form => src/Bundle/ChillThirdParty/Form}/ThirdPartyType.php (100%) rename {Form => src/Bundle/ChillThirdParty/Form}/Type/PickThirdPartyType.php (100%) rename LICENSE => src/Bundle/ChillThirdParty/LICENSE (100%) rename {Menu => src/Bundle/ChillThirdParty/Menu}/MenuBuilder.php (100%) rename README.md => src/Bundle/ChillThirdParty/README.md (100%) rename {Repository => src/Bundle/ChillThirdParty/Repository}/ThirdPartyRepository.php (100%) rename {Resources => src/Bundle/ChillThirdParty/Resources}/public/index.js (100%) rename {Resources => src/Bundle/ChillThirdParty/Resources}/public/sass/thirdparty.scss (100%) rename {Resources => src/Bundle/ChillThirdParty/Resources}/views/Contact/macro.html.twig (100%) rename {Resources => src/Bundle/ChillThirdParty/Resources}/views/ThirdParty/_render.html.twig (100%) rename {Resources => src/Bundle/ChillThirdParty/Resources}/views/ThirdParty/index.html.twig (100%) rename {Resources => src/Bundle/ChillThirdParty/Resources}/views/ThirdParty/new.html.twig (100%) rename {Resources => src/Bundle/ChillThirdParty/Resources}/views/ThirdParty/show.html.twig (100%) rename {Resources => src/Bundle/ChillThirdParty/Resources}/views/ThirdParty/update.html.twig (100%) rename {Search => src/Bundle/ChillThirdParty/Search}/ThirdPartySearch.php (100%) rename {Security => src/Bundle/ChillThirdParty/Security}/Voter/ThirdPartyVoter.php (100%) rename {Templating => src/Bundle/ChillThirdParty/Templating}/Entity/ThirdPartyRender.php (100%) rename {Tests => src/Bundle/ChillThirdParty/Tests}/Controller/ThirdPartyControllerTest.php (100%) rename {ThirdPartyType => src/Bundle/ChillThirdParty/ThirdPartyType}/ThirdPartyTypeManager.php (100%) rename {ThirdPartyType => src/Bundle/ChillThirdParty/ThirdPartyType}/ThirdPartyTypeProviderInterface.php (100%) rename chill.webpack.config.js => src/Bundle/ChillThirdParty/chill.webpack.config.js (100%) rename composer.json => src/Bundle/ChillThirdParty/composer.json (100%) rename {config => src/Bundle/ChillThirdParty/config}/routes.yaml (100%) rename {config => src/Bundle/ChillThirdParty/config}/services.yaml (100%) rename {config => src/Bundle/ChillThirdParty/config}/services/3partytype.yaml (100%) rename {config => src/Bundle/ChillThirdParty/config}/services/controller.yaml (100%) rename {config => src/Bundle/ChillThirdParty/config}/services/form.yaml (100%) rename {config => src/Bundle/ChillThirdParty/config}/services/menu.yaml (100%) rename {config => src/Bundle/ChillThirdParty/config}/services/search.yaml (100%) rename {config => src/Bundle/ChillThirdParty/config}/services/security.yaml (100%) rename {config => src/Bundle/ChillThirdParty/config}/services/templating.yaml (100%) rename {migrations => src/Bundle/ChillThirdParty/migrations}/Version20190307111314.php (100%) rename {migrations => src/Bundle/ChillThirdParty/migrations}/Version20190307131650.php (100%) rename {migrations => src/Bundle/ChillThirdParty/migrations}/Version20190418090842.php (100%) rename {migrations => src/Bundle/ChillThirdParty/migrations}/Version20190429171109.php (100%) rename {migrations => src/Bundle/ChillThirdParty/migrations}/Version20190502144206.php (100%) rename {translations => src/Bundle/ChillThirdParty/translations}/messages.fr.yml (100%) diff --git a/.gitignore b/src/Bundle/ChillThirdParty/.gitignore similarity index 100% rename from .gitignore rename to src/Bundle/ChillThirdParty/.gitignore diff --git a/.gitlab-ci.yml b/src/Bundle/ChillThirdParty/.gitlab-ci.yml similarity index 100% rename from .gitlab-ci.yml rename to src/Bundle/ChillThirdParty/.gitlab-ci.yml diff --git a/CHANGELOG.md b/src/Bundle/ChillThirdParty/CHANGELOG.md similarity index 100% rename from CHANGELOG.md rename to src/Bundle/ChillThirdParty/CHANGELOG.md diff --git a/ChillThirdPartyBundle.php b/src/Bundle/ChillThirdParty/ChillThirdPartyBundle.php similarity index 100% rename from ChillThirdPartyBundle.php rename to src/Bundle/ChillThirdParty/ChillThirdPartyBundle.php diff --git a/Controller/ThirdPartyController.php b/src/Bundle/ChillThirdParty/Controller/ThirdPartyController.php similarity index 100% rename from Controller/ThirdPartyController.php rename to src/Bundle/ChillThirdParty/Controller/ThirdPartyController.php diff --git a/DependencyInjection/ChillThirdPartyExtension.php b/src/Bundle/ChillThirdParty/DependencyInjection/ChillThirdPartyExtension.php similarity index 100% rename from DependencyInjection/ChillThirdPartyExtension.php rename to src/Bundle/ChillThirdParty/DependencyInjection/ChillThirdPartyExtension.php diff --git a/DependencyInjection/CompilerPass/ThirdPartyTypeCompilerPass.php b/src/Bundle/ChillThirdParty/DependencyInjection/CompilerPass/ThirdPartyTypeCompilerPass.php similarity index 100% rename from DependencyInjection/CompilerPass/ThirdPartyTypeCompilerPass.php rename to src/Bundle/ChillThirdParty/DependencyInjection/CompilerPass/ThirdPartyTypeCompilerPass.php diff --git a/DependencyInjection/Configuration.php b/src/Bundle/ChillThirdParty/DependencyInjection/Configuration.php similarity index 100% rename from DependencyInjection/Configuration.php rename to src/Bundle/ChillThirdParty/DependencyInjection/Configuration.php diff --git a/Entity/ThirdParty.php b/src/Bundle/ChillThirdParty/Entity/ThirdParty.php similarity index 100% rename from Entity/ThirdParty.php rename to src/Bundle/ChillThirdParty/Entity/ThirdParty.php diff --git a/Form/ChoiceLoader/ThirdPartyChoiceLoader.php b/src/Bundle/ChillThirdParty/Form/ChoiceLoader/ThirdPartyChoiceLoader.php similarity index 100% rename from Form/ChoiceLoader/ThirdPartyChoiceLoader.php rename to src/Bundle/ChillThirdParty/Form/ChoiceLoader/ThirdPartyChoiceLoader.php diff --git a/Form/ThirdPartyType.php b/src/Bundle/ChillThirdParty/Form/ThirdPartyType.php similarity index 100% rename from Form/ThirdPartyType.php rename to src/Bundle/ChillThirdParty/Form/ThirdPartyType.php diff --git a/Form/Type/PickThirdPartyType.php b/src/Bundle/ChillThirdParty/Form/Type/PickThirdPartyType.php similarity index 100% rename from Form/Type/PickThirdPartyType.php rename to src/Bundle/ChillThirdParty/Form/Type/PickThirdPartyType.php diff --git a/LICENSE b/src/Bundle/ChillThirdParty/LICENSE similarity index 100% rename from LICENSE rename to src/Bundle/ChillThirdParty/LICENSE diff --git a/Menu/MenuBuilder.php b/src/Bundle/ChillThirdParty/Menu/MenuBuilder.php similarity index 100% rename from Menu/MenuBuilder.php rename to src/Bundle/ChillThirdParty/Menu/MenuBuilder.php diff --git a/README.md b/src/Bundle/ChillThirdParty/README.md similarity index 100% rename from README.md rename to src/Bundle/ChillThirdParty/README.md diff --git a/Repository/ThirdPartyRepository.php b/src/Bundle/ChillThirdParty/Repository/ThirdPartyRepository.php similarity index 100% rename from Repository/ThirdPartyRepository.php rename to src/Bundle/ChillThirdParty/Repository/ThirdPartyRepository.php diff --git a/Resources/public/index.js b/src/Bundle/ChillThirdParty/Resources/public/index.js similarity index 100% rename from Resources/public/index.js rename to src/Bundle/ChillThirdParty/Resources/public/index.js diff --git a/Resources/public/sass/thirdparty.scss b/src/Bundle/ChillThirdParty/Resources/public/sass/thirdparty.scss similarity index 100% rename from Resources/public/sass/thirdparty.scss rename to src/Bundle/ChillThirdParty/Resources/public/sass/thirdparty.scss diff --git a/Resources/views/Contact/macro.html.twig b/src/Bundle/ChillThirdParty/Resources/views/Contact/macro.html.twig similarity index 100% rename from Resources/views/Contact/macro.html.twig rename to src/Bundle/ChillThirdParty/Resources/views/Contact/macro.html.twig diff --git a/Resources/views/ThirdParty/_render.html.twig b/src/Bundle/ChillThirdParty/Resources/views/ThirdParty/_render.html.twig similarity index 100% rename from Resources/views/ThirdParty/_render.html.twig rename to src/Bundle/ChillThirdParty/Resources/views/ThirdParty/_render.html.twig diff --git a/Resources/views/ThirdParty/index.html.twig b/src/Bundle/ChillThirdParty/Resources/views/ThirdParty/index.html.twig similarity index 100% rename from Resources/views/ThirdParty/index.html.twig rename to src/Bundle/ChillThirdParty/Resources/views/ThirdParty/index.html.twig diff --git a/Resources/views/ThirdParty/new.html.twig b/src/Bundle/ChillThirdParty/Resources/views/ThirdParty/new.html.twig similarity index 100% rename from Resources/views/ThirdParty/new.html.twig rename to src/Bundle/ChillThirdParty/Resources/views/ThirdParty/new.html.twig diff --git a/Resources/views/ThirdParty/show.html.twig b/src/Bundle/ChillThirdParty/Resources/views/ThirdParty/show.html.twig similarity index 100% rename from Resources/views/ThirdParty/show.html.twig rename to src/Bundle/ChillThirdParty/Resources/views/ThirdParty/show.html.twig diff --git a/Resources/views/ThirdParty/update.html.twig b/src/Bundle/ChillThirdParty/Resources/views/ThirdParty/update.html.twig similarity index 100% rename from Resources/views/ThirdParty/update.html.twig rename to src/Bundle/ChillThirdParty/Resources/views/ThirdParty/update.html.twig diff --git a/Search/ThirdPartySearch.php b/src/Bundle/ChillThirdParty/Search/ThirdPartySearch.php similarity index 100% rename from Search/ThirdPartySearch.php rename to src/Bundle/ChillThirdParty/Search/ThirdPartySearch.php diff --git a/Security/Voter/ThirdPartyVoter.php b/src/Bundle/ChillThirdParty/Security/Voter/ThirdPartyVoter.php similarity index 100% rename from Security/Voter/ThirdPartyVoter.php rename to src/Bundle/ChillThirdParty/Security/Voter/ThirdPartyVoter.php diff --git a/Templating/Entity/ThirdPartyRender.php b/src/Bundle/ChillThirdParty/Templating/Entity/ThirdPartyRender.php similarity index 100% rename from Templating/Entity/ThirdPartyRender.php rename to src/Bundle/ChillThirdParty/Templating/Entity/ThirdPartyRender.php diff --git a/Tests/Controller/ThirdPartyControllerTest.php b/src/Bundle/ChillThirdParty/Tests/Controller/ThirdPartyControllerTest.php similarity index 100% rename from Tests/Controller/ThirdPartyControllerTest.php rename to src/Bundle/ChillThirdParty/Tests/Controller/ThirdPartyControllerTest.php diff --git a/ThirdPartyType/ThirdPartyTypeManager.php b/src/Bundle/ChillThirdParty/ThirdPartyType/ThirdPartyTypeManager.php similarity index 100% rename from ThirdPartyType/ThirdPartyTypeManager.php rename to src/Bundle/ChillThirdParty/ThirdPartyType/ThirdPartyTypeManager.php diff --git a/ThirdPartyType/ThirdPartyTypeProviderInterface.php b/src/Bundle/ChillThirdParty/ThirdPartyType/ThirdPartyTypeProviderInterface.php similarity index 100% rename from ThirdPartyType/ThirdPartyTypeProviderInterface.php rename to src/Bundle/ChillThirdParty/ThirdPartyType/ThirdPartyTypeProviderInterface.php diff --git a/chill.webpack.config.js b/src/Bundle/ChillThirdParty/chill.webpack.config.js similarity index 100% rename from chill.webpack.config.js rename to src/Bundle/ChillThirdParty/chill.webpack.config.js diff --git a/composer.json b/src/Bundle/ChillThirdParty/composer.json similarity index 100% rename from composer.json rename to src/Bundle/ChillThirdParty/composer.json diff --git a/config/routes.yaml b/src/Bundle/ChillThirdParty/config/routes.yaml similarity index 100% rename from config/routes.yaml rename to src/Bundle/ChillThirdParty/config/routes.yaml diff --git a/config/services.yaml b/src/Bundle/ChillThirdParty/config/services.yaml similarity index 100% rename from config/services.yaml rename to src/Bundle/ChillThirdParty/config/services.yaml diff --git a/config/services/3partytype.yaml b/src/Bundle/ChillThirdParty/config/services/3partytype.yaml similarity index 100% rename from config/services/3partytype.yaml rename to src/Bundle/ChillThirdParty/config/services/3partytype.yaml diff --git a/config/services/controller.yaml b/src/Bundle/ChillThirdParty/config/services/controller.yaml similarity index 100% rename from config/services/controller.yaml rename to src/Bundle/ChillThirdParty/config/services/controller.yaml diff --git a/config/services/form.yaml b/src/Bundle/ChillThirdParty/config/services/form.yaml similarity index 100% rename from config/services/form.yaml rename to src/Bundle/ChillThirdParty/config/services/form.yaml diff --git a/config/services/menu.yaml b/src/Bundle/ChillThirdParty/config/services/menu.yaml similarity index 100% rename from config/services/menu.yaml rename to src/Bundle/ChillThirdParty/config/services/menu.yaml diff --git a/config/services/search.yaml b/src/Bundle/ChillThirdParty/config/services/search.yaml similarity index 100% rename from config/services/search.yaml rename to src/Bundle/ChillThirdParty/config/services/search.yaml diff --git a/config/services/security.yaml b/src/Bundle/ChillThirdParty/config/services/security.yaml similarity index 100% rename from config/services/security.yaml rename to src/Bundle/ChillThirdParty/config/services/security.yaml diff --git a/config/services/templating.yaml b/src/Bundle/ChillThirdParty/config/services/templating.yaml similarity index 100% rename from config/services/templating.yaml rename to src/Bundle/ChillThirdParty/config/services/templating.yaml diff --git a/migrations/Version20190307111314.php b/src/Bundle/ChillThirdParty/migrations/Version20190307111314.php similarity index 100% rename from migrations/Version20190307111314.php rename to src/Bundle/ChillThirdParty/migrations/Version20190307111314.php diff --git a/migrations/Version20190307131650.php b/src/Bundle/ChillThirdParty/migrations/Version20190307131650.php similarity index 100% rename from migrations/Version20190307131650.php rename to src/Bundle/ChillThirdParty/migrations/Version20190307131650.php diff --git a/migrations/Version20190418090842.php b/src/Bundle/ChillThirdParty/migrations/Version20190418090842.php similarity index 100% rename from migrations/Version20190418090842.php rename to src/Bundle/ChillThirdParty/migrations/Version20190418090842.php diff --git a/migrations/Version20190429171109.php b/src/Bundle/ChillThirdParty/migrations/Version20190429171109.php similarity index 100% rename from migrations/Version20190429171109.php rename to src/Bundle/ChillThirdParty/migrations/Version20190429171109.php diff --git a/migrations/Version20190502144206.php b/src/Bundle/ChillThirdParty/migrations/Version20190502144206.php similarity index 100% rename from migrations/Version20190502144206.php rename to src/Bundle/ChillThirdParty/migrations/Version20190502144206.php diff --git a/translations/messages.fr.yml b/src/Bundle/ChillThirdParty/translations/messages.fr.yml similarity index 100% rename from translations/messages.fr.yml rename to src/Bundle/ChillThirdParty/translations/messages.fr.yml