From bebee4fbeb37db986535fd73373f39f4063d76c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 2 Oct 2015 13:57:23 +0200 Subject: [PATCH] layout and clean activity reason crud --- .../ActivityReasonCategoryController.php | 47 ------------------- Entity/ActivityReason.php | 2 +- Entity/ActivityReasonCategory.php | 2 +- Resources/translations/messages.fr.yml | 12 ++++- .../ActivityReasonCategory/edit.html.twig | 11 +++-- .../ActivityReasonCategory/index.html.twig | 34 +++++--------- .../ActivityReasonCategory/new.html.twig | 10 ++-- .../ActivityReasonCategory/show.html.twig | 17 ++++--- 8 files changed, 46 insertions(+), 89 deletions(-) diff --git a/Controller/ActivityReasonCategoryController.php b/Controller/ActivityReasonCategoryController.php index 225c52415..8374f3f3e 100644 --- a/Controller/ActivityReasonCategoryController.php +++ b/Controller/ActivityReasonCategoryController.php @@ -101,11 +101,8 @@ class ActivityReasonCategoryController extends Controller throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.'); } - $deleteForm = $this->createDeleteForm($id); - return $this->render('ChillActivityBundle:ActivityReasonCategory:show.html.twig', array( 'entity' => $entity, - 'delete_form' => $deleteForm->createView(), )); } @@ -124,12 +121,10 @@ class ActivityReasonCategoryController extends Controller } $editForm = $this->createEditForm($entity); - $deleteForm = $this->createDeleteForm($id); return $this->render('ChillActivityBundle:ActivityReasonCategory:edit.html.twig', array( 'entity' => $entity, 'edit_form' => $editForm->createView(), - 'delete_form' => $deleteForm->createView(), )); } @@ -165,7 +160,6 @@ class ActivityReasonCategoryController extends Controller throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.'); } - $deleteForm = $this->createDeleteForm($id); $editForm = $this->createEditForm($entity); $editForm->handleRequest($request); @@ -178,47 +172,6 @@ class ActivityReasonCategoryController extends Controller return $this->render('ChillActivityBundle:ActivityReasonCategory:edit.html.twig', array( 'entity' => $entity, 'edit_form' => $editForm->createView(), - 'delete_form' => $deleteForm->createView(), )); } - /** - * Deletes a ActivityReasonCategory entity. - * - */ - public function deleteAction(Request $request, $id) - { - $form = $this->createDeleteForm($id); - $form->handleRequest($request); - - if ($form->isValid()) { - $em = $this->getDoctrine()->getManager(); - $entity = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->find($id); - - if (!$entity) { - throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.'); - } - - $em->remove($entity); - $em->flush(); - } - - return $this->redirect($this->generateUrl('chill_activity_activityreasoncategory')); - } - - /** - * Creates a form to delete a ActivityReasonCategory entity by id. - * - * @param mixed $id The entity id - * - * @return \Symfony\Component\Form\Form The form - */ - private function createDeleteForm($id) - { - return $this->createFormBuilder() - ->setAction($this->generateUrl('chill_activity_activityreasoncategory_delete', array('id' => $id))) - ->setMethod('DELETE') - ->add('submit', 'submit', array('label' => 'Delete')) - ->getForm() - ; - } } diff --git a/Entity/ActivityReason.php b/Entity/ActivityReason.php index fb196b8d9..77eaf4029 100644 --- a/Entity/ActivityReason.php +++ b/Entity/ActivityReason.php @@ -45,7 +45,7 @@ class ActivityReason /** * @var boolean */ - private $active; + private $active = true; /** diff --git a/Entity/ActivityReasonCategory.php b/Entity/ActivityReasonCategory.php index 0106ab881..0c97d37d8 100644 --- a/Entity/ActivityReasonCategory.php +++ b/Entity/ActivityReasonCategory.php @@ -40,7 +40,7 @@ class ActivityReasonCategory /** * @var boolean */ - private $active; + private $active = true; /** @var ArrayCollection array of ActivityReason */ private $reasons; diff --git a/Resources/translations/messages.fr.yml b/Resources/translations/messages.fr.yml index 549b6564c..5728aa5de 100644 --- a/Resources/translations/messages.fr.yml +++ b/Resources/translations/messages.fr.yml @@ -41,7 +41,8 @@ CHILL_ACTIVITY_SEE: Voir une activité Activity configuration menu: Configuration des activités Activity Types: Types d'activité Activity Reasons: Sujets d'une activité -Activity Reasons Category: Catégories d'activités +Activity Reasons Category: Catégories de sujet d'activités +Activity configuration: Configuration des activités # activity reason admin ActivityReason list: Liste des sujets @@ -53,3 +54,12 @@ ActivityReason edit: Modification d'un sujet ActivityReason: Sujet d'activité The entity is inactive and won't be proposed: Le sujet est inactif et ne sera pas proposé The entity is active and will be proposed: Le sujet est actif et sera proposé + +#activity reason category admin +ActivityReasonCategory list: Catégories de sujets +Create a new activity category reason: Créer une nouvelle catégorie +ActivityReasonCategory creation: Nouvelle catégorie de sujet +ActivityReasonCategory edit: Modification d'une catégorie de sujet +ActivityReasonCategory: Catégorie de sujet d'activité +ActivityReasonCategory is active and will be proposed: La catégorie est active et sera proposée +ActivityReasonCategory is inactive and won't be proposed: La catégorie est inactive et ne sera pas proposée diff --git a/Resources/views/ActivityReasonCategory/edit.html.twig b/Resources/views/ActivityReasonCategory/edit.html.twig index edc630cdb..2ff334b3b 100644 --- a/Resources/views/ActivityReasonCategory/edit.html.twig +++ b/Resources/views/ActivityReasonCategory/edit.html.twig @@ -17,16 +17,19 @@ {% extends "ChillActivityBundle::Admin/layout_activity.html.twig" %} {% block admin_content %} -

ActivityReasonCategory edit

+

{{ 'ActivityReasonCategory edit'|trans }}

- {{ form(edit_form) }} + {{ form_start(edit_form) }} + {{ form_row(edit_form.name) }} + {{ form_row(edit_form.active) }} + {{ form_row(edit_form.submit, { 'attr': { 'class': 'sc-button orange' } } ) }} + {{ form_end(edit_form) }} {% endblock %} diff --git a/Resources/views/ActivityReasonCategory/index.html.twig b/Resources/views/ActivityReasonCategory/index.html.twig index 43135ade8..606d17b72 100644 --- a/Resources/views/ActivityReasonCategory/index.html.twig +++ b/Resources/views/ActivityReasonCategory/index.html.twig @@ -17,40 +17,28 @@ {% extends "ChillActivityBundle::Admin/layout_activity.html.twig" %} {% block admin_content %} -

ActivityReasonCategory list

+

{{ 'ActivityReasonCategory list'|trans }}

- {% for entity in entities %} + - - {% endfor %} @@ -60,7 +48,7 @@ diff --git a/Resources/views/ActivityReasonCategory/new.html.twig b/Resources/views/ActivityReasonCategory/new.html.twig index 4e4c348da..8f90f8909 100644 --- a/Resources/views/ActivityReasonCategory/new.html.twig +++ b/Resources/views/ActivityReasonCategory/new.html.twig @@ -17,14 +17,18 @@ {% extends "ChillActivityBundle::Admin/layout_activity.html.twig" %} {% block admin_content %} -

ActivityReasonCategory creation

+

{{ 'ActivityReasonCategory creation'|trans }}

- {{ form(form) }} + {{ form_start(form) }} + {{ form_row(form.name) }} + {{ form_row(form.active) }} + {{ form_widget(form.submit, { 'attr': { 'class' : 'sc-button blue' } } ) }} +

{{ form_end(form) }}

diff --git a/Resources/views/ActivityReasonCategory/show.html.twig b/Resources/views/ActivityReasonCategory/show.html.twig index 162948acc..37fbffe3a 100644 --- a/Resources/views/ActivityReasonCategory/show.html.twig +++ b/Resources/views/ActivityReasonCategory/show.html.twig @@ -17,7 +17,7 @@ {% extends "ChillActivityBundle::Admin/layout_activity.html.twig" %} {% block admin_content %} -

ActivityReasonCategory

+

{{ 'ActivityReasonCategory'|trans }}

{{ 'Name'|trans }}{{ 'Active'|trans }}Active {{ 'Actions'|trans }}
{{ entity.name|localize_translatable_string }} - - {{ entity.name|localize_translatable_string }} - - - {% if entity.active %} -

{{ 'Active'|trans }}

- {% else %} -

{{ "Inactive"|trans }}

- {% endif %} - 		- +
@@ -28,11 +28,11 @@ @@ -41,14 +41,13 @@ {% endblock %}
{{ 'Active'|trans }} - {% if entity.active %} -

{{ 'The entity is active and will be proposed'|trans }}

- {% else %} -

{{ "The entity is inactive and won't be proposed"|trans }}

- {% endif %} + {%- if entity.active -%} + {{ 'ActivityReasonCategory is active and will be proposed'|trans }} + {%- else -%} + {{ "ActivityReasonCategory is inactive and won't be proposed"|trans }} + {%- endif -%}