r422 - in trunk/coser-business/src: main/java/fr/ifremer/coser/services main/resources/i18n test/java/fr/ifremer/coser/services - Coser-commits

15 Dec 2010

Author: chatellier
Date: 2010-12-15 17:39:33 +0000 (Wed, 15 Dec 2010)
New Revision: 422

Log:
Ajout des details du projet dans les rapports

Modified:
   trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java
   trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties
   trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties
   trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java

Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java
===================================================================

--- trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java	2010-12-15 17:21:36 UTC (rev 421)
+++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java	2010-12-15 17:39:33 UTC (rev 422)
@@ -44,7 +44,6 @@
 
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -449,10 +448,13 @@
             out.println("<title>" + _("coser.business.publication.controllogexporttitle", project.getName())+ "</title>");
             out.println("<meta http-equiv='Content-Type' content='text/html; charset=utf-8'>");
             out.println("</head><body>");
-            
+
             // header
             out.println("<h1 style='text-align:center'>" + _("coser.business.publication.controllogexporttitle", project.getName()) + "</h1>");
 
+            // partie detail
+            extractProjectReport(project, out);
+
             // partie specific : commandes
             extractHistoryCommandReport(project, control, out);
 
@@ -492,10 +494,13 @@
             out.println("<title>" + _("coser.business.publication.selectionlogexporttitle", selection.getName(), project.getName())+ "</title>");
             out.println("<meta http-equiv='Content-Type' content='text/html; charset=utf-8'>");
             out.println("</head><body>");
-            
+
             // header
             out.println("<h1 style='text-align:center'>" + _("coser.business.publication.selectionlogexporttitle", selection.getName(), project.getName()) + "</h1>");
 
+            // partie detail
+            extractProjectReport(project, out);
+
             // partie resumé de selection
             out.println("<h2>" + _("coser.business.publication.selectionchoices") + "</h2>");
             out.println("<ul>");
@@ -503,7 +508,7 @@
             out.println("<li>" + _("coser.business.common.strata") + " : " + StringUtils.join(selection.getSelectedStrata(), ", ") + "</li>");
             out.println("<li>" + _("coser.business.common.species") + " : " + StringUtils.join(selection.getSelectedSpecies(), ", ") + "</li>");
             out.println("</ul>");
-            
+
             // partie specific : commandes
             extractHistoryCommandReport(project, selection, out);
 
