FIX [center][crud] use crud controller for center entity

src/Bundle/ChillMainBundle/Controller/CenterController.php

@@ -11,178 +11,22 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Controller;
 
+use Chill\MainBundle\CRUD\Controller\CRUDController;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Form\CenterType;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
  * Class CenterController.
  */
-class CenterController extends AbstractController
+class CenterController extends CRUDController
 {
-    /**
-     * Creates a new Center entity.
-     */
-    public function createAction(Request $request)
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
-        $center = new Center();
-        $form = $this->createCreateForm($center);
-        $form->handleRequest($request);
+        $query->addOrderBy('e.name', 'ASC');
 
-        if ($form->isValid()) {
-            $em = $this->getDoctrine()->getManager();
-            $em->persist($center);
-            $em->flush();
-
-            return $this->redirect($this->generateUrl('admin_center'));
-        }
-
-        return $this->render('@ChillMain/Center/new.html.twig', [
-            'entity' => $center,
-            'form' => $form->createView(),
-        ]);
-    }
-
-    /**
-     * Displays a form to edit an existing Center entity.
-     *
-     * @param mixed $id
-     */
-    public function editAction($id)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $center = $em->getRepository(\Chill\MainBundle\Entity\Center::class)->find($id);
-
-        if (!$center) {
-            throw $this->createNotFoundException('Unable to find Center entity.');
-        }
-
-        $editForm = $this->createEditForm($center);
-
-        return $this->render('@ChillMain/Center/edit.html.twig', [
-            'entity' => $center,
-            'edit_form' => $editForm->createView(),
-        ]);
-    }
-
-    /**
-     * Lists all Center entities.
-     */
-    public function indexAction()
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $entities = $em->getRepository(\Chill\MainBundle\Entity\Center::class)->findAll();
-
-        usort($entities, fn (Center $a, Center $b) => $a->getName() <=> $b->getName());
-
-        return $this->render('@ChillMain/Center/index.html.twig', [
-            'entities' => $entities,
-        ]);
-    }
-
-    /**
-     * Displays a form to create a new Center entity.
-     */
-    public function newAction()
-    {
-        $center = new Center();
-        $form = $this->createCreateForm($center);
-
-        return $this->render('@ChillMain/Center/new.html.twig', [
-            'entity' => $center,
-            'form' => $form->createView(),
-        ]);
-    }
-
-    /**
-     * Finds and displays a Center entity.
-     *
-     * @param mixed $id
-     */
-    public function showAction($id)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $center = $em->getRepository(\Chill\MainBundle\Entity\Center::class)->find($id);
-
-        if (!$center) {
-            throw $this->createNotFoundException('Unable to find Center entity.');
-        }
-
-        return $this->render('@ChillMain/Center/show.html.twig', [
-            'entity' => $center,
-        ]);
-    }
-
-    /**
-     * Edits an existing Center entity.
-     *
-     * @param mixed $id
-     */
-    public function updateAction(Request $request, $id)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $center = $em->getRepository(\Chill\MainBundle\Entity\Center::class)->find($id);
-
-        if (!$center) {
-            throw $this->createNotFoundException('Unable to find Center entity.');
-        }
-
-        $editForm = $this->createEditForm($center);
-        $editForm->handleRequest($request);
-
-        if ($editForm->isValid()) {
-            $em->flush();
-
-            return $this->redirect($this->generateUrl('admin_center_edit', ['id' => $id]));
-        }
-
-        return $this->render('@ChillMain/Center/edit.html.twig', [
-            'entity' => $center,
-            'edit_form' => $editForm->createView(),
-        ]);
-    }
-
-    /**
-     * Creates a form to create a Center entity.
-     *
-     * @param Center $center The entity
-     *
-     * @return \Symfony\Component\Form\Form The form
-     */
-    private function createCreateForm(Center $center)
-    {
-        $form = $this->createForm(CenterType::class, $center, [
-            'action' => $this->generateUrl('admin_center_create'),
-            'method' => 'POST',
-        ]);
-
-        $form->add('submit', SubmitType::class, ['label' => 'Create']);
-
-        return $form;
-    }
-
-    /**
-     * Creates a form to edit a Center entity.
-     *
-     * @param Center $center The entity
-     *
-     * @return \Symfony\Component\Form\Form The form
-     */
-    private function createEditForm(Center $center)
-    {
-        $form = $this->createForm(CenterType::class, $center, [
-            'action' => $this->generateUrl('admin_center_update', ['id' => $center->getId()]),
-            'method' => 'PUT',
-        ]);
-
-        $form->add('submit', SubmitType::class, ['label' => 'Update']);
-
-        return $form;
+        return parent::orderQuery($action, $query, $request, $paginator);
     }
 }

