sf4, setting new path for all config yaml files, and replace 'controller' path syntax in routes definitions

config/routes.yaml

@@ -0,0 +1,34 @@
+chill_activity_activity:
+    resource: "@ChillActivityBundle/config/routes/activity.yaml"
+    prefix:   /
+
+chill_activity_activityreason:
+    resource: "@ChillActivityBundle/config/routes/activityreason.yaml"
+    prefix:   /
+
+chill_activity_activityreasoncategory:
+    resource: "@ChillActivityBundle/config/routes/activityreasoncategory.yaml"
+    prefix:   /
+
+chill_activity_activitytype:
+    resource: "@ChillActivityBundle/config/routes/activitytype.yaml"
+    prefix:   /
+
+chill_admin_activity_index:
+    path:     /{_locale}/admin/activity
+    controller: Chill\ActivityBundle\Controller\AdminController::indexActivityAction
+    options:
+        menus:
+            admin_section:
+                label: Activity configuration
+                order: 2000
+                icons: [tag]
+
+chill_admin_activity_redirect_to_admin_index:
+    path:     /{_locale}/admin/activity_redirect_to_main
+    controller: Chill\ActivityBundle\Controller\AdminController::redirectToAdminIndexAction
+    options:
+        menus:
+            admin_activity:
+                order: 0
+                label: Main admin menu

config/routes/activity.yaml

@@ -0,0 +1,30 @@
+chill_activity_activity_list:
+    path:     /{_locale}/person/{person_id}/activity/
+    controller: Chill\ActivityBundle\Controller\ActivityController::listAction
+
+chill_activity_activity_show:
+    path:     /{_locale}/person/{person_id}/activity/{id}/show
+    controller: Chill\ActivityBundle\Controller\ActivityController::showAction
+
+chill_activity_activity_new:
+    path:     /{_locale}/person/{person_id}/activity/new
+    controller: Chill\ActivityBundle\Controller\ActivityController::newAction
+
+chill_activity_activity_create:
+    path:     /{_locale}/person/{person_id}/activity/create
+    controller: Chill\ActivityBundle\Controller\ActivityController::createAction
+    methods:  POST
+
+chill_activity_activity_edit:
+    path:     /{_locale}/person/{person_id}/activity/{id}/edit
+    controller: Chill\ActivityBundle\Controller\ActivityController::editAction
+
+chill_activity_activity_update:
+    path:     /{_locale}/person/{person_id}/activity/{id}/update
+    controller: Chill\ActivityBundle\Controller\ActivityController::updateAction
+    methods:  [POST, PUT]
+
+chill_activity_activity_delete:
+    path:     /{_locale}/person/{person_id}/activity/{id}/delete
+    controller: Chill\ActivityBundle\Controller\ActivityController::deleteAction
+    methods:  [GET, POST, DELETE]

config/routes/activityreason.yaml

@@ -0,0 +1,35 @@
+chill_activity_activityreason:
+    path:     /{_locale}/admin/activityreason/
+    controller: Chill\ActivityBundle\Controller\ActivityReasonController::indexAction
+    options:
+        menus:
+            admin_activity: 
+                order: 2000
+                label: "Activity Reasons"
+
+chill_activity_activityreason_show:
+    path:     /{_locale}/admin/activityreason/{id}/show
+    controller: Chill\ActivityBundle\Controller\ActivityReasonController::showAction
+
+chill_activity_activityreason_new:
+    path:     /{_locale}/admin/activityreason/new
+    controller: Chill\ActivityBundle\Controller\ActivityReasonController::newAction
+
+chill_activity_activityreason_create:
+    path:     /{_locale}/admin/activityreason/create
+    controller: Chill\ActivityBundle\Controller\ActivityReasonController::createAction
+    methods:  POST
+
+chill_activity_activityreason_edit:
+    path:     /{_locale}/admin/activityreason/{id}/edit
+    controller: Chill\ActivityBundle\Controller\ActivityReasonController::editAction
+
+chill_activity_activityreason_update:
+    path:     /{_locale}/admin/activityreason/{id}/update
+    controller: Chill\ActivityBundle\Controller\ActivityReasonController::updateAction
+    methods:  [POST, PUT]
+
+chill_activity_activityreason_delete:
+    path:     /{_locale}/admin/activityreason/{id}/delete
+    controller: Chill\ActivityBundle\Controller\ActivityReasonController::deleteAction
+    methods:  [POST, DELETE]

