diff --git a/Controller/ReportController.php b/Controller/ReportController.php index a052f6995..510f1d867 100644 --- a/Controller/ReportController.php +++ b/Controller/ReportController.php @@ -156,7 +156,7 @@ class ReportController extends Controller ->getFlashBag() ->add('success', $this->get('translator') - ->trans('Report created') + ->trans('Success : report created!') ); return $this->redirect($this->generateUrl('report_view', @@ -166,7 +166,10 @@ class ReportController extends Controller $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id); $this->get('session') - ->getFlashBag()->add('danger', 'Errors : the report has not been created !'); + ->getFlashBag()->add('danger', + $this->get('translator') + ->trans('The form is not valid. The report has not been created !') + ); return $this->render('ChillReportBundle:Report:new.html.twig', array( 'entity' => $entity, @@ -208,7 +211,8 @@ class ReportController extends Controller $entity = $em->getRepository('ChillReportBundle:Report')->find($report_id); if (!$entity) { - throw $this->createNotFoundException('Unable to find Report entity.'); + throw $this->createNotFoundException( + $this->get('translator')->trans('Unable to find this report.')); } return $this->render('ChillReportBundle:Report:view.html.twig', array( @@ -228,11 +232,13 @@ class ReportController extends Controller $report = $em->getRepository('ChillReportBundle:Report')->find($report_id); if (!$report) { - throw $this->createNotFoundException('Unable to find the report.'); + throw $this->createNotFoundException( + $this->get('translator')->trans('Unable to find this report.')); } if(intval($person_id) !== intval($report->getPerson()->getId())) { - throw new Exception("This is not the report of the person", 1); + throw new Exception( + $this->get('translator')->trans('This is not the report of the person.'), 1); } $person = $report->getPerson(); @@ -276,7 +282,8 @@ class ReportController extends Controller $report = $em->getRepository('ChillReportBundle:Report')->find($report_id); if (!$report) { - throw $this->createNotFoundException('Unable to find the report '.$report_id.'.'); + throw $this->createNotFoundException( + $this->get('translator')->trans('Unable to find this report.')); } $editForm = $this->createEditForm($report, $person_id); @@ -289,7 +296,7 @@ class ReportController extends Controller ->getFlashBag() ->add('success', $this->get('translator') - ->trans('Report updated') + ->trans('Success : report updated!') ); return $this->redirect($this->generateUrl('report_view', @@ -299,7 +306,11 @@ class ReportController extends Controller $errors = $editForm->getErrorsAsString(); $this->get('session') - ->getFlashBag()->add('danger', 'Errors : the report has not been updated !'); + ->getFlashBag() + ->add('danger', + $this->get('translator') + ->trans('The form is not valid. The report has not been updated !') + ); return $this->render('ChillReportBundle:Report:edit.html.twig', array( 'edit_form' => $editForm->createView(), diff --git a/Resources/translations/messages.fr.yml b/Resources/translations/messages.fr.yml index ce323b21d..2fd9a1985 100644 --- a/Resources/translations/messages.fr.yml +++ b/Resources/translations/messages.fr.yml @@ -6,9 +6,22 @@ 'Create a new report': 'Créer un nouveau rapport' 'Report view': "Détails d'un rapport" 'Update the report': 'Mettre à jour le rapport' +'Report list': 'Liste des rapports' Details: Détails Person: Personne Scope: Scope Date: Date User: Utilisateur -'Report type': 'Type de rapport' \ No newline at end of file +'Report type': 'Type de rapport' +'View the report': "Voir le rapport" +'Update the report': "Mettre à jour le rapport" + +#Flash messages +'Success : report created!': "Succès : le rapport a bien été créé !" +'The form is not valid. The report has not been created !': "Le formulaire comporte des erreurs, le rapport n'a pas été créé" +'Success : report updated!': "Succès : le rapport a bien été mis à jour !" +'The form is not valid. The report has not been updated !': "Le formulaire comporte des erreurs, le rapport n'a pas été mis à jour" + +#Exception messags +'Unable to find this report.': Rapport introuvable. +'This is not the report of the person.': "La personne et le rapport sélectionnés ne sont pas associés" \ No newline at end of file diff --git a/Resources/views/Report/list.html.twig b/Resources/views/Report/list.html.twig new file mode 100644 index 000000000..c142d7a6d --- /dev/null +++ b/Resources/views/Report/list.html.twig @@ -0,0 +1,46 @@ +{# + * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, + * + * 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 . +#} +{% extends "ChillPersonBundle::layout.html.twig" %} + +{% set activeRouteKey = 'report_select_type' %} + +{% block title %}{{ 'Report list' |trans }}{% endblock title %} + +{% block personcontent %} + + + + + + + + + + + + {% for report in reports %} + + + + + + + + {% endfor %} + +
{{ 'Date' | trans }}{{ 'Report type' | trans }}
{% if report.date %}{{ report.date|date('d-m-Y') }}{% endif %}{{ report.cFGroup.getName(app.request.locale) }}{{ 'View the report' | trans }}{{ 'Update the report' | trans }}
+{% endblock %}