- | {{ entity.title|localize_translatable_string }} |
+ {{ entity.ordering }} |
+ {{ entity|chill_entity_render_box }} |
{%- if entity.isActive -%}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/new.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/new.html.twig
index d7ac89752..3c8ded234 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/new.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/new.html.twig
@@ -1,4 +1,4 @@
-{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
+{% extends "@ChillAsideActivity/Admin/layout_asideactivity.html.twig" %}
{% block title %}
{% include('@ChillMain/CRUD/_new_title.html.twig') %}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Templating/Entity/CategoryRender.php b/src/Bundle/ChillAsideActivityBundle/src/Templating/Entity/CategoryRender.php
new file mode 100644
index 000000000..902ed7a68
--- /dev/null
+++ b/src/Bundle/ChillAsideActivityBundle/src/Templating/Entity/CategoryRender.php
@@ -0,0 +1,80 @@
+ ' > '
+ ];
+
+ public function __construct(TranslatableStringHelper $translatableStringHelper, EngineInterface $engine)
+ {
+ $this->translatableStringHelper = $translatableStringHelper;
+ $this->engine = $engine;
+ }
+
+ /**
+ * @param AsideActivityCategory $asideActivityCategory
+ */
+ public function renderString($asideActivityCategory, array $options): string
+ {
+ $options = array_merge(self::DEFAULT_ARGS, $options);
+
+ $titles[] = $this->translatableStringHelper->localize($asideActivityCategory->getTitle());
+
+ while ($asideActivityCategory->hasParent()) {
+ $asideActivityCategory = $asideActivityCategory->getParent();
+ $titles[] = $this->translatableStringHelper->localize($asideActivityCategory->getTitle());
+ }
+
+ $titles = array_reverse($titles);
+
+ return implode($options[self::SEPERATOR_KEY], $titles);
+
+ }
+
+ /**
+ * @param AsideActivityCategory $asideActivityCategory
+ */
+ public function supports($asideActivityCategory, array $options): bool
+ {
+ return $asideActivityCategory instanceof AsideActivityCategory;
+ }
+
+ public function buildParents(AsideActivityCategory $asideActivityCategory)
+ {
+ $parents = [];
+
+ while($asideActivityCategory->hasParent()) {
+ $asideActivityCategory = $parents[] = $asideActivityCategory->getParent();
+ }
+
+ return $parents;
+ }
+
+ /**
+ * @param AsideActivityCategory $asideActivityCategory
+ */
+ public function renderBox($asideActivityCategory, array $options): string
+ {
+ $options = array_merge(self::DEFAULT_ARGS, $options);
+ $parents = $this->buildParents($asideActivityCategory);
+
+ return $this->engine->render('@ChillAsideActivity/Entity/asideActivityCategory.html.twig',
+ [
+ 'asideActivityCategory' => $asideActivityCategory,
+ 'parents' => $parents,
+ 'options' => $options
+ ]);
+ }
+}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/config/services.yaml b/src/Bundle/ChillAsideActivityBundle/src/config/services.yaml
index 8ff656fdc..34bb6da33 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/config/services.yaml
+++ b/src/Bundle/ChillAsideActivityBundle/src/config/services.yaml
@@ -1,5 +1,22 @@
services:
- Chill\AsideActivityBundle\DataFixtures\:
- resource: './../DataFixtures'
- autowire: true
- autoconfigure: true
+ Chill\AsideActivityBundle\DataFixtures\:
+ resource: "./../DataFixtures"
+ autowire: true
+ autoconfigure: true
+
+ Chill\AsideActivityBundle\Templating\Entity\:
+ autowire: true
+ autoconfigure: true
+ resource: "../Templating/Entity"
+ tags:
+ - "chill.render_entity"
+
+ Chill\AsideActivityBundle\Repository\:
+ resource: "../Repository"
+ autowire: true
+ autoconfigure: true
+
+ Chill\AsideActivityBundle\Controller\:
+ resource: "../Controller"
+ autowire: true
+ autoconfigure: true
diff --git a/src/Bundle/ChillAsideActivityBundle/src/config/services/menu.yaml b/src/Bundle/ChillAsideActivityBundle/src/config/services/menu.yaml
index 614391a0e..909f82381 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/config/services/menu.yaml
+++ b/src/Bundle/ChillAsideActivityBundle/src/config/services/menu.yaml
@@ -1,5 +1,5 @@
services:
Chill\AsideActivityBundle\Menu\:
- resource: './../../Menu'
+ resource: "./../../Menu"
autowire: true
autoconfigure: true
diff --git a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210706124644.php b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210706124644.php
index 59fa35be4..13bee6404 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210706124644.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210706124644.php
@@ -7,14 +7,11 @@ namespace Chill\Migrations\AsideActivity;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
final class Version20210706124644 extends AbstractMigration
{
public function getDescription(): string
{
- return '';
+ return 'Aside activity category entity created';
}
public function up(Schema $schema): void
diff --git a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210804082249.php b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210804082249.php
index 4135bb4a2..85b99c572 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210804082249.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210804082249.php
@@ -7,14 +7,11 @@ namespace Chill\Migrations\AsideActivity;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
final class Version20210804082249 extends AbstractMigration
{
public function getDescription(): string
{
- return '';
+ return 'Aside activity entity created';
}
public function up(Schema $schema): void
@@ -59,12 +56,12 @@ final class Version20210804082249 extends AbstractMigration
$this->addSql('CREATE INDEX idx_e9fa219165ff1aec ON asideactivity (updatedby_id)');
$this->addSql('CREATE INDEX idx_e9fa21913414710b ON asideactivity (agent_id)');
$this->addSql('COMMENT ON COLUMN asideactivity.updatedat IS \'(DC2Type:datetime_immutable)\'');
- $this->addSql('CREATE TABLE chill_main_address_legacy (id INT DEFAULT NULL, postcode_id INT DEFAULT NULL, street VARCHAR(255) DEFAULT NULL, streetnumber VARCHAR(255) DEFAULT NULL, validfrom DATE DEFAULT NULL, isnoaddress BOOLEAN DEFAULT NULL, customs JSONB DEFAULT NULL, floor VARCHAR(16) DEFAULT NULL, corridor VARCHAR(16) DEFAULT NULL, steps VARCHAR(16) DEFAULT NULL, buildingname VARCHAR(255) DEFAULT NULL, flat VARCHAR(16) DEFAULT NULL, distribution VARCHAR(255) DEFAULT NULL, extra VARCHAR(255) DEFAULT NULL, validto DATE DEFAULT NULL, point VARCHAR(255) DEFAULT NULL, linkedtothirdparty_id INT DEFAULT NULL)');
$this->addSql('ALTER TABLE asideactivity ADD CONSTRAINT fk_e9fa2191c54c8c93 FOREIGN KEY (type_id) REFERENCES asideactivitytype (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
$this->addSql('ALTER TABLE asideactivity ADD CONSTRAINT fk_e9fa21913174800f FOREIGN KEY (createdby_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
$this->addSql('ALTER TABLE asideactivity ADD CONSTRAINT fk_e9fa219165ff1aec FOREIGN KEY (updatedby_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
$this->addSql('ALTER TABLE asideactivity ADD CONSTRAINT fk_e9fa21913414710b FOREIGN KEY (agent_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
$this->addSql('DROP TABLE chill_asideactivity.AsideActivity');
$this->addSql('DROP TABLE chill_asideactivity.AsideActivityCategory');
+ $this->addSql('DROP SCHEMA chill_asideactivity');
}
}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140343.php b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140343.php
index 62b568407..75c7b81b2 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140343.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140343.php
@@ -7,14 +7,11 @@ namespace Chill\Migrations\AsideActivity;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
final class Version20210806140343 extends AbstractMigration
{
public function getDescription(): string
{
- return '';
+ return 'Duration changed to type integer';
}
public function up(Schema $schema): void
diff --git a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140710.php b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140710.php
index 92320e639..5c572e650 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140710.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140710.php
@@ -7,14 +7,11 @@ namespace Chill\Migrations\AsideActivity;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
final class Version20210806140710 extends AbstractMigration
{
public function getDescription(): string
{
- return '';
+ return 'Duration changed back to timestamp';
}
public function up(Schema $schema): void
diff --git a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210810084456.php b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210810084456.php
index 29d6be7f3..2984108c2 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210810084456.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210810084456.php
@@ -7,14 +7,11 @@ namespace Chill\Migrations\AsideActivity;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
final class Version20210810084456 extends AbstractMigration
{
public function getDescription(): string
{
- return '';
+ return 'createdat, updatedat and date given a type timestamp';
}
public function up(Schema $schema): void
diff --git a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210922182907.php b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210922182907.php
new file mode 100644
index 000000000..13ba8749c
--- /dev/null
+++ b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210922182907.php
@@ -0,0 +1,28 @@
+addSql('ALTER TABLE chill_asideactivity.asideactivitycategory ADD parent_id INT DEFAULT NULL');
+ $this->addSql('ALTER TABLE chill_asideactivity.asideactivitycategory ADD CONSTRAINT FK_7BF90DBE727ACA70 FOREIGN KEY (parent_id) REFERENCES chill_asideactivity.AsideActivityCategory (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+ $this->addSql('CREATE INDEX IDX_7BF90DBE727ACA70 ON chill_asideactivity.asideactivitycategory (parent_id)');
+ }
+
+ public function down(Schema $schema): void
+ {
+ $this->addSql('ALTER TABLE chill_asideactivity.AsideActivityCategory DROP parent');
+ }
+}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20211004134012.php b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20211004134012.php
new file mode 100644
index 000000000..42763638e
--- /dev/null
+++ b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20211004134012.php
@@ -0,0 +1,29 @@
+addSql('ALTER TABLE chill_asideactivity.asideactivitycategory ADD ordering DOUBLE PRECISION NOT NULL DEFAULT 0.00');
+ }
+
+ public function down(Schema $schema): void
+ {
+ $this->addSql('ALTER TABLE chill_asideactivity.asideactivitycategory DROP ordering');
+ }
+}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
index fa62befea..c16f6af6a 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
+++ b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
@@ -14,11 +14,8 @@ present: présent
not present: absent
Delete: Supprimer
Update: Mettre à jour
-Update activity: Modifier l'activité
Aside activity data: Données de l'activité annexe
-No reason associated: Aucun sujet
There aren't any aside activities.: Aucune activité annexe enregistrée.
-type_name: type de l'activité
Type: Type
Invisible: Invisible
Optional: Optionnel
@@ -43,14 +40,8 @@ crud:
title_edit: Edition d'une catégorie de type d'activité
#forms
-Activity creation: Nouvelle activité annexe
-Create a new aside activity type: Nouvelle catégorie d'activité annexe
-Create: Créer
+Create a new aside activity type: Nouvelle categorie d'activité annexe
Back to the list: Retour à la liste
-Save activity: Sauver l'activité
-Reset form: Remise à zéro du formulaire
-Choose the agent for whom this activity is created: Choisissez l'utilisateur pour qui l'activité est créée.
-Choose the activity category: Choisissez le type d'activité
Choose the duration: Choisir la durée
Choose a category: Choisir une catégorie
Is active: Actif
@@ -58,12 +49,106 @@ Agent: Utilisateur
date: Date
Duration: Durée
Note: Note
+Choose the agent for whom this activity is created: Choisissez l'agent pour qui l'activité est créée
+Choose the activity category: Choisir la catégorie
+
+#Duration
+minutes: minutes
+hour: heure
+hours: heures
+day: jour
+days: jours
+5 minutes: 5 minutes
+10 minutes: 10 minutes
+15 minutes: 15 minutes
+20 minutes: 20 minutes
+25 minutes: 25 minutes
+30 minutes: 30 minutes
+45 minutes: 45 minutes
+1 hour: 1 heure
+1 hour 15: 1 heure 15
+1 hour 30: 1 heure 30
+1 hour 45: 1 heure 45
+2 hours: 2 heures
+2 hours 30: 2 heure 30
+3 hours: 3 heures
+3 hours 30: 3 heure 30
+4 hours: 4 heures
+4 hours 30: 4 heure 30
+5 hours: 5 heures
+5 hours 30: 5 heure 30
+6 hours: 6 heures
+6 hours 30: 6 heure 30
+7 hours: 7 heures
+7 hours 30: 7 heure 30
+8 hours: 8 heures
+8 hours 30: 8 heure 30
+9 hours: 9 heures
+9 hours 30: 9 heure 30
+10 hours: 10 heures
+1/2 day: 1/2 jour
+1 day: 1 jour
+1 1/2 days: 1 1/2 jours
+2 days: 2 jours
+2 1/2 days: 2 1/2 jours
+3 days: 3 jours
+3 1/2 days: 3 1/2 jours
+4 days: 4 jours
+4 1/2 days: 4 1/2 jours
+5 days: 5 jours
+5 1/2 days: 5 1/2 jours
+6 days: 6 jours
+6 1/2 days: 6 1/2 jours
+7 days: 7 jours
+7 1/2 days: 7 1/2 jours
+8 days: 8 jours
+8 1/2 days: 8 1/2 jours
+9 days: 9 jours
+9 1/2 days: 9 1/2 jours
+10 days: 10 jours
+10 1/2 days: 10 1/2 jours
+11 days: 11 jours
+11 1/2 days: 11 1/2 jours
+12 days: 12 jours
+12 1/2 days: 12 1/2 jours
+13 days: 13 jours
+13 1/2 days: 13 1/2 jours
+14 days: 14 jours
+14 1/2 days: 14 1/2 jours
+15 days: 15 jours
+15 1/2 days: 15 1/2 jours
+16 days: 16 jours
+16 1/2 days: 16 1/2 jours
+17 days: 17 jours
+17 1/2 days: 17 1/2 jours
+18 days: 18 jours
+18 1/2 days: 18 1/2 jours
+19 days: 19 jours
+19 1/2 days: 19 1/2 jours
+20 days: 20 jours
+20 1/2 days: 20 1/2 jours
+21 days: 21 jours
+21 1/2 days: 21 1/2 jours
+22 days: 22 jours
+22 1/2 days: 22 1/2 jours
+23 days: 23 jours
+23 1/2 days: 23 1/2 jours
+24 days: 24 jours
+24 1/2 days: 24 1/2 jours
+25 days: 25 jours
+25 1/2 days: 25 1/2 jours
+26 days: 26 jours
+26 1/2 days: 26 1/2 jours
+27 days: 27 jours
+27 1/2 days: 27 1/2 jours
+28 days: 28 jours
+28 1/2 days: 28 1/2 jours
+29 days: 29 jours
+29 1/2 days: 29 1/2 jours
+30 days: 30 jours
#list
My aside activities: Mes activités annexes
-Date: Date
-Created by: Créée par
-
#Aside activity delete
Delete aside activity: Supprimer une activité annexe
Are you sure you want to remove the aside activity concerning "%name%" ?: Êtes-vous sûr de vouloir supprimer une activité annexe qui concerne "%name%" ?
@@ -73,3 +158,4 @@ The activity has been successfully removed.: L'activité a été supprimée.
Create an aside activity: "Créer une activité annexe"
Aside activity configuration menu: "Menu de configuration des activités annexes"
Aside activity configuration: "Configuration des activités annexes"
+Phonecall: "Appel téléphonique"
diff --git a/src/Bundle/ChillAsideActivityBundle/src/translations/validators.fr.yaml b/src/Bundle/ChillAsideActivityBundle/src/translations/validators.fr.yaml
new file mode 100644
index 000000000..28883568c
--- /dev/null
+++ b/src/Bundle/ChillAsideActivityBundle/src/translations/validators.fr.yaml
@@ -0,0 +1 @@
+You must not add twice the same category in the parent tree (previous result returned): Il est interdit d'indiquer la même entité dans l'arbre des parents. Le résultat précédent a été rétabli
diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
index d135cda39..9c657ae46 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
@@ -20,6 +20,8 @@
namespace Chill\MainBundle\CRUD\Controller;
+use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
+use Chill\MainBundle\Templating\Listing\FilterOrderHelperFactoryInterface;
use Doctrine\ORM\QueryBuilder;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Request;
@@ -209,22 +211,24 @@ class CRUDController extends AbstractController
* This method:
*
* 1. Launch `onPreIndex`
- * x. check acl. If it does return a response instance, return it
- * x. launch `onPostCheckACL`. If it does return a response instance, return it
- * 1. count the items, using `countEntities`
- * 2. build a paginator element from the the number of entities ;
- * 3. Launch `onPreIndexQuery`. If it does return a response instance, return it
- * 3. build a query, using `queryEntities`
- * x. fetch the results, using `getQueryResult`
- * x. Launch `onPostIndexFetchQuery`. If it does return a response instance, return it
- * 4. create default parameters:
+ * 2. check acl. If it does return a response instance, return it
+ * 3. launch `onPostCheckACL`. If it does return a response instance, return it
+ * 4. count the items, using `countEntities`
+ * 5. build a paginator element from the the number of entities ;
+ * 6. Launch `onPreIndexQuery`. If it does return a response instance, return it
+ * 7. fetch the results, using `getQueryResult`
+ *
+ * Internally, this build a query, using `queryEntities`
+ *
+ * 8. Launch `onPostIndexFetchQuery`. If it does return a response instance, return it
+ * 9. create default parameters:
*
* The default parameters are:
*
* * entities: the list en entities ;
* * crud_name: the name of the crud ;
* * paginator: a paginator element ;
- * 5. Launch rendering, the parameter is fetch using `getTemplateFor`
+ * 10. Launch rendering, the parameter is fetch using `getTemplateFor`
* The parameters may be personnalized using `generateTemplateParameter`.
*
* @param string $action
@@ -249,7 +253,8 @@ class CRUDController extends AbstractController
return $response;
}
- $totalItems = $this->countEntities($action, $request);
+ $filterOrder = $this->buildFilterOrderHelper($action, $request);
+ $totalItems = $this->countEntities($action, $request, $filterOrder);
$paginator = $this->getPaginatorFactory()->create($totalItems);
$response = $this->onPreIndexBuildQuery($action, $request, $totalItems,
@@ -259,16 +264,7 @@ class CRUDController extends AbstractController
return $response;
}
- $query = $this->queryEntities($action, $request, $paginator);
-
- $response = $this->onPostIndexBuildQuery($action, $request, $totalItems,
- $paginator, $query);
-
- if ($response instanceof Response) {
- return $response;
- }
-
- $entities = $this->getQueryResult($action, $request, $totalItems, $paginator, $query);
+ $entities = $this->getQueryResult($action, $request, $totalItems, $paginator, $filterOrder);
$response = $this->onPostIndexFetchQuery($action, $request, $totalItems,
$paginator, $entities);
@@ -280,7 +276,8 @@ class CRUDController extends AbstractController
$defaultTemplateParameters = [
'entities' => $entities,
'crud_name' => $this->getCrudName(),
- 'paginator' => $paginator
+ 'paginator' => $paginator,
+ 'filter_order' => $filterOrder
];
return $this->render(
@@ -289,6 +286,11 @@ class CRUDController extends AbstractController
);
}
+ protected function buildFilterOrderHelper(string $action, Request $request): ?FilterOrderHelper
+ {
+ return null;
+ }
+
/**
* @param string $action
* @param Request $request
@@ -361,9 +363,9 @@ class CRUDController extends AbstractController
* @param PaginatorInterface $paginator
* @return type
*/
- protected function queryEntities(string $action, Request $request, PaginatorInterface $paginator)
+ protected function queryEntities(string $action, Request $request, PaginatorInterface $paginator, ?FilterOrderHelper $filterOrder = null)
{
- $query = $this->buildQueryEntities($action, $request)
+ $query = $this->buildQueryEntities($action, $request, $filterOrder)
->setFirstResult($paginator->getCurrentPage()->getFirstItemNumber())
->setMaxResults($paginator->getItemsPerPage());
@@ -393,11 +395,13 @@ class CRUDController extends AbstractController
* @param Request $request
* @param int $totalItems
* @param PaginatorInterface $paginator
- * @param mixed $query
* @return mixed
*/
- protected function getQueryResult(string $action, Request $request, int $totalItems, PaginatorInterface $paginator, $query)
+ protected function getQueryResult(string $action, Request $request, int $totalItems, PaginatorInterface $paginator,
+ ?FilterOrderHelper $filterOrder = null)
{
+ $query = $this->queryEntities($action, $request, $paginator, $filterOrder);
+
return $query->getQuery()->getResult();
}
@@ -408,9 +412,9 @@ class CRUDController extends AbstractController
* @param Request $request
* @return int
*/
- protected function countEntities(string $action, Request $request): int
+ protected function countEntities(string $action, Request $request, ?FilterOrderHelper $filterOrder = null): int
{
- return $this->buildQueryEntities($action, $request)
+ return $this->buildQueryEntities($action, $request, $filterOrder)
->select('COUNT(e)')
->getQuery()
->getSingleScalarResult()
@@ -1183,6 +1187,11 @@ class CRUDController extends AbstractController
return $this->get(Resolver::class);
}
+ protected function getFilterOrderHelperFactory(): FilterOrderHelperFactoryInterface
+ {
+ return $this->get(FilterOrderHelperFactoryInterface::class);
+ }
+
/**
* @return array
*/
@@ -1197,6 +1206,7 @@ class CRUDController extends AbstractController
EventDispatcherInterface::class => EventDispatcherInterface::class,
Resolver::class => Resolver::class,
SerializerInterface::class => SerializerInterface::class,
+ FilterOrderHelperFactoryInterface::class => FilterOrderHelperFactoryInterface::class,
]
);
}
diff --git a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
index ba51db779..21090a61f 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
@@ -19,6 +19,8 @@
namespace Chill\MainBundle\Command;
+use Chill\MainBundle\Doctrine\Model\Point;
+use Chill\MainBundle\Entity\Country;
use Doctrine\ORM\EntityManager;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface;
@@ -69,6 +71,9 @@ class LoadPostalCodesCommand extends Command
. "using the postal code and name. \n"
. "The CSV file must have the following columns: "
. "postal code, label, country code."
+ . "Optionally, the csv file can have the following "
+ . "columns after the country code: reference code, latitude, longitude, source. "
+ . "The latitude and longitude columns are supposed to be in WGS84 and expressed in decimal degrees. "
. "The CSV file should not have any header row.")
->addArgument('csv_file', InputArgument::REQUIRED, "the path to "
. "the csv file. See the help for specifications.")
@@ -163,7 +168,7 @@ class LoadPostalCodesCommand extends Command
}
$em = $this->entityManager;
$country = $em
- ->getRepository('ChillMainBundle:Country')
+ ->getRepository(Country::class)
->findOneBy(array('countryCode' => $row[2]));
if ($country === NULL) {
@@ -173,7 +178,7 @@ class LoadPostalCodesCommand extends Command
// try to find an existing postal code
$existingPC = $em
- ->getRepository('ChillMainBundle:PostalCode')
+ ->getRepository(PostalCode::class)
->findBy(array('code' => $row[0], 'name' => $row[1]));
if (count($existingPC) > 0) {
@@ -187,6 +192,18 @@ class LoadPostalCodesCommand extends Command
->setCountry($country)
;
+ if (NULL != $row[3]){
+ $postalCode->setRefPostalCodeId($row[3]);
+ }
+
+ if (NULL != $row[4] & NULL != $row[5]){
+ $postalCode->setCenter(Point::fromLonLat((float) $row[5], (float) $row[4]));
+ }
+
+ if (NULL != $row[6]){
+ $postalCode->setPostalCodeSource($row[6]);
+ }
+
$errors = $this->validator->validate($postalCode);
if ($errors->count() == 0) {
diff --git a/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyCivility.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCivility.php
similarity index 65%
rename from src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyCivility.php
rename to src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCivility.php
index 36325deaa..07f824cd1 100644
--- a/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyCivility.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCivility.php
@@ -1,22 +1,17 @@
setName($val['name'])
->setActive(true);
$manager->persist($civility);
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php
index 6e3d1781b..26ce7415e 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php
@@ -22,6 +22,8 @@
namespace Chill\MainBundle\DataFixtures\ORM;
+use Chill\MainBundle\Doctrine\Model\Point;
+use Chill\MainBundle\Entity\Country;
use Doctrine\Common\DataFixtures\AbstractFixture;
use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
use Doctrine\Persistence\ObjectManager;
@@ -40,21 +42,41 @@ class LoadPostalCodes extends AbstractFixture implements OrderedFixtureInterface
return 50;
}
- public static $refs = array();
+ public static $refs = [];
public function load(ObjectManager $manager)
{
- $lines = str_getcsv(self::$codes, "\n");
- $belgium = $manager->getRepository('ChillMainBundle:Country')
- ->findOneBy(array('countryCode' => 'BE'));
+ echo "loading postal codes... \n";
+ $this->loadPostalCodeCSV($manager, self::$postalCodeBelgium, 'BE');
+ $this->loadPostalCodeCSV($manager, self::$postalCodeFrance, 'FR');
+ }
+
+ private function loadPostalCodeCSV(ObjectManager $manager, string $csv, string $countryCode) {
+
+ $lines = str_getcsv($csv, "\n");
+ $country = $manager->getRepository(Country::class)
+ ->findOneBy(['countryCode' => $countryCode]);
foreach($lines as $line) {
$code = str_getcsv($line);
$c = new PostalCode();
- $c->setCountry($belgium)
+ $c->setCountry($country)
->setCode($code[0])
- ->setName(\ucwords(\strtolower($code[2])))
+ ->setName(\ucwords(\strtolower($code[1])))
;
+
+ if (NULL != $code[3]){
+ $c->setRefPostalCodeId($code[3]);
+ }
+
+ if (NULL != $code[4] & NULL != $code[5]){
+ $c->setCenter(Point::fromLonLat((float) $code[5], (float) $code[4]));
+ }
+
+ if (NULL != $code[6]){
+ $c->setPostalCodeSource($code[6]);
+ }
+
$manager->persist($c);
$ref = 'postal_code_'.$code[0];
@@ -66,40 +88,342 @@ class LoadPostalCodes extends AbstractFixture implements OrderedFixtureInterface
$manager->flush();
}
-
- private static $codes = <<.
*/
-namespace Chill\ThirdPartyBundle\Entity;
+namespace Chill\MainBundle\Entity;
-use Chill\ThirdPartyBundle\Repository\ThirdPartyCivilityRepository;
use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation as Serializer;
/**
- * @ORM\Table(name="chill_3party.party_civility")
- * @ORM\Entity(repositoryClass=ThirdPartyCivilityRepository::class)
+ * @ORM\Table(name="chill_main_civility")
+ * @ORM\Entity
*/
-class ThirdPartyCivility
+class Civility
{
/**
* @ORM\Id
* @ORM\GeneratedValue
* @ORM\Column(type="integer")
+ * @Serializer\Groups({"read"})
*/
private $id;
/**
* @ORM\Column(type="json")
+ * @Serializer\Groups({"read"})
*/
- private $name = [];
+ private array $name = [];
+
+ /**
+ * @ORM\Column(type="json")
+ * @Serializer\Groups({"read"})
+ */
+ private array $abbreviation = [];
/**
* @ORM\Column(type="boolean")
*/
- private $active = true;
+ private bool $active = true;
public function getId(): ?int
{
@@ -76,4 +84,22 @@ class ThirdPartyCivility
return $this;
}
+
+ /**
+ * @return array
+ */
+ public function getAbbreviation(): array
+ {
+ return $this->abbreviation;
+ }
+
+ /**
+ * @param array $abbreviation
+ * @return Civility
+ */
+ public function setAbbreviation(array $abbreviation): self
+ {
+ $this->abbreviation = $abbreviation;
+ return $this;
+ }
}
diff --git a/src/Bundle/ChillMainBundle/Entity/PostalCode.php b/src/Bundle/ChillMainBundle/Entity/PostalCode.php
index 910245680..91ce46e17 100644
--- a/src/Bundle/ChillMainBundle/Entity/PostalCode.php
+++ b/src/Bundle/ChillMainBundle/Entity/PostalCode.php
@@ -2,6 +2,7 @@
namespace Chill\MainBundle\Entity;
+use Chill\MainBundle\Doctrine\Model\Point;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Serializer\Annotation\Groups;
@@ -62,6 +63,30 @@ class PostalCode
*/
private $origin = 0;
+ /**
+ * @var string
+ *
+ * @ORM\Column(type="string", length=255, nullable=true)
+ * @groups({"read"})
+ */
+ private $refPostalCodeId;
+
+ /**
+ * @var string
+ *
+ * @ORM\Column(type="string", length=255, nullable=true)
+ * @groups({"read"})
+ */
+ private $postalCodeSource;
+
+ /**
+ * @var Point
+ *
+ * @ORM\Column(type="point", nullable=true)
+ * @groups({"read"})
+ */
+ private $center;
+
/**
* Get id
*
@@ -169,5 +194,41 @@ class PostalCode
{
return $this->country;
}
+
+ public function getRefPostalCodeId(): ?string
+ {
+ return $this->refPostalCodeId;
+ }
+
+ public function setRefPostalCodeId(?string $refPostalCodeId): self
+ {
+ $this->refPostalCodeId = $refPostalCodeId;
+
+ return $this;
+ }
+
+ public function getPostalCodeSource(): ?string
+ {
+ return $this->postalCodeSource;
+ }
+
+ public function setPostalCodeSource(?string $postalCodeSource): self
+ {
+ $this->postalCodeSource = $postalCodeSource;
+
+ return $this;
+ }
+
+ public function getCenter(): ?Point
+ {
+ return $this->center;
+ }
+
+ public function setCenter(?Point $center): self
+ {
+ $this->center = $center;
+
+ return $this;
+ }
}
diff --git a/src/Bundle/ChillMainBundle/Form/Type/CenterType.php b/src/Bundle/ChillMainBundle/Form/Type/CenterType.php
deleted file mode 100644
index 14ac63e8c..000000000
--- a/src/Bundle/ChillMainBundle/Form/Type/CenterType.php
+++ /dev/null
@@ -1,136 +0,0 @@
-
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
-
-namespace Chill\MainBundle\Form\Type;
-
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Chill\MainBundle\Entity\Center;
-use Chill\MainBundle\Form\Type\DataTransformer\CenterTransformer;
-use Symfony\Component\Form\Extension\Core\Type\HiddenType;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-
-/**
- *
- *
- * @author Julien Fastré
- */
-class CenterType extends AbstractType
-{
- /**
- * The user linked with this type.
- *
- * @var \Chill\MainBundle\Entity\User
- */
- protected $user;
-
- /**
- * associative array where keys are center.id and
- * value are center objects
- *
- * @var Center[]
- */
- protected $reachableCenters = array();
-
- /**
- *
- * @var CenterTransformer
- */
- protected $transformer;
-
- public function __construct(TokenStorageInterface $tokenStorage,
- CenterTransformer $transformer)
- {
- $this->user = $tokenStorage->getToken()->getUser();
- $this->transformer = $transformer;
- $this->prepareReachableCenterByUser();
- }
-
- /**
- * return a 'hidden' field if only one center is available.
- *
- * Return a 'choice' field if more than one center is available.
- *
- * @return string
- * @throws \RuntimeException if the user is not associated with any center
- */
- public function getParent()
- {
- $nbReachableCenters = count($this->reachableCenters);
-
- if ($nbReachableCenters <= 1) {
- return HiddenType::class;
- } else {
- return EntityType::class;
- }
- }
-
- /**
- * configure default options, i.e. add choices if user can reach multiple
- * centers.
- *
- * @param OptionsResolver $resolver
- */
- public function configureOptions(OptionsResolver $resolver)
- {
- if (count($this->reachableCenters) > 1) {
- $resolver->setDefault('class', Center::class)
- ->setDefault('choices', $this->reachableCenters)
- ->setDefault('placeholder', 'Pick a center')
- ;
- }
-
- }
-
- /**
- * add a data transformer if user can reach only one center
- *
- * @param FormBuilderInterface $builder
- * @param array $options
- */
- public function buildForm(FormBuilderInterface $builder, array $options)
- {
- if ($this->getParent() === HiddenType::class) {
- $builder->addModelTransformer($this->transformer);
- }
- }
-
- /**
- * populate reachableCenters as an associative array where
- * keys are center.id and value are center entities.
- *
- */
- private function prepareReachableCenterByUser()
- {
- $groupCenters = $this->user->getGroupCenters();
-
- foreach ($groupCenters as $groupCenter) {
-
- $center = $groupCenter->getCenter();
-
- if (!array_key_exists($center->getId(),
- $this->reachableCenters)) {
- $this->reachableCenters[$center->getId()] = $center;
- }
- }
- }
-
-}
diff --git a/src/Bundle/ChillMainBundle/Form/Type/ChillCollectionType.php b/src/Bundle/ChillMainBundle/Form/Type/ChillCollectionType.php
index 1068522c9..2b20dbd98 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/ChillCollectionType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/ChillCollectionType.php
@@ -24,14 +24,14 @@ use Symfony\Component\Form\FormInterface;
/**
* Available options :
- *
+ *
* - `button_add_label`
* - `button_remove_label`
* - `identifier`: an identifier to identify the kind of collecton. Useful if some
* javascript should be launched associated to `add_entry`, `remove_entry` events.
- *
+ * - `empty_collection_explain`
+ *
*
- * @author Julien Fastré
*/
class ChillCollectionType extends AbstractType
{
@@ -41,10 +41,11 @@ class ChillCollectionType extends AbstractType
->setDefaults([
'button_add_label' => 'Add an entry',
'button_remove_label' => 'Remove entry',
- 'identifier' => ''
+ 'identifier' => '',
+ 'empty_collection_explain' => '',
]);
}
-
+
public function buildView(FormView $view, FormInterface $form, array $options)
{
$view->vars['button_add_label'] = $options['button_add_label'];
@@ -52,8 +53,9 @@ class ChillCollectionType extends AbstractType
$view->vars['allow_delete'] = (int) $options['allow_delete'];
$view->vars['allow_add'] = (int) $options['allow_add'];
$view->vars['identifier'] = $options['identifier'];
+ $view->vars['empty_collection_explain'] = $options['empty_collection_explain'];
}
-
+
public function getParent()
{
return \Symfony\Component\Form\Extension\Core\Type\CollectionType::class;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/CenterTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/CenterTransformer.php
index b90ab5a46..c088edeba 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/CenterTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/CenterTransformer.php
@@ -20,36 +20,57 @@
namespace Chill\MainBundle\Form\Type\DataTransformer;
use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Repository\CenterRepository;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
use Doctrine\ORM\EntityManagerInterface;
use Symfony\Component\Form\DataTransformerInterface;
use Symfony\Component\Form\Exception\TransformationFailedException;
+use Symfony\Component\Form\Exception\UnexpectedTypeException;
class CenterTransformer implements DataTransformerInterface
{
- private EntityManagerInterface $em;
+ private CenterRepository $centerRepository;
+ private bool $multiple = false;
- public function __construct(EntityManagerInterface $em)
- {
- $this->em = $em;
+ public function __construct(
+ CenterRepository $centerRepository,
+ bool $multiple = false
+ ) {
+ $this->centerRepository = $centerRepository;
+ $this->multiple = $multiple;
}
public function reverseTransform($id)
{
if ($id === NULL) {
- return NULL;
+ if ($this->multiple) {
+ return new ArrayCollection();
+ } else {
+ return NULL;
+ }
}
- $center = $this
- ->em
- ->getRepository(Center::class)
- ->find($id);
+ if ($this->multiple) {
+ $ids = \explode(',', $id);
+ } else {
+ $ids[] = (int) $id;
+ }
- if ($center === NULL) {
+ $centers = $this
+ ->centerRepository
+ ->findBy(['id' => $ids ]);
+
+ if ([] === $centers || count($ids) > count($centers)) {
throw new TransformationFailedException(sprintf(
- 'No center found with id %d', $id));
+ 'No center found for one of those ids: %s', implode(',', $ids)));
}
- return $center;
+ if ($this->multiple) {
+ return new ArrayCollection($centers);
+ } else {
+ return $centers[0];
+ }
}
public function transform($center)
@@ -58,7 +79,21 @@ class CenterTransformer implements DataTransformerInterface
return '';
}
- return $center->getId();
- }
+ if ($this->multiple) {
+ if (!is_iterable($center)) {
+ throw new UnexpectedTypeException($center, \Traversable::class);
+ }
+ $ids = [];
+ foreach ($center as $c) {
+ $ids[] = $c->getId();
+ }
+ return implode(',', $ids);
+ } else {
+ if (!$center instanceof Center) {
+ throw new UnexpectedTypeException($center, Center::class);
+ }
+ return (string) $center->getId();
+ }
+ }
}
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php b/src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php
new file mode 100644
index 000000000..1068301b0
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php
@@ -0,0 +1,55 @@
+requestStack = $requestStack;
+ }
+
+ public function buildForm(FormBuilderInterface $builder, array $options)
+ {
+ /** @var FilterOrderHelper $helper */
+ $helper = $options['helper'];
+
+ if ($helper->hasSearchBox()) {
+ $builder->add('q', SearchType::class, [
+ 'label' => false,
+ 'required' => false
+ ]);
+ }
+
+ foreach ($this->requestStack->getCurrentRequest()->query->getIterator() as $key => $value) {
+ switch($key) {
+ case 'q':
+ continue;
+ case 'page':
+ $builder->add($key, HiddenType::class, [
+ 'data' => 1
+ ]);
+ break;
+ default:
+ $builder->add($key, HiddenType::class, [
+ 'data' => $value
+ ]);
+ break;
+ }
+ }
+ }
+
+ public function configureOptions(\Symfony\Component\OptionsResolver\OptionsResolver $resolver)
+ {
+ $resolver->setRequired('helper')
+ ->setAllowedTypes('helper', FilterOrderHelper::class);
+ }
+}
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PickCenterType.php b/src/Bundle/ChillMainBundle/Form/Type/PickCenterType.php
new file mode 100644
index 000000000..07c3d5c67
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Form/Type/PickCenterType.php
@@ -0,0 +1,174 @@
+
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+
+namespace Chill\MainBundle\Form\Type;
+
+use Chill\MainBundle\Repository\CenterRepository;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\CallbackTransformer;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Form\Type\DataTransformer\CenterTransformer;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Security\Core\Security;
+
+/**
+ * Pick a center
+ *
+ * For a given role and, eventually, scopes, show a dropdown (if more than
+ * one reachable center) or a HiddenType (if one or zero center).
+ *
+ *
+ */
+class PickCenterType extends AbstractType
+{
+ protected AuthorizationHelperInterface $authorizationHelper;
+
+ protected Security $security;
+
+ protected CenterRepository $centerRepository;
+
+ public function __construct(
+ AuthorizationHelperInterface $authorizationHelper,
+ Security $security,
+ CenterRepository $centerRepository
+ ) {
+ $this->authorizationHelper = $authorizationHelper;
+ $this->security = $security;
+ $this->centerRepository = $centerRepository;
+ }
+
+ /**
+ * return a 'hidden' field if only one center is available.
+ *
+ * Return a 'choice' field if more than one center is available.
+ *
+ * @return string
+ * @throws \RuntimeException if the user is not associated with any center
+ */
+ /*
+ public function getParent()
+ {
+ $nbReachableCenters = count($this->reachableCenters);
+
+ if ($nbReachableCenters <= 1) {
+ return HiddenType::class;
+ } else {
+ return EntityType::class;
+ }
+ }
+ */
+
+ /**
+ * configure default options, i.e. add choices if user can reach multiple
+ * centers.
+ *
+ * @param OptionsResolver $resolver
+ */
+ public function configureOptions(OptionsResolver $resolver)
+ {
+ $resolver
+ ->setDefault('class', Center::class)
+ ->setRequired('role')
+ ->setAllowedTypes('role', [ 'string' ])
+ ->setDefault('scopes', [])
+ ->setAllowedTypes('scopes', ['iterable'])
+ ->setDefault('choice_options', [])
+ ;
+ /*
+ ->setDefault('choices', $this->reachableCenters)
+ ->setDefault('placeholder', 'Pick a center')
+ ;
+ */
+ }
+
+ /**
+ * add a data transformer if user can reach only one center
+ *
+ * @param FormBuilderInterface $builder
+ * @param array $options
+ */
+ public function buildForm(FormBuilderInterface $builder, array $options)
+ {
+ $centers = $this->getReachableCenters($options['role'], $options['scopes']);
+
+ if (count($centers) <= 1) {
+ $multiple = $options['choice_options']['multiple'] ?? false;
+ $builder->add('center', HiddenType::class);
+ $builder->get('center')->addModelTransformer(
+ new CenterTransformer($this->centerRepository, $multiple)
+ );
+ } else {
+ $builder->add('center', EntityType::class,
+ \array_merge(
+ $options['choice_options'],
+ [
+ 'class' => Center::class,
+ 'choices' => $centers
+ ]
+ )
+ );
+ }
+
+ $builder
+ ->addModelTransformer(new CallbackTransformer(
+ function($data) {
+ if (NULL === $data) {
+ return ['center' => null];
+ }
+ return ['center' => $data];
+ },
+ function($data) {
+ return $data['center'];
+ }
+ ));
+ }
+
+ private function getReachableCenters(string $role, iterable $scopes): array
+ {
+ if (0 < count($scopes)) {
+ $centers = [];
+
+ foreach($scopes as $scope) {
+ foreach ($this->authorizationHelper
+ ->getReachableCenters($this->security->getUser(), $role, $scope) as $center) {
+ $centers[spl_object_hash($center)] = $center;
+ }
+ }
+
+ return \array_values($centers);
+ } else {
+ return $this->authorizationHelper
+ ->getReachableCenters($this->security->getUser(), $role);
+ }
+ }
+
+ public function buildView(FormView $view, FormInterface $form, array $options)
+ {
+ $view->vars['is_hidden'] = count($this->getReachableCenters($options['role'],
+ $options['scopes'])) <= 1;
+ }
+}
diff --git a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyCivilityRepository.php b/src/Bundle/ChillMainBundle/Repository/CivilityRepository.php
similarity index 65%
rename from src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyCivilityRepository.php
rename to src/Bundle/ChillMainBundle/Repository/CivilityRepository.php
index 5c965a830..2702784f0 100644
--- a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyCivilityRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/CivilityRepository.php
@@ -20,23 +20,23 @@
* along with this program. If not, see .
*/
-namespace Chill\ThirdPartyBundle\Repository;
+namespace Chill\MainBundle\Repository;
-use Chill\ThirdPartyBundle\Entity\ThirdPartyCivility;
+use Chill\MainBundle\Entity\Civility;
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
use Doctrine\Persistence\ManagerRegistry;
/**
- * @method ThirdPartyCivility|null find($id, $lockMode = null, $lockVersion = null)
- * @method ThirdPartyCivility|null findOneBy(array $criteria, array $orderBy = null)
- * @method ThirdPartyCivility[] findAll()
- * @method ThirdPartyCivility[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
+ * @method Civility|null find($id, $lockMode = null, $lockVersion = null)
+ * @method Civility|null findOneBy(array $criteria, array $orderBy = null)
+ * @method Civility[] findAll()
+ * @method Civility[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
*/
-class ThirdPartyCivilityRepository extends ServiceEntityRepository
+class CivilityRepository extends ServiceEntityRepository
{
public function __construct(ManagerRegistry $registry)
{
- parent::__construct($registry, ThirdPartyCivility::class);
+ parent::__construct($registry, Civility::class);
}
}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
index 436f764dd..593cd49b4 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
@@ -1,6 +1,9 @@
// Access to Bootstrap variables and mixins
@import '~ChillMainAssets/module/bootstrap/shared';
+// Chill variables
+@import './scss/chill_variables';
+
// Chill mixins
@import './scss/mixins';
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/chill_variables.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/chill_variables.scss
new file mode 100644
index 000000000..61d975b42
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/chill_variables.scss
@@ -0,0 +1,13 @@
+/*
+* ADDITIONNAL COLORS VARIABLES
+*/
+
+// Contexts banners
+$chill-person-context: $chill-green;
+$chill-accourse-context: #718596;
+$chill-household-context: #929d69;
+
+// Badges colors
+$social-issue-color: #4bafe8;
+$social-action-color: $orange;
+$activity-color: yellowgreen;
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss
index 21ecde267..8e3a9121b 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss
@@ -115,7 +115,7 @@ div.flex-table {
}
ul.record_actions {
- align-self: flex-start;
+ align-self: flex-start; // !! conflict with .float-button.bottom see L297
}
}
}
@@ -274,29 +274,35 @@ div.float-button {
div.action {
float: right;
+ position: relative;
+ z-index: 1;
+ }
+
+ a {
+ word-break: break-all; // break email address
}
}
&.top {
div.action {
padding: 0 0 1em 1em;
}
-
- // avoid a position relative that make links unclickable
- .fa-ul > li {
- position: initial;
- }
}
&.bottom {
display: flex;
overflow: hidden;
+
div.action {
height: calc(100% - 0em);
- shape-outside: inset(calc(100% - 2em) 0 0);
+ shape-outside: inset(calc(100% - 4em) 0 0);
display: flex;
align-items: flex-end;
padding: 0 0 0 1em;
* {
- align-self: flex-end !important;
+ align-self: flex-end !important; // neutralize flex-table rule L118
+ }
+ ul.record_actions {
+ margin: 0;
+ padding: 0;
}
}
}
@@ -304,8 +310,19 @@ div.float-button {
padding: 1em;
border: 1px solid black;
background-color: yellow;
- div.action {
- background-color: transparentize(#00ffff, 0.4);
+ div.box {
+ div.action {
+ background-color: transparentize(cyan, 0.4);
+ }
+ & > ul li,
+ & > div,
+ & > p {
+ background-color: transparentize(orange, 0.4);
+ }
+ & > div {
+ margin-bottom: 1em;
+ }
}
}
+
}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/mixins.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/mixins.scss
index 9b4650087..ef874c274 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/mixins.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/mixins.scss
@@ -1,4 +1,3 @@
-
//
// Titles in forms
//
@@ -12,7 +11,6 @@
display: block;
}
-
// We use box-shadow instead of border
// to avoid to manage border double-width
// Then we can simulate border-collapse: collapse (table)
diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/collection/index.js b/src/Bundle/ChillMainBundle/Resources/public/lib/collection/index.js
index 0a4955207..b763c4ddb 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/lib/collection/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/collection/index.js
@@ -1,27 +1,27 @@
/**
* Javascript file which handle ChillCollectionType
- *
- * Two events are emitted by this module, both on window and on collection / ul.
- *
+ *
+ * Two events are emitted by this module, both on window and on collection / ul.
+ *
* Collection (an UL element) and entry (a li element) are associated with those
* events.
- *
+ *
* ```
* window.addEventListener('collection-add-entry', function(e) {
* console.log(e.detail.collection);
* console.log(e.detail.entry);
* });
- *
+ *
* window.addEventListener('collection-remove-entry', function(e) {
* console.log(e.detail.collection);
* console.log(e.detail.entry);
* });
- *
+ *
* collection.addEventListener('collection-add-entry', function(e) {
* console.log(e.detail.collection);
* console.log(e.detail.entry);
* });
- *
+ *
* collection.addEventListener('collection-remove-entry', function(e) {
* console.log(e.detail.collection);
* console.log(e.detail.entry);
@@ -38,7 +38,7 @@ class CollectionEvent {
}
/**
- *
+ *
* @param {type} button
* @returns {handleAdd}
*/
@@ -47,6 +47,7 @@ var handleAdd = function(button) {
form_name = button.dataset.collectionAddTarget,
prototype = button.dataset.formPrototype,
collection = document.querySelector('ul[data-collection-name="'+form_name+'"]'),
+ empty_explain = collection.querySelector('li[data-collection-empty-explain]'),
entry = document.createElement('li'),
event = new CustomEvent('collection-add-entry', { detail: { collection: collection, entry: entry } }),
counter = collection.childNodes.length,
@@ -56,8 +57,11 @@ var handleAdd = function(button) {
entry.innerHTML = content;
entry.classList.add('entry');
initializeRemove(collection, entry);
+ if (empty_explain !== null) {
+ empty_explain.remove();
+ }
collection.appendChild(entry);
-
+
collection.dispatchEvent(event);
window.dispatchEvent(event);
};
@@ -70,30 +74,30 @@ var initializeRemove = function(collection, entry) {
allowDelete = collection.dataset.collectionAllowDelete,
event = new CustomEvent('collection-remove-entry', { detail: { collection: collection, entry: entry } })
;
-
+
if (allowDelete === '0' && isPersisted === '1') {
return;
}
-
+
button.classList.add('btn', 'btn-delete', 'remove-entry');
button.textContent = content;
-
+
button.addEventListener('click', function(e) {
e.preventDefault();
entry.remove();
collection.dispatchEvent(event);
window.dispatchEvent(event);
});
-
+
entry.appendChild(button);
};
window.addEventListener('load', function() {
- var
+ var
addButtons = document.querySelectorAll("button[data-collection-add-target]"),
collections = document.querySelectorAll("ul[data-collection-name]")
;
-
+
for (let i = 0; i < addButtons.length; i ++) {
let addButton = addButtons[i];
addButton.addEventListener('click', function(e) {
@@ -101,11 +105,15 @@ window.addEventListener('load', function() {
handleAdd(e.target);
});
}
-
+
for (let i = 0; i < collections.length; i ++) {
let entries = collections[i].querySelectorAll(':scope > li');
-
+
for (let j = 0; j < entries.length; j ++) {
+ console.log(entries[j].dataset);
+ if (entries[j].dataset.collectionEmptyExplain === "1") {
+ continue;
+ }
initializeRemove(collections[i], entries[j]);
}
}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/disable-buttons/index.js b/src/Bundle/ChillMainBundle/Resources/public/module/disable-buttons/index.js
new file mode 100644
index 000000000..c6ec7c789
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/disable-buttons/index.js
@@ -0,0 +1,16 @@
+/**
+ * Submit button(s) are disabled as soon as submit button is clicked and form is submitted.
+ * ID 'create-form' must be added to submit forms.
+ */
+
+var form = document.getElementById('create-form');
+var submitButtons = document.querySelectorAll("[type=submit]");
+
+form.addEventListener('submit', function(e){
+ for(var i=0; i
+
{% block crud_content_header %}
{{ ('crud.'~crud_name~'.title_edit')|trans }}
{% endblock crud_content_header %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_index.html.twig
index 46828a49e..15774bdf6 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_index.html.twig
@@ -1,9 +1,15 @@
-
+
{% block index_header %}
{{ ('crud.' ~ crud_name ~ '.index.title')|trans({'%crud_name%': crud_name}) }}
{% endblock index_header %}
+{% block filter_order %}
+ {% if filter_order is not null %}
+ {{ filter_order|chill_render_filter_order_helper }}
+ {% endif %}
+{% endblock %}
+
{% if entities|length == 0 %}
{% block no_existing_entities %}
{{ no_existing_entities_sentences|default('No entities')|trans }}
@@ -32,17 +38,20 @@
{% endif %}
-
+{% block pagination %}
+
+{% endblock %}
{% block list_actions %}
{% endblock list_actions %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_new_content.html.twig b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_new_content.html.twig
index 4c2003617..906a77d0d 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_new_content.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_new_content.html.twig
@@ -1,10 +1,11 @@
+{% set formId = crudMainFormId|default('crud_main_form') %}
{% block crud_content_header %}
{{ ('crud.' ~ crud_name ~ '.title_new')|trans({'%crud_name%' : crud_name }) }}
{% endblock crud_content_header %}
{% block crud_content_form %}
- {{ form_start(form) }}
+ {{ form_start(form, { 'attr' : { 'id': formId } }) }}
{% block crud_content_form_rows %}
{% for f in form %}{% if f.vars.name != 'submit' %}
@@ -14,6 +15,8 @@
{% block crud_content_after_form %}{% endblock %}
+ {{ form_end(form) }}
+
{% block crud_content_form_actions %}
+ {% else %}
+
+ {{ form.vars.empty_collection_explain|default('No item')|trans }}
+
{% endfor %}
@@ -198,3 +202,15 @@
{{ form_widget(entry) }}
{% endfor %}
{% endblock comment_widget %}
+
+{% block pick_center_widget %}
+ {{ form_widget(form.center) }}
+{% endblock pick_center_widget %}
+
+{% block pick_center_row %}
+ {% if (not form.vars.is_hidden) %}
+ {{ block('form_row') }}
+ {% else %}
+ {{ form_widget(form.center) }}
+ {% endif %}
+{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Menu/defaultMenu.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Menu/defaultMenu.html.twig
index 67a32b98b..6eada4dd6 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Menu/defaultMenu.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Menu/defaultMenu.html.twig
@@ -1,5 +1,5 @@
{#
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
/
*
* This program is free software: you can redistribute it and/or modify
@@ -17,7 +17,7 @@
#}
\ No newline at end of file
+
diff --git a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
index 27fc4430b..8bee2983e 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
@@ -70,6 +70,9 @@
{% if accompanyingCourse.locationStatus == 'person' %}
- {{ 'This course is located by'|trans }}
+ {{ 'This course is located by'|trans }}
{{ accompanyingCourse.personLocation|chill_entity_render_string }}
{% elseif accompanyingCourse.locationStatus == 'address' %}
{{ 'This course has a temporarily location'|trans }}
@@ -82,97 +82,9 @@
{% endif %}
-
- {# DISABLED
- {{ 'Resume Accompanying Course'|trans }}
-
-
- {{ 'Associated peoples'|trans }}
-
- {% for participation in accompanyingCourse.participations %}
- {% if participation.enddate is null %}
-
- {{ participation.person|chill_entity_render_box({
- 'render': 'bloc', 'addLink': false, 'addInfo': true, 'addAltNames': false,
- 'customButtons': { 'before': _self.button_person(participation.person) }
- }) }}
-
- {% endif %}
- {% endfor %}
-
-
- {{ 'Accompanying course location'|trans }}
-
- {% if accompanyingCourse.locationStatus == 'person' %}
- {{ 'This course is located by'|trans }}
- {{ accompanyingCourse.personLocation|chill_entity_render_string }}
-
- {% elseif accompanyingCourse.locationStatus == 'address' %}
- {{ 'This course has a temporarily location'|trans }}
- {% endif %}
-
- {% if accompanyingCourse.locationStatus != 'none' %}
-
-
- {{ accompanyingCourse.location|chill_entity_render_box }}
-
-
- {% endif %}
-
- {{ 'Requestor'|trans }}
- {% if accompanyingCourse.requestorPerson is not empty %}
- {% set requestor = accompanyingCourse.requestorPerson %}
- {% set info = true %}
- {% elseif accompanyingCourse.requestor is not empty %}
- {% set requestor = accompanyingCourse.requestorThirdParty %}
- {% set info = false %}
- {% endif %}
- {% if accompanyingCourse.requestor == null %}
- {{ 'Any requestor to this accompanying course'|trans }}
- {% else %}
-
-
- {{ requestor|chill_entity_render_box({
- 'render': 'bloc', 'addLink': false, 'addEntity': true, 'addInfo': info, 'addAltNames': false
- }) }}
-
-
- {% endif %}
-
- {{ 'Resources'|trans }}
- {% if accompanyingCourse.resources|length == 0 %}
- {{ 'Any resource for this accompanying course'|trans }}
- {% else %}
-
- {% for r in accompanyingCourse.resources %}
-
- {% if r.person %}
- {{ r.person|chill_entity_render_box({
- 'render': 'bloc', 'addLink': false, 'addEntity': true, 'addInfo': true, 'addAltNames': false
- }) }}
- {% endif %}
- {% if r.thirdParty %}
- {{ r.thirdParty|chill_entity_render_box({
- 'render': 'bloc', 'addLink': false, 'addEntity': true, 'addInfo': false
- }) }}
- {% endif %}
-
- {% endfor %}
-
- {% endif %}
-
- {{ 'Social actions'|trans }}
- {% include 'ChillPersonBundle:AccompanyingCourseWork:list_by_accompanying_period.html.twig' with {'buttonText': false } %}
+ {{ 'Last social actions'|trans }}
+ {% include 'ChillPersonBundle:AccompanyingCourseWork:list_recent_by_accompanying_period.html.twig' with {'buttonText': false } %}
{% block contentActivity %}
@@ -189,9 +101,9 @@
{% set accompanying_course_id = accompanyingCourse.id %}
{% endif %}
- {{ 'Activity list' |trans }}
+ {{ 'Last activities' |trans }}
- {% include 'ChillActivityBundle:Activity:list.html.twig' with { 'context': 'accompanyingCourse', 'no_action': true } %}
+ {% include 'ChillActivityBundle:Activity:list_recent.html.twig' with { 'context': 'accompanyingCourse', 'no_action': true } %}
{% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig
index d44b7eb3b..f0f0a051e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig
@@ -10,7 +10,7 @@
-
+
{{ 'accompanying_course_work.action'|trans }}
{{ w.socialAction|chill_entity_render_string }}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig
new file mode 100644
index 000000000..61f48aa76
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig
@@ -0,0 +1,32 @@
+ {% if works|length == 0 %}
+ {{ 'accompanying_course_work.Any work'|trans }}
+ {# TODO link #}
+
+ {% endif %}
+
+
+ {% for w in works | slice(0,5) %}
+
+
+
+ {{ 'accompanying_course_work.action'|trans }}
+ {{ w.socialAction|chill_entity_render_string }}
+
+
+ -
+ {{ 'accompanying_course_work.start_date'|trans ~ ' : ' }}
+ {{ w.startDate|format_date('short') }}
+
+ -
+ {{ 'Last updated by'|trans ~ ' : ' }}
+ {{ w.updatedBy|chill_entity_render_box }}, {{ w.updatedAt|format_datetime('short', 'short') }}
+
+
+
+
+
+ {% endfor %}
+
+
+
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
index bcb630cde..a53a7c0d0 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
@@ -58,11 +58,10 @@
-
{% if accompanying_period.requestorPerson is not null or accompanying_period.requestorThirdParty is not null %}
- {{ 'Requestor'|trans }}
+ {{ 'Requestor'|trans({'gender': null }) }}
{% if accompanying_period.requestorPerson is not null %}
{{ accompanying_period.requestorPerson|chill_entity_render_string }}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
index bd1042dd7..799d71e19 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
@@ -61,7 +61,7 @@
|