config/routes/activityreasoncategory.yaml

@@ -0,0 +1,35 @@
+chill_activity_activityreasoncategory:
+    path:     /{_locale}/admin/activityreasoncategory/
+    controller: Chill\ActivityBundle\Controller\ActivityReasonCategoryController::indexAction
+    options:
+        menus:
+            admin_activity: 
+                order: 2010
+                label: "Activity Reasons Category"
+
+chill_activity_activityreasoncategory_show:
+    path:     /{_locale}/admin/activityreasoncategory/{id}/show
+    controller: Chill\ActivityBundle\Controller\ActivityReasonCategoryController::showAction
+
+chill_activity_activityreasoncategory_new:
+    path:     /{_locale}/admin/activityreasoncategory/new
+    controller: Chill\ActivityBundle\Controller\ActivityReasonCategoryController::newAction
+
+chill_activity_activityreasoncategory_create:
+    path:     /{_locale}/admin/activityreasoncategory/create
+    controller: Chill\ActivityBundle\Controller\ActivityReasonCategoryController::createAction
+    methods:  POST
+
+chill_activity_activityreasoncategory_edit:
+    path:     /{_locale}/admin/activityreasoncategory/{id}/edit
+    controller: Chill\ActivityBundle\Controller\ActivityReasonCategoryController::editAction
+
+chill_activity_activityreasoncategory_update:
+    path:     /{_locale}/admin/activityreasoncategory/{id}/update
+    controller: Chill\ActivityBundle\Controller\ActivityReasonCategoryController::updateAction
+    methods:  [POST, PUT]
+
+chill_activity_activityreasoncategory_delete:
+    path:     /{_locale}/admin/activityreasoncategory/{id}/delete
+    controller: Chill\ActivityBundle\Controller\ActivityReasonCategoryController::deleteAction
+    methods:  [POST, DELETE]

config/routes/activitytype.yaml

@@ -0,0 +1,35 @@
+chill_activity_activitytype:
+    path:     /{_locale}/admin/activitytype/
+    controller: Chill\ActivityBundle\Controller\ActivityTypeController::indexAction
+    options:
+        menus:
+            admin_activity: 
+                order: 2020
+                label: "Activity Types"
+
+chill_activity_activitytype_show:
+    path:     /{_locale}/admin/activitytype/{id}/show
+    controller: Chill\ActivityBundle\Controller\ActivityTypeController::showAction
+
+chill_activity_activitytype_new:
+    path:     /{_locale}/admin/activitytype/new
+    controller: Chill\ActivityBundle\Controller\ActivityTypeController::newAction
+
+chill_activity_activitytype_create:
+    path:     /{_locale}/admin/activitytype/create
+    controller: Chill\ActivityBundle\Controller\ActivityTypeController::createAction
+    methods:  POST
+
+chill_activity_activitytype_edit:
+    path:     /{_locale}/admin/activitytype/{id}/edit
+    controller: Chill\ActivityBundle\Controller\ActivityTypeController::editAction
+
+chill_activity_activitytype_update:
+    path:     /{_locale}/admin/activitytype/{id}/update
+    controller: Chill\ActivityBundle\Controller\ActivityTypeController::updateAction
+    methods:  [POST, PUT]
+
+chill_activity_activitytype_delete:
+    path:     /{_locale}/admin/activitytype/{id}/delete
+    controller: Chill\ActivityBundle\Controller\ActivityTypeController::deleteAction
+    methods:  [POST, DELETE]

config/services.yaml

