From chatellier@users.labs.libre-entreprise.org Mon Jun 15 04:19:40 2026
From: chatellier@users.labs.libre-entreprise.org
To: coser-commits@list.forge.codelutin.com
Subject: [Coser-commits] r422 - in trunk/coser-business/src:
main/java/fr/ifremer/coser/services main/resources/i18n
test/java/fr/ifremer/coser/services
Date: Wed, 15 Dec 2010 18:39:33 +0100
Message-ID: <20101215173934.0B0A02F259@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8530446326053631558=="
--===============8530446326053631558==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
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/PublicationSe=
rvice.java
trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properti=
es
trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properti=
es
trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationSe=
rviceTest.java
Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/Public=
ationService.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationS=
ervice.java 2010-12-15 17:21:36 UTC (rev 421)
+++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationS=
ervice.java 2010-12-15 17:39:33 UTC (rev 422)
@@ -44,7 +44,6 @@
=20
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("" + _("coser.business.publication.controllog=
exporttitle", project.getName())+ "");
out.println("");
out.println("");
- =20
+
// header
out.println("" + _("coser.busine=
ss.publication.controllogexporttitle", project.getName()) + "
");
=20
+ // partie detail
+ extractProjectReport(project, out);
+
// partie specific : commandes
extractHistoryCommandReport(project, control, out);
=20
@@ -492,10 +494,13 @@
out.println("" + _("coser.business.publication.selectionl=
ogexporttitle", selection.getName(), project.getName())+ "");
out.println("");
out.println("");
- =20
+
// header
out.println("" + _("coser.busine=
ss.publication.selectionlogexporttitle", selection.getName(), project.getName=
()) + "
");
=20
+ // partie detail
+ extractProjectReport(project, out);
+
// partie resum=C3=A9 de selection
out.println("" + _("coser.business.publication.selectionchoi=
ces") + "
");
out.println("");
@@ -503,7 +508,7 @@
out.println("- " + _("coser.business.common.strata") + " : " +=
StringUtils.join(selection.getSelectedStrata(), ", ") + "
");
out.println("- " + _("coser.business.common.species") + " : " =
+ StringUtils.join(selection.getSelectedSpecies(), ", ") + "
");
out.println("
");
- =20
+
// partie specific : commandes
extractHistoryCommandReport(project, selection, out);
=20
@@ -519,6 +524,25 @@
}
=20
/**
+ * Extrait la partie "detail projet" vers le flux.
+ *=20
+ * @param project project
+ * @param out stream
+ */
+ protected void extractProjectReport(Project project, PrintStream out) {
+ // partie projet
+ out.println("" + _("coser.business.publication.projectdetails") =
+ "
");
+ out.println("");
+ out.println("- " + _("coser.business.publication.author") + " : " =
+ project.getAuthor() + "
");
+ out.println("- " + _("coser.business.publication.catchfilename") +=
" : " + projectService.getDataStorageFileName(project, Category.CATCH, null)=
+ "
");
+ out.println("- " + _("coser.business.publication.lengthfilename") =
+ " : " + projectService.getDataStorageFileName(project, Category.LENGTH, nul=
l) + "
");
+ out.println("- " + _("coser.business.publication.haulfilename") + =
" : " + projectService.getDataStorageFileName(project, Category.HAUL, null) +=
"
");
+ out.println("- " + _("coser.business.publication.stratafilename") =
+ " : " + projectService.getDataStorageFileName(project, Category.STRATA, nul=
l) + "
");
+ out.println("- " + _("coser.business.publication.comment") + " : "=
+ project.getComment() + "
");
+ out.println("
");
+ }
+
+ /**
* Partie commune aux export qui effectue en 2 passe la recuperation
* des lignes d'erreur, la recuperation des donn=C3=A9es correspondant =
=C3=A0
* ces lignes dans les fichiers originaux et la sortie des erreurs.
Modified: trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.p=
roperties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.propert=
ies 2010-12-15 17:21:36 UTC (rev 421)
+++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.propert=
ies 2010-12-15 17:39:33 UTC (rev 422)
@@ -71,14 +71,21 @@
coser.business.matrix.lengthstructure=3DLength structures
coser.business.matrix.occurrence=3DOccurrence
coser.business.matrix.samplingeffort=3DSampling effort
+coser.business.publication.author=3DAuthor
+coser.business.publication.catchfilename=3DCatch file name
+coser.business.publication.comment=3DComment
coser.business.publication.controllogexporttitle=3DSelection report for %s (=
project %s)
coser.business.publication.datamodification=3DData modifications
coser.business.publication.errorexportlines=3DLines
coser.business.publication.errorexporttitle=3DError report for project %s
coser.business.publication.errorgraph=3DGraph
coser.business.publication.errorgraphs=3DGraphs
+coser.business.publication.haulfilename=3DHaul file name
+coser.business.publication.lengthfilename=3DLength file name
+coser.business.publication.projectdetails=3DProject details
coser.business.publication.selectionchoices=3DSelection choices
coser.business.publication.selectionlogexporttitle=3D
+coser.business.publication.stratafilename=3DStrata file name
coser.business.result.rsufiResultAlreadyExists=3DResult %s already exists \!
coser.business.selection.notValidatedControl=3DNot validated control \!
coser.config.control.diffcatchlength.description=3DPercentage difference all=
owed between catch and length (in percent, for example 5% set 5.0)
Modified: trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.p=
roperties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.propert=
ies 2010-12-15 17:21:36 UTC (rev 421)
+++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.propert=
ies 2010-12-15 17:39:33 UTC (rev 422)
@@ -71,14 +71,21 @@
coser.business.matrix.lengthstructure=3DStructures en taille
coser.business.matrix.occurrence=3DOccurrence
coser.business.matrix.samplingeffort=3DEffort d'\u00E9chantillonnage
+coser.business.publication.author=3DAuteur
+coser.business.publication.catchfilename=3DNom du fichier captures
+coser.business.publication.comment=3DCommentaire
coser.business.publication.controllogexporttitle=3DRapport de contr\u00F4le =
(projet %s)
coser.business.publication.datamodification=3DModifications sur les donn\u00=
E9es
coser.business.publication.errorexportlines=3DLignes
coser.business.publication.errorexporttitle=3DRapport d'erreur pour le proje=
t %s
coser.business.publication.errorgraph=3DGraphique
coser.business.publication.errorgraphs=3DGraphiques
+coser.business.publication.haulfilename=3DNom du fichier traits
+coser.business.publication.lengthfilename=3DNom du fichier tailles
+coser.business.publication.projectdetails=3DD\u00E9tails du projet
coser.business.publication.selectionchoices=3DChoix de s\u00E9lections
coser.business.publication.selectionlogexporttitle=3DRapport de la s\u00E9le=
ction %s (projet %s)
+coser.business.publication.stratafilename=3DNom du fichier strates
coser.business.result.rsufiResultAlreadyExists=3DLe r\u00E9sultat %D existe =
d\u00E9j\u00E0 \!
coser.business.selection.notValidatedControl=3DContr\u00F4le non valid\u00E9=
\!
coser.config.control.diffcatchlength.description=3DPourcentage 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/Public=
ationServiceTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationS=
erviceTest.java 2010-12-15 17:21:36 UTC (rev 421)
+++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationS=
erviceTest.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);
=20
// clean all
- htmlExport.delete();
+ //htmlExport.delete();
}
=20
/**
@@ -216,6 +216,6 @@
Assert.assertTrue(fileContent.indexOf("COSER_SPECIES3") > 0);
=20
// clean all
- htmlExport.delete();
+ //htmlExport.delete();
}
}
--===============8530446326053631558==--