diff --git a/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityCategoryController.php b/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityCategoryController.php new file mode 100644 index 000000000..60007b179 --- /dev/null +++ b/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityCategoryController.php @@ -0,0 +1,16 @@ +createForm(AsideActivityType::class); - - return $this->render('asideActivity_new.html.twig', [ - 'asideActivityForm' => $form->createView(), - ]); - } + } diff --git a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php b/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php index 087ae6456..952dd1400 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php +++ b/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php @@ -12,9 +12,10 @@ namespace Chill\AsideActivityBundle\DependencyInjection; use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Extension\Extension; -use Symfony\Component\DependencyInjection\Loader\PhpFileLoader; +use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface; +use Symfony\Component\DependencyInjection\Loader; -final class ChillAsideActivityExtension extends Extension +final class ChillAsideActivityExtension extends Extension implements PrependExtensionInterface { /** * {@inheritdoc} @@ -23,11 +24,54 @@ final class ChillAsideActivityExtension extends Extension */ public function load(array $configs, ContainerBuilder $container): void { - $loader = new PhpFileLoader( - $container, - new FileLocator(__DIR__ . '/../Resources/config') - ); + $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config')); + $loader->load('services.yaml'); + } - $loader->load('services.php'); + public function prepend(ContainerBuilder $container) + { + $this->prependRoute($container); + $this->prependCruds($container); + } + + protected function prependRoute(ContainerBuilder $container) + { + //declare routes for task bundle + $container->prependExtensionConfig('chill_main', array( + 'routing' => array( + 'resources' => array( + '@ChillAsideActivityBundle/config/routes.yaml', + ) + ) + )); + } + + protected function prependCruds(ContainerBuilder $container) + { + $container->prependExtensionConfig('chill_main', [ + 'cruds' => [ + [ + 'class' => \Chill\AsideActivityBundle\Entity\AsideActivityCategory::class, + 'name' => 'aside_activity_category', + 'base_path' => '/admin/asideactivity/category', + 'form_class' => \Chill\AsideActivityBundle\Form\AsideActivityCategoryType::class, + 'controller' => \Chill\AsideActivityBundle\Controller\AsideActivityCategoryController::class, + 'actions' => [ + 'index' => [ + 'template' => '@ChillAsideActivity/asideActivityCategory/index.html.twig', + 'role' => 'ROLE_ADMIN' + ], + 'new' => [ + 'role' => 'ROLE_ADMIN', + 'template' => '@ChillAsideActivity/asideActivityCategory/new.html.twig', + ], + 'edit' => [ + 'role' => 'ROLE_ADMIN', + 'template' => '@ChillAsideActivity/asideActivityCategory/edit.html.twig', + ] + ] + ], + ] + ]); } } \ No newline at end of file diff --git a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityCategoryType.php b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityCategoryType.php index 5c7054ded..36c818b4c 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityCategoryType.php +++ b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityCategoryType.php @@ -1,5 +1,7 @@ 'L’agent pour qui l\'activité annexe est créée', 'choice_label' => 'username' ]) - ->add('type', EntityType::class, - [ - 'label' => 'Type', - 'required' => true, - 'class' => AsideActivityCategory::class, - 'choice_label' => 'title' - ]) - ->add('date', DateType::class, [ - 'label' => 'Date', - 'required' => true - ]) - ->add('duration', NumberType::class, [ - 'label' => 'Durée' - ]) ->add('note', TextareaType::class, [ 'label' => 'Note' ]) diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/config/services.php b/src/Bundle/ChillAsideActivityBundle/src/Resources/config/services.php deleted file mode 100644 index 827fa1765..000000000 --- a/src/Bundle/ChillAsideActivityBundle/src/Resources/config/services.php +++ /dev/null @@ -1,14 +0,0 @@ -Creér un activité annexe + + {{ form_start(asideActivityForm) }} + + + + + {{ form_widget(asideActivityForm) }} + + + {{ form_end(asideActivityForm)}} + +{% endblock %} \ No newline at end of file diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/edit.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/edit.html.twig new file mode 100644 index 000000000..dacee767c --- /dev/null +++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/edit.html.twig @@ -0,0 +1,12 @@ +{% extends "@ChillActivity/Admin/layout_activity.html.twig" %} + +{% block title %} + {% include('@ChillMain/CRUD/_edit_title.html.twig') %} +{% endblock %} + +{% block layout_wvm_content %} + {% embed '@ChillMain/CRUD/_edit_content.html.twig' %} + {% block content_form_actions_view %}{% endblock %} + {% block content_form_actions_save_and_show %}{% endblock %} + {% endembed %} +{% endblock %} diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/index.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/index.html.twig new file mode 100644 index 000000000..fd1fd8e29 --- /dev/null +++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/index.html.twig @@ -0,0 +1,60 @@ +{# + * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, + * + * 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 . +#} +{% extends "@ChillActivity/Admin/layout_activity.html.twig" %} + +{% block admin_content %} +

{{ 'ActivityType list'|trans }}

+ + + + + + + + + + + {% for entity in entities %} + + + + + + {% endfor %} + +
{{ 'Name'|trans }}{{ 'Active'|trans }}{{ 'Actions'|trans }}
{{ entity.name|localize_translatable_string }} + {%- if entity.active -%} + + {%- else -%} + + {%- endif -%} + +
    +
  • + +
  • +
+
+ + + {% endblock %} diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/new.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/new.html.twig new file mode 100644 index 000000000..d7ac89752 --- /dev/null +++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/new.html.twig @@ -0,0 +1,11 @@ +{% extends "@ChillActivity/Admin/layout_activity.html.twig" %} + +{% block title %} + {% include('@ChillMain/CRUD/_new_title.html.twig') %} +{% endblock %} + +{% block layout_wvm_content %} + {% embed '@ChillMain/CRUD/_new_content.html.twig' %} + {% block content_form_actions_save_and_show %}{% endblock %} + {% endembed %} +{% endblock %} diff --git a/src/Bundle/ChillAsideActivityBundle/src/Templates/asideActivity_new.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Templates/asideActivity_new.html.twig deleted file mode 100644 index 0781272a1..000000000 --- a/src/Bundle/ChillAsideActivityBundle/src/Templates/asideActivity_new.html.twig +++ /dev/null @@ -1,11 +0,0 @@ -{% extends '@ChillMain/Admin/layout.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 %} \ No newline at end of file diff --git a/src/Bundle/ChillAsideActivityBundle/src/config/routes.yaml b/src/Bundle/ChillAsideActivityBundle/src/config/routes.yaml new file mode 100644 index 000000000..622102e34 --- /dev/null +++ b/src/Bundle/ChillAsideActivityBundle/src/config/routes.yaml @@ -0,0 +1,3 @@ +chill_asideactivities_controllers: + resource: "@ChillAsideActivityBundle/Controller" + type: annotation \ No newline at end of file diff --git a/src/Bundle/ChillAsideActivityBundle/src/config/services.yaml b/src/Bundle/ChillAsideActivityBundle/src/config/services.yaml new file mode 100644 index 000000000..e69de29bb diff --git a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.yaml b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.yaml new file mode 100644 index 000000000..e69de29bb