@@ -0,0 +1,27 @@
+services:     
+    chill.activity.security.authorization.activity_voter:
+        class: Chill\ActivityBundle\Security\Authorization\ActivityVoter
+        arguments:
+            - "@chill.main.security.authorization.helper"
+        tags:
+            - { name: security.voter }
+            - { name: chill.role }
+            
+    chill.activity.security.authorization.activity_stats_voter:
+        class: Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter
+        arguments:
+            - "@chill.main.security.authorization.helper"
+        tags:
+            - { name: security.voter }
+            - { name: chill.role }
+            
+            
+    chill.activity.timeline:
+        class: Chill\ActivityBundle\Timeline\TimelineActivityProvider
+        arguments:
+            - '@doctrine.orm.entity_manager'
+            - '@chill.main.security.authorization.helper'
+            - '@security.token_storage'
+        public: true
+        tags:
+            - { name: chill.timeline, context: 'person' }

config/services/controller.yaml

@@ -0,0 +1,6 @@
+services:
+    Chill\ActivityBundle\Controller\ActivityController:
+        arguments:
+            $eventDispatcher: '@Symfony\Component\EventDispatcher\EventDispatcherInterface'
+            $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'
+        tags: ['controller.service_arguments']

config/services/export.yaml

@@ -0,0 +1,82 @@
+services:
+    chill.activity.export.count_activity:
+        class: Chill\ActivityBundle\Export\Export\CountActivity
+        arguments:
+            - "@doctrine.orm.entity_manager"
+        tags:
+            - { name: chill.export, alias: 'count_activity' }
+            
+    chill.activity.export.sum_activity_duration:
+        class: Chill\ActivityBundle\Export\Export\StatActivityDuration
+        arguments:
+            - "@doctrine.orm.entity_manager"
+            - "sum"
+        tags:
+            - { name: chill.export, alias: 'sum_activity_duration' }
+            
+    chill.activity.export.list_activity:
+        class: Chill\ActivityBundle\Export\Export\ListActivity
+        arguments:
+            - "@doctrine.orm.entity_manager"
+            - "@translator"
+            - "@chill.main.helper.translatable_string"
+        tags:
+            - { name: chill.export, alias: 'list_activity' }
+            
+    chill.activity.export.reason_filter:
+        class: Chill\ActivityBundle\Export\Filter\ActivityReasonFilter
+        arguments:
+            - "@chill.main.helper.translatable_string"
+            - "@chill_activity.repository.reason"
+        tags:
+            - { name: chill.export_filter, alias: 'activity_reason_filter' }
+            
+    chill.activity.export.type_filter:
+        class: Chill\ActivityBundle\Export\Filter\ActivityTypeFilter
+        arguments:
+            - "@chill.main.helper.translatable_string"
+            - "@chill_activity.repository.activity_type"
+        tags:
+            - { name: chill.export_filter, alias: 'activity_type_filter' }
+            
+    chill.activity.export.date_filter:
+        class: Chill\ActivityBundle\Export\Filter\ActivityDateFilter
+        arguments:
+            - "@translator"
+        tags:
+            - { name: chill.export_filter, alias: 'activity_date_filter' }
+
+    chill.activity.export.person_having_an_activity_between_date_filter:
+        class: Chill\ActivityBundle\Export\Filter\PersonHavingActivityBetweenDateFilter
+        arguments:
+            - "@chill.main.helper.translatable_string"
+            - "@chill_activity.repository.reason"
+            - "@translator"
+        tags:
+            - #0 register as a filter
+                name: chill.export_filter
+                alias: 'activity_person_having_ac_bw_date_filter'
+            
+    chill.activity.export.reason_aggregator:
+        class: Chill\ActivityBundle\Export\Aggregator\ActivityReasonAggregator
+        arguments:
+            - "@chill_activity.repository.reason_category"
+            - "@chill_activity.repository.reason"
+            - "@chill.main.helper.translatable_string"
+        tags:
+            - { name: chill.export_aggregator, alias: activity_reason_aggregator }
+            
+    chill.activity.export.type_aggregator:
+        class: Chill\ActivityBundle\Export\Aggregator\ActivityTypeAggregator
+        arguments:
+            - "@chill_activity.repository.activity_type"
+            - "@chill.main.helper.translatable_string"
+        tags:
+            - { name: chill.export_aggregator, alias: activity_type_aggregator }
+            
+    chill.activity.export.user_aggregator:
+        class: Chill\ActivityBundle\Export\Aggregator\ActivityUserAggregator
+        arguments:
+            $em: "@doctrine.orm.entity_manager"
+        tags:
+            - { name: chill.export_aggregator, alias: activity_user_aggregator }