src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\MainBundle\DependencyInjection;
 
 use Chill\MainBundle\Controller\AddressApiController;
+use Chill\MainBundle\Controller\CenterController;
 use Chill\MainBundle\Controller\CivilityApiController;
 use Chill\MainBundle\Controller\CivilityController;
 use Chill\MainBundle\Controller\CountryController;
@@ -44,6 +45,7 @@ use Chill\MainBundle\Doctrine\DQL\Unaccent;
 use Chill\MainBundle\Doctrine\ORM\Hydration\FlatHierarchyEntityHydrator;
 use Chill\MainBundle\Doctrine\Type\NativeDateIntervalType;
 use Chill\MainBundle\Doctrine\Type\PointType;
+use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Civility;
 use Chill\MainBundle\Entity\Country;
 use Chill\MainBundle\Entity\GeographicalUnitLayer;
@@ -53,6 +55,7 @@ use Chill\MainBundle\Entity\LocationType;
 use Chill\MainBundle\Entity\Regroupment;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\UserJob;
+use Chill\MainBundle\Form\CenterType;
 use Chill\MainBundle\Form\CivilityType;
 use Chill\MainBundle\Form\CountryType;
 use Chill\MainBundle\Form\LanguageType;
@@ -524,6 +527,27 @@ class ChillMainExtension extends Extension implements
                         ],
                     ],
                 ],
+                [
+                    'class' => Center::class,
+                    'name' => 'center',
+                    'base_path' => '/admin/center',
+                    'form_class' => CenterType::class,
+                    'controller' => CenterController::class,
+                    'actions' => [
+                        'index' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillMain/Admin/Center/index.html.twig',
+                        ],
+                        'new' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillMain/Admin/Center/new.html.twig',
+                        ],
+                        'edit' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillMain/Admin/Center/edit.html.twig',
+                        ],
+                    ],
+                ],
             ],
             'apis' => [
                 [

src/Bundle/ChillMainBundle/Form/CenterType.php

@@ -11,7 +11,10 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Form;
 
+use Chill\MainBundle\Entity\Center;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -21,24 +24,18 @@ class CenterType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('name', TextType::class);
+            ->add('name', TextType::class, [
+                'label' => 'Nom',
+            ]);
+/*            ->add('isActive', CheckboxType::class, [
+                'label' => 'Actif ?',
+                'required' => false,
+            ]);*/
     }
 
-    /**
-     * @param OptionsResolverInterface $resolver
-     */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults([
-            'data_class' => \Chill\MainBundle\Entity\Center::class,
-        ]);
-    }
-
-    /**
-     * @return string
-     */
-    public function getBlockPrefix()
-    {
-        return 'chill_mainbundle_center';
+        $resolver
+            ->setDefault('class', Center::class);
     }
 }

src/Bundle/ChillMainBundle/Resources/views/Admin/Center/edit.html.twig

@@ -0,0 +1,11 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}

src/Bundle/ChillMainBundle/Resources/views/Admin/Center/index.html.twig

