From 1ab9b44737c153841b65825a015c339981285406 Mon Sep 17 00:00:00 2001
From: Marc Ducobu <marc@champs-libres.coop>
Date: Wed, 12 Nov 2014 12:35:57 +0100
Subject: [PATCH] Report View CF

---
 Resources/views/Report/list.html.twig |  4 +-
 Resources/views/Report/show.html.twig | 66 ++++++++++++---------------
 2 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/Resources/views/Report/list.html.twig b/Resources/views/Report/list.html.twig
index bf5e53ee2..a14b373e8 100644
--- a/Resources/views/Report/list.html.twig
+++ b/Resources/views/Report/list.html.twig
@@ -28,6 +28,7 @@
                 <th>{{ 'Report Type' | trans }}</th>
                 <th>{{ 'Report Scope' | trans }}</th>
                 <th></th>
+                <th></th>
             </tr>
         </thead>
         <tbody>
@@ -36,7 +37,8 @@
                 <td>{% if report.date %}{{ report.date|date('d-m-Y') }}{% endif %}</td>
                 <td>{{ report.cFGroup.getName(app.request.locale)  }}</td>
                 <td>{{ report.scope }}</td>
-                <td><a href="{{ path('report_edit', { 'person_id': report.person.id, 'report_id': report.id }) }}">{{ 'update' | trans }}</a></td>
+                <td><a href="{{ path('report_show', { 'person_id': report.person.id, 'report_id': report.id }) }}">{{ 'View' | trans }}</a></td>
+                <td><a href="{{ path('report_edit', { 'person_id': report.person.id, 'report_id': report.id }) }}">{{ 'Update' | trans }}</a></td>
             </tr>
         {% endfor %}
         </tbody>
diff --git a/Resources/views/Report/show.html.twig b/Resources/views/Report/show.html.twig
index 539ac25ca..2579bdeb8 100644
--- a/Resources/views/Report/show.html.twig
+++ b/Resources/views/Report/show.html.twig
@@ -21,40 +21,34 @@
 {% block title %}{{ 'Details d\' un rapport' |trans() }}{% endblock title %}
 
 {% block personcontent %}
-    <table class="record_properties">
-        <tbody>
-            <tr>
-                <th>Id</th>
-                <td>{{ entity.id }}</td>
-            </tr>
-            <tr>
-                <th>User</th>
-                <td>{{ entity.user }}</td>
-            </tr>
-            <tr>
-                <th>Person</th>
-                <td>{{ entity.person }}</td>
-            </tr>
-            <tr>
-                <th>Date</th>
-                <td>{{ entity.date|date('d-m-Y') }}</td>
-            </tr>
-            <tr>
-                <th>Scope</th>
-                <td>{{ entity.scope }}</td>
-            </tr>
-            <tr>
-                <th>Cfdata</th>
-                <td>{# { entity.cFData } #}</td>
-            </tr>
-            <tr>
-                <th>Cfgroup</th>
-                <td>{{ entity.cFGroup.getName(app.request.locale) }}</td>
-            </tr>
-            <tr>
-                <th></th>
-                <td><a href="{{ path('report_edit', { 'person_id': entity.person.id, 'report_id': entity.id }) }}">{{ 'update' | trans }}</a></td>
-            </tr>
-        </tbody>
-    </table>
+
+
+    <a href="{{ path('report_edit', { 'person_id': entity.person.id, 'report_id': entity.id }) }}">{{ 'Modifier' | trans }}</a>
+
+    <h2>{{ 'Details'|trans }}</h2>
+
+    <dl>
+        <dt class="inline">{{ 'Personne'|trans }}</dt>
+        <dd>{{ entity.person }}</dd>
+        <dt class="inline">{{ 'Scope'|trans }}</dt>
+        <dd>{{ entity.scope }}</dd>
+        <dt class="inline">{{ 'Date'|trans }}</dt>
+        <dd>{{ entity.date|date('d-m-Y') }}</dd>
+        <dt class="inline">{{ 'Agent'|trans }}</dt>
+        <dd>{{ entity.user }}</dd>
+        <dt class="inline">{{ 'Type de rapport'|trans }}</dt>
+        <dd>{{ entity.cFGroup.getName(app.request.locale) }}</dd>
+
+        {% for customField in entity.cFGroup.customFields %}
+            {% if customField.type == 'title' %}
+                {{ chill_custom_field_widget(entity.cFData , customField) }}
+            {% else %}
+                <dt>{{ chill_custom_field_label(customField) }}</dt>
+                <dd>{{ chill_custom_field_widget(entity.cFData , customField) }}</dd>
+            {% endif %}
+        {% endfor %}
+    </dl>
+
+    <a href="{{ path('report_edit', { 'person_id': entity.person.id, 'report_id': entity.id }) }}">{{ 'Modifier' | trans }}</a>
+
 {% endblock %}
\ No newline at end of file