config/services/fixtures.yaml

@@ -0,0 +1,4 @@
+services:
+    Chill\ActivityBundle\DataFixtures\ORM\:
+        resource: ../../DataFixtures/ORM
+        tags: [ 'doctrine.fixture.orm' ]

config/services/form.yaml

@@ -0,0 +1,35 @@
+---
+services:
+    chill.activity.form.type.translatableactivityreasoncategory:
+        class: Chill\ActivityBundle\Form\Type\TranslatableActivityReasonCategory
+        arguments:
+            - "@request_stack"
+        tags:
+            - { name: form.type, alias: translatable_activity_reason_category }
+            
+    chill.activity.form.type.translatableactivityreason:
+        class: Chill\ActivityBundle\Form\Type\TranslatableActivityReason
+        arguments:
+            $translatableStringHelper: "@chill.main.helper.translatable_string"
+            $reasonRender: '@Chill\ActivityBundle\Templating\Entity\ActivityReasonRender'
+        tags:
+            - { name: form.type, alias: translatable_activity_reason }
+            
+    chill.activity.form.type.translatableactivitytype:
+        class: Chill\ActivityBundle\Form\Type\TranslatableActivityType
+        arguments:
+            - "@chill.main.helper.translatable_string"
+            - "@chill_activity.repository.activity_type"
+        tags:
+            - { name: form.type, alias: translatable_activity_type }
+            
+    chill.activity.form.type.activity:
+        class: Chill\ActivityBundle\Form\ActivityType
+        arguments:
+            - "@security.token_storage"
+            - "@chill.main.security.authorization.helper"
+            - "@doctrine.orm.entity_manager"
+            - "@chill.main.helper.translatable_string"
+            - "%chill_activity.form.time_duration%"
+        tags:
+            - { name: form.type, alias: chill_activitybundle_activity }

config/services/menu.yaml

@@ -0,0 +1,8 @@
+services:
+    Chill\ActivityBundle\Menu\MenuBuilder:
+        arguments:
+            $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'
+            $tokenStorage: '@Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface'
+            $translator: '@Symfony\Component\Translation\TranslatorInterface'
+        tags:
+            - { name: 'chill.menu_builder' }

config/services/repositories.yaml

@@ -0,0 +1,18 @@
+services:
+    chill_activity.repository.activity_type:
+        class: Doctrine\ORM\EntityRepository
+        factory: ['@doctrine.orm.entity_manager', getRepository]
+        arguments:
+            - 'Chill\ActivityBundle\Entity\ActivityType'
+            
+    chill_activity.repository.reason:
+        class: Doctrine\ORM\EntityRepository
+        factory: ['@doctrine.orm.entity_manager', getRepository]
+        arguments:
+            - 'Chill\ActivityBundle\Entity\ActivityReason'
+            
+    chill_activity.repository.reason_category:
+        class: Doctrine\ORM\EntityRepository
+        factory: ['@doctrine.orm.entity_manager', getRepository]
+        arguments:
+            - 'Chill\ActivityBundle\Entity\ActivityReasonCategory'

config/services/templating.yaml

@@ -0,0 +1,7 @@
+---
+services:
+    Chill\ActivityBundle\Templating\Entity\ActivityReasonRender:
+        arguments:
+            $translatableStringHelper: '@Chill\MainBundle\Templating\TranslatableStringHelper'
+        tags:
+            - { name: 'chill.render_entity' }