[Tutti-commits] r1113 - in trunk: . tutti-service/src/main/java/fr/ifremer/tutti/service/export

3 Jul 2013

Author: tchemit
Date: 2013-07-03 14:52:32 +0200 (Wed, 03 Jul 2013)
New Revision: 1113

Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1113

Log:
refs #2711: [EXPORT GENERIQUE] points ?\195?\160 am?\195?\169liorer

Modified:
   trunk/pom.xml
   trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/AccidentalCatchExportModel.java
   trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java
   trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/IndividualObservationExportModel.java
   trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/MarineLitterExportModel.java
   trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportModel.java
   trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SurveyExportModel.java

Modified: trunk/pom.xml
===================================================================

--- trunk/pom.xml	2013-07-03 10:32:48 UTC (rev 1112)
+++ trunk/pom.xml	2013-07-03 12:52:32 UTC (rev 1113)
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.nuiton</groupId>
     <artifactId>mavenpom4redmine</artifactId>
-    <version>3.4.11</version>
+    <version>3.4.12</version>
   </parent>
 
   <groupId>fr.ifremer</groupId>
@@ -126,9 +126,9 @@
     <eugenePluginVersion>2.6.2</eugenePluginVersion>
     <hibernateVersion>3.6.10.Final</hibernateVersion>
 
-    <jaxxVersion>2.5.22</jaxxVersion>
+    <jaxxVersion>2.5.23</jaxxVersion>
     <swingXVersion>1.6.4</swingXVersion>
-    <xworkVersion>2.3.14.1</xworkVersion>
+    <xworkVersion>2.3.15</xworkVersion>
 
     <slf4jVersion>1.7.5</slf4jVersion>
 

Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/AccidentalCatchExportModel.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/AccidentalCatchExportModel.java	2013-07-03 10:32:48 UTC (rev 1112)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/AccidentalCatchExportModel.java	2013-07-03 12:52:32 UTC (rev 1113)
@@ -83,7 +83,7 @@
         newColumnForExport("BatchId", AccidentalCatchExportRow.PROPERTY_BATCH_ID, TuttiCsvUtil.PRIMITIVE_INTEGER);
         newColumnForExport("ReferenceTaxonId", AccidentalBatch.PROPERTY_SPECIES + "." + Species.PROPERTY_REFERENCE_TAXON_ID, TuttiCsvUtil.PRIMITIVE_INTEGER);
         newColumnForExport("ReferenceTaxonName", AccidentalBatch.PROPERTY_SPECIES + "." + Species.PROPERTY_NAME);
-        newColumnForExport("Comment", AccidentalBatch.PROPERTY_COMMENT);
+        newColumnForExport("Commentaire", AccidentalBatch.PROPERTY_COMMENT);
         newColumnForExport("CaracteristicId", AccidentalCatchExportRow.PROPERTY_CARACTERISTIC, Caracteristic.PROPERTY_ID);
         newColumnForExport("CaracteristicValue", AccidentalCatchExportRow.PROPERTY_CARACTERISTIC_VALUE, TuttiCsvUtil.CARACTERISTIC_VALUE_FORMATTER);
     }

Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java	2013-07-03 10:32:48 UTC (rev 1112)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java	2013-07-03 12:52:32 UTC (rev 1113)
@@ -38,6 +38,7 @@
 import fr.ifremer.tutti.persistence.entities.referential.Gear;
 import fr.ifremer.tutti.persistence.entities.referential.Species;
 import fr.ifremer.tutti.persistence.entities.referential.Vessel;
+import fr.ifremer.tutti.service.DecoratorService;
 import fr.ifremer.tutti.service.PersistenceService;
 import fr.ifremer.tutti.service.TuttiCsvUtil;
 import org.apache.commons.collections.CollectionUtils;
@@ -58,7 +59,10 @@
 
     Map<SampleCategoryEnum, Caracteristic> sampleCategoryToCaracteristics;
 
