[Tutti-commits] r1500 - in trunk/tutti-service/src: main/java/fr/ifremer/tutti/service main/java/fr/ifremer/tutti/service/export/generic test/java/fr/ifremer/tutti/service/export/generic test/resources/report/2013.12.05/allegro-tutti/reports test/resources/report/exportCruise

Author: tchemit Date: 2014-01-17 15:58:15 +0100 (Fri, 17 Jan 2014) New Revision: 1500 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1500 Log: refs #4135: [EXPORT GENERIQUE] demande d'?\195?\169volutions Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/AccidentalCatchExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/IndividualObservationExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/MarineLitterExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/OperationExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/OperationExportRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/ParameterExportModel.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportService2Test.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportServiceTest.java trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/reports/controle_data_allegro_campagne.rptdesign trunk/tutti-service/src/test/resources/report/exportCruise/accidentalCatch.csv trunk/tutti-service/src/test/resources/report/exportCruise/catch.csv trunk/tutti-service/src/test/resources/report/exportCruise/individualObservation.csv trunk/tutti-service/src/test/resources/report/exportCruise/marineLitter.csv trunk/tutti-service/src/test/resources/report/exportCruise/operation.csv trunk/tutti-service/src/test/resources/report/exportCruise/parameter.csv Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2014-01-17 09:53:22 UTC (rev 1499) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2014-01-17 14:58:15 UTC (rev 1500) @@ -74,6 +74,28 @@ */ public class TuttiCsvUtil extends Common { + public static final ValueParserFormatter<Float> FLOAT_NULL_TO_9 = + new FloatParserFormatter(-9f, true) { + @Override + public String format(Float value) { + if (value == null) { + // if value is null then use the default value + value = defaultValue; + } + return super.format(value); + } + + @Override + protected Float parseNoneEmptyValue(String value) { + Float aFloat = super.parseNoneEmptyValue(value); + if (defaultValue.equals(aFloat)) { + // if having -9, then value is null + aFloat = null; + } + return aFloat; + } + }; + public static final ValueFormatter<Caracteristic> CARACTERISTIC_ID_FORMATTER = new ValueFormatter<Caracteristic>() { @Override public String format(Caracteristic value) { Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/AccidentalCatchExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/AccidentalCatchExportModel.java 2014-01-17 09:53:22 UTC (rev 1499) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/AccidentalCatchExportModel.java 2014-01-17 14:58:15 UTC (rev 1500) @@ -75,7 +75,7 @@ newColumnForExport("Serie_Partielle", Cruise.PROPERTY_SURVEY_PART); newNullableColumnForExport("Engin", FishingOperation.PROPERTY_GEAR + "." + Gear.PROPERTY_NAME); newColumnForExport("Code_station", FishingOperation.PROPERTY_STATION_NUMBER); - newColumnForExport("Numero_Trait", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); + newColumnForExport("Id_Operation", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); newColumnForExport("Navire", Cruise.PROPERTY_VESSEL, TuttiCsvUtil.VESSEL_VALUE_FORMATTER); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportModel.java 2014-01-17 09:53:22 UTC (rev 1499) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportModel.java 2014-01-17 14:58:15 UTC (rev 1500) @@ -69,12 +69,14 @@ newColumnForExport("Serie_Partielle", Cruise.PROPERTY_SURVEY_PART); newNullableColumnForExport("Engin", FishingOperation.PROPERTY_GEAR + "." + Gear.PROPERTY_NAME); newColumnForExport("Code_station", FishingOperation.PROPERTY_STATION_NUMBER); - newColumnForExport("Numero_Trait", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); + newColumnForExport("Id_Operation", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); 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("Code_Taxon", SpeciesBatch.PROPERTY_SPECIES + "." + Species.PROPERTY_REFERENCE_TAXON_ID, TuttiCsvUtil.INTEGER); + newColumnForExport("Code_Espece_Campagne", SpeciesBatch.PROPERTY_SPECIES + "." + Species.PROPERTY_SURVEY_CODE); newColumnForExport("Nom_scientifique", SpeciesBatch.PROPERTY_SPECIES + "." + Species.PROPERTY_NAME); newColumnForExport("Commentaire", SpeciesBatch.PROPERTY_COMMENT); + //FIXME Use me newColumnForExport("Coef_Final_Elevation", CatchExportRow.FINAL_RAISING_FACTOR); for (SampleCategoryModelEntry entry : sampleCategoryModel.getCategory()) { addSampleCategory(entry.getCanonicalLabel(), entry.getOrder()); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportRow.java 2014-01-17 09:53:22 UTC (rev 1499) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportRow.java 2014-01-17 14:58:15 UTC (rev 1500) @@ -76,6 +76,8 @@ public static final String BATCH_WEIGHT_UNIT = "batchWeightUnit"; + public static final String FINAL_RAISING_FACTOR = "finalRaisingFactor"; + protected Cruise cruise; protected FishingOperation fishingOperation; @@ -92,6 +94,8 @@ protected float raisingFactor; + protected float finalRaisingFactor; + protected Integer batchNumber; protected String batchWeightUnit; @@ -138,6 +142,14 @@ this.batchNumber = benthosFrequency.getNumber(); } + public float getFinalRaisingFactor() { + return finalRaisingFactor; + } + + public void setFinalRaisingFactor(float finalRaisingFactor) { + this.finalRaisingFactor = finalRaisingFactor; + } + public Date getBeginDate() { return cruise.getBeginDate(); } @@ -224,6 +236,7 @@ result.setBatchNumber(batchNumber); result.setBatchWeightUnit(batchWeightUnit); result.comment.addAll(comment); + result.setFinalRaisingFactor(finalRaisingFactor); return result; } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/IndividualObservationExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/IndividualObservationExportModel.java 2014-01-17 09:53:22 UTC (rev 1499) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/IndividualObservationExportModel.java 2014-01-17 14:58:15 UTC (rev 1500) @@ -75,7 +75,7 @@ newColumnForExport("Serie_Partielle", Cruise.PROPERTY_SURVEY_PART); newNullableColumnForExport("Engin", FishingOperation.PROPERTY_GEAR + "." + Gear.PROPERTY_NAME); newColumnForExport("Code_station", FishingOperation.PROPERTY_STATION_NUMBER); - newColumnForExport("Numero_Trait", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); + newColumnForExport("Id_Operation", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); newColumnForExport("Navire", Cruise.PROPERTY_VESSEL, TuttiCsvUtil.VESSEL_VALUE_FORMATTER); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/MarineLitterExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/MarineLitterExportModel.java 2014-01-17 09:53:22 UTC (rev 1499) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/MarineLitterExportModel.java 2014-01-17 14:58:15 UTC (rev 1500) @@ -52,7 +52,7 @@ newColumnForExport("Serie_Partielle", Cruise.PROPERTY_SURVEY_PART); newNullableColumnForExport("Engin", FishingOperation.PROPERTY_GEAR + "." + Gear.PROPERTY_NAME); newColumnForExport("Code_station", FishingOperation.PROPERTY_STATION_NUMBER); - newColumnForExport("Numero_Trait", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); + newColumnForExport("Id_Operation", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); newColumnForExport("Navire", Cruise.PROPERTY_VESSEL, TuttiCsvUtil.VESSEL_VALUE_FORMATTER); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/OperationExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/OperationExportModel.java 2014-01-17 09:53:22 UTC (rev 1499) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/OperationExportModel.java 2014-01-17 14:58:15 UTC (rev 1500) @@ -28,7 +28,6 @@ import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.Program; -import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.TuttiLocation; import fr.ifremer.tutti.persistence.entities.referential.Vessel; @@ -45,27 +44,13 @@ */ public class OperationExportModel extends TuttiCsvUtil.AbstractTuttiExportModel<OperationExportRow> { - - protected final Caracteristic verticalOpeningCaracteristic; - - protected final Caracteristic horizontalOpeningWingCaracteristic; - - protected final Caracteristic horizontalOpeningDoorCaracteristic; - - public OperationExportModel(char separator, - Caracteristic verticalOpeningCaracteristic, - Caracteristic horizontalOpeningWingCaracteristic, - Caracteristic horizontalOpeningDoorCaracteristic, - Decorator<Vessel> vesselDecorator) { + public OperationExportModel(char separator, Decorator<Vessel> vesselDecorator) { super(separator); - this.verticalOpeningCaracteristic = verticalOpeningCaracteristic; - this.horizontalOpeningWingCaracteristic = horizontalOpeningWingCaracteristic; - this.horizontalOpeningDoorCaracteristic = horizontalOpeningDoorCaracteristic; newColumnForExport("Annee", Cruise.PROPERTY_BEGIN_DATE, TuttiCsvUtil.YEAR); newColumnForExport("Serie", Cruise.PROPERTY_PROGRAM, Program.PROPERTY_NAME); newColumnForExport("Serie_Partielle", Cruise.PROPERTY_SURVEY_PART); newColumnForExport("Code_Station", FishingOperation.PROPERTY_STATION_NUMBER); - newColumnForExport("Numero_Trait", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); + newColumnForExport("Id_Operation", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); newNullableColumnForExport("Engin", FishingOperation.PROPERTY_GEAR + "." + Gear.PROPERTY_NAME); @@ -82,69 +67,66 @@ newColumnForExport("Localite", FishingOperation.PROPERTY_LOCATION, TuttiLocation.PROPERTY_NAME, "NA"); newColumnForExport("Validite_OP", FishingOperation.PROPERTY_FISHING_OPERATION_VALID, TuttiCsvUtil.BOOLEAN); newColumnForExport("Rectiligne", FishingOperation.PROPERTY_FISHING_OPERATION_RECTILIGNE, TuttiCsvUtil.BOOLEAN); - newColumnForExport("Distance", FishingOperation.PROPERTY_TRAWL_DISTANCE, TuttiCsvUtil.FLOAT); - newColumnForExport("Ouv_Verticale", OperationExportRow.PROPERTY_VERTICAL_OPENING_GEAR_USE_FEATURE, TuttiCsvUtil.CARACTERISTIC_VALUE_FORMATTER); - newColumnForExport("Ouv_Horizontale_Ailes", OperationExportRow.PROPERTY_HORIZONTAL_OPENING_WING_GEAR_USE_FEATURE, TuttiCsvUtil.CARACTERISTIC_VALUE_FORMATTER); - newColumnForExport("Ouv_Horizontale_Panneaux", OperationExportRow.PROPERTY_HORIZONTAL_OPENING_DOOR_GEAR_USE_FEATURE, TuttiCsvUtil.CARACTERISTIC_VALUE_FORMATTER); + newColumnForExport("Distance", FishingOperation.PROPERTY_TRAWL_DISTANCE, TuttiCsvUtil.FLOAT_NULL_TO_9); newColumnForExport("Saisisseur", FishingOperation.PROPERTY_RECORDER_PERSON, TuttiCsvUtil.LIST_PERSON_FORMATTER); newColumnForExport("NavireAssocie", FishingOperation.PROPERTY_SECONDARY_VESSEL, TuttiCsvUtil.newListVesselFormatter(vesselDecorator)); newColumnForExport("Commentaire", FishingOperation.PROPERTY_COMMENT); - newNullableColumnForExport("Poids_Total", OperationExportRow.PROPERTY_CATCH_TOTAL_WEIGHT, TuttiCsvUtil.FLOAT); + newNullableColumnForExport("Poids_Total", OperationExportRow.PROPERTY_CATCH_TOTAL_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); newNullableColumnForExport("Poids_Total_Calcule", OperationExportRow.PROPERTY_CATCH_TOTAL_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newNullableColumnForExport("Poids_Total_Vrac", OperationExportRow.PROPERTY_CATCH_TOTAL_SORTED_WEIGHT, TuttiCsvUtil.FLOAT); + newNullableColumnForExport("Poids_Total_Vrac", OperationExportRow.PROPERTY_CATCH_TOTAL_SORTED_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); newNullableColumnForExport("Poids_Total_Vrac_Calcule", OperationExportRow.PROPERTY_CATCH_TOTAL_SORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newNullableColumnForExport("Poids_Total_HorsVrac", OperationExportRow.PROPERTY_CATCH_TOTAL_UNSORTED_WEIGHT, TuttiCsvUtil.FLOAT); + newNullableColumnForExport("Poids_Total_HorsVrac", OperationExportRow.PROPERTY_CATCH_TOTAL_UNSORTED_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); newNullableColumnForExport("Poids_Total_HorsVrac_Calcule", OperationExportRow.PROPERTY_CATCH_TOTAL_UNSORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newNullableColumnForExport("Poids_Total_Non_Trie", OperationExportRow.PROPERTY_CATCH_TOTAL_REJECTED_WEIGHT, TuttiCsvUtil.FLOAT); + newNullableColumnForExport("Poids_Total_Non_Trie", OperationExportRow.PROPERTY_CATCH_TOTAL_REJECTED_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); newNullableColumnForExport("Poids_Total_Non_Trie_Calcule", OperationExportRow.PROPERTY_CATCH_TOTAL_REJECTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newNullableColumnForExport("Poids_Total_Tremis", OperationExportRow.PROPERTY_CATCH_TOTAL_SORTED_TREMIS_WEIGHT, TuttiCsvUtil.FLOAT); + newNullableColumnForExport("Poids_Total_Tremis", OperationExportRow.PROPERTY_CATCH_TOTAL_SORTED_TREMIS_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); newNullableColumnForExport("Poids_Total_Tremis_Calcule", OperationExportRow.PROPERTY_CATCH_TOTAL_SORTED_TREMIS_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newNullableColumnForExport("Poids_Total_Carroussel", OperationExportRow.PROPERTY_CATCH_TOTAL_SORTED_CAROUSSEL_WEIGHT, TuttiCsvUtil.FLOAT); + newNullableColumnForExport("Poids_Total_Carroussel", OperationExportRow.PROPERTY_CATCH_TOTAL_SORTED_CAROUSSEL_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); newNullableColumnForExport("Poids_Total_Carroussel_Calcule", OperationExportRow.PROPERTY_CATCH_TOTAL_SORTED_CAROUSSEL_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newNullableColumnForExport("Poids_Total_Espece", OperationExportRow.PROPERTY_SPECIES_TOTAL_WEIGHT, TuttiCsvUtil.FLOAT); + newNullableColumnForExport("Poids_Total_Espece", OperationExportRow.PROPERTY_SPECIES_TOTAL_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); newNullableColumnForExport("Poids_Total_Espece_Calcule", OperationExportRow.PROPERTY_SPECIES_TOTAL_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newNullableColumnForExport("Poids_Total_Espece_Vrac", OperationExportRow.PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT, TuttiCsvUtil.FLOAT); + newNullableColumnForExport("Poids_Total_Espece_Vrac", OperationExportRow.PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); newNullableColumnForExport("Poids_Total_Espece_Vrac_Calcule", OperationExportRow.PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newNullableColumnForExport("Poids_Total_Espece_Vrac_Trie", OperationExportRow.PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_WEIGHT, TuttiCsvUtil.FLOAT); + newNullableColumnForExport("Poids_Total_Espece_Vrac_Trie", OperationExportRow.PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); newNullableColumnForExport("Poids_Total_Espece_Vrac_Trie_Calcule", OperationExportRow.PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newNullableColumnForExport("Poids_Total_Espece_HorsVrac", OperationExportRow.PROPERTY_SPECIES_TOTAL_UNSORTED_WEIGHT, TuttiCsvUtil.FLOAT); + newNullableColumnForExport("Poids_Total_Espece_HorsVrac", OperationExportRow.PROPERTY_SPECIES_TOTAL_UNSORTED_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); newNullableColumnForExport("Poids_Total_Espece_HorsVrac_Calcule", OperationExportRow.PROPERTY_SPECIES_TOTAL_UNSORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newNullableColumnForExport("Poids_Total_Espece_Inerte_Trie", OperationExportRow.PROPERTY_SPECIES_TOTAL_INERT_WEIGHT, TuttiCsvUtil.FLOAT); + newNullableColumnForExport("Poids_Total_Espece_Inerte_Trie", OperationExportRow.PROPERTY_SPECIES_TOTAL_INERT_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); newNullableColumnForExport("Poids_Total_Espece_Inerte_Trie_Calcule", OperationExportRow.PROPERTY_SPECIES_TOTAL_INERT_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newNullableColumnForExport("Poids_Total_Espece_Vivant_non_detaille_trie", OperationExportRow.PROPERTY_SPECIES_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT, TuttiCsvUtil.FLOAT); + newNullableColumnForExport("Poids_Total_Espece_Vivant_non_detaille_trie", OperationExportRow.PROPERTY_SPECIES_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); newNullableColumnForExport("Poids_Total_Espece_Vivant_non_detaille_trie_Calcule", OperationExportRow.PROPERTY_SPECIES_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newNullableColumnForExport("Poids_Total_Benthos", OperationExportRow.PROPERTY_BENTHOS_TOTAL_WEIGHT, TuttiCsvUtil.FLOAT); + newNullableColumnForExport("Poids_Total_Benthos", OperationExportRow.PROPERTY_BENTHOS_TOTAL_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); newNullableColumnForExport("Poids_Total_Benthos_Calcule", OperationExportRow.PROPERTY_BENTHOS_TOTAL_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newNullableColumnForExport("Poids_Total_Benthos_Vrac", OperationExportRow.PROPERTY_BENTHOS_TOTAL_SORTED_WEIGHT, TuttiCsvUtil.FLOAT); + newNullableColumnForExport("Poids_Total_Benthos_Vrac", OperationExportRow.PROPERTY_BENTHOS_TOTAL_SORTED_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); newNullableColumnForExport("Poids_Total_Benthos_Vrac_Calcule", OperationExportRow.PROPERTY_BENTHOS_TOTAL_SORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newNullableColumnForExport("Poids_Total_Benthos_Vrac_Trie", OperationExportRow.PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_WEIGHT, TuttiCsvUtil.FLOAT); + newNullableColumnForExport("Poids_Total_Benthos_Vrac_Trie", OperationExportRow.PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); newNullableColumnForExport("Poids_Total_Benthos_Vrac_Trie_Calcule", OperationExportRow.PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newNullableColumnForExport("Poids_Total_Benthos_HorsVrac", OperationExportRow.PROPERTY_BENTHOS_TOTAL_UNSORTED_WEIGHT, TuttiCsvUtil.FLOAT); + newNullableColumnForExport("Poids_Total_Benthos_HorsVrac", OperationExportRow.PROPERTY_BENTHOS_TOTAL_UNSORTED_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); newNullableColumnForExport("Poids_Total_Benthos_HorsVrac_Calcule", OperationExportRow.PROPERTY_BENTHOS_TOTAL_UNSORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newNullableColumnForExport("Poids_Total_Benthos_Inerte_Trie", OperationExportRow.PROPERTY_BENTHOS_TOTAL_INERT_WEIGHT, TuttiCsvUtil.FLOAT); + newNullableColumnForExport("Poids_Total_Benthos_Inerte_Trie", OperationExportRow.PROPERTY_BENTHOS_TOTAL_INERT_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); newNullableColumnForExport("Poids_Total_Benthos_Inerte_Trie_Calcule", OperationExportRow.PROPERTY_BENTHOS_TOTAL_INERT_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newNullableColumnForExport("Poids_Total_Benthos_Vivant_non_detaille_trie", OperationExportRow.PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT, TuttiCsvUtil.FLOAT); + newNullableColumnForExport("Poids_Total_Benthos_Vivant_non_detaille_trie", OperationExportRow.PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); newNullableColumnForExport("Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule", OperationExportRow.PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newNullableColumnForExport("Poids_Total_Macro_Dechet", OperationExportRow.PROPERTY_MARINE_LITTER_TOTAL_WEIGHT, TuttiCsvUtil.FLOAT); + newNullableColumnForExport("Poids_Total_Macro_Dechet", OperationExportRow.PROPERTY_MARINE_LITTER_TOTAL_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); newNullableColumnForExport("Poids_Total_Macro_Dechet_Calcule", OperationExportRow.PROPERTY_MARINE_LITTER_TOTAL_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); } @@ -153,10 +135,7 @@ FishingOperation operation, CatchBatch catchBatch) { - OperationExportRow row = new OperationExportRow( - verticalOpeningCaracteristic, - horizontalOpeningWingCaracteristic, - horizontalOpeningDoorCaracteristic); + OperationExportRow row = new OperationExportRow(); row.setCruise(cruise); row.setFishingOperation(operation); row.setCatchBatch(catchBatch); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/OperationExportRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/OperationExportRow.java 2014-01-17 09:53:22 UTC (rev 1499) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/OperationExportRow.java 2014-01-17 14:58:15 UTC (rev 1500) @@ -50,12 +50,6 @@ public static final String PROPERTY_DURATION = "duration"; - public static final String PROPERTY_VERTICAL_OPENING_GEAR_USE_FEATURE = "verticalOpeningGearUseFeature"; - - public static final String PROPERTY_HORIZONTAL_OPENING_WING_GEAR_USE_FEATURE = "horizontalOpeningWingGearUseFeature"; - - public static final String PROPERTY_HORIZONTAL_OPENING_DOOR_GEAR_USE_FEATURE = "horizontalOpeningDoorGearUseFeature"; - public static final String PROPERTY_CATCH_TOTAL_WEIGHT = "catchTotalWeight"; public static final String PROPERTY_CATCH_TOTAL_WEIGHT_COMPUTED = "catchTotalWeightComputed"; @@ -141,21 +135,6 @@ protected CatchBatch catchBatch; - private Caracteristic verticalOpeningCaracteristic; - - private Caracteristic horizontalOpeningWingCaracteristic; - - private Caracteristic horizontalOpeningDoorCaracteristic; - - public OperationExportRow(Caracteristic verticalOpeningCaracteristic, - Caracteristic horizontalOpeningWingCaracteristic, - Caracteristic horizontalOpeningDoorCaracteristic) { - - this.verticalOpeningCaracteristic = verticalOpeningCaracteristic; - this.horizontalOpeningWingCaracteristic = horizontalOpeningWingCaracteristic; - this.horizontalOpeningDoorCaracteristic = horizontalOpeningDoorCaracteristic; - } - public void setCruise(Cruise cruise) { this.cruise = cruise; } @@ -267,21 +246,6 @@ "mm"); } - public Serializable getVerticalOpeningGearUseFeature() { - Serializable result = getGearUseFeature(verticalOpeningCaracteristic); - return result; - } - - public Serializable getHorizontalOpeningWingGearUseFeature() { - Serializable result = getGearUseFeature(horizontalOpeningWingCaracteristic); - return result; - } - - public Serializable getHorizontalOpeningDoorGearUseFeature() { - Serializable result = getGearUseFeature(horizontalOpeningDoorCaracteristic); - return result; - } - public Float getCatchTotalWeight() { return TuttiEntities.getValueOrComputedValue( catchBatch.getCatchTotalWeight(), Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/ParameterExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/ParameterExportModel.java 2014-01-17 09:53:22 UTC (rev 1499) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/ParameterExportModel.java 2014-01-17 14:58:15 UTC (rev 1500) @@ -51,7 +51,7 @@ newColumnForExport("Serie", Cruise.PROPERTY_PROGRAM, Program.PROPERTY_NAME); newColumnForExport("Serie_Partielle", Cruise.PROPERTY_SURVEY_PART); newColumnForExport("Code_station", FishingOperation.PROPERTY_STATION_NUMBER); - newColumnForExport("Numero_Trait", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); + newColumnForExport("Id_Operation", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); newColumnForExport("Code_PMFM", ParameterExportRow.PROPERTY_CARACTERISTIC, Caracteristic.PROPERTY_ID); Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportService2Test.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportService2Test.java 2014-01-17 09:53:22 UTC (rev 1499) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportService2Test.java 2014-01-17 14:58:15 UTC (rev 1500) @@ -147,7 +147,7 @@ URL url = new URL(urlPrefix + "accidentalCatch.csv"); ServiceDbResource.assertFileContent("accidentalCatch export:\n", url, - "Annee;Serie;Serie_Partielle;Engin;Code_station;Numero_Trait;Poche;Navire;BatchId;ReferenceTaxonId;ReferenceTaxonName;Commentaire;CaracteristicId;CaracteristicValue"); + "Annee;Serie;Serie_Partielle;Engin;Code_station;Id_Operation;Poche;Navire;BatchId;ReferenceTaxonId;ReferenceTaxonName;Commentaire;CaracteristicId;CaracteristicValue"); } @@ -157,7 +157,7 @@ URL url = new URL(urlPrefix + "operation.csv"); ServiceDbResource.assertFileContent("operation export:\n", url, - "Annee;Serie;Serie_Partielle;Code_Station;Numero_Trait;Poche;Engin;Navire;DateDeb_Op;LatDeb;LongDeb;DateFin_Op;LatFin;LongFin;Duree;Strate;Sous-Strate;Localite;Validite_OP;Rectiligne;Distance;Ouv_Verticale;Ouv_Horizontale_Ailes;Ouv_Horizontale_Panneaux;Saisisseur;NavireAssocie;Commentaire;Poids_Total;Poids_Total_Calcule;Poids_Total_Vrac;Poids_Total_Vrac_Calcule;Poids_Total_HorsVrac;Poids_Total_HorsVrac_Calcule;Poids_Total_Non_Trie;Poids_Total_Non_Trie_Calcule;Poids_Total_Tremis;Poids_Total_Tremis_Calcule;Poids_Total_Carroussel;Poids_Total_Carroussel_Calcule;Poids_Total_Espece;Poids_Total_Espece_Calcule;Poids_Total_Espece_Vrac;Poids_Total_Espece_Vrac_Calcule;Poids_Total_Espece_Vrac_Trie;Poids_Total_Espece_Vrac_Trie_Calcule;Poids_Total_Espece_HorsVrac;Poids_Total_Espece_HorsVrac_Calcule;Poids_Total_Espece_Inerte_Trie;Poids_Total_Espece_Inerte_Trie_Calcule;Poids_Total_Espece_Vivant_non_detaille_trie;Poids_Total_Espece_Vivant_non_detaille_trie_Calcule;Poids_Total_Benthos;Poids_Total_Benthos_Calcule;Poids_Total_Benthos_Vrac;Poids_Total_Benthos_Vrac_Calcule;Poids_Total_Benthos_Vrac_Trie;Poids_Total_Benthos_Vrac_Trie_Calcule;Poids_Total_Benthos_HorsVrac;Poids_Total_Benthos_HorsVrac_Calcule;Poids_Total_Benthos_Inerte_Trie;Poids_Total_Benthos_Inerte_Trie_Calcule;Poids_Total_Benthos_Vivant_non_detaille_trie;Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule;Poids_Total_Macro_Dechet;Poids_Total_Macro_Dechet_Calcule\n" + + "Annee;Serie;Serie_Partielle;Code_Station;Id_Operation;Poche;Engin;Navire;DateDeb_Op;LatDeb;LongDeb;DateFin_Op;LatFin;LongFin;Duree;Strate;Sous-Strate;Localite;Validite_OP;Rectiligne;Distance;Ouv_Verticale;Ouv_Horizontale_Ailes;Ouv_Horizontale_Panneaux;Saisisseur;NavireAssocie;Commentaire;Poids_Total;Poids_Total_Calcule;Poids_Total_Vrac;Poids_Total_Vrac_Calcule;Poids_Total_HorsVrac;Poids_Total_HorsVrac_Calcule;Poids_Total_Non_Trie;Poids_Total_Non_Trie_Calcule;Poids_Total_Tremis;Poids_Total_Tremis_Calcule;Poids_Total_Carroussel;Poids_Total_Carroussel_Calcule;Poids_Total_Espece;Poids_Total_Espece_Calcule;Poids_Total_Espece_Vrac;Poids_Total_Espece_Vrac_Calcule;Poids_Total_Espece_Vrac_Trie;Poids_Total_Espece_Vrac_Trie_Calcule;Poids_Total_Espece_HorsVrac;Poids_Total_Espece_HorsVrac_Calcule;Poids_Total_Espece_Inerte_Trie;Poids_Total_Espece_Inerte_Trie_Calcule;Poids_Total_Espece_Vivant_non_detaille_trie;Poids_Total_Espece_Vivant_non_detaille_trie_Calcule;Poids_Total_Benthos;Poids_Total_Benthos_Calcule;Poids_Total_Benthos_Vrac;Poids_Total_Benthos_Vrac_Calcule;Poids_Total_Benthos_Vrac_Trie;Poids_Total_Benthos_Vrac_Trie_Calcule;Poids_Total_Benthos_HorsVrac;Poids_Total_Benthos_HorsVrac_Calcule;Poids_Total_Benthos_Inerte_Trie;Poids_Total_Benthos_Inerte_Trie_Calcule;Poids_Total_Benthos_Vivant_non_detaille_trie;Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule;Poids_Total_Macro_Dechet;Poids_Total_Macro_Dechet_Calcule\n" + "2013;test elevation;1;B;2;1;OTB 20/28.10;278970;01/07/2013 00:00:00;;;01/07/2013 00:00:00;;;00;NA;NA;NA;?;N;;NA;NA;NA;;;\"Commentaire sur le trait B-2-1\n" + "\n" + "avec\n" + @@ -191,7 +191,7 @@ URL url = new URL(urlPrefix + "individualObservation.csv"); ServiceDbResource.assertFileContent("individualObservation export:\n", url, - "Annee;Serie;Serie_Partielle;Engin;Code_station;Numero_Trait;Poche;Navire;BatchId;ReferenceTaxonId;ReferenceTaxonName;Commentaire;CaracteristicId;CaracteristicValue"); + "Annee;Serie;Serie_Partielle;Engin;Code_station;Id_Operation;Poche;Navire;BatchId;ReferenceTaxonId;ReferenceTaxonName;Commentaire;CaracteristicId;CaracteristicValue"); } @@ -201,7 +201,7 @@ URL url = new URL("jar:" + exportFile.toURI().toURL() + "!/exportCruise-" + CRUISE_ID + "/catch.csv"); ServiceDbResource.assertFileContent("Catch export:\n", url, - "Annee;Serie;Serie_Partielle;Engin;Code_station;Numero_Trait;Poche;Navire;Taxon;Nom_scientifique;Commentaire;V_HV;Num_Ordre_V_HV_H2;Tot_V_HV;Ech_V_HV;Type_Volume_Poids_V_HV;Unite_Volume_Poids_V_HV;Class_Tri_;Num_Ordre_Class_Tri__H2;Tot_Class_Tri_;Ech_Class_Tri_;Type_Volume_Poids_Class_Tri_;Unite_Volume_Poids_Class_Tri_;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Maturité;Num_Ordre_Maturité_H2;Tot_Maturité;Ech_Maturité;Type_Volume_Poids_Maturité;Unite_Volume_Poids_Maturité;Age;Num_Ordre_Age_H2;Tot_Age;Ech_Age;Type_Volume_Poids_Age;Unite_Volume_Poids_Age;Code_Longueur;Libelle_Longueur;Taille;NumOrdre_Taille_H2;Poids_Classe_Taille;Unite_Taille;Precision_Mesure;Nbr;Poids_Reference;Coef_Elev_Espece_Capture\n" + + "Annee;Serie;Serie_Partielle;Engin;Code_station;Id_Operation;Poche;Navire;Code_Taxon;Nom_scientifique;Commentaire;V_HV;Num_Ordre_V_HV_H2;Tot_V_HV;Ech_V_HV;Type_Volume_Poids_V_HV;Unite_Volume_Poids_V_HV;Class_Tri_;Num_Ordre_Class_Tri__H2;Tot_Class_Tri_;Ech_Class_Tri_;Type_Volume_Poids_Class_Tri_;Unite_Volume_Poids_Class_Tri_;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Maturité;Num_Ordre_Maturité_H2;Tot_Maturité;Ech_Maturité;Type_Volume_Poids_Maturité;Unite_Volume_Poids_Maturité;Age;Num_Ordre_Age_H2;Tot_Age;Ech_Age;Type_Volume_Poids_Age;Unite_Volume_Poids_Age;Code_Longueur;Libelle_Longueur;Taille;NumOrdre_Taille_H2;Poids_Classe_Taille;Unite_Taille;Precision_Mesure;Nbr;Poids_Reference;Coef_Elev_Espece_Capture\n" + "2013;test elevation;1;OTB 20/28.10;B;2;1;278970;1938;Agonus cataphractus;Trait B-2-1 AGONCAT-vrac 80;Vrac;1;80.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;80.0;3.5;\n" + "2013;test elevation;1;OTB 20/28.10;B;2;1;278970;1358;Alosa alosa;Trait B-2-1 ALOSALO Vrac|Trait B-2-1 ALOSALO Vrac - Male 60;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;60.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;60.0;5.8333335;\n" + "2013;test elevation;1;OTB 20/28.10;B;2;1;278970;1358;Alosa alosa;Trait B-2-1 ALOSALO Vrac|Trait B-2-1 ALOSALO Vrac - Femelle 40.0;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;40.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;40.0;8.75;\n" + @@ -243,7 +243,7 @@ URL url = new URL(urlPrefix + "marineLitter.csv"); ServiceDbResource.assertFileContent("marineLitter export:\n", url, - "Annee;Serie;Serie_Partielle;Engin;Code_station;Numero_Trait;Poche;Navire;MarineLitterCategory;MarineLitterSizeCategory;Number;Weight;Commentaire\n" + + "Annee;Serie;Serie_Partielle;Engin;Code_station;Id_Operation;Poche;Navire;MarineLitterCategory;MarineLitterSizeCategory;Number;Weight;Commentaire\n" + "2013;test elevation;1;OTB 20/28.10;B;2;1;278970;L1 PLASTIQUE;A: <5*5 cm= 25 cm2;10;;\"Trait B-2-1 Macro dechet L1 Plastique (nb 10)\n" + "\n" + "avec \n" + @@ -257,7 +257,7 @@ URL url = new URL(urlPrefix + "parameter.csv"); ServiceDbResource.assertFileContent("parameter export:\n", url, - "Annee;Serie;Serie_Partielle;Code_station;Numero_Trait;Poche;Code_PMFM;Libelle_PMFm;Valeur"); + "Annee;Serie;Serie_Partielle;Code_station;Id_Operation;Poche;Code_PMFM;Libelle_PMFm;Valeur"); } } Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportServiceTest.java 2014-01-17 09:53:22 UTC (rev 1499) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportServiceTest.java 2014-01-17 14:58:15 UTC (rev 1500) @@ -76,20 +76,20 @@ "2013;Campagne CGFS;;ScientificGear;287;Volet dépresseur (drague) - engin - totale - Déclaration d'un professionnel;Oui;"; public static final String OPERATION_WITH_NO_CATCH_CONTENT = - "Annee;Serie;Serie_Partielle;Code_Station;Numero_Trait;Poche;Engin;Navire;DateDeb_Op;LatDeb;LongDeb;DateFin_Op;LatFin;LongFin;Duree;Strate;Sous-Strate;Localite;Validite_OP;Rectiligne;Distance;Ouv_Verticale;Ouv_Horizontale_Ailes;Ouv_Horizontale_Panneaux;Saisisseur;NavireAssocie;Commentaire;Poids_Total;Poids_Total_Calcule;Poids_Total_Vrac;Poids_Total_Vrac_Calcule;Poids_Total_HorsVrac;Poids_Total_HorsVrac_Calcule;Poids_Total_Non_Trie;Poids_Total_Non_Trie_Calcule;Poids_Total_Tremis;Poids_Total_Tremis_Calcule;Poids_Total_Carroussel;Poids_Total_Carroussel_Calcule;Poids_Total_Espece;Poids_Total_Espece_Calcule;Poids_Total_Espece_Vrac;Poids_Total_Espece_Vrac_Calcule;Poids_Total_Espece_Vrac_Trie;Poids_Total_Espece_Vrac_Trie_Calcule;Poids_Total_Espece_HorsVrac;Poids_Total_Espece_HorsVrac_Calcule;Poids_Total_Espece_Inerte_Trie;Poids_Total_Espece_Inerte_Trie_Calcule;Poids_Total_Espece_Vivant_non_detaille_trie;Poids_Total_Espece_Vivant_non_detaille_trie_Calcule;Poids_Total_Benthos;Poids_Total_Benthos_Calcule;Poids_Total_Benthos_Vrac;Poids_Total_Benthos_Vrac_Calcule;Poids_Total_Benthos_Vrac_Trie;Poids_Total_Benthos_Vrac_Trie_Calcule;Poids_Total_Benthos_HorsVrac;Poids_Total_Benthos_HorsVrac_Calcule;Poids_Total_Benthos_Inerte_Trie;Poids_Total_Benthos_Inerte_Trie_Calcule;Poids_Total_Benthos_Vivant_non_detaille_trie;Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule;Poids_Total_Macro_Dechet;Poids_Total_Macro_Dechet_Calcule\n" + + "Annee;Serie;Serie_Partielle;Code_Station;Id_Operation;Poche;Engin;Navire;DateDeb_Op;LatDeb;LongDeb;DateFin_Op;LatFin;LongFin;Duree;Strate;Sous-Strate;Localite;Validite_OP;Rectiligne;Distance;Ouv_Verticale;Ouv_Horizontale_Ailes;Ouv_Horizontale_Panneaux;Saisisseur;NavireAssocie;Commentaire;Poids_Total;Poids_Total_Calcule;Poids_Total_Vrac;Poids_Total_Vrac_Calcule;Poids_Total_HorsVrac;Poids_Total_HorsVrac_Calcule;Poids_Total_Non_Trie;Poids_Total_Non_Trie_Calcule;Poids_Total_Tremis;Poids_Total_Tremis_Calcule;Poids_Total_Carroussel;Poids_Total_Carroussel_Calcule;Poids_Total_Espece;Poids_Total_Espece_Calcule;Poids_Total_Espece_Vrac;Poids_Total_Espece_Vrac_Calcule;Poids_Total_Espece_Vrac_Trie;Poids_Total_Espece_Vrac_Trie_Calcule;Poids_Total_Espece_HorsVrac;Poids_Total_Espece_HorsVrac_Calcule;Poids_Total_Espece_Inerte_Trie;Poids_Total_Espece_Inerte_Trie_Calcule;Poids_Total_Espece_Vivant_non_detaille_trie;Poids_Total_Espece_Vivant_non_detaille_trie_Calcule;Poids_Total_Benthos;Poids_Total_Benthos_Calcule;Poids_Total_Benthos_Vrac;Poids_Total_Benthos_Vrac_Calcule;Poids_Total_Benthos_Vrac_Trie;Poids_Total_Benthos_Vrac_Trie_Calcule;Poids_Total_Benthos_HorsVrac;Poids_Total_Benthos_HorsVrac_Calcule;Poids_Total_Benthos_Inerte_Trie;Poids_Total_Benthos_Inerte_Trie_Calcule;Poids_Total_Benthos_Vivant_non_detaille_trie;Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule;Poids_Total_Macro_Dechet;Poids_Total_Macro_Dechet_Calcule\n" + "2010;Campagne CGFS;;65;65;1;GOV 19.7/25.9;278970;13/10/2010 13:35:00;50.22833;0.31833;13/10/2010 14:05:00;50.22167;0.28333;30;Strate 4J;NA;Localité 4J2;N;Y;2512.0;NA;NA;NA;;;avarie - chalut annulé completement à poil;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;"; public static final String OPERATION_WITH_NO_CATCH_CONTENT_AND_NO_GEAR = - "Annee;Serie;Serie_Partielle;Code_Station;Numero_Trait;Poche;Engin;Navire;DateDeb_Op;LatDeb;LongDeb;DateFin_Op;LatFin;LongFin;Duree;Strate;Sous-Strate;Localite;Validite_OP;Rectiligne;Distance;Ouv_Verticale;Ouv_Horizontale_Ailes;Ouv_Horizontale_Panneaux;Saisisseur;NavireAssocie;Commentaire;Poids_Total;Poids_Total_Calcule;Poids_Total_Vrac;Poids_Total_Vrac_Calcule;Poids_Total_HorsVrac;Poids_Total_HorsVrac_Calcule;Poids_Total_Non_Trie;Poids_Total_Non_Trie_Calcule;Poids_Total_Tremis;Poids_Total_Tremis_Calcule;Poids_Total_Carroussel;Poids_Total_Carroussel_Calcule;Poids_Total_Espece;Poids_Total_Espece_Calcule;Poids_Total_Espece_Vrac;Poids_Total_Espece_Vrac_Calcule;Poids_Total_Espece_Vrac_Trie;Poids_Total_Espece_Vrac_Trie_Calcule;Poids_Total_Espece_HorsVrac;Poids_Total_Espece_HorsVrac_Calcule;Poids_Total_Espece_Inerte_Trie;Poids_Total_Espece_Inerte_Trie_Calcule;Poids_Total_Espece_Vivant_non_detaille_trie;Poids_Total_Espece_Vivant_non_detaille_trie_Calcule;Poids_Total_Benthos;Poids_Total_Benthos_Calcule;Poids_Total_Benthos_Vrac;Poids_Total_Benthos_Vrac_Calcule;Poids_Total_Benthos_Vrac_Trie;Poids_Total_Benthos_Vrac_Trie_Calcule;Poids_Total_Benthos_HorsVrac;Poids_Total_Benthos_HorsVrac_Calcule;Poids_Total_Benthos_Inerte_Trie;Poids_Total_Benthos_Inerte_Trie_Calcule;Poids_Total_Benthos_Vivant_non_detaille_trie;Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule;Poids_Total_Macro_Dechet;Poids_Total_Macro_Dechet_Calcule\n" + + "Annee;Serie;Serie_Partielle;Code_Station;Id_Operation;Poche;Engin;Navire;DateDeb_Op;LatDeb;LongDeb;DateFin_Op;LatFin;LongFin;Duree;Strate;Sous-Strate;Localite;Validite_OP;Rectiligne;Distance;Ouv_Verticale;Ouv_Horizontale_Ailes;Ouv_Horizontale_Panneaux;Saisisseur;NavireAssocie;Commentaire;Poids_Total;Poids_Total_Calcule;Poids_Total_Vrac;Poids_Total_Vrac_Calcule;Poids_Total_HorsVrac;Poids_Total_HorsVrac_Calcule;Poids_Total_Non_Trie;Poids_Total_Non_Trie_Calcule;Poids_Total_Tremis;Poids_Total_Tremis_Calcule;Poids_Total_Carroussel;Poids_Total_Carroussel_Calcule;Poids_Total_Espece;Poids_Total_Espece_Calcule;Poids_Total_Espece_Vrac;Poids_Total_Espece_Vrac_Calcule;Poids_Total_Espece_Vrac_Trie;Poids_Total_Espece_Vrac_Trie_Calcule;Poids_Total_Espece_HorsVrac;Poids_Total_Espece_HorsVrac_Calcule;Poids_Total_Espece_Inerte_Trie;Poids_Total_Espece_Inerte_Trie_Calcule;Poids_Total_Espece_Vivant_non_detaille_trie;Poids_Total_Espece_Vivant_non_detaille_trie_Calcule;Poids_Total_Benthos;Poids_Total_Benthos_Calcule;Poids_Total_Benthos_Vrac;Poids_Total_Benthos_Vrac_Calcule;Poids_Total_Benthos_Vrac_Trie;Poids_Total_Benthos_Vrac_Trie_Calcule;Poids_Total_Benthos_HorsVrac;Poids_Total_Benthos_HorsVrac_Calcule;Poids_Total_Benthos_Inerte_Trie;Poids_Total_Benthos_Inerte_Trie_Calcule;Poids_Total_Benthos_Vivant_non_detaille_trie;Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule;Poids_Total_Macro_Dechet;Poids_Total_Macro_Dechet_Calcule\n" + "2010;Campagne CGFS;;65;65;1;;278970;13/10/2010 13:35:00;50.22833;0.31833;13/10/2010 14:05:00;50.22167;0.28333;30;Strate 4J;NA;Localité 4J2;N;Y;2512.0;NA;NA;NA;;;avarie - chalut annulé completement à poil;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;"; public static final String OPERATION_CONTENT = - "Annee;Serie;Serie_Partielle;Code_Station;Numero_Trait;Poche;Engin;Navire;DateDeb_Op;LatDeb;LongDeb;DateFin_Op;LatFin;LongFin;Duree;Strate;Sous-Strate;Localite;Validite_OP;Rectiligne;Distance;Ouv_Verticale;Ouv_Horizontale_Ailes;Ouv_Horizontale_Panneaux;Saisisseur;NavireAssocie;Commentaire;Poids_Total;Poids_Total_Calcule;Poids_Total_Vrac;Poids_Total_Vrac_Calcule;Poids_Total_HorsVrac;Poids_Total_HorsVrac_Calcule;Poids_Total_Non_Trie;Poids_Total_Non_Trie_Calcule;Poids_Total_Tremis;Poids_Total_Tremis_Calcule;Poids_Total_Carroussel;Poids_Total_Carroussel_Calcule;Poids_Total_Espece;Poids_Total_Espece_Calcule;Poids_Total_Espece_Vrac;Poids_Total_Espece_Vrac_Calcule;Poids_Total_Espece_Vrac_Trie;Poids_Total_Espece_Vrac_Trie_Calcule;Poids_Total_Espece_HorsVrac;Poids_Total_Espece_HorsVrac_Calcule;Poids_Total_Espece_Inerte_Trie;Poids_Total_Espece_Inerte_Trie_Calcule;Poids_Total_Espece_Vivant_non_detaille_trie;Poids_Total_Espece_Vivant_non_detaille_trie_Calcule;Poids_Total_Benthos;Poids_Total_Benthos_Calcule;Poids_Total_Benthos_Vrac;Poids_Total_Benthos_Vrac_Calcule;Poids_Total_Benthos_Vrac_Trie;Poids_Total_Benthos_Vrac_Trie_Calcule;Poids_Total_Benthos_HorsVrac;Poids_Total_Benthos_HorsVrac_Calcule;Poids_Total_Benthos_Inerte_Trie;Poids_Total_Benthos_Inerte_Trie_Calcule;Poids_Total_Benthos_Vivant_non_detaille_trie;Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule;Poids_Total_Macro_Dechet;Poids_Total_Macro_Dechet_Calcule\n" + + "Annee;Serie;Serie_Partielle;Code_Station;Id_Operation;Poche;Engin;Navire;DateDeb_Op;LatDeb;LongDeb;DateFin_Op;LatFin;LongFin;Duree;Strate;Sous-Strate;Localite;Validite_OP;Rectiligne;Distance;Ouv_Verticale;Ouv_Horizontale_Ailes;Ouv_Horizontale_Panneaux;Saisisseur;NavireAssocie;Commentaire;Poids_Total;Poids_Total_Calcule;Poids_Total_Vrac;Poids_Total_Vrac_Calcule;Poids_Total_HorsVrac;Poids_Total_HorsVrac_Calcule;Poids_Total_Non_Trie;Poids_Total_Non_Trie_Calcule;Poids_Total_Tremis;Poids_Total_Tremis_Calcule;Poids_Total_Carroussel;Poids_Total_Carroussel_Calcule;Poids_Total_Espece;Poids_Total_Espece_Calcule;Poids_Total_Espece_Vrac;Poids_Total_Espece_Vrac_Calcule;Poids_Total_Espece_Vrac_Trie;Poids_Total_Espece_Vrac_Trie_Calcule;Poids_Total_Espece_HorsVrac;Poids_Total_Espece_HorsVrac_Calcule;Poids_Total_Espece_Inerte_Trie;Poids_Total_Espece_Inerte_Trie_Calcule;Poids_Total_Espece_Vivant_non_detaille_trie;Poids_Total_Espece_Vivant_non_detaille_trie_Calcule;Poids_Total_Benthos;Poids_Total_Benthos_Calcule;Poids_Total_Benthos_Vrac;Poids_Total_Benthos_Vrac_Calcule;Poids_Total_Benthos_Vrac_Trie;Poids_Total_Benthos_Vrac_Trie_Calcule;Poids_Total_Benthos_HorsVrac;Poids_Total_Benthos_HorsVrac_Calcule;Poids_Total_Benthos_Inerte_Trie;Poids_Total_Benthos_Inerte_Trie_Calcule;Poids_Total_Benthos_Vivant_non_detaille_trie;Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule;Poids_Total_Macro_Dechet;Poids_Total_Macro_Dechet_Calcule\n" + "2013;Campagne CGFS;;A;1;1;GOV 19.7/25.9;278970;01/05/2013 00:00:00;;;01/05/2013 00:23:00;;;23;Strate 1D;NA;Localité 1D2;?;N;;NA;NA;NA;Vincent AURECHE;;op1;120.0;Y;100.0;Y;20.0;Y;0.0;Y;;?;;?;120.0;Y;100.0;Y;100.0;Y;20.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;6.0;Y;\n" + "2013;Campagne CGFS;;A;2;1;GOV 19.7/25.9;278970;11/05/2013 08:00:00;;;11/05/2013 08:23:00;;;23;Strate 1D;NA;Localité 1D2;?;N;;NA;NA;NA;Robert BELLAIL|Herve BARONE;;OP2;0.0;Y;0.0;Y;0.0;Y;0.0;Y;;?;;?;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;"; public static final String PARAMETER_CONTENT = - "Annee;Serie;Serie_Partielle;Code_station;Numero_Trait;Poche;Code_PMFM;Libelle_PMFm;Valeur\n" + + "Annee;Serie;Serie_Partielle;Code_station;Id_Operation;Poche;Code_PMFM;Libelle_PMFm;Valeur\n" + "2013;Campagne CGFS;;A;1;1;1164;Catégorie UE - produit/lot - totale - Diffusion par une Halle à marée;Cat UE10;\n" + "2013;Campagne CGFS;;A;1;1;1302;(Gross Tonnage) : augmentation de tonnage accordée pour des raisons de sécurité - navire - totale - Déclaration d'un professionnel;10.0;\n" + "2013;Campagne CGFS;;A;1;1;194;\"Etat de la mer - masse d'eau, eau brute - totale - Observation par un observateur\";\"2 - belle, vagues de 0.1 à 0.5 mètres\";\n" + @@ -99,7 +99,7 @@ "2013;Campagne CGFS;;A;2;1;308;Nombre d'engin - engin - totale - Déclaration d'un professionnel;2.0;"; public static final String CATCH_CONTENT = - "Annee;Serie;Serie_Partielle;Engin;Code_station;Numero_Trait;Poche;Navire;Taxon;Nom_scientifique;Commentaire;V_HV;Num_Ordre_V_HV_H2;Tot_V_HV;Ech_V_HV;Type_Volume_Poids_V_HV;Unite_Volume_Poids_V_HV;Class_Tri_;Num_Ordre_Class_Tri__H2;Tot_Class_Tri_;Ech_Class_Tri_;Type_Volume_Poids_Class_Tri_;Unite_Volume_Poids_Class_Tri_;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Maturité;Num_Ordre_Maturité_H2;Tot_Maturité;Ech_Maturité;Type_Volume_Poids_Maturité;Unite_Volume_Poids_Maturité;Age;Num_Ordre_Age_H2;Tot_Age;Ech_Age;Type_Volume_Poids_Age;Unite_Volume_Poids_Age;Code_Longueur;Libelle_Longueur;Taille;NumOrdre_Taille_H2;Poids_Classe_Taille;Unite_Taille;Precision_Mesure;Nbr;Poids_Reference;Coef_Elev_Espece_Capture\n" + + "Annee;Serie;Serie_Partielle;Engin;Code_station;Id_Operation;Poche;Navire;Code_Taxon;Nom_scientifique;Commentaire;V_HV;Num_Ordre_V_HV_H2;Tot_V_HV;Ech_V_HV;Type_Volume_Poids_V_HV;Unite_Volume_Poids_V_HV;Class_Tri_;Num_Ordre_Class_Tri__H2;Tot_Class_Tri_;Ech_Class_Tri_;Type_Volume_Poids_Class_Tri_;Unite_Volume_Poids_Class_Tri_;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Maturité;Num_Ordre_Maturité_H2;Tot_Maturité;Ech_Maturité;Type_Volume_Poids_Maturité;Unite_Volume_Poids_Maturité;Age;Num_Ordre_Age_H2;Tot_Age;Ech_Age;Type_Volume_Poids_Age;Unite_Volume_Poids_Age;Code_Longueur;Libelle_Longueur;Taille;NumOrdre_Taille_H2;Poids_Classe_Taille;Unite_Taille;Precision_Mesure;Nbr;Poids_Reference;Coef_Elev_Espece_Capture\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;278970;11242;Aaptos;|||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Mâle;1;30.0;;Poids;kg;1 - Stade 1;1;10.0;5.0;Poids;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;10.0;1;;cm;0.5;5;5.0;20.0;\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;278970;11242;Aaptos;|||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Mâle;1;30.0;;Poids;kg;1 - Stade 1;1;10.0;5.0;Poids;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;10.5;2;;cm;0.5;2;5.0;20.0;\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;278970;11242;Aaptos;|||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Mâle;1;30.0;;Poids;kg;1 - Stade 1;1;10.0;5.0;Poids;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;11.0;3;;cm;0.5;1;5.0;20.0;\n" + @@ -111,7 +111,7 @@ "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;278970;11242;Aaptos;;Hors Vrac;1;20.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;2;20.0;1.0;"; public static final String CATCH_CONTENT_2 = - "Annee;Serie;Serie_Partielle;Engin;Code_station;Numero_Trait;Poche;Navire;Taxon;Nom_scientifique;Commentaire;V_HV;Num_Ordre_V_HV_H2;Tot_V_HV;Ech_V_HV;Type_Volume_Poids_V_HV;Unite_Volume_Poids_V_HV;Class_Tri_;Num_Ordre_Class_Tri__H2;Tot_Class_Tri_;Ech_Class_Tri_;Type_Volume_Poids_Class_Tri_;Unite_Volume_Poids_Class_Tri_;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Maturité;Num_Ordre_Maturité_H2;Tot_Maturité;Ech_Maturité;Type_Volume_Poids_Maturité;Unite_Volume_Poids_Maturité;Age;Num_Ordre_Age_H2;Tot_Age;Ech_Age;Type_Volume_Poids_Age;Unite_Volume_Poids_Age;Code_Longueur;Libelle_Longueur;Taille;NumOrdre_Taille_H2;Poids_Classe_Taille;Unite_Taille;Precision_Mesure;Nbr;Poids_Reference;Coef_Elev_Espece_Capture\n" + + "Annee;Serie;Serie_Partielle;Engin;Code_station;Id_Operation;Poche;Navire;Code_Taxon;Nom_scientifique;Commentaire;V_HV;Num_Ordre_V_HV_H2;Tot_V_HV;Ech_V_HV;Type_Volume_Poids_V_HV;Unite_Volume_Poids_V_HV;Class_Tri_;Num_Ordre_Class_Tri__H2;Tot_Class_Tri_;Ech_Class_Tri_;Type_Volume_Poids_Class_Tri_;Unite_Volume_Poids_Class_Tri_;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Maturité;Num_Ordre_Maturité_H2;Tot_Maturité;Ech_Maturité;Type_Volume_Poids_Maturité;Unite_Volume_Poids_Maturité;Age;Num_Ordre_Age_H2;Tot_Age;Ech_Age;Type_Volume_Poids_Age;Unite_Volume_Poids_Age;Code_Longueur;Libelle_Longueur;Taille;NumOrdre_Taille_H2;Poids_Classe_Taille;Unite_Taille;Precision_Mesure;Nbr;Poids_Reference;Coef_Elev_Espece_Capture\n" + "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;278970;365;Aequipecten opercularis;taxon;Vrac;1;0.005;0.005;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;1;0.005;1.0001919;\n" + "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;278970;491;Alloteuthis;taxon;Vrac;2;0.004;0.004;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;1;0.004;1.0001919;\n" + "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;278970;300;Buccinum undatum;taxon;Vrac;3;0.015;0.015;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;1;0.015;1.0001919;\n" + @@ -143,12 +143,12 @@ "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;278970;1662;Trachurus trachurus;taxon|categorie_individu;Vrac;15;;;Poids;kg;G - Gros;2;0.13;0.13;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;306;Longueur totale (LT) - individu - totale - Mesure au cm par un observateur;23.0;1;;cm;1.0;1;0.13;1009.42444;"; public static final String MARINE_LITTER_CONTENT = - "Annee;Serie;Serie_Partielle;Engin;Code_station;Numero_Trait;Poche;Navire;MarineLitterCategory;MarineLitterSizeCategory;Number;Weight;Commentaire\n" + + "Annee;Serie;Serie_Partielle;Engin;Code_station;Id_Operation;Poche;Navire;MarineLitterCategory;MarineLitterSizeCategory;Number;Weight;Commentaire\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;278970;L1 PLASTIQUE;A: <5*5 cm= 25 cm2;2;5.0;S1;\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;278970;L1a Sacs;B: <10*10 cm= 100 cm2;3;1.0;S2;"; public static final String INDIVIDUAL_OBSERVATION_CONTENT = - "Annee;Serie;Serie_Partielle;Engin;Code_station;Numero_Trait;Poche;Navire;BatchId;ReferenceTaxonId;ReferenceTaxonName;Commentaire;CaracteristicId;CaracteristicValue\n" + + "Annee;Serie;Serie_Partielle;Engin;Code_station;Id_Operation;Poche;Navire;BatchId;ReferenceTaxonId;ReferenceTaxonName;Commentaire;CaracteristicId;CaracteristicValue\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;278970;100000;11242;Aaptos;P1;220;0.1;\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;278970;100000;11242;Aaptos;P1;1433;307;\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;278970;100000;11242;Aaptos;P1;307;10.0;\n" + @@ -159,7 +159,7 @@ "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;278970;100000;11242;Aaptos;P1;1388;5.0;"; public static final String ACCIDENTAL_CATCH_CONTENT = - "Annee;Serie;Serie_Partielle;Engin;Code_station;Numero_Trait;Poche;Navire;BatchId;ReferenceTaxonId;ReferenceTaxonName;Commentaire;CaracteristicId;CaracteristicValue\n" + + "Annee;Serie;Serie_Partielle;Engin;Code_station;Id_Operation;Poche;Navire;BatchId;ReferenceTaxonId;ReferenceTaxonName;Commentaire;CaracteristicId;CaracteristicValue\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;278970;100001;3835;Abalistes;;1393;Rejet mort;\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;278970;100001;3835;Abalistes;;196;Femelle;\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;278970;100001;3835;Abalistes;;220;10.0;\n" + Modified: trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/reports/controle_data_allegro_campagne.rptdesign =================================================================== --- trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/reports/controle_data_allegro_campagne.rptdesign 2014-01-17 09:53:22 UTC (rev 1499) +++ trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/reports/controle_data_allegro_campagne.rptdesign 2014-01-17 14:58:15 UTC (rev 1500) @@ -127,9 +127,9 @@ <text-property name="heading">Code_Station</text-property> </structure> <structure> - <property name="columnName">Numero_Trait</property> + <property name="columnName">Id_Operation</property> <property name="analysis">measure</property> - <text-property name="heading">Numero_Trait</text-property> + <text-property name="heading">Id_Operation</text-property> </structure> <structure> <property name="columnName">Poche</property> @@ -450,7 +450,7 @@ <expression name="expr" type="javascript">if (params["rpt-param_numerotrait"].value==0) { 0; } else { -row["Numero_Trait"] +row["Id_Operation"] }</expression> <simple-property-list name="value1"> <value>params["rpt-param_numerotrait"].value</value> @@ -483,7 +483,7 @@ </structure> <structure> <property name="position">5</property> - <property name="name">Numero_Trait</property> + <property name="name">Id_Operation</property> <property name="dataType">integer</property> </structure> <structure> @@ -820,8 +820,8 @@ </structure> <structure> <property name="position">5</property> - <property name="name">Numero_Trait</property> - <property name="nativeName">Numero_Trait</property> + <property name="name">Id_Operation</property> + <property name="nativeName">Id_Operation</property> <property name="dataType">integer</property> <property name="nativeDataType">4</property> </structure> @@ -1246,7 +1246,7 @@ <property name="nativeDataType">12</property> </structure> </list-property> - <xml-property name="queryText"><![CDATA[select "Annee", "Serie", "Serie_Partielle", "Code_Station", "Numero_Trait", "Poche", "Engin", "Navire", "DateDeb_Op", "LatDeb", "LongDeb", "DateFin_Op", "LatFin", "LongFin", "Duree", "Strate", "Sous-Strate", "Localite", "Validite_OP", "Rectiligne", "Distance", "Ouv_Verticale", "Ouv_Horizontale_Ailes", "Ouv_Horizontale_Panneaux", "Saisisseur", "NavireAssocie", "Commentaire", "Poids_Total", "Poids_Total_Calcule", "Poids_Total_Vrac", "Poids_Total_Vrac_Calcule", "Poids_Total_HorsVrac", "Poids_Total_HorsVrac_Calcule", "Poids_Total_Non_Trie", "Poids_Total_Non_Trie_Calcule", "Poids_Total_Tremis", "Poids_Total_Tremis_Calcule", "Poids_Total_Carroussel", "Poids_Total_Carroussel_Calcule", "Poids_Total_Espece", "Poids_Total_Espece_Calcule", "Poids_Total_Espece_Vrac", "Poids_Total_Espece_Vrac_Calcule", "Poids_Total_Espece_Vrac_Trie", "Poids_Total_Espece_Vrac_Trie_Calcule", "Poids_Total_Espece_HorsVrac", "Poids_Total_Espece_HorsVrac_Calcule", "Poids_Total_Espece_Inerte_Trie", "Poids_Total_Espece_Inerte_Trie_Calcule", "Poids_Total_Espece_Vivant_non_detaille_trie", "Poids_Total_Espece_Vivant_non_detaille_trie_Calcule", "Poids_Total_Benthos", "Poids_Total_Benthos_Calcule", "Poids_Total_Benthos_Vrac", "Poids_Total_Benthos_Vrac_Calcule", "Poids_Total_Benthos_Vrac_Trie", "Poids_Total_Benthos_Vrac_Trie_Calcule", "Poids_Total_Benthos_HorsVrac", "Poids_Total_Benthos_HorsVrac_Calcule", "Poids_Total_Benthos_Inerte_Trie", "Poids_Total_Benthos_Inerte_Trie_Calcule", "Poids_Total_Benthos_Vivant_non_detaille_trie", "Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule", "Poids_Total_Macro_Dechet", "Poids_Total_Macro_Dechet_Calcule" from "operation.csv" : {"Annee","Annee",INT;"Serie","Serie",STRING;"Serie_Partielle","Serie_Partielle",STRING;"Code_Station","Code_Station",STRING;"Numero_Trait","Numero_Trait",INT;"Poche","Poche",STRING;"Engin","Engin",STRING;"Navire","Navire",STRING;"DateDeb_Op","DateDeb_Op",STRING;"LatDeb","LatDeb",STRING;"LongDeb","LongDeb",STRING;"DateFin_Op","DateFin_Op",STRING;"LatFin","LatFin",STRING;"LongFin","LongFin",STRING;"Duree","Duree",STRING;"Strate","Strate",STRING;"Sous-Strate","Sous-Strate",STRING;"Localite","Localite",STRING;"Validite_OP","Validite_OP",STRING;"Rectiligne","Rectiligne",STRING;"Distance","Distance",BIGDECIMAL;"Ouv_Verticale","Ouv_Verticale",STRING;"Ouv_Horizontale_Ailes","Ouv_Horizontale_Ailes",STRING;"Ouv_Horizontale_Panneaux","Ouv_Horizontale_Panneaux",STRING;"Saisisseur","Saisisseur",STRING;"NavireAssocie","NavireAssocie",STRING;"Commentaire","Commentaire",STRING;"Poids_Total","Poids_Total",BIGDECIMAL;"Poids_Total_Calcule","Poids_Total_Calcule",STRING;"Poids_Total_Vrac","Poids_Total_Vrac",BIGDECIMAL;"Poids_Total_Vrac_Calcule","Poids_Total_Vrac_Calcule",STRING;"Poids_Total_HorsVrac","Poids_Total_HorsVrac",BIGDECIMAL;"Poids_Total_HorsVrac_Calcule","Poids_Total_HorsVrac_Calcule",STRING;"Poids_Total_Non_Trie","Poids_Total_Non_Trie",BIGDECIMAL;"Poids_Total_Non_Trie_Calcule","Poids_Total_Non_Trie_Calcule",STRING;"Poids_Total_Tremis","Poids_Total_Tremis",BIGDECIMAL;"Poids_Total_Tremis_Calcule","Poids_Total_Tremis_Calcule",STRING;"Poids_Total_Carroussel","Poids_Total_Carroussel",BIGDECIMAL;"Poids_Total_Carroussel_Calcule","Poids_Total_Carroussel_Calcule",STRING;"Poids_Total_Espece","Poids_Total_Espece",BIGDECIMAL;"Poids_Total_Espece_Calcule","Poids_Total_Espece_Calcule",STRING;"Poids_Total_Espece_Vrac","Poids_Total_Espece_Vrac",BIGDECIMAL;"Poids_Total_Espece_Vrac_Calcule","Poids_Total_Espece_Vrac_Calcule",STRING;"Poids_Total_Espece_Vrac_Trie","Poids_Total_Espece_Vrac_Trie",BIGDECIMAL;"Poids_Total_Espece_Vrac_Trie_Calcule","Poids_Total_Espece_Vrac_Trie_Calcule",STRING;"Poids_Total_Espece_HorsVrac","Poids_Total_Espece_HorsVrac",BIGDECIMAL;"Poids_Total_Espece_HorsVrac_Calcule","Poids_Total_Espece_HorsVrac_Calcule",STRING;"Poids_Total_Espece_Inerte_Trie","Poids_Total_Espece_Inerte_Trie",BIGDECIMAL;"Poids_Total_Espece_Inerte_Trie_Calcule","Poids_Total_Espece_Inerte_Trie_Calcule",STRING;"Poids_Total_Espece_Vivant_non_detaille_trie","Poids_Total_Espece_Vivant_non_detaille_trie",BIGDECIMAL;"Poids_Total_Espece_Vivant_non_detaille_trie_Calcule","Poids_Total_Espece_Vivant_non_detaille_trie_Calcule",STRING;"Poids_Total_Benthos","Poids_Total_Benthos",BIGDECIMAL;"Poids_Total_Benthos_Calcule","Poids_Total_Benthos_Calcule",STRING;"Poids_Total_Benthos_Vrac","Poids_Total_Benthos_Vrac",BIGDECIMAL;"Poids_Total_Benthos_Vrac_Calcule","Poids_Total_Benthos_Vrac_Calcule",STRING;"Poids_Total_Benthos_Vrac_Trie","Poids_Total_Benthos_Vrac_Trie",BIGDECIMAL;"Poids_Total_Benthos_Vrac_Trie_Calcule","Poids_Total_Benthos_Vrac_Trie_Calcule",STRING;"Poids_Total_Benthos_HorsVrac","Poids_Total_Benthos_HorsVrac",BIGDECIMAL;"Poids_Total_Benthos_HorsVrac_Calcule","Poids_Total_Benthos_HorsVrac_Calcule",STRING;"Poids_Total_Benthos_Inerte_Trie","Poids_Total_Benthos_Inerte_Trie",BIGDECIMAL;"Poids_Total_Benthos_Inerte_Trie_Calcule","Poids_Total_Benthos_Inerte_Trie_Calcule",STRING;"Poids_Total_Benthos_Vivant_non_detaille_trie","Poids_Total_Benthos_Vivant_non_detaille_trie",BIGDECIMAL;"Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule","Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule",STRING;"Poids_Total_Macro_Dechet","Poids_Total_Macro_Dechet",BIGDECIMAL;"Poids_Total_Macro_Dechet_Calcule","Poids_Total_Macro_Dechet_Calcule",STRING}]]></xml-property> + <xml-property name="queryText"><![CDATA[select "Annee", "Serie", "Serie_Partielle", "Code_Station", "Id_Operation", "Poche", "Engin", "Navire", "DateDeb_Op", "LatDeb", "LongDeb", "DateFin_Op", "LatFin", "LongFin", "Duree", "Strate", "Sous-Strate", "Localite", "Validite_OP", "Rectiligne", "Distance", "Ouv_Verticale", "Ouv_Horizontale_Ailes", "Ouv_Horizontale_Panneaux", "Saisisseur", "NavireAssocie", "Commentaire", "Poids_Total", "Poids_Total_Calcule", "Poids_Total_Vrac", "Poids_Total_Vrac_Calcule", "Poids_Total_HorsVrac", "Poids_Total_HorsVrac_Calcule", "Poids_Total_Non_Trie", "Poids_Total_Non_Trie_Calcule", "Poids_Total_Tremis", "Poids_Total_Tremis_Calcule", "Poids_Total_Carroussel", "Poids_Total_Carroussel_Calcule", "Poids_Total_Espece", "Poids_Total_Espece_Calcule", "Poids_Total_Espece_Vrac", "Poids_Total_Espece_Vrac_Calcule", "Poids_Total_Espece_Vrac_Trie", "Poids_Total_Espece_Vrac_Trie_Calcule", "Poids_Total_Espece_HorsVrac", "Poids_Total_Espece_HorsVrac_Calcule", "Poids_Total_Espece_Inerte_Trie", "Poids_Total_Espece_Inerte_Trie_Calcule", "Poids_Total_Espece_Vivant_non_detaille_trie", "Poids_Total_Espece_Vivant_non_detaille_trie_Calcule", "Poids_Total_Benthos", "Poids_Total_Benthos_Calcule", "Poids_Total_Benthos_Vrac", "Poids_Total_Benthos_Vrac_Calcule", "Poids_Total_Benthos_Vrac_Trie", "Poids_Total_Benthos_Vrac_Trie_Calcule", "Poids_Total_Benthos_HorsVrac", "Poids_Total_Benthos_HorsVrac_Calcule", "Poids_Total_Benthos_Inerte_Trie", "Poids_Total_Benthos_Inerte_Trie_Calcule", "Poids_Total_Benthos_Vivant_non_detaille_trie", "Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule", "Poids_Total_Macro_Dechet", "Poids_Total_Macro_Dechet_Calcule" from "operation.csv" : {"Annee","Annee",INT;"Serie","Serie",STRING;"Serie_Partielle","Serie_Partielle",STRING;"Code_Station","Code_Station",STRING;"Id_Operation","Id_Operation",INT;"Poche","Poche",STRING;"Engin","Engin",STRING;"Navire","Navire",STRING;"DateDeb_Op","DateDeb_Op",STRING;"LatDeb","LatDeb",STRING;"LongDeb","LongDeb",STRING;"DateFin_Op","DateFin_Op",STRING;"LatFin","LatFin",STRING;"LongFin","LongFin",STRING;"Duree","Duree",STRING;"Strate","Strate",STRING;"Sous-Strate","Sous-Strate",STRING;"Localite","Localite",STRING;"Validite_OP","Validite_OP",STRING;"Rectiligne","Rectiligne",STRING;"Distance","Distance",BIGDECIMAL;"Ouv_Verticale","Ouv_Verticale",STRING;"Ouv_Horizontale_Ailes","Ouv_Horizontale_Ailes",STRING;"Ouv_Horizontale_Panneaux","Ouv_Horizontale_Panneaux",STRING;"Saisisseur","Saisisseur",STRING;"NavireAssocie","NavireAssocie",STRING;"Commentaire","Commentaire",STRING;"Poids_Total","Poids_Total",BIGDECIMAL;"Poids_Total_Calcule","Poids_Total_Calcule",STRING;"Poids_Total_Vrac","Poids_Total_Vrac",BIGDECIMAL;"Poids_Total_Vrac_Calcule","Poids_Total_Vrac_Calcule",STRING;"Poids_Total_HorsVrac","Poids_Total_HorsVrac",BIGDECIMAL;"Poids_Total_HorsVrac_Calcule","Poids_Total_HorsVrac_Calcule",STRING;"Poids_Total_Non_Trie","Poids_Total_Non_Trie",BIGDECIMAL;"Poids_Total_Non_Trie_Calcule","Poids_Total_Non_Trie_Calcule",STRING;"Poids_Total_Tremis","Poids_Total_Tremis",BIGDECIMAL;"Poids_Total_Tremis_Calcule","Poids_Total_Tremis_Calcule",STRING;"Poids_Total_Carroussel","Poids_Total_Carroussel",BIGDECIMAL;"Poids_Total_Carroussel_Calcule","Poids_Total_Carroussel_Calcule",STRING;"Poids_Total_Espece","Poids_Total_Espece",BIGDECIMAL;"Poids_Total_Espece_Calcule","Poids_Total_Espece_Calcule",STRING;"Poids_Total_Espece_Vrac","Poids_Total_Espece_Vrac",BIGDECIMAL;"Poids_Total_Espece_Vrac_Calcule","Poids_Total_Espece_Vrac_Calcule",STRING;"Poids_Total_Espece_Vrac_Trie","Poids_Total_Espece_Vrac_Trie",BIGDECIMAL;"Poids_Total_Espece_Vrac_Trie_Calcule","Poids_Total_Espece_Vrac_Trie_Calcule",STRING;"Poids_Total_Espece_HorsVrac","Poids_Total_Espece_HorsVrac",BIGDECIMAL;"Poids_Total_Espece_HorsVrac_Calcule","Poids_Total_Espece_HorsVrac_Calcule",STRING;"Poids_Total_Espece_Inerte_Trie","Poids_Total_Espece_Inerte_Trie",BIGDECIMAL;"Poids_Total_Espece_Inerte_Trie_Calcule","Poids_Total_Espece_Inerte_Trie_Calcule",STRING;"Poids_Total_Espece_Vivant_non_detaille_trie","Poids_Total_Espece_Vivant_non_detaille_trie",BIGDECIMAL;"Poids_Total_Espece_Vivant_non_detaille_trie_Calcule","Poids_Total_Espece_Vivant_non_detaille_trie_Calcule",STRING;"Poids_Total_Benthos","Poids_Total_Benthos",BIGDECIMAL;"Poids_Total_Benthos_Calcule","Poids_Total_Benthos_Calcule",STRING;"Poids_Total_Benthos_Vrac","Poids_Total_Benthos_Vrac",BIGDECIMAL;"Poids_Total_Benthos_Vrac_Calcule","Poids_Total_Benthos_Vrac_Calcule",STRING;"Poids_Total_Benthos_Vrac_Trie","Poids_Total_Benthos_Vrac_Trie",BIGDECIMAL;"Poids_Total_Benthos_Vrac_Trie_Calcule","Poids_Total_Benthos_Vrac_Trie_Calcule",STRING;"Poids_Total_Benthos_HorsVrac","Poids_Total_Benthos_HorsVrac",BIGDECIMAL;"Poids_Total_Benthos_HorsVrac_Calcule","Poids_Total_Benthos_HorsVrac_Calcule",STRING;"Poids_Total_Benthos_Inerte_Trie","Poids_Total_Benthos_Inerte_Trie",BIGDECIMAL;"Poids_Total_Benthos_Inerte_Trie_Calcule","Poids_Total_Benthos_Inerte_Trie_Calcule",STRING;"Poids_Total_Benthos_Vivant_non_detaille_trie","Poids_Total_Benthos_Vivant_non_detaille_trie",BIGDECIMAL;"Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule","Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule",STRING;"Poids_Total_Macro_Dechet","Poids_Total_Macro_Dechet",BIGDECIMAL;"Poids_Total_Macro_Dechet_Calcule","Poids_Total_Macro_Dechet_Calcule",STRING}]]></xml-property> <xml-property name="designerValues"><![CDATA[<?xml version="1.0" encoding="UTF-8"?> <model:DesignValues xmlns:design="http://www.eclipse.org/datatools/connectivity/oda/design" xmlns:model="http://www.eclipse.org/birt/report/model/adapter/odaModel"> <Version>2.0</Version> @@ -1320,7 +1320,7 @@ <design:resultColumnDefinitions> <design:attributes> <design:identifier> - <design:name>Numero_Trait</design:name> + <design:name>Id_Operation</design:name> <design:position>5</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> @@ -1329,7 +1329,7 @@ <design:nullability>Unknown</design:nullability> </design:attributes> <design:usageHints> - <design:label>Numero_Trait</design:label> + <design:label>Id_Operation</design:label> <design:formattingHints/> </design:usageHints> </design:resultColumnDefinitions> @@ -2733,7 +2733,7 @@ </structure> <structure> <property name="position">5</property> - <property name="name">Numero_Trait</property> + <property name="name">Id_Operation</property> <property name="dataType">integer</property> </structure> <structure> @@ -2790,8 +2790,8 @@ </structure> <structure> <property name="position">5</property> - <property name="name">Numero_Trait</property> - <property name="nativeName">Numero_Trait</property> + <property name="name">Id_Operation</property> + <property name="nativeName">Id_Operation</property> <property name="dataType">integer</property> <property name="nativeDataType">4</property> </structure> @@ -2824,7 +2824,7 @@ <property name="nativeDataType">2</property> </structure> </list-property> - <xml-property name="queryText"><![CDATA[select "Annee", "Serie", "Serie_Partielle", "Code_Station", "Numero_Trait", "Poche", "Code_PMFM", "Libelle_PMFm", "Valeur" from parameter.csv : {"Annee","Annee",INT;"Serie","Serie",STRING;"Serie_Partielle","Serie_Partielle",STRING;"Code_Station","Code_Station",STRING;"Numero_Trait","Numero_Trait",INT;"Poche","Poche",STRING;"Code_PMFM","Code_PMFM",STRING;"Libelle_PMFm","Libelle_PMFm",STRING;"Valeur","Valeur",BIGDECIMAL}]]></xml-property> + <xml-property name="queryText"><![CDATA[select "Annee", "Serie", "Serie_Partielle", "Code_Station", "Id_Operation", "Poche", "Code_PMFM", "Libelle_PMFm", "Valeur" from parameter.csv : {"Annee","Annee",INT;"Serie","Serie",STRING;"Serie_Partielle","Serie_Partielle",STRING;"Code_Station","Code_Station",STRING;"Id_Operation","Id_Operation",INT;"Poche","Poche",STRING;"Code_PMFM","Code_PMFM",STRING;"Libelle_PMFm","Libelle_PMFm",STRING;"Valeur","Valeur",BIGDECIMAL}]]></xml-property> <xml-property name="designerValues"><![CDATA[<?xml version="1.0" encoding="UTF-8"?> <model:DesignValues xmlns:design="http://www.eclipse.org/datatools/connectivity/oda/design" xmlns:model="http://www.eclipse.org/birt/report/model/adapter/odaModel"> <Version>1.0</Version> @@ -2889,7 +2889,7 @@ </design:resultColumnDefinitions> <design:resultColumnDefinitions> <design:attributes> - <design:name>Numero_Trait</design:name> + <design:name>Id_Operation</design:name> <design:position>5</design:position> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -2897,7 +2897,7 @@ <design:nullability>Unknown</design:nullability> </design:attributes> <design:usageHints> - <design:label>Numero_Trait</design:label> + <design:label>Id_Operation</design:label> <design:formattingHints/> </design:usageHints> </design:resultColumnDefinitions> @@ -2992,7 +2992,7 @@ </structure> <structure> <property name="position">6</property> - <property name="name">Numero_Trait</property> + <property name="name">Id_Operation</property> <property name="dataType">integer</property> </structure> <structure> @@ -3071,8 +3071,8 @@ </structure> <structure> <property name="position">6</property> - <property name="name">Numero_Trait</property> - <property name="nativeName">Numero_Trait</property> + <property name="name">Id_Operation</property> + <property name="nativeName">Id_Operation</property> <property name="dataType">integer</property> <property name="nativeDataType">4</property> </structure> @@ -3126,7 +3126,7 @@ <property name="nativeDataType">12</property> </structure> </list-property> - <xml-property name="queryText"><![CDATA[select "Annee", "Serie", "Serie_Partielle", "Engin", "Code_Station", "Numero_Trait", "Poche", "Navire", "MarineLitterCategory", "MarineLitterSizeCategory", "Number", "Weight", "Commentaire" from marineLitter.csv : {"Annee","Annee",INT;"Serie","Serie",STRING;"Serie_Partielle","Serie_Partielle",STRING;"Engin","Engin",STRING;"Code_Station","Code_Station",STRING;"Numero_Trait","Numero_Trait",INT;"Poche","Poche",STRING;"Navire","Navire",STRING;"MarineLitterCategory","MarineLitterCategory",STRING;"MarineLitterSizeCategory","MarineLitterSizeCategory",STRING;"Number","Number",INT;"Weight","Weight",BIGDECIMAL;"Commentaire","Commentaire",STRING}]]></xml-property> + <xml-property name="queryText"><![CDATA[select "Annee", "Serie", "Serie_Partielle", "Engin", "Code_Station", "Id_Operation", "Poche", "Navire", "MarineLitterCategory", "MarineLitterSizeCategory", "Number", "Weight", "Commentaire" from marineLitter.csv : {"Annee","Annee",INT;"Serie","Serie",STRING;"Serie_Partielle","Serie_Partielle",STRING;"Engin","Engin",STRING;"Code_Station","Code_Station",STRING;"Id_Operation","Id_Operation",INT;"Poche","Poche",STRING;"Navire","Navire",STRING;"MarineLitterCategory","MarineLitterCategory",STRING;"MarineLitterSizeCategory","MarineLitterSizeCategory",STRING;"Number","Number",INT;"Weight","Weight",BIGDECIMAL;"Commentaire","Commentaire",STRING}]]></xml-property> <xml-property name="designerValues"><![CDATA[<?xml version="1.0" encoding="UTF-8"?> <model:DesignValues xmlns:design="http://www.eclipse.org/datatools/connectivity/oda/design" xmlns:model="http://www.eclipse.org/birt/report/model/adapter/odaModel"> <Version>1.0</Version> @@ -3205,7 +3205,7 @@ </design:resultColumnDefinitions> <design:resultColumnDefinitions> <design:attributes> - <design:name>Numero_Trait</design:name> + <design:name>Id_Operation</design:name> <design:position>6</design:position> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -3213,7 +3213,7 @@ <design:nullability>Unknown</design:nullability> </design:attributes> <design:usageHints> - <design:label>Numero_Trait</design:label> + <design:label>Id_Operation</design:label> <design:formattingHints/> </design:usageHints> </design:resultColumnDefinitions> @@ -3388,9 +3388,9 @@ <text-property name="heading">Code_Station</text-property> </structure> <structure> - <property name="columnName">Numero_Trait</property> + <property name="columnName">Id_Operation</property> <property name="analysis">measure</property> - <text-property name="heading">Numero_Trait</text-property> + <text-property name="heading">Id_Operation</text-property> </structure> <structure> <property name="columnName">Poche</property> @@ -3403,9 +3403,9 @@ <text-property name="heading">Navire</text-property> </structure> <structure> - <property name="columnName">Taxon</property> + <property name="columnName">Code_Taxon</property> <property name="analysis">measure</property> - <text-property name="heading">Taxon</text-property> + <text-property name="heading">Code_Taxon</text-property> </structure> <structure> <property name="columnName">Nom_scientifique</property> @@ -3648,7 +3648,7 @@ </structure> <structure> <property name="position">6</property> - <property name="name">Numero_Trait</property> + <property name="name">Id_Operation</property> <property name="dataType">integer</property> </structure> <structure> @@ -3663,7 +3663,7 @@ </structure> <structure> <property name="position">9</property> - <property name="name">Taxon</property> + <property name="name">Code_Taxon</property> <property name="dataType">integer</property> </structure> <structure> @@ -3922,8 +3922,8 @@ </structure> <structure> <property name="position">6</property> - <property name="name">Numero_Trait</property> - <property name="nativeName">Numero_Trait</property> + <property name="name">Id_Operation</property> + <property name="nativeName">Id_Operation</property> <property name="dataType">integer</property> <property name="nativeDataType">4</property> </structure> @@ -3943,8 +3943,8 @@ </structure> <structure> <property name="position">9</property> - <property name="name">Taxon</property> - <property name="nativeName">Taxon</property> + <property name="name">Code_Taxon</property> + <property name="nativeName">Code_Taxon</property> <property name="dataType">integer</property> <property name="nativeDataType">4</property> </structure> @@ -4243,7 +4243,7 @@ <property name="nativeDataType">2</property> </structure> </list-property> - <xml-property name="queryText"><![CDATA[select "Annee", "Serie", "Serie_Partielle", "Engin", "Code_Station", "Numero_Trait", "Poche", "Navire", "Taxon", "Nom_scientifique", "Commentaire", "V_HV", "Num_Ordre_V_HV_H2", "Tot_V_HV", "Ech_V_HV", "Type_Volume_Poids_V_HV", "Unite_Volume_Poids_V_HV", "Class_Tri_", "Num_Ordre_Class_Tri__H2", "Tot_Class_Tri_", "Ech_Class_Tri_", "Type_Volume_Poids_Class_Tri_", "Unite_Volume_Poids_Class_Tri_", "Sexe", "Num_Ordre_Sexe_H2", "Tot_Sexe", "Ech_Sexe", "Type_Volume_Poids_Sexe", "Unite_Volume_Poids_Sexe", "Maturité", "Num_Ordre_Maturité_H2", "Tot_Maturité", "Ech_Maturité", "Type_Volume_Poids_Maturité", "Unite_Volume_Poids_Maturité", "Age", "Num_Ordre_Age_H2", "Tot_Age", "Ech_Age", "Type_Volume_Poids_Age", "Unite_Volume_Poids_Age", "Code_Longueur", "Libelle_Longueur", "Taille", "NumOrdre_Taille_H2", "Poids_Classe_Taille", "Unite_Taille", "Precision_Mesure", "Nbr", "Poids_Reference", "Coef_Elev_Espece_Capture" from "catch.csv" : {"Annee","Annee",INT;"Serie","Serie",STRING;"Serie_Partielle","Serie_Partielle",STRING;"Engin","Engin",STRING;"Code_Station","Code_Station",STRING;"Numero_Trait","Numero_Trait",INT;"Poche","Poche",STRING;"Navire","Navire",STRING;"Taxon","Taxon",INT;"Nom_scientifique","Nom_scientifique",STRING;"Commentaire","Commentaire",STRING;"V_HV","V_HV",STRING;"Num_Ordre_V_HV_H2","Num_Ordre_V_HV_H2",INT;"Tot_V_HV","Tot_V_HV",BIGDECIMAL;"Ech_V_HV","Ech_V_HV",BIGDECIMAL;"Type_Volume_Poids_V_HV","Type_Volume_Poids_V_HV",STRING;"Unite_Volume_Poids_V_HV","Unite_Volume_Poids_V_HV",STRING;"Class_Tri_","Class_Tri_",STRING;"Num_Ordre_Class_Tri__H2","Num_Ordre_Class_Tri__H2",INT;"Tot_Class_Tri_","Tot_Class_Tri_",BIGDECIMAL;"Ech_Class_Tri_","Ech_Class_Tri_",BIGDECIMAL;"Type_Volume_Poids_Class_Tri_","Type_Volume_Poids_Class_Tri_",STRING;"Unite_Volume_Poids_Class_Tri_","Unite_Volume_Poids_Class_Tri_",STRING;"Sexe","Sexe",STRING;"Num_Ordre_Sexe_H2","Num_Ordre_Sexe_H2",INT;"Tot_Sexe","Tot_Sexe",BIGDECIMAL;"Ech_Sexe","Ech_Sexe",BIGDECIMAL;"Type_Volume_Poids_Sexe","Type_Volume_Poids_Sexe",STRING;"Unite_Volume_Poids_Sexe","Unite_Volume_Poids_Sexe",STRING;"Maturité","Maturité",STRING;"Num_Ordre_Maturité_H2","Num_Ordre_Maturité_H2",INT;"Tot_Maturité","Tot_Maturité",BIGDECIMAL;"Ech_Maturité","Ech_Maturité",BIGDECIMAL;"Type_Volume_Poids_Maturité","Type_Volume_Poids_Maturité",STRING;"Unite_Volume_Poids_Maturité","Unite_Volume_Poids_Maturité",STRING;"Age","Age",STRING;"Num_Ordre_Age_H2","Num_Ordre_Age_H2",INT;"Tot_Age","Tot_Age",BIGDECIMAL;"Ech_Age","Ech_Age",BIGDECIMAL;"Type_Volume_Poids_Age","Type_Volume_Poids_Age",STRING;"Unite_Volume_Poids_Age","Unite_Volume_Poids_Age",STRING;"Code_Longueur","Code_Longueur",INT;"Libelle_Longueur","Libelle_Longueur",STRING;"Taille","Taille",BIGDECIMAL;"NumOrdre_Taille_H2","NumOrdre_Taille_H2",INT;"Poids_Classe_Taille","Poids_Classe_Taille",BIGDECIMAL;"Unite_Taille","Unite_Taille",STRING;"Precision_Mesure","Precision_Mesure",BIGDECIMAL;"Nbr","Nbr",INT;"Poids_Reference","Poids_Reference",BIGDECIMAL;"Coef_Elev_Espece_Capture","Coef_Elev_Espece_Capture",BIGDECIMAL}]]></xml-property> + <xml-property name="queryText"><![CDATA[select "Annee", "Serie", "Serie_Partielle", "Engin", "Code_Station", "Id_Operation", "Poche", "Navire", "Code_Taxon", "Nom_scientifique", "Commentaire", "V_HV", "Num_Ordre_V_HV_H2", "Tot_V_HV", "Ech_V_HV", "Type_Volume_Poids_V_HV", "Unite_Volume_Poids_V_HV", "Class_Tri_", "Num_Ordre_Class_Tri__H2", "Tot_Class_Tri_", "Ech_Class_Tri_", "Type_Volume_Poids_Class_Tri_", "Unite_Volume_Poids_Class_Tri_", "Sexe", "Num_Ordre_Sexe_H2", "Tot_Sexe", "Ech_Sexe", "Type_Volume_Poids_Sexe", "Unite_Volume_Poids_Sexe", "Maturité", "Num_Ordre_Maturité_H2", "Tot_Maturité", "Ech_Maturité", "Type_Volume_Poids_Maturité", "Unite_Volume_Poids_Maturité", "Age", "Num_Ordre_Age_H2", "Tot_Age", "Ech_Age", "Type_Volume_Poids_Age", "Unite_Volume_Poids_Age", "Code_Longueur", "Libelle_Longueur", "Taille", "NumOrdre_Taille_H2", "Poids_Classe_Taille", "Unite_Taille", "Precision_Mesure", "Nbr", "Poids_Reference", "Coef_Elev_Espece_Capture" from "catch.csv" : {"Annee","Annee",INT;"Serie","Serie",STRING;"Serie_Partielle","Serie_Partielle",STRING;"Engin","Engin",STRING;"Code_Station","Code_Station",STRING;"Id_Operation","Id_Operation",INT;"Poche","Poche",STRING;"Navire","Navire",STRING;"Code_Taxon","Code_Taxon",INT;"Nom_scientifique","Nom_scientifique",STRING;"Commentaire","Commentaire",STRING;"V_HV","V_HV",STRING;"Num_Ordre_V_HV_H2","Num_Ordre_V_HV_H2",INT;"Tot_V_HV","Tot_V_HV",BIGDECIMAL;"Ech_V_HV","Ech_V_HV",BIGDECIMAL;"Type_Volume_Poids_V_HV","Type_Volume_Poids_V_HV",STRING;"Unite_Volume_Poids_V_HV","Unite_Volume_Poids_V_HV",STRING;"Class_Tri_","Class_Tri_",STRING;"Num_Ordre_Class_Tri__H2","Num_Ordre_Class_Tri__H2",INT;"Tot_Class_Tri_","Tot_Class_Tri_",BIGDECIMAL;"Ech_Class_Tri_","Ech_Class_Tri_",BIGDECIMAL;"Type_Volume_Poids_Class_Tri_","Type_Volume_Poids_Class_Tri_",STRING;"Unite_Volume_Poids_Class_Tri_","Unite_Volume_Poids_Class_Tri_",STRING;"Sexe","Sexe",STRING;"Num_Ordre_Sexe_H2","Num_Ordre_Sexe_H2",INT;"Tot_Sexe","Tot_Sexe",BIGDECIMAL;"Ech_Sexe","Ech_Sexe",BIGDECIMAL;"Type_Volume_Poids_Sexe","Type_Volume_Poids_Sexe",STRING;"Unite_Volume_Poids_Sexe","Unite_Volume_Poids_Sexe",STRING;"Maturité","Maturité",STRING;"Num_Ordre_Maturité_H2","Num_Ordre_Maturité_H2",INT;"Tot_Maturité","Tot_Maturité",BIGDECIMAL;"Ech_Maturité","Ech_Maturité",BIGDECIMAL;"Type_Volume_Poids_Maturité","Type_Volume_Poids_Maturité",STRING;"Unite_Volume_Poids_Maturité","Unite_Volume_Poids_Maturité",STRING;"Age","Age",STRING;"Num_Ordre_Age_H2","Num_Ordre_Age_H2",INT;"Tot_Age","Tot_Age",BIGDECIMAL;"Ech_Age","Ech_Age",BIGDECIMAL;"Type_Volume_Poids_Age","Type_Volume_Poids_Age",STRING;"Unite_Volume_Poids_Age","Unite_Volume_Poids_Age",STRING;"Code_Longueur","Code_Longueur",INT;"Libelle_Longueur","Libelle_Longueur",STRING;"Taille","Taille",BIGDECIMAL;"NumOrdre_Taille_H2","NumOrdre_Taille_H2",INT;"Poids_Classe_Taille","Poids_Classe_Taille",BIGDECIMAL;"Unite_Taille","Unite_Taille",STRING;"Precision_Mesure","Precision_Mesure",BIGDECIMAL;"Nbr","Nbr",INT;"Poids_Reference","Poids_Reference",BIGDECIMAL;"Coef_Elev_Espece_Capture","Coef_Elev_Espece_Capture",BIGDECIMAL}]]></xml-property> <xml-property name="designerValues"><![CDATA[<?xml version="1.0" encoding="UTF-8"?> <model:DesignValues xmlns:design="http://www.eclipse.org/datatools/connectivity/oda/design" xmlns:model="http://www.eclipse.org/birt/report/model/adapter/odaModel"> <Version>2.0</Version> @@ -4333,7 +4333,7 @@ <design:resultColumnDefinitions> <design:attributes> <design:identifier> - <design:name>Numero_Trait</design:name> + <design:name>Id_Operation</design:name> <design:position>6</design:position> </design:identifier> <design:nativeDataTypeCode>4</design:nativeDataTypeCode> @@ -4342,7 +4342,7 @@ <design:nullability>Unknown</design:nullability> </design:attributes> <design:usageHints> - <design:label>Numero_Trait</design:label> + <design:label>Id_Operation</design:label> <design:formattingHints/> </design:usageHints> </design:resultColumnDefinitions> @@ -4381,7 +4381,7 @@ <design:resultColumnDefinitions> <design:attributes> <design:identifier> - <design:name>Taxon</design:name> + <design:name>Code_Taxon</design:name> <design:position>9</design:position> </design:identifier> <design:nativeDataTypeCode>4</design:nativeDataTypeCode> @@ -4390,7 +4390,7 @@ <design:nullability>Unknown</design:nullability> </design:attributes> <design:usageHints> - <design:label>Taxon</design:label> + <design:label>Code_Taxon</design:label> <design:formattingHints/> </design:usageHints> </design:resultColumnDefinitions> @@ -5237,7 +5237,7 @@ </structure> <structure> <property name="position">6</property> - <property name="name">Numero_Trait</property> + <property name="name">Id_Operation</property> <property name="dataType">integer</property> </structure> <structure> @@ -5322,8 +5322,8 @@ </structure> <structure> <property name="position">6</property> - <property name="name">Numero_Trait</property> - <property name="nativeName">Numero_Trait</property> + <property name="name">Id_Operation</property> + <property name="nativeName">Id_Operation</property> <property name="dataType">integer</property> <property name="nativeDataType">4</property> </structure> @@ -5384,7 +5384,7 @@ <property name="nativeDataType">12</property> </structure> </list-property> - <xml-property name="queryText"><![CDATA[select "Annee", "Serie", "Serie_Partielle", "Engin", "Code_Station", "Numero_Trait", "Poche", "Navire", "BatchId", "ReferenceTaxonId", "ReferenceTaxonName", "Commentaire", "CaracteristicId", "CaracteristicValue" from accidentalCatch.csv : {"Annee","Annee",INT;"Serie","Serie",STRING;"Serie_Partielle","Serie_Partielle",STRING;"Engin","Engin",STRING;"Code_Station","Code_Station",STRING;"Numero_Trait","Numero_Trait",INT;"Poche","Poche",STRING;"Navire","Navire",STRING;"BatchId","BatchId",INT;"ReferenceTaxonId","ReferenceTaxonId",INT;"ReferenceTaxonName","ReferenceTaxonName",STRING;"Commentaire","Commentaire",STRING;"CaracteristicId","CaracteristicId",INT;"CaracteristicValue","CaracteristicValue",STRING}]]></xml-property> + <xml-property name="queryText"><![CDATA[select "Annee", "Serie", "Serie_Partielle", "Engin", "Code_Station", "Id_Operation", "Poche", "Navire", "BatchId", "ReferenceTaxonId", "ReferenceTaxonName", "Commentaire", "CaracteristicId", "CaracteristicValue" from accidentalCatch.csv : {"Annee","Annee",INT;"Serie","Serie",STRING;"Serie_Partielle","Serie_Partielle",STRING;"Engin","Engin",STRING;"Code_Station","Code_Station",STRING;"Id_Operation","Id_Operation",INT;"Poche","Poche",STRING;"Navire","Navire",STRING;"BatchId","BatchId",INT;"ReferenceTaxonId","ReferenceTaxonId",INT;"ReferenceTaxonName","ReferenceTaxonName",STRING;"Commentaire","Commentaire",STRING;"CaracteristicId","CaracteristicId",INT;"CaracteristicValue","CaracteristicValue",STRING}]]></xml-property> <xml-property name="designerValues"><![CDATA[<?xml version="1.0" encoding="UTF-8"?> <model:DesignValues xmlns:design="http://www.eclipse.org/datatools/connectivity/oda/design" xmlns:model="http://www.eclipse.org/birt/report/model/adapter/odaModel"> <Version>1.0</Version> @@ -5463,7 +5463,7 @@ </design:resultColumnDefinitions> <design:resultColumnDefinitions> <design:attributes> - <design:name>Numero_Trait</design:name> + <design:name>Id_Operation</design:name> <design:position>6</design:position> <design:nativeDataTypeCode>4</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -5471,7 +5471,7 @@ <design:nullability>Unknown</design:nullability> </design:attributes> <design:usageHints> - <design:label>Numero_Trait</design:label> + <design:label>Id_Operation</design:label> <design:formattingHints/> </design:usageHints> </design:resultColumnDefinitions> @@ -5615,8 +5615,8 @@ <property name="alias">Code_Station</property> </structure> <structure> - <property name="columnName">catch::Numero_Trait</property> - <property name="alias">Numero_Trait</property> + <property name="columnName">catch::Id_Operation</property> + <property name="alias">Id_Operation</property> </structure> <structure> <property name="columnName">catch::Poche</property> @@ -5627,8 +5627,8 @@ <property name="alias">Navire</property> </structure> <structure> - <property name="columnName">catch::Taxon</property> - <property name="alias">Taxon</property> + <property name="columnName">catch::Code_Taxon</property> + <property name="alias">Code_Taxon</property> </structure> <structure> <property name="columnName">catch::Nom_scientifique</property> @@ -5852,7 +5852,7 @@ </structure> <structure> <property name="position">6</property> - <property name="name">Numero_Trait</property> + <property name="name">Id_Operation</property> <property name="dataType">integer</property> </structure> <structure> @@ -5867,7 +5867,7 @@ </structure> <structure> <property name="position">9</property> - <property name="name">Taxon</property> + <property name="name">Code_Taxon</property> <property name="dataType">integer</property> </structure> <structure> @@ -6122,7 +6122,7 @@ <property name="joinOperator">eq</property> <property name="leftDataSet">catch</property> <property name="rightDataSet">species</property> - <expression name="leftExpression">dataSetRow["Taxon"]</expression> + <expression name="leftExpression">dataSetRow["Code_Taxon"]</expression> <expression name="rightExpression">dataSetRow["Id"]</expression> </structure> </list-property> @@ -6414,9 +6414,9 @@ <property name="dataType">string</property> </structure> <structure> - <property name="name">Numero_Trait</property> - <text-property name="displayName">Numero_Trait</text-property> - <expression name="expression" type="javascript">dataSetRow["Numero_Trait"]</expression> + <property name="name">Id_Operation</property> + <text-property name="displayName">Id_Operation</text-property> + <expression name="expression" type="javascript">dataSetRow["Id_Operation"]</expression> <property name="dataType">integer</property> </structure> <structure> @@ -6783,7 +6783,7 @@ <detail> <grid name="general" id="2804"> <structure name="toc"> - <expression name="expressionValue">"Code Station : "+row["Code_Station"]+" - N° trait : "+row["Numero_Trait"]</expression> + <expression name="expressionValue">"Code Station : "+row["Code_Station"]+" - N° trait : "+row["Id_Operation"]</expression> </structure> <column id="2805"/> <row id="2806"> @@ -6906,7 +6906,7 @@ <property name="fontWeight">bold</property> <property name="textAlign">left</property> <property name="display">inline</property> - <property name="resultSetColumn">Numero_Trait</property> + <property name="resultSetColumn">Id_Operation</property> </data> </cell> </row> @@ -6950,7 +6950,7 @@ </list-property> <expression name="valueExpr">var cartouche=(getMessage("serie")+" <b>"+row._outer["Serie"]+"</b>"+" / "+getMessage("campagne")+" <b>"+row._outer["Campagne"]+"</b>"+" / "+getMessage("annee")+" <b>"+row._outer["Annee"]+"</b>"+" / "+getMessage("serie-partielle")+" <b>"+row._outer["Serie_Partielle"]+"</b>"+ "<P>"+ -getMessage("code-station")+" <b>"+row["Code_Station"]+"</b>"+" / "+getMessage("num-trait")+" <b>"+row["Numero_Trait"]+"</b>"+" / "+getMessage("num-poche")+" <b>"+row["Poche"]+"</b>"+" / "+getMessage("date-debut-trait")+" <b>"+row["DateDeb_Op"]+"</b>").replace("<b>null</b>","");</expression> +getMessage("code-station")+" <b>"+row["Code_Station"]+"</b>"+" / "+getMessage("num-trait")+" <b>"+row["Id_Operation"]+"</b>"+" / "+getMessage("num-poche")+" <b>"+row["Poche"]+"</b>"+" / "+getMessage("date-debut-trait")+" <b>"+row["DateDeb_Op"]+"</b>").replace("<b>null</b>","");</expression> <property name="contentType">html</property> </text-data> </cell> @@ -7115,7 +7115,7 @@ <data id="2902"> <property name="textAlign">left</property> <property name="display">inline</property> - <property name="resultSetColumn">Numero_Trait</property> + <property name="resultSetColumn">Id_Operation</property> </data> </cell> </row> @@ -7469,8 +7469,8 @@ <property name="dataType">string</property> </structure> <structure> - <property name="name">Numero_Trait</property> - <expression name="expression">dataSetRow["Numero_Trait"]</expression> + <property name="name">Id_Operation</property> + <expression name="expression">dataSetRow["Id_Operation"]</expression> <property name="dataType">integer</property> </structure> <structure> @@ -7497,9 +7497,9 @@ <list-property name="filter"> <structure> <property name="operator">eq</property> - <expression name="expr">row["Numero_Trait"]</expression> + <expression name="expr">row["Id_Operation"]</expression> <simple-property-list name="value1"> - <value>row._outer["Numero_Trait"]</value> + <value>row._outer["Id_Operation"]</value> </simple-property-list> </structure> <structure> @@ -8270,8 +8270,8 @@ <property name="dataType">string</property> </structure> <structure> - <property name="name">Numero_Trait</property> - <expression name="expression">dataSetRow["Numero_Trait"]</expression> + <property name="name">Id_Operation</property> + <expression name="expression">dataSetRow["Id_Operation"]</expression> <property name="dataType">integer</property> </structure> <structure> @@ -8285,8 +8285,8 @@ <property name="dataType">string</property> </structure> <structure> - <property name="name">Taxon</property> - <expression name="expression">dataSetRow["Taxon"]</expression> + <property name="name">Code_Taxon</property> + <expression name="expression">dataSetRow["Code_Taxon"]</expression> <property name="dataType">integer</property> </structure> <structure> @@ -8644,9 +8644,9 @@ <list-property name="filter"> <structure> <property name="operator">eq</property> - <expression name="expr" type="javascript">row["Numero_Trait"]</expression> + <expression name="expr" type="javascript">row["Id_Operation"]</expression> <simple-property-list name="value1"> - <value>row._outer["Numero_Trait"]</value> + <value>row._outer["Id_Operation"]</value> </simple-property-list> <property name="updateAggregation">true</property> </structure> @@ -10435,8 +10435,8 @@ <property name="dataType">string</property> </structure> <structure> - <property name="name">Numero_Trait</property> - <expression name="expression">dataSetRow["Numero_Trait"]</expression> + <property name="name">Id_Operation</property> + <expression name="expression">dataSetRow["Id_Operation"]</expression> <property name="dataType">integer</property> </structure> <structure> @@ -10478,9 +10478,9 @@ <list-property name="filter"> <structure> <property name="operator">eq</property> - <expression name="expr" type="javascript">row["Numero_Trait"]</expression> + <expression name="expr" type="javascript">row["Id_Operation"]</expression> <simple-property-list name="value1"> - <value>row._outer["Numero_Trait"]</value> + <value>row._outer["Id_Operation"]</value> </simple-property-list> <property name="updateAggregation">true</property> </structure> @@ -10632,8 +10632,8 @@ <property name="dataType">string</property> </structure> <structure> - <property name="name">Numero_Trait</property> - <expression name="expression">dataSetRow["Numero_Trait"]</expression> + <property name="name">Id_Operation</property> + <expression name="expression">dataSetRow["Id_Operation"]</expression> <property name="dataType">integer</property> </structure> <structure> @@ -10680,9 +10680,9 @@ <list-property name="filter"> <structure> <property name="operator">eq</property> - <expression name="expr" type="javascript">row["Numero_Trait"]</expression> + <expression name="expr" type="javascript">row["Id_Operation"]</expression> <simple-property-list name="value1"> - <value>row._outer["Numero_Trait"]</value> + <value>row._outer["Id_Operation"]</value> </simple-property-list> <property name="updateAggregation">true</property> </structure> Modified: trunk/tutti-service/src/test/resources/report/exportCruise/accidentalCatch.csv =================================================================== --- trunk/tutti-service/src/test/resources/report/exportCruise/accidentalCatch.csv 2014-01-17 09:53:22 UTC (rev 1499) +++ trunk/tutti-service/src/test/resources/report/exportCruise/accidentalCatch.csv 2014-01-17 14:58:15 UTC (rev 1500) @@ -1 +1 @@ -Annee;Serie;Serie_Partielle;Engin;Code_station;Numero_Trait;Poche;Navire;BatchId;ReferenceTaxonId;ReferenceTaxonName;Commentaire;CaracteristicId;CaracteristicValue +Annee;Serie;Serie_Partielle;Engin;Code_station;Id_Operation;Poche;Navire;BatchId;ReferenceTaxonId;ReferenceTaxonName;Commentaire;CaracteristicId;CaracteristicValue Modified: trunk/tutti-service/src/test/resources/report/exportCruise/catch.csv =================================================================== --- trunk/tutti-service/src/test/resources/report/exportCruise/catch.csv 2014-01-17 09:53:22 UTC (rev 1499) +++ trunk/tutti-service/src/test/resources/report/exportCruise/catch.csv 2014-01-17 14:58:15 UTC (rev 1500) @@ -1,4 +1,4 @@ -Annee;Serie;Serie_Partielle;Engin;Code_station;Numero_Trait;Poche;Navire;Taxon;Nom_scientifique;Commentaire;V_HV;Num_Ordre_V_HV_H2;Tot_V_HV;Ech_V_HV;Type_Volume_Poids_V_HV;Unite_Volume_Poids_V_HV;Class_Tri_;Num_Ordre_Class_Tri__H2;Tot_Class_Tri_;Ech_Class_Tri_;Type_Volume_Poids_Class_Tri_;Unite_Volume_Poids_Class_Tri_;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Maturité;Num_Ordre_Maturité_H2;Tot_Maturité;Ech_Maturité;Type_Volume_Poids_Maturité;Unite_Volume_Poids_Maturité;Age;Num_Ordre_Age_H2;Tot_Age;Ech_Age;Type_Volume_Poids_Age;Unite_Volume_Poids_Age;Code_Longueur;Libelle_Longueur;Taille;NumOrdre_Taille_H2;Poids_Classe_Taille;Unite_Taille;Precision_Mesure;Nbr;Poids_Reference;Coef_Elev_Espece_Capture +Annee;Serie;Serie_Partielle;Engin;Code_station;Id_Operation;Poche;Navire;Code_Taxon;Nom_scientifique;Commentaire;V_HV;Num_Ordre_V_HV_H2;Tot_V_HV;Ech_V_HV;Type_Volume_Poids_V_HV;Unite_Volume_Poids_V_HV;Class_Tri_;Num_Ordre_Class_Tri__H2;Tot_Class_Tri_;Ech_Class_Tri_;Type_Volume_Poids_Class_Tri_;Unite_Volume_Poids_Class_Tri_;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Maturité;Num_Ordre_Maturité_H2;Tot_Maturité;Ech_Maturité;Type_Volume_Poids_Maturité;Unite_Volume_Poids_Maturité;Age;Num_Ordre_Age_H2;Tot_Age;Ech_Age;Type_Volume_Poids_Age;Unite_Volume_Poids_Age;Code_Longueur;Libelle_Longueur;Taille;NumOrdre_Taille_H2;Poids_Classe_Taille;Unite_Taille;Precision_Mesure;Nbr;Poids_Reference;Coef_Elev_Espece_Capture 2013;MEDITS;;GOC73;G101;53;1;;1540;Merluccius merluccius;|;Vrac;1;;;Poids;kg;NA;;;;;kg;UNK - Indéterminé;1;0.11;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;11.5;1;;cm;0.5;1;0.11;2.8810701; 2013;MEDITS;;GOC73;G101;53;1;;1540;Merluccius merluccius;|;Vrac;1;;;Poids;kg;NA;;;;;kg;UNK - Indéterminé;1;0.11;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;14.0;2;;cm;0.5;1;0.11;2.8810701; 2013;MEDITS;;GOC73;G101;53;1;;1540;Merluccius merluccius;|;Vrac;1;;;Poids;kg;NA;;;;;kg;UNK - Indéterminé;1;0.11;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;15.0;3;;cm;0.5;2;0.11;2.8810701; Modified: trunk/tutti-service/src/test/resources/report/exportCruise/individualObservation.csv =================================================================== --- trunk/tutti-service/src/test/resources/report/exportCruise/individualObservation.csv 2014-01-17 09:53:22 UTC (rev 1499) +++ trunk/tutti-service/src/test/resources/report/exportCruise/individualObservation.csv 2014-01-17 14:58:15 UTC (rev 1500) @@ -1,4 +1,4 @@ -Annee;Serie;Serie_Partielle;Engin;Code_station;Numero_Trait;Poche;Navire;BatchId;ReferenceTaxonId;ReferenceTaxonName;Commentaire;CaracteristicId;CaracteristicValue +Annee;Serie;Serie_Partielle;Engin;Code_station;Id_Operation;Poche;Navire;BatchId;ReferenceTaxonId;ReferenceTaxonName;Commentaire;CaracteristicId;CaracteristicValue 2013;MEDITS;;GOC73;G101;53;1;;100018;1540;Merluccius merluccius;;220;0.11; 2013;MEDITS;;GOC73;G101;53;1;;100018;1540;Merluccius merluccius;;1433;307; 2013;MEDITS;;GOC73;G101;53;1;;100018;1540;Merluccius merluccius;;307;11.5; Modified: trunk/tutti-service/src/test/resources/report/exportCruise/marineLitter.csv =================================================================== --- trunk/tutti-service/src/test/resources/report/exportCruise/marineLitter.csv 2014-01-17 09:53:22 UTC (rev 1499) +++ trunk/tutti-service/src/test/resources/report/exportCruise/marineLitter.csv 2014-01-17 14:58:15 UTC (rev 1500) @@ -1,4 +1,4 @@ -Annee;Serie;Serie_Partielle;Engin;Code_station;Numero_Trait;Poche;Navire;MarineLitterCategory;MarineLitterSizeCategory;Number;Weight;Commentaire +Annee;Serie;Serie_Partielle;Engin;Code_station;Id_Operation;Poche;Navire;MarineLitterCategory;MarineLitterSizeCategory;Number;Weight;Commentaire 2013;MEDITS;;GOC73;G101;53;1;;L1b Bouteilles;X: UNK - catégorisation non réalisée;3;0.435;; 2013;MEDITS;;GOC73;G101;53;1;;L1c Emballages alimentaires;X: UNK - catégorisation non réalisée;12;0.12;; 2013;MEDITS;;GOC73;G101;53;1;;"L1e Objets en plastique dur - Caisse, récipients, tubes, cendrier, couvercles, etc.";X: UNK - catégorisation non réalisée;4;0.635;; Modified: trunk/tutti-service/src/test/resources/report/exportCruise/operation.csv =================================================================== --- trunk/tutti-service/src/test/resources/report/exportCruise/operation.csv 2014-01-17 09:53:22 UTC (rev 1499) +++ trunk/tutti-service/src/test/resources/report/exportCruise/operation.csv 2014-01-17 14:58:15 UTC (rev 1500) @@ -1,2 +1,2 @@ -Annee;Serie;Serie_Partielle;Code_Station;Numero_Trait;Poche;Engin;Navire;DateDeb_Op;LatDeb;LongDeb;DateFin_Op;LatFin;LongFin;Duree;Strate;Sous-Strate;Localite;Validite_OP;Rectiligne;Distance;Ouv_Verticale;Ouv_Horizontale_Ailes;Ouv_Horizontale_Panneaux;Saisisseur;NavireAssocie;Commentaire;Poids_Total;Poids_Total_Calcule;Poids_Total_Vrac;Poids_Total_Vrac_Calcule;Poids_Total_HorsVrac;Poids_Total_HorsVrac_Calcule;Poids_Total_Non_Trie;Poids_Total_Non_Trie_Calcule;Poids_Total_Tremis;Poids_Total_Tremis_Calcule;Poids_Total_Carroussel;Poids_Total_Carroussel_Calcule;Poids_Total_Espece;Poids_Total_Espece_Calcule;Poids_Total_Espece_Vrac;Poids_Total_Espece_Vrac_Calcule;Poids_Total_Espece_Vrac_Trie;Poids_Total_Espece_Vrac_Trie_Calcule;Poids_Total_Espece_HorsVrac;Poids_Total_Espece_HorsVrac_Calcule;Poids_Total_Espece_Inerte_Trie;Poids_Total_Espece_Inerte_Trie_Calcule;Poids_Total_Espece_Vivant_non_detaille_trie;Poids_Total_Espece_Vivant_non_detaille_trie_Calcule;Poids_Total_Benthos;Poids_Total_Benthos_Calcule;Poids_Total_Benthos_Vrac;Poids_Total_Benthos_Vrac_Calcule;Poids_Total_Benthos_Vrac_Trie;Poids_Total_Benthos_Vrac_Trie_Calcule;Poids_Total_Benthos_HorsVrac;Poids_Total_Benthos_HorsVrac_Calcule;Poids_Total_Benthos_Inerte_Trie;Poids_Total_Benthos_Inerte_Trie_Calcule;Poids_Total_Benthos_Vivant_non_detaille_trie;Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule;Poids_Total_Macro_Dechet;Poids_Total_Macro_Dechet_Calcule +Annee;Serie;Serie_Partielle;Code_Station;Id_Operation;Poche;Engin;Navire;DateDeb_Op;LatDeb;LongDeb;DateFin_Op;LatFin;LongFin;Duree;Strate;Sous-Strate;Localite;Validite_OP;Rectiligne;Distance;Ouv_Verticale;Ouv_Horizontale_Ailes;Ouv_Horizontale_Panneaux;Saisisseur;NavireAssocie;Commentaire;Poids_Total;Poids_Total_Calcule;Poids_Total_Vrac;Poids_Total_Vrac_Calcule;Poids_Total_HorsVrac;Poids_Total_HorsVrac_Calcule;Poids_Total_Non_Trie;Poids_Total_Non_Trie_Calcule;Poids_Total_Tremis;Poids_Total_Tremis_Calcule;Poids_Total_Carroussel;Poids_Total_Carroussel_Calcule;Poids_Total_Espece;Poids_Total_Espece_Calcule;Poids_Total_Espece_Vrac;Poids_Total_Espece_Vrac_Calcule;Poids_Total_Espece_Vrac_Trie;Poids_Total_Espece_Vrac_Trie_Calcule;Poids_Total_Espece_HorsVrac;Poids_Total_Espece_HorsVrac_Calcule;Poids_Total_Espece_Inerte_Trie;Poids_Total_Espece_Inerte_Trie_Calcule;Poids_Total_Espece_Vivant_non_detaille_trie;Poids_Total_Espece_Vivant_non_detaille_trie_Calcule;Poids_Total_Benthos;Poids_Total_Benthos_Calcule;Poids_Total_Benthos_Vrac;Poids_Total_Benthos_Vrac_Calcule;Poids_Total_Benthos_Vrac_Trie;Poids_Total_Benthos_Vrac_Trie_Calcule;Poids_Total_Benthos_HorsVrac;Poids_Total_Benthos_HorsVrac_Calcule;Poids_Total_Benthos_Inerte_Trie;Poids_Total_Benthos_Inerte_Trie_Calcule;Poids_Total_Benthos_Vivant_non_detaille_trie;Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule;Poids_Total_Macro_Dechet;Poids_Total_Macro_Dechet_Calcule 2013;MEDITS;;G101;53;1;GOC73;;13/06/2013 05:32:00;42.975418;3.095972;13/06/2013 06:01:00;42.450695;3.09375;29;NA;NA;NA;Y;N;2778.0;NA;NA;NA;Luisa METRAL;;;203.6;Y;61.05;Y;27.72;Y;114.8;N;;?;;?;65.34;Y;37.77;Y;37.767998;Y;27.57;Y;3.907;N;0.0;Y;23.43;Y;23.282;N;3.142;Y;0.147;Y;0.0;Y;0.0;Y;46.28;Y; Modified: trunk/tutti-service/src/test/resources/report/exportCruise/parameter.csv =================================================================== --- trunk/tutti-service/src/test/resources/report/exportCruise/parameter.csv 2014-01-17 09:53:22 UTC (rev 1499) +++ trunk/tutti-service/src/test/resources/report/exportCruise/parameter.csv 2014-01-17 14:58:15 UTC (rev 1500) @@ -1,4 +1,4 @@ -Annee;Serie;Serie_Partielle;Code_station;Numero_Trait;Poche;Code_PMFM;Libelle_PMFm;Valeur +Annee;Serie;Serie_Partielle;Code_station;Id_Operation;Poche;Code_PMFM;Libelle_PMFm;Valeur 2013;MEDITS;;G101;53;1;826;Longueur des funes - opération - totale - Instrument de bord;220.0; 2013;MEDITS;;G101;53;1;905;Longueur d'un bras - engin - bras - Inconnue;100.0; 2013;MEDITS;;G101;53;1;833;Ouverture verticale (chalut ou drague) - opération - totale - Instrument de bord;1.8;