improve report view

This commit is contained in:
Julien Fastré 2015-12-18 01:45:25 +01:00
parent ef718fe93a
commit b672074823
3 changed files with 13 additions and 6 deletions

View File

@ -9,12 +9,15 @@
'Report list': 'Liste des rapports' 'Report list': 'Liste des rapports'
Details: Détails Details: Détails
Person: Personne Person: Personne
Scope: Scope Scope: Cercle
Date: Date Date: Date
User: Utilisateur User: Utilisateur
'Report type': 'Type de rapport' 'Report type': 'Type de rapport'
'View the report': "Voir le rapport" 'View the report': "Voir le rapport"
'Update the report': "Mettre à jour le rapport" 'Update the report': "Mettre à jour le rapport"
Report data: Données du rapport
'Report view : %name%': 'Rapport : %name%'
Report: Rapport
#Flash messages #Flash messages
'Success : report created!': "Succès : le rapport a bien été créé !" 'Success : report created!': "Succès : le rapport a bien été créé !"

View File

@ -21,6 +21,8 @@
{% block title %}{{ 'Report view' |trans() }}{% endblock title %} {% block title %}{{ 'Report view' |trans() }}{% endblock title %}
{% block personcontent %} {% block personcontent %}
<h1>{{ 'Report view : %name%' | trans({ '%name%' : entity.cFGroup.getName|localize_translatable_string } ) }}</h1>
<h2 class="chill-red">{{ 'Details'|trans }}</h2> <h2 class="chill-red">{{ 'Details'|trans }}</h2>
@ -33,12 +35,14 @@
<dd>{{ entity.date|localizeddate('long', 'none') }}</dd> <dd>{{ entity.date|localizeddate('long', 'none') }}</dd>
<dt>{{ 'User'|trans }}&nbsp;:</dt> <dt>{{ 'User'|trans }}&nbsp;:</dt>
<dd>{{ entity.user }}</dd> <dd>{{ entity.user }}</dd>
<dt>{{ 'Report type'|trans }}&nbsp;:</dt>
<dd>{{ entity.cFGroup.getName(app.request.locale) }}</dd>
{{ chill_custom_fields_group_widget(entity.cFData, entity.cFGroup) }}
</dl> </dl>
<h2 class="chill-red">{{ 'Report data'|trans }}</h2>
<dl class="chill_report_view_data">
{{ chill_custom_fields_group_widget(entity.cFData, entity.cFGroup) }}
</dl>
{% if is_granted('CHILL_REPORT_UPDATE', entity) %} {% if is_granted('CHILL_REPORT_UPDATE', entity) %}
<a class="sc-button bt-update" href="{{ path('report_edit', { 'person_id': entity.person.id, 'report_id': entity.id }) }}"><i class="fa fa-pencil"></i> {{ 'Update the report' | trans }}</a> <a class="sc-button bt-update" href="{{ path('report_edit', { 'person_id': entity.person.id, 'report_id': entity.id }) }}"><i class="fa fa-pencil"></i> {{ 'Update the report' | trans }}</a>
{% endif %} {% endif %}

View File

@ -12,7 +12,7 @@
{% if custom_fields_in_summary|length > 0 %} {% if custom_fields_in_summary|length > 0 %}
<div class="summary"> <div class="summary">
<hr/> <hr/>
<dl> <dl class="chill_report_view_data timeline">
{% for field in custom_fields_in_summary %} {% for field in custom_fields_in_summary %}
{% if field.type == 'title' %} {% if field.type == 'title' %}
{{ chill_custom_field_widget(report.cFData, field) }} {{ chill_custom_field_widget(report.cFData, field) }}