-    public CatchExportModel(char separator, List<SampleCategoryEnum> samplingOrder, Map<SampleCategoryEnum, Caracteristic> sampleCategoryToCaracteristics) {
+    public CatchExportModel(char separator,
+                            List<SampleCategoryEnum> samplingOrder,
+                            Map<SampleCategoryEnum, Caracteristic> sampleCategoryToCaracteristics,
+                            DecoratorService decoratorService) {
         super(separator);
         this.sampleCategoryToCaracteristics = sampleCategoryToCaracteristics;
 
@@ -71,6 +75,8 @@
         newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION);
         newColumnForExport("Navire", Cruise.PROPERTY_VESSEL, TuttiCsvUtil.VESSEL_VALUE_FORMATTER);
         newColumnForExport("Taxon", SpeciesBatch.PROPERTY_SPECIES + "." + Species.PROPERTY_REFERENCE_TAXON_ID, TuttiCsvUtil.INTEGER);
+        newColumnForExport("Nom scientifique", SpeciesBatch.PROPERTY_SPECIES + "." + Species.PROPERTY_NAME);
+        newColumnForExport("Commentaire", SpeciesBatch.PROPERTY_COMMENT);
 
         for (SampleCategoryEnum sampleCategoryEnum : samplingOrder) {
             switch (sampleCategoryEnum) {
@@ -96,6 +102,7 @@
         // mensuration
 
         newNullableColumnForExport("Code_Longueur", CatchExportRow.FREQUENCY_LENGTH_STEP_CARACTERISTIC + "." + Caracteristic.PROPERTY_ID);
+        newColumnForExportByDecorator("Libelle_Longueur", CatchExportRow.FREQUENCY_LENGTH_STEP_CARACTERISTIC, decoratorService.getDecoratorByType(Caracteristic.class));
         newNullableColumnForExport("Taille", CatchExportRow.FREQUENCY_LENGTH_STEP, TuttiCsvUtil.FLOAT);
         newNullableColumnForExport("NumOrdre_Taille_H2", CatchExportRow.FREQUENCY_RANK_ORDER, TuttiCsvUtil.INTEGER);
         newNullableColumnForExport("Poids_Classe_Taille", CatchExportRow.FREQUENCY_WEIGHT, TuttiCsvUtil.FLOAT);

Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/IndividualObservationExportModel.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/IndividualObservationExportModel.java	2013-07-03 10:32:48 UTC (rev 1112)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/IndividualObservationExportModel.java	2013-07-03 12:52:32 UTC (rev 1113)
@@ -83,7 +83,7 @@
         newColumnForExport("BatchId", IndividualObservationExportRow.PROPERTY_BATCH_ID, TuttiCsvUtil.PRIMITIVE_INTEGER);
         newColumnForExport("ReferenceTaxonId", IndividualObservationBatch.PROPERTY_SPECIES + "." + Species.PROPERTY_REFERENCE_TAXON_ID, TuttiCsvUtil.PRIMITIVE_INTEGER);
         newColumnForExport("ReferenceTaxonName", IndividualObservationBatch.PROPERTY_SPECIES + "." + Species.PROPERTY_NAME);
-        newColumnForExport("Comment", IndividualObservationBatch.PROPERTY_COMMENT);
+        newColumnForExport("Commentaire", IndividualObservationBatch.PROPERTY_COMMENT);
         newColumnForExport("CaracteristicId", IndividualObservationExportRow.PROPERTY_CARACTERISTIC, Caracteristic.PROPERTY_ID);
         newColumnForExport("CaracteristicValue", IndividualObservationExportRow.PROPERTY_CARACTERISTIC_VALUE, TuttiCsvUtil.CARACTERISTIC_VALUE_FORMATTER);
     }

Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/MarineLitterExportModel.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/MarineLitterExportModel.java	2013-07-03 10:32:48 UTC (rev 1112)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/MarineLitterExportModel.java	2013-07-03 12:52:32 UTC (rev 1113)
@@ -61,7 +61,7 @@
         newColumnForExport("MarineLitterSizeCategory", MarineLitterBatch.PROPERTY_MARINE_LITTER_SIZE_CATEGORY, TuttiCsvUtil.CARACTERISTIC_VALUE_FORMATTER);
         newColumnForExport("Number", MarineLitterBatch.PROPERTY_NUMBER, TuttiCsvUtil.INTEGER);
         newColumnForExport("Weight", MarineLitterBatch.PROPERTY_WEIGHT, TuttiCsvUtil.FLOAT);
-        newColumnForExport("Comment", MarineLitterBatch.PROPERTY_COMMENT);
+        newColumnForExport("Commentaire", MarineLitterBatch.PROPERTY_COMMENT);
     }
 
     public void prepareRows(PersistenceService persistenceService,

Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportModel.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportModel.java	2013-07-03 10:32:48 UTC (rev 1112)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportModel.java	2013-07-03 12:52:32 UTC (rev 1113)
@@ -61,8 +61,8 @@
         newColumnForExport("Annee", Cruise.PROPERTY_BEGIN_DATE, TuttiCsvUtil.YEAR);
         newColumnForExport("Serie", Cruise.PROPERTY_PROGRAM, Program.PROPERTY_NAME);
         newColumnForExport("Serie_Partielle", Cruise.PROPERTY_SURVEY_PART);
-        newColumnForExport("Id_Operation", FishingOperation.PROPERTY_STATION_NUMBER);
-        newColumnForExport("NumOrdre_Station", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER);
+        newColumnForExport("Code_Station", FishingOperation.PROPERTY_STATION_NUMBER);
+        newColumnForExport("Numero_Trait", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER);
         newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION);
 
         newColumnForExport("Engin", FishingOperation.PROPERTY_GEAR, Gear.PROPERTY_NAME);

Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SurveyExportModel.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SurveyExportModel.java	2013-07-03 10:32:48 UTC (rev 1112)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SurveyExportModel.java	2013-07-03 12:52:32 UTC (rev 1113)
@@ -49,12 +49,12 @@
         newColumnForExport("Pays", SurveyExportRow.PROPERTY_COUNTRY);
         newColumnForExport("Zone_Etude", Program.PROPERTY_ZONE, TuttiLocation.PROPERTY_NAME);
         newColumnForExport("Id_Sismer", Cruise.PROPERTY_NAME);
-        newColumnForExport("Nombre_de_poche", Cruise.PROPERTY_MULTIRIG_NUMBER, TuttiCsvUtil.PRIMITIVE_INTEGER);
+//        newColumnForExport("Nombre_de_poche", Cruise.PROPERTY_MULTIRIG_NUMBER, TuttiCsvUtil.PRIMITIVE_INTEGER);
         newColumnForExport("Date_Deb_Campagne", Cruise.PROPERTY_BEGIN_DATE, TuttiCsvUtil.DAY_TIME_SECOND);
         newColumnForExport("Port_Deb_Campagne", Cruise.PROPERTY_DEPARTURE_LOCATION, TuttiLocation.PROPERTY_NAME);
         newColumnForExport("Date_Fin_Campagne", Cruise.PROPERTY_END_DATE, TuttiCsvUtil.DAY_TIME_SECOND);
         newColumnForExport("Port_Fin_Campagne", Cruise.PROPERTY_RETURN_LOCATION, TuttiLocation.PROPERTY_NAME);
-        newColumnForExport("Engin", Cruise.PROPERTY_GEAR, TuttiCsvUtil.LIST_GEAR_FORMATTER);
+//        newColumnForExport("Engin", Cruise.PROPERTY_GEAR, TuttiCsvUtil.LIST_GEAR_FORMATTER);
         newColumnForExport("Chef_Mission", Cruise.PROPERTY_HEAD_OF_MISSION, TuttiCsvUtil.LIST_PERSON_FORMATTER);
         newColumnForExport("Resp_Salle_Tri", Cruise.PROPERTY_HEAD_OF_SORT_ROOM, TuttiCsvUtil.LIST_PERSON_FORMATTER);
         newColumnForExport("Commentaire", Cruise.PROPERTY_COMMENT);

    

[Tutti-commits] r1113 - in trunk: . tutti-service/src/main/java/fr/ifremer/tutti/service/export

tchemit＠users.forge.codelutin.com