First step of integration code generated

Controller/ActivityController.php

@@ -1,5 +1,25 @@
 <?php
 
+/*
+ * Chill is a software for social workers
+ *
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
+ * <http://www.champs-libres.coop>, <info@champs-libres.coop>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
 namespace Chill\ActivityBundle\Controller;
 
 use Symfony\Component\HttpFoundation\Request;
@@ -19,24 +39,28 @@ class ActivityController extends Controller
      * Lists all Activity entities.
      *
      */
-    public function indexAction()
+    public function listAction($person_id, Request $request)
     {
         $em = $this->getDoctrine()->getManager();
+        $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id);
+        $activities = $em->getRepository('ChillActivityBundle:Activity')->findAll();
 
-        $entities = $em->getRepository('ChillActivityBundle:Activity')->findAll();
+        return $this->render('ChillActivityBundle:Activity:list.html.twig', array(
-
+            'activities' => $activities,
-        return $this->render('ChillActivityBundle:Activity:index.html.twig', array(
+            'person'   => $person
-            'entities' => $entities,
         ));
     }
     /**
      * Creates a new Activity entity.
      *
      */
-    public function createAction(Request $request)
+    public function createAction($person_id, Request $request)
     {
+        $em = $this->getDoctrine()->getManager();
+        $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id);
+        
         $entity = new Activity();
-        $form = $this->createCreateForm($entity);
+        $form = $this->createCreateForm($entity, $person);
         $form->handleRequest($request);
 
         if ($form->isValid()) {
@@ -44,12 +68,13 @@ class ActivityController extends Controller
             $em->persist($entity);
             $em->flush();
 
-            return $this->redirect($this->generateUrl('activity_show', array('id' => $entity->getId())));
+            return $this->redirect($this->generateUrl('chill_activity_activity_show', array('id' => $entity->getId())));
         }
 
         return $this->render('ChillActivityBundle:Activity:new.html.twig', array(
             'entity' => $entity,
             'form'   => $form->createView(),
+            'person' => $person
         ));
     }
 
@@ -60,10 +85,10 @@ class ActivityController extends Controller
      *
      * @return \Symfony\Component\Form\Form The form
      */
-    private function createCreateForm(Activity $entity)
+    private function createCreateForm(Activity $entity, $person)
     {
         $form = $this->createForm(new ActivityType(), $entity, array(
-            'action' => $this->generateUrl('activity_create'),
+            'action' => $this->generateUrl('chill_activity_activity_create', ['person_id' => $person->getId()]),
             'method' => 'POST',
         ));
 
@@ -76,12 +101,16 @@ class ActivityController extends Controller
      * Displays a form to create a new Activity entity.
      *
      */
-    public function newAction()
+    public function newAction($person_id)
     {
+        $em = $this->getDoctrine()->getManager();
+        $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id);
+        
         $entity = new Activity();
-        $form   = $this->createCreateForm($entity);
+        $form   = $this->createCreateForm($entity, $person);
 
         return $this->render('ChillActivityBundle:Activity:new.html.twig', array(
+            'person'   => $person,
             'entity' => $entity,
             'form'   => $form->createView(),
         ));
@@ -113,9 +142,10 @@ class ActivityController extends Controller
      * Displays a form to edit an existing Activity entity.
      *
      */
-    public function editAction($id)
+    public function editAction($person_id, $id)
     {
         $em = $this->getDoctrine()->getManager();
+        $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id);
 
         $entity = $em->getRepository('ChillActivityBundle:Activity')->find($id);
 
@@ -130,6 +160,7 @@ class ActivityController extends Controller
             'entity'      => $entity,
             'edit_form'   => $editForm->createView(),
             'delete_form' => $deleteForm->createView(),
+            'person' => $$person
         ));
     }
 
