From 6df0000382e6cf2494d8f3537b217247ee91affc Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 6 Mar 2022 19:12:11 +0100 Subject: [PATCH] configure cruds --- config/packages/app.yaml | 2 +- .../EstablishmentAdminController.php | 27 +++++++------- .../InterventionAdminController.php | 36 ++++++++++++------- src/Controller/SpeakerAdminController.php | 27 +++++++------- src/Controller/ToolAdminController.php | 25 ++++++------- src/Entity/Establishment.php | 5 +++ src/Entity/Speaker.php | 5 +++ ...y.php => EstablishmentRepositoryQuery.php} | 4 +-- ...ry.php => InterventionRepositoryQuery.php} | 4 +-- ...ryQuery.php => SpeakerRepositoryQuery.php} | 4 +-- ...QueryQuery.php => ToolRepositoryQuery.php} | 4 +-- templates/admin/menu.html.twig | 33 +++++++++++++---- translations/messages.fr.yaml | 5 +++ 13 files changed, 117 insertions(+), 64 deletions(-) rename src/Repository/{EstablishmentRepositoryQueryQuery.php => EstablishmentRepositoryQuery.php} (68%) rename src/Repository/{InterventionRepositoryQueryQuery.php => InterventionRepositoryQuery.php} (69%) rename src/Repository/{SpeakerRepositoryQueryQuery.php => SpeakerRepositoryQuery.php} (71%) rename src/Repository/{ToolRepositoryQueryQuery.php => ToolRepositoryQuery.php} (72%) create mode 100644 translations/messages.fr.yaml diff --git a/config/packages/app.yaml b/config/packages/app.yaml index 07a8def..98886d6 100644 --- a/config/packages/app.yaml +++ b/config/packages/app.yaml @@ -1,6 +1,6 @@ core: site: - name: "Murph" + name: "Tinternet & Cie - Suivi des interventions" logo: "build/images/core/logo.svg" # controllers: # - {name: 'Foo', action: 'App\Controller\ExampleController::foo'} diff --git a/src/Controller/EstablishmentAdminController.php b/src/Controller/EstablishmentAdminController.php index ff14eba..1367a73 100644 --- a/src/Controller/EstablishmentAdminController.php +++ b/src/Controller/EstablishmentAdminController.php @@ -85,10 +85,10 @@ class EstablishmentAdminController extends CrudController protected function getConfiguration(): CrudConfiguration { return CrudConfiguration::create() - ->setPageTitle('index', 'List of App\Entity\Establishment') - ->setPageTitle('edit', 'Edition of {id}') - ->setPageTitle('new', 'New App\Entity\Establishment') - ->setPageTitle('show', 'View of {id}') + ->setPageTitle('index', 'Établissements') + ->setPageTitle('edit', '{name}') + ->setPageTitle('new', 'Nouveau établissement') + ->setPageTitle('show', '{name}') ->setPageRoute('index', 'admin_establishment_index') ->setPageRoute('new', 'admin_establishment_new') @@ -109,24 +109,27 @@ class EstablishmentAdminController extends CrudController // ->setSortableCollectionProperty('sortOrder') // ->setAction('index', 'new', true) - // ->setAction('index', 'show', true) + ->setAction('index', 'show', false) // ->setAction('index', 'edit', true) // ->setAction('index', 'delete', true) // ->setAction('edit', 'back', true) - // ->setAction('edit', 'show', true) + ->setAction('edit', 'show', false) // ->setAction('edit', 'delete', true) // ->setAction('show', 'back', true) // ->setAction('show', 'edit', true) - // ->setField('index', 'Label', Field\TextField::class, [ - // 'property' => 'label', - // ]) + ->setDefaultSort('index', 'name') - // ->setBatchAction('index', 'delete', 'Delete', function(EntityInterface $entity, EntityManager $manager) { - // $manager->delete($entity); - // }) + ->setField('index', 'Nom', Field\TextField::class, [ + 'property' => 'name', + 'sort' => ['name', '.name'], + ]) + + ->setBatchAction('index', 'delete', 'Delete', function(EntityInterface $entity, EntityManager $manager) { + $manager->delete($entity); + }) ; } diff --git a/src/Controller/InterventionAdminController.php b/src/Controller/InterventionAdminController.php index 103ffb4..565831d 100644 --- a/src/Controller/InterventionAdminController.php +++ b/src/Controller/InterventionAdminController.php @@ -85,10 +85,10 @@ class InterventionAdminController extends CrudController protected function getConfiguration(): CrudConfiguration { return CrudConfiguration::create() - ->setPageTitle('index', 'List of App\Entity\Intervention') - ->setPageTitle('edit', 'Edition of {id}') - ->setPageTitle('new', 'New App\Entity\Intervention') - ->setPageTitle('show', 'View of {id}') + ->setPageTitle('index', 'Interventions') + ->setPageTitle('edit', 'Intervention {id}') + ->setPageTitle('new', 'Nouvelle intervention') + ->setPageTitle('show', 'Intervention {id}') ->setPageRoute('index', 'admin_intervention_index') ->setPageRoute('new', 'admin_intervention_new') @@ -109,24 +109,36 @@ class InterventionAdminController extends CrudController // ->setSortableCollectionProperty('sortOrder') // ->setAction('index', 'new', true) - // ->setAction('index', 'show', true) + ->setAction('index', 'show', false) // ->setAction('index', 'edit', true) // ->setAction('index', 'delete', true) // ->setAction('edit', 'back', true) - // ->setAction('edit', 'show', true) + ->setAction('edit', 'show', false) // ->setAction('edit', 'delete', true) // ->setAction('show', 'back', true) // ->setAction('show', 'edit', true) - // ->setField('index', 'Label', Field\TextField::class, [ - // 'property' => 'label', - // ]) + ->setDefaultSort('index', 'date', 'desc') - // ->setBatchAction('index', 'delete', 'Delete', function(EntityInterface $entity, EntityManager $manager) { - // $manager->delete($entity); - // }) + ->setField('index', 'Establishment', Field\TextField::class, [ + 'property' => 'establishment', + 'sort' => ['establishment', '.establishment'], + ]) + ->setField('index', 'Speaker', Field\TextField::class, [ + 'property' => 'speaker', + 'sort' => ['speaker', '.speaker'], + 'attr' => ['class' => 'col-3,'] + ]) + ->setField('index', 'Date', Field\DateField::class, [ + 'property' => 'date', + 'sort' => ['date', '.date'], + ]) + + ->setBatchAction('index', 'delete', 'Delete', function(EntityInterface $entity, EntityManager $manager) { + $manager->delete($entity); + }) ; } diff --git a/src/Controller/SpeakerAdminController.php b/src/Controller/SpeakerAdminController.php index 0793915..af6878d 100644 --- a/src/Controller/SpeakerAdminController.php +++ b/src/Controller/SpeakerAdminController.php @@ -85,10 +85,10 @@ class SpeakerAdminController extends CrudController protected function getConfiguration(): CrudConfiguration { return CrudConfiguration::create() - ->setPageTitle('index', 'List of App\Entity\Speaker') - ->setPageTitle('edit', 'Edition of {id}') - ->setPageTitle('new', 'New App\Entity\Speaker') - ->setPageTitle('show', 'View of {id}') + ->setPageTitle('index', 'Intervenant⋅e⋅s') + ->setPageTitle('edit', '{name}') + ->setPageTitle('new', 'Nouvelle·au intervenant⋅e') + ->setPageTitle('show', '{name}') ->setPageRoute('index', 'admin_speaker_index') ->setPageRoute('new', 'admin_speaker_new') @@ -109,24 +109,27 @@ class SpeakerAdminController extends CrudController // ->setSortableCollectionProperty('sortOrder') // ->setAction('index', 'new', true) - // ->setAction('index', 'show', true) + ->setAction('index', 'show', false) // ->setAction('index', 'edit', true) // ->setAction('index', 'delete', true) // ->setAction('edit', 'back', true) - // ->setAction('edit', 'show', true) + ->setAction('edit', 'show', false) // ->setAction('edit', 'delete', true) // ->setAction('show', 'back', true) // ->setAction('show', 'edit', true) - // ->setField('index', 'Label', Field\TextField::class, [ - // 'property' => 'label', - // ]) + ->setDefaultSort('index', 'name') - // ->setBatchAction('index', 'delete', 'Delete', function(EntityInterface $entity, EntityManager $manager) { - // $manager->delete($entity); - // }) + ->setField('index', 'Name', Field\TextField::class, [ + 'property' => 'name', + 'sort' => ['name', '.name'], + ]) + + ->setBatchAction('index', 'delete', 'Delete', function(EntityInterface $entity, EntityManager $manager) { + $manager->delete($entity); + }) ; } diff --git a/src/Controller/ToolAdminController.php b/src/Controller/ToolAdminController.php index 094f071..cbe664c 100644 --- a/src/Controller/ToolAdminController.php +++ b/src/Controller/ToolAdminController.php @@ -85,10 +85,10 @@ class ToolAdminController extends CrudController protected function getConfiguration(): CrudConfiguration { return CrudConfiguration::create() - ->setPageTitle('index', 'List of App\Entity\Tool') - ->setPageTitle('edit', 'Edition of {id}') - ->setPageTitle('new', 'New App\Entity\Tool') - ->setPageTitle('show', 'View of {id}') + ->setPageTitle('index', 'Outils et supports') + ->setPageTitle('edit', '{label}') + ->setPageTitle('new', 'Nouvel outil') + ->setPageTitle('show', '{label}') ->setPageRoute('index', 'admin_tool_index') ->setPageRoute('new', 'admin_tool_new') @@ -109,24 +109,25 @@ class ToolAdminController extends CrudController // ->setSortableCollectionProperty('sortOrder') // ->setAction('index', 'new', true) - // ->setAction('index', 'show', true) + ->setAction('index', 'show', false) // ->setAction('index', 'edit', true) // ->setAction('index', 'delete', true) // ->setAction('edit', 'back', true) - // ->setAction('edit', 'show', true) + ->setAction('edit', 'show', false) // ->setAction('edit', 'delete', true) // ->setAction('show', 'back', true) // ->setAction('show', 'edit', true) - // ->setField('index', 'Label', Field\TextField::class, [ - // 'property' => 'label', - // ]) + ->setField('index', 'Label', Field\TextField::class, [ + 'property' => 'label', + 'sort' => ['label', '.label'], + ]) - // ->setBatchAction('index', 'delete', 'Delete', function(EntityInterface $entity, EntityManager $manager) { - // $manager->delete($entity); - // }) + ->setBatchAction('index', 'delete', 'Delete', function(EntityInterface $entity, EntityManager $manager) { + $manager->delete($entity); + }) ; } diff --git a/src/Entity/Establishment.php b/src/Entity/Establishment.php index 0d3a259..9dc8d82 100644 --- a/src/Entity/Establishment.php +++ b/src/Entity/Establishment.php @@ -50,6 +50,11 @@ class Establishment implements EntityInterface $this->interventions = new ArrayCollection(); } + public function __toString() + { + return $this->getName(); + } + public function getId(): ?int { return $this->id; diff --git a/src/Entity/Speaker.php b/src/Entity/Speaker.php index c4a8f3a..dc6262b 100644 --- a/src/Entity/Speaker.php +++ b/src/Entity/Speaker.php @@ -35,6 +35,11 @@ class Speaker implements EntityInterface $this->interventions = new ArrayCollection(); } + public function __toString() + { + return $this->getName(); + } + public function getId(): ?int { return $this->id; diff --git a/src/Repository/EstablishmentRepositoryQueryQuery.php b/src/Repository/EstablishmentRepositoryQuery.php similarity index 68% rename from src/Repository/EstablishmentRepositoryQueryQuery.php rename to src/Repository/EstablishmentRepositoryQuery.php index 89da162..c49a72a 100644 --- a/src/Repository/EstablishmentRepositoryQueryQuery.php +++ b/src/Repository/EstablishmentRepositoryQuery.php @@ -4,9 +4,9 @@ namespace App\Repository; use App\Core\Repository\RepositoryQuery; use Knp\Component\Pager\PaginatorInterface; -use App\Repository\EstablishmentRepositoryQuery as Repository; +use App\Repository\EstablishmentRepository as Repository; -class EstablishmentRepositoryQueryQuery extends RepositoryQuery +class EstablishmentRepositoryQuery extends RepositoryQuery { public function __construct(Repository $repository, PaginatorInterface $paginator) { diff --git a/src/Repository/InterventionRepositoryQueryQuery.php b/src/Repository/InterventionRepositoryQuery.php similarity index 69% rename from src/Repository/InterventionRepositoryQueryQuery.php rename to src/Repository/InterventionRepositoryQuery.php index de8575c..3c7ab0e 100644 --- a/src/Repository/InterventionRepositoryQueryQuery.php +++ b/src/Repository/InterventionRepositoryQuery.php @@ -4,9 +4,9 @@ namespace App\Repository; use App\Core\Repository\RepositoryQuery; use Knp\Component\Pager\PaginatorInterface; -use App\Repository\InterventionRepositoryQuery as Repository; +use App\Repository\InterventionRepository as Repository; -class InterventionRepositoryQueryQuery extends RepositoryQuery +class InterventionRepositoryQuery extends RepositoryQuery { public function __construct(Repository $repository, PaginatorInterface $paginator) { diff --git a/src/Repository/SpeakerRepositoryQueryQuery.php b/src/Repository/SpeakerRepositoryQuery.php similarity index 71% rename from src/Repository/SpeakerRepositoryQueryQuery.php rename to src/Repository/SpeakerRepositoryQuery.php index abb1a69..d891067 100644 --- a/src/Repository/SpeakerRepositoryQueryQuery.php +++ b/src/Repository/SpeakerRepositoryQuery.php @@ -4,9 +4,9 @@ namespace App\Repository; use App\Core\Repository\RepositoryQuery; use Knp\Component\Pager\PaginatorInterface; -use App\Repository\SpeakerRepositoryQuery as Repository; +use App\Repository\SpeakerRepository as Repository; -class SpeakerRepositoryQueryQuery extends RepositoryQuery +class SpeakerRepositoryQuery extends RepositoryQuery { public function __construct(Repository $repository, PaginatorInterface $paginator) { diff --git a/src/Repository/ToolRepositoryQueryQuery.php b/src/Repository/ToolRepositoryQuery.php similarity index 72% rename from src/Repository/ToolRepositoryQueryQuery.php rename to src/Repository/ToolRepositoryQuery.php index ac86d76..ec38dbf 100644 --- a/src/Repository/ToolRepositoryQueryQuery.php +++ b/src/Repository/ToolRepositoryQuery.php @@ -4,9 +4,9 @@ namespace App\Repository; use App\Core\Repository\RepositoryQuery; use Knp\Component\Pager\PaginatorInterface; -use App\Repository\ToolRepositoryQuery as Repository; +use App\Repository\ToolRepository as Repository; -class ToolRepositoryQueryQuery extends RepositoryQuery +class ToolRepositoryQuery extends RepositoryQuery { public function __construct(Repository $repository, PaginatorInterface $paginator) { diff --git a/templates/admin/menu.html.twig b/templates/admin/menu.html.twig index 97c6237..f7979c2 100644 --- a/templates/admin/menu.html.twig +++ b/templates/admin/menu.html.twig @@ -1,14 +1,33 @@ -{# {% if is_granted('ROLE_WRITER') %} - {{ include('@Core/admin/module/_menu_section.html.twig', {label: 'Blog'}) }} + {{ include('@Core/admin/module/_menu_section.html.twig', {label: 'Interventions'}) }} {% endif %} -#} diff --git a/translations/messages.fr.yaml b/translations/messages.fr.yaml new file mode 100644 index 0000000..58baeed --- /dev/null +++ b/translations/messages.fr.yaml @@ -0,0 +1,5 @@ +"Address": "Adresse" +"Zip code": "Code postal" +"City": "Ville" +"Speaker": "Intervenant⋅e" +"Establishment": "Établissement"