@@ -519,6 +524,25 @@
     }
 
     /**
+     * Extrait la partie "detail projet" vers le flux.
+     * 
+     * @param project project
+     * @param out stream
+     */
+    protected void extractProjectReport(Project project, PrintStream out) {
+        // partie projet
+        out.println("<h2>" + _("coser.business.publication.projectdetails") + "</h2>");
+        out.println("<ul>");
+        out.println("<li>" + _("coser.business.publication.author") + " : " + project.getAuthor() + "</li>");
+        out.println("<li>" + _("coser.business.publication.catchfilename") + " : " + projectService.getDataStorageFileName(project, Category.CATCH, null) + "</li>");
+        out.println("<li>" + _("coser.business.publication.lengthfilename") + " : " + projectService.getDataStorageFileName(project, Category.LENGTH, null) + "</li>");
+        out.println("<li>" + _("coser.business.publication.haulfilename") + " : " + projectService.getDataStorageFileName(project, Category.HAUL, null) + "</li>");
+        out.println("<li>" + _("coser.business.publication.stratafilename") + " : " + projectService.getDataStorageFileName(project, Category.STRATA, null) + "</li>");
+        out.println("<li>" + _("coser.business.publication.comment") + " : " + project.getComment() + "</li>");
+        out.println("</ul>");
+    }
+
+    /**
      * Partie commune aux export qui effectue en 2 passe la recuperation
      * des lignes d'erreur, la recuperation des données correspondant à
      * ces lignes dans les fichiers originaux et la sortie des erreurs.

Modified: trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties
===================================================================
--- trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties	2010-12-15 17:21:36 UTC (rev 421)
+++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties	2010-12-15 17:39:33 UTC (rev 422)
@@ -71,14 +71,21 @@
 coser.business.matrix.lengthstructure=Length structures
 coser.business.matrix.occurrence=Occurrence
 coser.business.matrix.samplingeffort=Sampling effort
+coser.business.publication.author=Author
+coser.business.publication.catchfilename=Catch file name
+coser.business.publication.comment=Comment
 coser.business.publication.controllogexporttitle=Selection report for %s (project %s)
 coser.business.publication.datamodification=Data modifications
 coser.business.publication.errorexportlines=Lines
 coser.business.publication.errorexporttitle=Error report for project %s
 coser.business.publication.errorgraph=Graph
 coser.business.publication.errorgraphs=Graphs
+coser.business.publication.haulfilename=Haul file name
+coser.business.publication.lengthfilename=Length file name
+coser.business.publication.projectdetails=Project details
 coser.business.publication.selectionchoices=Selection choices
 coser.business.publication.selectionlogexporttitle=
+coser.business.publication.stratafilename=Strata file name
 coser.business.result.rsufiResultAlreadyExists=Result %s already exists \!
 coser.business.selection.notValidatedControl=Not validated control \!
 coser.config.control.diffcatchlength.description=Percentage difference allowed between catch and length (in percent, for example 5% set 5.0)

Modified: trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties
===================================================================
--- trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties	2010-12-15 17:21:36 UTC (rev 421)
+++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties	2010-12-15 17:39:33 UTC (rev 422)
@@ -71,14 +71,21 @@
 coser.business.matrix.lengthstructure=Structures en taille
 coser.business.matrix.occurrence=Occurrence
 coser.business.matrix.samplingeffort=Effort d'\u00E9chantillonnage
+coser.business.publication.author=Auteur
+coser.business.publication.catchfilename=Nom du fichier captures
+coser.business.publication.comment=Commentaire
 coser.business.publication.controllogexporttitle=Rapport de contr\u00F4le (projet %s)
 coser.business.publication.datamodification=Modifications sur les donn\u00E9es
 coser.business.publication.errorexportlines=Lignes
 coser.business.publication.errorexporttitle=Rapport d'erreur pour le projet %s
 coser.business.publication.errorgraph=Graphique
 coser.business.publication.errorgraphs=Graphiques
+coser.business.publication.haulfilename=Nom du fichier traits
+coser.business.publication.lengthfilename=Nom du fichier tailles
+coser.business.publication.projectdetails=D\u00E9tails du projet
 coser.business.publication.selectionchoices=Choix de s\u00E9lections
 coser.business.publication.selectionlogexporttitle=Rapport de la s\u00E9lection %s (projet %s)
+coser.business.publication.stratafilename=Nom du fichier strates
 coser.business.result.rsufiResultAlreadyExists=Le r\u00E9sultat %D existe d\u00E9j\u00E0 \!
 coser.business.selection.notValidatedControl=Contr\u00F4le non valid\u00E9 \!
 coser.config.control.diffcatchlength.description=Pourcentage d'\u00E9cart tol\u00E9r\u00E9 entre les captures et les tailles (en pourcent, par exemple pour 5% mettre 5.0)

Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java
===================================================================
--- trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java	2010-12-15 17:21:36 UTC (rev 421)
+++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java	2010-12-15 17:39:33 UTC (rev 422)
@@ -177,7 +177,7 @@
         Assert.assertTrue(fileContent.indexOf("from \"251.86\" to \"392.98\"") > 0);
 
         // clean all
-        htmlExport.delete();
+        //htmlExport.delete();
     }
     
     /**
@@ -216,6 +216,6 @@
         Assert.assertTrue(fileContent.indexOf("COSER_SPECIES3") > 0);
 
         // clean all
-        htmlExport.delete();
+        //htmlExport.delete();
     }
 }

    

r422 - in trunk/coser-business/src: main/java/fr/ifremer/coser/services main/resources/i18n test/java/fr/ifremer/coser/services

chatellier＠users.labs.libre-entreprise.org

tags

participants (1)