@@ -143,7 +174,7 @@ class ActivityController extends Controller
     private function createEditForm(Activity $entity)
     {
         $form = $this->createForm(new ActivityType(), $entity, array(
-            'action' => $this->generateUrl('activity_update', array('id' => $entity->getId())),
+            'action' => $this->generateUrl('chill_activity_activity_update', array('id' => $entity->getId())),
             'method' => 'PUT',
         ));
 
@@ -172,7 +203,7 @@ class ActivityController extends Controller
         if ($editForm->isValid()) {
             $em->flush();
 
-            return $this->redirect($this->generateUrl('activity_edit', array('id' => $id)));
+            return $this->redirect($this->generateUrl('chill_activity_activity_edit', array('id' => $id)));
         }
 
         return $this->render('ChillActivityBundle:Activity:edit.html.twig', array(
@@ -215,7 +246,7 @@ class ActivityController extends Controller
     private function createDeleteForm($id)
     {
         return $this->createFormBuilder()
-            ->setAction($this->generateUrl('activity_delete', array('id' => $id)))
+            ->setAction($this->generateUrl('chill_activity_activity_delete', array('id' => $id)))
             ->setMethod('DELETE')
             ->add('submit', 'submit', array('label' => 'Delete'))
             ->getForm()

Form/ActivityType.php

@@ -20,10 +20,10 @@ class ActivityType extends AbstractType
             ->add('remark')
             ->add('attendee')
             ->add('user')
-            ->add('scope')
+            //->add('scope')
-            ->add('reason')
+            //->add('reason')
-            ->add('type')
+            //->add('type')
-            ->add('person')
+            //->add('person')
         ;
     }
     

Resources/config/routing.yml

@@ -1,6 +1,6 @@
 chill_activity_activity:
     resource: "@ChillActivityBundle/Resources/config/routing/activity.yml"
-    prefix:   /activity
+    prefix:   /
 
 chill_activity_activityreason:
     resource: "@ChillActivityBundle/Resources/config/routing/activityreason.yml"

Resources/config/routing/activity.yml

@@ -1,30 +1,40 @@
-activity:
+chill_activity_activity_list:
-    path:     /
+    path:     /{_locale}/person/{person_id}/activity/
-    defaults: { _controller: "ChillActivityBundle:Activity:index" }
+    defaults: { _controller: "ChillActivityBundle:Activity:list" }
+    options:
+        menus:
+            person:
+                order: 201
+                label: Activity list
 
-activity_show:
+chill_activity_activity_show:
-    path:     /{id}/show
+    path:     /{_locale}/person/{person_id}/activity/{id}/show
     defaults: { _controller: "ChillActivityBundle:Activity:show" }
 
-activity_new:
+chill_activity_activity_new:
-    path:     /new
+    path:     /{_locale}/person/{person_id}/activity/new
     defaults: { _controller: "ChillActivityBundle:Activity:new" }
+    options:
+        menus:
+            person:
+                order: 200
+                label: Add an activity
 
-activity_create:
+chill_activity_activity_create:
-    path:     /create
+    path:     /{_locale}/person/{person_id}/activity/create
     defaults: { _controller: "ChillActivityBundle:Activity:create" }
     methods:  POST
 
-activity_edit:
+chill_activity_activity_edit:
-    path:     /{id}/edit
+    path:     /{_locale}/person/{person_id}/activity/{id}/edit
     defaults: { _controller: "ChillActivityBundle:Activity:edit" }
 
-activity_update:
+chill_activity_activity_update:
-    path:     /{id}/update
+    path:     /{_locale}/person/{person_id}/activity/{id}/update
     defaults: { _controller: "ChillActivityBundle:Activity:update" }
     methods:  [POST, PUT]
 
-activity_delete:
+chill_activity_activity_delete:
-    path:     /{id}/delete
+    path:     /{_locale}/person/{person_id}/activity/{id}/delete
     defaults: { _controller: "ChillActivityBundle:Activity:delete" }
     methods:  [POST, DELETE]

Resources/views/Activity/edit.html.twig

@@ -1,13 +1,33 @@
-{% extends '::base.html.twig' %}
+{#
+ * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ * 
+ * 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 <http://www.gnu.org/licenses/>.
+#}
+{% extends "ChillPersonBundle::layout.html.twig"  %}
 
-{% block body -%}
+{% set activeRouteKey = 'chill_activity_activity_list' %}
+
+{% block title %}{{ 'Activity edit' |trans }}{% endblock title %}
+
+{% block personcontent %}
     <h1>Activity edit</h1>
 
     {{ form(edit_form) }}
 
         <ul class="record_actions">
     <li>
-        <a href="{{ path('activity') }}">
+        <a href="{{ path('chill_activity_activity', {'person_id': person.id}) }}">
             Back to the list
         </a>
     </li>

Resources/views/Activity/index.html.twig

@@ -1,47 +0,0 @@
-{% extends '::base.html.twig' %}
-
-{% block body -%}
-    <h1>Activity list</h1>
-
-    <table class="records_list">
-        <thead>
-            <tr>
-                <th>Id</th>
-                <th>Date</th>
-                <th>Durationtime</th>
-                <th>Remark</th>
-                <th>Attendee</th>
-                <th>Actions</th>
-            </tr>
-        </thead>
-        <tbody>
-        {% for entity in entities %}
-            <tr>
-                <td><a href="{{ path('activity_show', { 'id': entity.id }) }}">{{ entity.id }}</a></td>
-                <td>{% if entity.date %}{{ entity.date|date('Y-m-d H:i:s') }}{% endif %}</td>
-                <td>{{ entity.durationTime }}</td>
-                <td>{{ entity.remark }}</td>
-                <td>{{ entity.attendee }}</td>
-                <td>
-                <ul>
-                    <li>
-                        <a href="{{ path('activity_show', { 'id': entity.id }) }}">show</a>
-                    </li>
-                    <li>
-                        <a href="{{ path('activity_edit', { 'id': entity.id }) }}">edit</a>
-                    </li>
-                </ul>
-                </td>
-            </tr>
-        {% endfor %}
-        </tbody>
-    </table>
-
-        <ul>
-        <li>
-            <a href="{{ path('activity_new') }}">
-                Create a new entry
-            </a>
-        </li>
-    </ul>
-    {% endblock %}

Resources/views/Activity/list.html.twig

@@ -0,0 +1,67 @@
+{#
+ * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ * 
+ * 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 <http://www.gnu.org/licenses/>.
+#}
+{% extends "ChillPersonBundle::layout.html.twig"  %}
+
+{% set activeRouteKey = 'chill_activity_activity_list' %}
+
+{% block title %}{{ 'Activity list' |trans }}{% endblock title %}
+
+{% block personcontent %}
+    <h1>Activity list</h1>
+
+    <table class="records_list">
+        <thead>
+            <tr>
+                <th>Id</th>
+                <th>Date</th>
+                <th>Durationtime</th>
+                <th>Remark</th>
+                <th>Attendee</th>
+                <th>Actions</th>
+            </tr>
+        </thead>
+        <tbody>
+        {% for activity in activities %}
+            <tr>
+                <td><a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person.id }) }}">{{ activity.id }}</a></td>
+                <td>{% if activity.date %}{{ activity.date|date('Y-m-d H:i:s') }}{% endif %}</td>
+                <td>{{ activity.durationTime }}</td>
+                <td>{{ activity.remark }}</td>
+                <td>{{ activity.attendee }}</td>
+                <td>
+                <ul>
+                    <li>
+                        <a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person.id }) }}">show</a>
+                    </li>
+                    <li>
+                        <a href="{{ path('chill_activity_activity_edit', { 'id': activity.id, 'person_id': person.id }) }}">edit</a>
+                    </li>
+                </ul>
+                </td>
+            </tr>
+        {% endfor %}
+        </tbody>
+    </table>
+
+        <ul>
+        <li>
+            <a href="{{ path('chill_activity_activity_new', {'person_id': person.id}) }}">
+                Create a new entry
+            </a>
+        </li>
+    </ul>
+{% endblock %}