@@ -0,0 +1,39 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_index.html.twig' %}
+        {% block table_entities_thead_tr %}
+            <th>{{ 'Label'|trans }}</th>
+{#            <th>{{ 'Active'|trans }}</th>#}
+            <th>&nbsp;</th>
+        {% endblock %}
+
+        {% block table_entities_tbody %}
+            {% for entity in entities %}
+                <tr>
+                    <td>{{ entity.name }}</td>
+{#                    <td style="text-align:center">#}
+{#                        {% if entity.isActive %}#}
+{#                            <i class="fa fa-check-square-o"></i>#}
+{#                        {% else %}#}
+{#                            <i class="fa fa-square-o"></i>#}
+{#                        {% endif %}#}
+{#                    </td>#}
+                    <td>
+                        <ul class="record_actions">
+                            <li>
+                                <a href="{{ chill_path_add_return_path('chill_crud_center_edit', { 'id': entity.id }) }}" class="btn btn-edit"></a>
+                            </li>
+                        </ul>
+                    </td>
+                </tr>
+            {% endfor %}
+        {% endblock %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
+    {% endembed %}
+{% endblock %}

src/Bundle/ChillMainBundle/Resources/views/Admin/Center/new.html.twig

@@ -0,0 +1,11 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}

src/Bundle/ChillMainBundle/Resources/views/Center/edit.html.twig

@@ -1,23 +0,0 @@
-{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
-
-{% block title %}{{ 'Center edit'|trans }}{% endblock %}
-
-{% block admin_content -%}
-    <h1>{{ 'Center edit'|trans }}</h1>
-
-    {{ form_start(edit_form) }}
-    {{ form_row(edit_form.name) }}
-
-    <ul class="record_actions sticky-form-buttons">
-        <li class='cancel'>
-            <a href="{{ path('admin_center') }}" class="btn btn-cancel">
-                {{ 'Back to the list'|trans }}
-            </a>
-        </li>
-        <li>
-            {{ form_widget(edit_form.submit, { 'attr' : { 'class' : 'btn btn-update' }}) }}
-        </li>
-    </ul>
-    
-    {{ form_end(edit_form) }}
-{% endblock %}

src/Bundle/ChillMainBundle/Resources/views/Center/index.html.twig

@@ -1,50 +0,0 @@
-{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
-
-{% block title %}{{ 'Center list'|trans }}{% endblock %}
-
-{% block admin_content -%}
-    {% embed '@ChillMain/CRUD/_index.html.twig' %}
-    
-        {% block index_header %}
-            <h1>{{ 'Center list'|trans }}</h1>
-        {% endblock %}
-    
-        {% block filter_order %}{% endblock %}
-    
-        {% block table_entities_thead_tr %}
-            <th>id</th>
-            <th>{{ 'Name'|trans }}</th>
-            <th>{{ 'Actions'|trans }}</th>
-        {% endblock %}
-    
-        {% block table_entities_tbody %}
-            {% for entity in entities %}
-                <tr>
-                    <td>{{ entity.id }}</td>
-                    <td>{{ entity.name }}</td>
-                    <td>
-                        <ul class="record_actions">
-                            <li>
-                                <a href="{{ path('admin_center_edit', { 'id': entity.id }) }}" class="btn btn-edit">{{ 'edit'|trans }}</a>
-                            </li>
-                        </ul>
-                    </td>
-                </tr>
-            {% endfor %}
-        {% endblock %}
-    
-        {% block pagination %}{% endblock %}
-    
-        {% block list_actions %}
-            <ul class="record_actions sticky-form-buttons">
-                <li class='cancel'>
-                    <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
-                </li>
-                <li>
-                    <a href="{{ path('admin_center_new') }}" class="btn btn-create">{{ 'Create a new center'|trans }}</a>
-                </li>
-            </ul>
-        {% endblock list_actions %}
-    
-    {% endembed %}
-{% endblock %}

src/Bundle/ChillMainBundle/Resources/views/Center/new.html.twig

@@ -1,23 +0,0 @@
-{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
-
-{% block title %}{{ 'Center creation'|trans }}{% endblock %}
-
-{% block admin_content -%}
-    <h1>{{ 'Center creation'|trans }}</h1>
-
-    {{ form_start(form) }}
-    {{ form_row(form.name) }}
-
-    <ul class="record_actions sticky-form-buttons">
-        <li class='cancel'>
-            <a href="{{ path('admin_center') }}" class="btn btn-cancel">
-                {{ 'Back to the list'|trans }}
-            </a>
-        </li>
-        <li>
-            {{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-save' }}) }}
-        </li>
-    </ul>
-    
-    {{ form_end(form) }}
-{% endblock %}

src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php

@@ -49,7 +49,7 @@ class AdminUserMenuBuilder implements LocalMenuBuilderInterface
             ]);
 
         $menu->addChild('Center list', [
-            'route' => 'admin_center',
+            'route' => 'chill_crud_center_index',
         ])->setExtras(['order' => 1010]);
 
         $menu->addChild('Regroupements des centres', [

src/Bundle/ChillMainBundle/config/routes.yaml

@@ -10,9 +10,9 @@ chill_main_admin_scope:
     resource: "@ChillMainBundle/config/routes/scope.yaml"
     prefix:   "{_locale}/admin/scope"
 
-chill_main_admin:
-    resource: "@ChillMainBundle/config/routes/center.yaml"
-    prefix:   "{_locale}/admin/center"
+#chill_main_admin:
+#    resource: "@ChillMainBundle/config/routes/center.yaml"
+#    prefix:   "{_locale}/admin/center"
 
 chill_main_exports:
     resource: "@ChillMainBundle/config/routes/exports.yaml"

src/Bundle/ChillMainBundle/translations/messages.fr.yml

@@ -425,6 +425,12 @@ crud:
             add_new: Ajouter un regroupement
         title_new: Nouveau regroupement
         title_edit: Modifier un regroupement
+    center:
+        index:
+            title: Liste des centres
+            add_new: Ajouter un centre
+        title_new: Nouveau centre
+        title_edit: Modifier un centre
 
 No entities: Aucun élément