Add / Edit / Delete activity from Accompanying Course

src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig

@@ -1,95 +1,75 @@
-{#
- * 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 "@ChillPerson/layout.html.twig"  %}
+<h1>{{ "Update activity"|trans }}</h1>
 
-{% set activeRouteKey = 'chill_activity_activity_list' %}
-
-{% block title  'Update activity'|trans %}
-
-{% block personcontent %}
-    <h1>{{ "Update activity"|trans }}</h1>
-
-    {{ form_start(edit_form) }}
+{{ form_start(edit_form) }}
 
+{%- if edit_form.user is defined -%}
     {{ form_row(edit_form.user) }}
+{% endif %}
+
+{%- if edit_form.scope is defined -%}
     {{ form_row(edit_form.scope) }}
+{% endif %}
 
-    <h2>{{ 'Activity data'|trans }}</h2>
+<h2>{{ 'Activity data'|trans }}</h2>
 
-    {%- if form.date is defined -%}
-        {{ form_row(form.date) }}
-    {% endif %}
-    {%- if form.durationTime is defined -%}
-        {{ form_row(form.durationTime) }}
-    {% endif %}
-    {%- if form.travelTime is defined -%}
-        {{ form_row(form.travelTime) }}
-    {% endif %}
-    {%- if form.attendee is defined -%}
-        {{ form_row(form.attendee) }}
-    {% endif %}
-    {%- if form.comment is defined -%}
-        {{ form_row(form.comment) }}
-    {% endif %}
-    {%- if form.reasons is defined -%}
-        {{ form_row(form.reasons) }}
-    {% endif %}
-    {%- if form.persons is defined -%}
-        {{ form_row(form.persons) }}
-    {% endif %}
-    {%- if form.thirdParties is defined -%}
-        {{ form_row(form.thirdParties) }}
-    {% endif %}
-    {%- if form.users is defined -%}
-        {{ form_row(form.users) }}
-    {% endif %}
-    {%- if form.emergency is defined -%}
-        {{ form_row(form.emergency) }}
-    {% endif %}
-    {%- if form.sentReceived is defined -%}
-        {{ form_row(form.sentReceived) }}
-    {% endif %}
-    {%- if form.documents is defined -%}
-        {{ form_row(form.documents) }}
-    {% endif %}
+{%- if form.date is defined -%}
+    {{ form_row(form.date) }}
+{% endif %}
+{%- if form.durationTime is defined -%}
+    {{ form_row(form.durationTime) }}
+{% endif %}
+{%- if form.travelTime is defined -%}
+    {{ form_row(form.travelTime) }}
+{% endif %}
+{%- if form.attendee is defined -%}
+    {{ form_row(form.attendee) }}
+{% endif %}
+{%- if form.comment is defined -%}
+    {{ form_row(form.comment) }}
+{% endif %}
+{%- if form.reasons is defined -%}
+    {{ form_row(form.reasons) }}
+{% endif %}
+{%- if form.persons is defined -%}
+    {{ form_row(form.persons) }}
+{% endif %}
+{%- if form.thirdParties is defined -%}
+    {{ form_row(form.thirdParties) }}
+{% endif %}
+{%- if form.users is defined -%}
+    {{ form_row(form.users) }}
+{% endif %}
+{%- if form.emergency is defined -%}
+    {{ form_row(form.emergency) }}
+{% endif %}
+{%- if form.sentReceived is defined -%}
+    {{ form_row(form.sentReceived) }}
+{% endif %}
+{%- if form.documents is defined -%}
+    {{ form_row(form.documents) }}
+{% endif %}
 
-    {{ form_widget(edit_form) }}
-        <ul class="record_actions sticky-form-buttons">
-            <li class="cancel">
-                <a href="{{ path('chill_activity_activity_show', { 'id': entity.id, 'person_id': entity.person.id } ) }}" class="sc-button bt-cancel">
-                    {{ 'Cancel'|trans }}
-                </a>
-            </li>
-            <li>
-                <button class="sc-button bt-update" type="submit">{{ 'Save activity'|trans }}</button>
-            </li>
-        </ul>
-    {{ form_end(edit_form) }}
+{% set person_id = null %}
+{% if entity.person %}
+    {% set person_id = entity.person.id %}
+{% endif %}
 
-    {# {{ form(delete_form) }} #}
-{% endblock %}
+{% set accompanying_course_id = null %}
+{% if accompanyingCourse %}
+    {% set accompanying_course_id = accompanyingCourse.id %}
+{% endif %}
 
-{% block js %}
-    <script src="{{ asset('build/async_upload.js') }}" type="text/javascript"></script>
-    <script type="text/javascript">
-        chill.displayAlertWhenLeavingModifiedForm('form[name="{{ edit_form.vars.form.vars.name }}"]', '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
-    </script>
-{% endblock %}
+{{ form_widget(edit_form) }}
+    <ul class="record_actions sticky-form-buttons">
+        <li class="cancel">
+            <a href="{{ path('chill_activity_activity_show', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id  } ) }}" class="sc-button bt-cancel">
+                {{ 'Cancel'|trans }}
+            </a>
+        </li>
+        <li>
+            <button class="sc-button bt-update" type="submit">{{ 'Save activity'|trans }}</button>
+        </li>
+    </ul>
+{{ form_end(edit_form) }}
 
-{% block css %}
-    <link rel="stylesheet" href="{{ asset('build/async_upload.css') }}"/>
-{% endblock %}
+{# {{ form(delete_form) }} #}