Resources/views/Activity/new.html.twig

@@ -1,15 +1,35 @@
-{% extends '::base.html.twig' %}
+{#
+ * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ * 
+ * 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 <http://www.gnu.org/licenses/>.
+#}
+{% extends "ChillPersonBundle::layout.html.twig"  %}
 
-{% block body -%}
+{% set activeRouteKey = 'chill_activity_activity_new' %}
+
+{% block title %}{{ 'Activity create' |trans }}{% endblock title %}
+
+{% block personcontent %}
     <h1>Activity creation</h1>
 
     {{ form(form) }}
 
         <ul class="record_actions">
     <li>
-        <a href="{{ path('activity') }}">
+        <a href="{{ path('chill_activity_activity_list', {'person_id': person.id}) }}">
             Back to the list
         </a>
     </li>
 </ul>
-{% endblock %}
+{% endblock %}

Resources/views/Activity/show.html.twig

@@ -30,12 +30,12 @@
 
         <ul class="record_actions">
     <li>
-        <a href="{{ path('activity') }}">
+        <a href="{{ path('chill_activity_activity_list', { 'person_id': person.id }) }}">
             Back to the list
         </a>
     </li>
     <li>
-        <a href="{{ path('activity_edit', { 'id': entity.id }) }}">
+        <a href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person.id }) }}">
             Edit
         </a>
     </li>