This is an automated email from the git hooks/post-receive script. New commit to branch feature/6150 in repository tutti. See http://git.codelutin.com/tutti.git commit a543cdcc0e1157e753d6bb582d2d88cc25e0333a Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Nov 24 09:50:53 2014 +0100 - ajout des espèces non importées dans le rapport - generer le rapport pdf avant le traitement du melag --- .../fr/ifremer/tutti/service/pupitri/PupitriImportService.java | 6 +++--- .../tutti/service/pupitri/report/PupitriImportReportModel.java | 5 +++++ tutti-service/src/main/resources/ftl/pupitriReport_fr.ftl | 7 +++++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportService.java index ddf1600..1bcd0fc 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportService.java @@ -156,13 +156,13 @@ public class PupitriImportService extends AbstractTuttiService { if (result.isFishingOperationFound()) { + // generation du rapport + File reportFile = generatePupitriReport(operation, result); + // gestion du melange Decorator<Species> decorator = getService(DecoratorService.class).getDecoratorByType(Species.class); result.prepareMelag(decorator); - // generation du rapport - File reportFile = generatePupitriReport(operation, result); - try { // persistence des lots diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/report/PupitriImportReportModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/report/PupitriImportReportModel.java index 7c49388..8367d86 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/report/PupitriImportReportModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/report/PupitriImportReportModel.java @@ -8,6 +8,7 @@ import fr.ifremer.tutti.util.Weights; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Set; /** * Modèle du rapport d'import Pupitri. @@ -87,6 +88,10 @@ public class PupitriImportReportModel { return totalWeight; } + public Set<String> getNotImportedSpeciesIds() { + return importResult.getNotImportedSpeciesIds(); + } + public List<PupitriImportReportRow> getRows() { return rows; } diff --git a/tutti-service/src/main/resources/ftl/pupitriReport_fr.ftl b/tutti-service/src/main/resources/ftl/pupitriReport_fr.ftl index 85d503d..6524380 100644 --- a/tutti-service/src/main/resources/ftl/pupitriReport_fr.ftl +++ b/tutti-service/src/main/resources/ftl/pupitriReport_fr.ftl @@ -139,5 +139,12 @@ </#list> </table> +<h4>Espèces non importées</h4> +<ul> +<#list notImportedSpeciesIds as speciesId> + <li>${speciesId}</li> +</#list> +</ul> + </body> </html> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.