Add CommentEmbeddable to Activity (Ref #21)

Resources/views/Activity/edit.html.twig

@@ -1,16 +1,16 @@
 {#
  * 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/>.
 #}
@@ -22,9 +22,9 @@
 
 {% block personcontent %}
     <h1>{{ "Update activity"|trans }}</h1>
-    
+
     {{ form_start(edit_form) }}
-    
+
     {{ form_row(edit_form.user) }}
     {{ form_row(edit_form.scope) }}
 
@@ -35,7 +35,7 @@
     {{ form_row(edit_form.remark) }}
     {{ form_row(edit_form.attendee) }}
     {{ form_row(edit_form.reasons) }}
-    
+    {{ form_row(form.comment) }}
 
     {{ form_widget(edit_form) }}
         <ul class="record_actions sticky-form-buttons">

Resources/views/Activity/new.html.twig

@@ -1,16 +1,16 @@
 {#
  * 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/>.
 #}
@@ -24,27 +24,28 @@
     <h2 class="chill-red">{{ "Activity creation"|trans }}</h1>
 
     {{ form_start(form) }}
-    
+
     {{ form_row(form.user) }}
     {{ form_row(form.scope) }}
-    
+
     <h2 class="chill-red">{{ 'Activity data'|trans }}</h2>
-    
+
     {{ form_row(form.date) }}
     {{ form_row(form.durationTime) }}
     {{ form_row(form.type) }}
     {{ form_row(form.remark) }}
     {{ form_row(form.attendee) }}
     {{ form_row(form.reasons) }}
-    
+    {{ form_row(form.comment) }}
+
         <div class="grid-12 centered sticky-form-buttons">
             <button class="sc-button green margin-10" type="submit"><i class="fa fa-save"></i> {{ 'Add a new activity'|trans }}</button>
         </div>
     {{ form_end(form) }}
 {% endblock %}
-    
+
 {% block js %}
 <script type="text/javascript">
     chill.displayAlertWhenLeavingUnsubmittedForm('form[name="{{ 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 %}
+{% endblock %}

Resources/views/Activity/show.html.twig

@@ -8,17 +8,17 @@
 
 {% block personcontent -%}
     <h1 >{{ "Activity"|trans }}</h1>
-    
+
     <dl class="chill_view_data">
         <dt class="inline">{{ 'User'|trans }}</dt>
         <dd>{{ entity.user }}</dd>
         <dt class="inline">{{ 'Scope'|trans }}</dt>
         <dd><span class="scope">{{ entity.scope.name|localize_translatable_string }}</span></dd>
-        
+
         <h2 class="chill-red">{{ 'Activity data'|trans }}</h2>
         <dt class="inline">{{ 'Person'|trans }}</dt>
         <dd>{{ entity.person }}</dd>
-        
+
         <dt class="inline">{{ 'Date'|trans }}</dt>
         <dd>{{ entity.date|format_date('long') }}</dd>
         <dt class="inline">{{ 'Duration Time'|trans }}</dt>
@@ -27,17 +27,24 @@
         <dd>{{ entity.type.name | localize_translatable_string }}</dd>
         <dt class="inline">{{ 'Remark'|trans }}</dt>
         <dd>{% if entity.remark is empty %}<span class="chill-no-data-statement">{{ 'No remarks'|trans }}</span>{% else %}<blockquote class="chill-user-quote">{{ entity.remark|nl2br }}</blockquote>{% endif %}</dd>
-        
+
         <dt class="inline">{{ 'Attendee'|trans }}</dt>
         <dd>{% if entity.attendee is not null %}{% if entity.attendee %}{{ 'present'|trans|capitalize }} {% else %} {{ 'not present'|trans|capitalize }}{% endif %}{% else %}{{ 'None'|trans|capitalize }}{% endif %}</dd>
-        
+
         <dt class="inline">{{ 'Reasons'|trans }}</dt>
         {%- if entity.reasons is empty -%}
         <dd><span class="chill-no-data-statement">{{ 'No reason associated'|trans }}</span></dd>
         {%- else -%}
         <dd>{% for r in entity.reasons %}{{ r|chill_entity_render_box }} {% endfor %}</dd>
         {%- endif -%}
-        
+
+        <dt class="inline">{{ 'Comment'|trans }}</dt>
+        {%- if entity.comment is empty -%}
+            <dd><span class="chill-no-data-statement">{{ 'No comment associated'|trans }}</span></dd>
+        {%- else -%}
+            <dd>{{ entity.comment|chill_entity_render_box }}</dd>
+        {%- endif -%}
+
     </dl>
 
     <ul class="record_actions">
@@ -59,5 +66,5 @@
         </li>
         {% endif %}
     </ul>
-        
+
 {% endblock personcontent %}