June 2013 - Tutti-commits - mailman.cloud.codelutin.com

r1111 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency
by kmorin＠users.forge.codelutin.com June 28, 2013

June 28, 2013

Author: kmorin Date: 2013-06-28 12:28:11 +0200 (Fri, 28 Jun 2013) New Revision: 1111 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1111 Log: fixes #2830 [MENSURATION] erreur au moment ou je saisi ma premi?\195?\168re valeur en mode rafale Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-06-13 14:11:03 UTC (rev 1110) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-06-28 10:28:11 UTC (rev 1111) @@ -460,7 +460,11 @@ tableModel.addNewRow(rowIndex, row); } - model.setTotalNumber(model.getTotalNumber() + 1); + Integer totalNumber = model.getTotalNumber(); + if (totalNumber == null) { + totalNumber = 0; + } + model.setTotalNumber(totalNumber + 1); getTable().scrollRowToVisible(rowIndex); }

1 0

r1110 - trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export
by tchemit＠users.forge.codelutin.com June 13, 2013

June 13, 2013

Author: tchemit Date: 2013-06-13 16:11:03 +0200 (Thu, 13 Jun 2013) New Revision: 1110 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1110 Log: refs #2711: [EXPORT GENERIQUE] points ?\195?\160 am?\195?\169liorer (utilisation decoratuer sur navire) Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/AccidentalCatchExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/IndividualObservationExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/MarineLitterExportModel.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/AccidentalCatchExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/AccidentalCatchExportModel.java 2013-06-13 10:16:24 UTC (rev 1109) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/AccidentalCatchExportModel.java 2013-06-13 14:11:03 UTC (rev 1110) @@ -78,7 +78,7 @@ newColumnForExport("Id_Operation", FishingOperation.PROPERTY_STATION_NUMBER); newColumnForExport("NumOrdre_Station", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); - newColumnForExport("Navire", Cruise.PROPERTY_VESSEL, Vessel.PROPERTY_NAME); + newColumnForExport("Navire", Cruise.PROPERTY_VESSEL, TuttiCsvUtil.VESSEL_VALUE_FORMATTER); newColumnForExport("BatchId", AccidentalCatchExportRow.PROPERTY_BATCH_ID, TuttiCsvUtil.PRIMITIVE_INTEGER); newColumnForExport("ReferenceTaxonId", AccidentalBatch.PROPERTY_SPECIES + "." + Species.PROPERTY_REFERENCE_TAXON_ID, TuttiCsvUtil.PRIMITIVE_INTEGER); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java 2013-06-13 10:16:24 UTC (rev 1109) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java 2013-06-13 14:11:03 UTC (rev 1110) @@ -69,7 +69,7 @@ newColumnForExport("Id_Operation", FishingOperation.PROPERTY_STATION_NUMBER); newColumnForExport("NumOrdre_Station", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); - newColumnForExport("Navire", Cruise.PROPERTY_VESSEL, Vessel.PROPERTY_NAME); + newColumnForExport("Navire", Cruise.PROPERTY_VESSEL, TuttiCsvUtil.VESSEL_VALUE_FORMATTER); newColumnForExport("Taxon", SpeciesBatch.PROPERTY_SPECIES + "." + Species.PROPERTY_REFERENCE_TAXON_ID, TuttiCsvUtil.INTEGER); for (SampleCategoryEnum sampleCategoryEnum : samplingOrder) { Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/IndividualObservationExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/IndividualObservationExportModel.java 2013-06-13 10:16:24 UTC (rev 1109) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/IndividualObservationExportModel.java 2013-06-13 14:11:03 UTC (rev 1110) @@ -78,7 +78,7 @@ newColumnForExport("Id_Operation", FishingOperation.PROPERTY_STATION_NUMBER); newColumnForExport("NumOrdre_Station", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); - newColumnForExport("Navire", Cruise.PROPERTY_VESSEL, Vessel.PROPERTY_NAME); + newColumnForExport("Navire", Cruise.PROPERTY_VESSEL, TuttiCsvUtil.VESSEL_VALUE_FORMATTER); newColumnForExport("BatchId", IndividualObservationExportRow.PROPERTY_BATCH_ID, TuttiCsvUtil.PRIMITIVE_INTEGER); newColumnForExport("ReferenceTaxonId", IndividualObservationBatch.PROPERTY_SPECIES + "." + Species.PROPERTY_REFERENCE_TAXON_ID, TuttiCsvUtil.PRIMITIVE_INTEGER); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/MarineLitterExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/MarineLitterExportModel.java 2013-06-13 10:16:24 UTC (rev 1109) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/MarineLitterExportModel.java 2013-06-13 14:11:03 UTC (rev 1110) @@ -55,7 +55,7 @@ newColumnForExport("Id_Operation", FishingOperation.PROPERTY_STATION_NUMBER); newColumnForExport("NumOrdre_Station", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); - newColumnForExport("Navire", Cruise.PROPERTY_VESSEL, Vessel.PROPERTY_NAME); + newColumnForExport("Navire", Cruise.PROPERTY_VESSEL, TuttiCsvUtil.VESSEL_VALUE_FORMATTER); newColumnForExport("MarineLitterCategory", MarineLitterBatch.PROPERTY_MARINE_LITTER_CATEGORY, TuttiCsvUtil.CARACTERISTIC_VALUE_FORMATTER); newColumnForExport("MarineLitterSizeCategory", MarineLitterBatch.PROPERTY_MARINE_LITTER_SIZE_CATEGORY, TuttiCsvUtil.CARACTERISTIC_VALUE_FORMATTER);

1 0

r1109 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com June 13, 2013

June 13, 2013

Author: maven-release Date: 2013-06-13 12:16:24 +0200 (Thu, 13 Jun 2013) New Revision: 1109 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1109 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-06-13 10:16:16 UTC (rev 1108) +++ trunk/pom.xml 2013-06-13 10:16:24 UTC (rev 1109) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3.1</version> + <version>2.3.2-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> @@ -86,12 +86,12 @@ </modules> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.3.1</url> + <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.3.1 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.3.1 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-06-13 10:16:16 UTC (rev 1108) +++ trunk/tutti-persistence/pom.xml 2013-06-13 10:16:24 UTC (rev 1109) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3.1</version> + <version>2.3.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-06-13 10:16:16 UTC (rev 1108) +++ trunk/tutti-service/pom.xml 2013-06-13 10:16:24 UTC (rev 1109) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3.1</version> + <version>2.3.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-06-13 10:16:16 UTC (rev 1108) +++ trunk/tutti-ui-swing/pom.xml 2013-06-13 10:16:24 UTC (rev 1109) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3.1</version> + <version>2.3.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1108 - tags
by maven-release＠users.forge.codelutin.com June 13, 2013

June 13, 2013

Author: maven-release Date: 2013-06-13 12:16:16 +0200 (Thu, 13 Jun 2013) New Revision: 1108 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1108 Log: [maven-release-plugin] copy for tag tutti-2.3.1 Added: tags/tutti-2.3.1/

1 0

r1107 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com June 13, 2013

June 13, 2013

Author: maven-release Date: 2013-06-13 12:16:08 +0200 (Thu, 13 Jun 2013) New Revision: 1107 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1107 Log: [maven-release-plugin] prepare release tutti-2.3.1 Modified: trunk/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-06-13 10:11:50 UTC (rev 1106) +++ trunk/pom.xml 2013-06-13 10:16:08 UTC (rev 1107) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3.1-SNAPSHOT</version> + <version>2.3.1</version> <packaging>pom</packaging> <name>Tutti</name> @@ -86,12 +86,12 @@ </modules> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> + <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.3.1</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.3.1 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.3.1 </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-06-13 10:11:50 UTC (rev 1106) +++ trunk/tutti-persistence/pom.xml 2013-06-13 10:16:08 UTC (rev 1107) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3.1-SNAPSHOT</version> + <version>2.3.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-06-13 10:11:50 UTC (rev 1106) +++ trunk/tutti-service/pom.xml 2013-06-13 10:16:08 UTC (rev 1107) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3.1-SNAPSHOT</version> + <version>2.3.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-06-13 10:11:50 UTC (rev 1106) +++ trunk/tutti-ui-swing/pom.xml 2013-06-13 10:16:08 UTC (rev 1107) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3.1-SNAPSHOT</version> + <version>2.3.1</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1106 - in trunk/tutti-service/src: main/java/fr/ifremer/tutti/service main/java/fr/ifremer/tutti/service/export test/java/fr/ifremer/tutti/service/export
by tchemit＠users.forge.codelutin.com June 13, 2013

June 13, 2013

Author: tchemit Date: 2013-06-13 12:11:50 +0200 (Thu, 13 Jun 2013) New Revision: 1106 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1106 Log: fixes #2690: [EXPORT GENERIQUE] je ne suis pas certain que l'export g?\195?\169n?\195?\169rique contienne toute la donn?\195?\169e brute Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SurveyExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java 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 2013-06-13 09:17:55 UTC (rev 1105) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2013-06-13 10:11:50 UTC (rev 1106) @@ -32,6 +32,7 @@ import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Person; +import fr.ifremer.tutti.persistence.entities.referential.Vessel; import org.apache.commons.beanutils.BeanUtilsBean; import org.apache.commons.beanutils.NestedNullException; import org.apache.commons.beanutils.PropertyUtils; @@ -179,6 +180,22 @@ } } + public static class VesselFormatter implements ValueFormatter<Vessel> { + + + @Override + public String format(Vessel value) { + String result = ""; + if (value != null) { + result = value.getRegistrationCode(); + if (result == null) { + result = value.getInternationalRegistrationCode(); + } + } + return result; + } + } + /** * @param <E> * @author tchemit <chemit(a)codelutin.com> @@ -305,6 +322,9 @@ public static final ValueFormatter<Serializable> CARACTERISTIC_VALUE_FORMATTER = new CaracteristicValueFormatter(); + public static final ValueFormatter<Vessel> VESSEL_VALUE_FORMATTER = + new VesselFormatter(); + public static final ValueFormatter<List<Person>> LIST_PERSON_FORMATTER = new ListPersonValueFormatter(); @@ -436,7 +456,7 @@ Lists.transform(value, new Function<Gear, String>() { @Override public String apply(Gear input) { - return input.getLabel() + ' ' + input.getName(); + return input.getName(); } }); return Joiner.on('|').join(decoratedValues); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportModel.java 2013-06-13 09:17:55 UTC (rev 1105) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportModel.java 2013-06-13 10:11:50 UTC (rev 1106) @@ -31,7 +31,6 @@ 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; import fr.ifremer.tutti.service.TuttiCsvUtil; import java.util.List; @@ -67,7 +66,7 @@ newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); newColumnForExport("Engin", FishingOperation.PROPERTY_GEAR, Gear.PROPERTY_NAME); - newColumnForExport("Navire", FishingOperation.PROPERTY_VESSEL, Vessel.PROPERTY_NAME); + newColumnForExport("Navire", FishingOperation.PROPERTY_VESSEL, TuttiCsvUtil.VESSEL_VALUE_FORMATTER); newColumnForExport("DateDeb_Op", FishingOperation.PROPERTY_GEAR_SHOOTING_START_DATE, TuttiCsvUtil.DAY_TIME_SECOND); newColumnForExport("LatDeb", FishingOperation.PROPERTY_GEAR_SHOOTING_START_LATITUDE, TuttiCsvUtil.FLOAT); newColumnForExport("LongDeb", FishingOperation.PROPERTY_GEAR_SHOOTING_START_LONGITUDE, TuttiCsvUtil.FLOAT); @@ -99,6 +98,12 @@ newNullableColumnForExport("Poids_Total_Non_Trie", OperationExportRow.PROPERTY_CATCH_TOTAL_REJECTED_WEIGHT, TuttiCsvUtil.FLOAT); 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_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_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_Calcule", OperationExportRow.PROPERTY_SPECIES_TOTAL_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportRow.java 2013-06-13 09:17:55 UTC (rev 1105) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportRow.java 2013-06-13 10:11:50 UTC (rev 1106) @@ -376,7 +376,8 @@ public Float getSpeciesTotalSampleSortedWeight() { return TuttiExportService.getValueOrComputedValue( - null, catchBatch.getSpeciesTotalSampleSortedComputedWeight()); + catchBatch.getSpeciesTotalSampleSortedComputedWeight(), + catchBatch.getSpeciesTotalSampleSortedComputedWeight()); } public Boolean getSpeciesTotalSampleSortedWeightComputed() { Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SurveyExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SurveyExportModel.java 2013-06-13 09:17:55 UTC (rev 1105) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SurveyExportModel.java 2013-06-13 10:11:50 UTC (rev 1106) @@ -27,7 +27,6 @@ import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.persistence.entities.referential.TuttiLocation; -import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.service.TuttiCsvUtil; import java.util.List; @@ -46,7 +45,7 @@ newColumnForExport("Annee", Cruise.PROPERTY_BEGIN_DATE, TuttiCsvUtil.YEAR); newColumnForExport("Serie", Cruise.PROPERTY_PROGRAM, Program.PROPERTY_NAME); newColumnForExport("Serie_Partielle", Cruise.PROPERTY_SURVEY_PART); - newColumnForExport("Navire", Cruise.PROPERTY_VESSEL, Vessel.PROPERTY_NAME); + newColumnForExport("Navire", Cruise.PROPERTY_VESSEL, TuttiCsvUtil.VESSEL_VALUE_FORMATTER); newColumnForExport("Pays", SurveyExportRow.PROPERTY_COUNTRY); newColumnForExport("Zone_Etude", Program.PROPERTY_ZONE, TuttiLocation.PROPERTY_NAME); newColumnForExport("Id_Sismer", Cruise.PROPERTY_NAME); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 2013-06-13 09:17:55 UTC (rev 1105) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 2013-06-13 10:11:50 UTC (rev 1106) @@ -126,7 +126,7 @@ result = computedValue == null ? null : true; } else { - result = true; + result = false; } return result; } Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java 2013-06-13 09:17:55 UTC (rev 1105) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java 2013-06-13 10:11:50 UTC (rev 1106) @@ -79,15 +79,16 @@ public static final String SURVEY_CONTENT = "Annee;Serie;Serie_Partielle;Navire;Pays;Zone_Etude;Id_Sismer;Nombre_de_poche;Date_Deb_Campagne;Port_Deb_Campagne;Date_Fin_Campagne;Port_Fin_Campagne;Engin;Chef_Mission;Resp_Salle_Tri;Commentaire\n" + - "2013;Campagne CGFS;;GWEN DREZ;FRA;CGFS - Manche Est / Sud Mer du Nord;Campagne CGFS_2013;1;01/05/2013 00:00:00;La Barbotière (Gujan-Mestras);31/05/2013 00:00:00;Etang de Palo;GOV1925 GOV 19.7/25.9;Vincent AURECHE;;;"; + "2013;Campagne CGFS;;278970;FRA;CGFS - Manche Est / Sud Mer du Nord;Campagne CGFS_2013;1;01/05/2013 00:00:00;La Barbotière (Gujan-Mestras);31/05/2013 00:00:00;Etang de Palo;GOV 19.7/25.9;Vincent AURECHE;;;"; - public static final String OPERATION_WITH_NO_CATCH_CONTENT = "Annee;Serie;Serie_Partielle;Id_Operation;NumOrdre_Station;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;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_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;GWEN DREZ;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 = + "Annee;Serie;Serie_Partielle;Id_Operation;NumOrdre_Station;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;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_CONTENT = - "Annee;Serie;Serie_Partielle;Id_Operation;NumOrdre_Station;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;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_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;GWEN DREZ;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;GWEN DREZ;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;"; + "Annee;Serie;Serie_Partielle;Id_Operation;NumOrdre_Station;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;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;Id_Operation;NumOrdre_Station;Poche;Code_PMFM;Libelle_PMFm;Valeur\n" +

1 0

r1105 - in trunk: tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost tutti-service/src/main/java/fr/ifremer/tutti/service/export tutti-service/src/test/java/fr/ifremer/tutti/service tutti-service/src/test/java/fr/ifremer/tutti/service/export tutti-service/src/test/resources tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home
by tchemit＠users.forge.codelutin.com June 13, 2013

June 13, 2013

Author: tchemit Date: 2013-06-13 11:17:55 +0200 (Thu, 13 Jun 2013) New Revision: 1105 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1105 Log: fixes #2692: [EXPORT GENERIQUE] table species.csv colonne Code campagne vide Added: trunk/tutti-service/src/test/resources/tuttiProtocol.tuttiProtocol Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/ServiceDbResource.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProgramAction.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRow.java 2013-06-12 07:45:06 UTC (rev 1104) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRow.java 2013-06-13 09:17:55 UTC (rev 1105) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.catches.multipost; +/* + * #%L + * Tutti :: Service + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.util.Date; /** Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRowModel.java 2013-06-12 07:45:06 UTC (rev 1104) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRowModel.java 2013-06-13 09:17:55 UTC (rev 1105) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.catches.multipost; +/* + * #%L + * Tutti :: Service + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.service.TuttiCsvUtil; /** Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRow.java 2013-06-12 07:45:06 UTC (rev 1104) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRow.java 2013-06-13 09:17:55 UTC (rev 1105) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.catches.multipost; +/* + * #%L + * Tutti :: Service + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.util.Date; /** Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRowModel.java 2013-06-12 07:45:06 UTC (rev 1104) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRowModel.java 2013-06-13 09:17:55 UTC (rev 1105) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.catches.multipost; +/* + * #%L + * Tutti :: Service + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.service.TuttiCsvUtil; /** Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 2013-06-12 07:45:06 UTC (rev 1104) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 2013-06-13 09:17:55 UTC (rev 1105) @@ -194,9 +194,6 @@ log.debug("Will export program: " + programId); } List<Cruise> allCruise = persistenceService.getAllCruise(programId); -// for (Cruise cruise : allCruise) { -// checkCruise(progressionModel, cruise); -// } File basedir = new File(context.getConfig().newTempFile( "exportProgram"), "exportProgram-" + programId); Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/ServiceDbResource.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/ServiceDbResource.java 2013-06-12 07:45:06 UTC (rev 1104) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/ServiceDbResource.java 2013-06-13 09:17:55 UTC (rev 1105) @@ -26,10 +26,13 @@ import fr.ifremer.tutti.persistence.RessourceClassLoader; import fr.ifremer.tutti.persistence.config.TuttiPersistenceConfigOption; +import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.test.DatabaseResource; import fr.ifremer.tutti.service.config.TuttiServiceConfig; import fr.ifremer.tutti.service.config.TuttiServiceConfigOption; +import fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService; import org.apache.commons.io.IOUtils; +import org.junit.Assert; import org.junit.runner.Description; import org.nuiton.i18n.I18n; import org.nuiton.util.config.ApplicationConfig; @@ -113,6 +116,16 @@ return serviceConfig; } + public TuttiProtocol loadProtocol(File protocolFile) { + Assert.assertTrue(protocolFile.exists()); + + TuttiProtocolImportExportService tuttiProtocolImportExportService = + getServiceContext().getService(TuttiProtocolImportExportService.class); + + TuttiProtocol protocol = tuttiProtocolImportExportService.importProtocol(protocolFile); + return protocol; + } + @Override protected void before(Description description) throws Throwable { super.before(description); Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java 2013-06-12 07:45:06 UTC (rev 1104) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java 2013-06-13 09:17:55 UTC (rev 1105) @@ -33,6 +33,7 @@ import fr.ifremer.tutti.persistence.entities.data.IndividualObservationBatch; import fr.ifremer.tutti.persistence.entities.data.MarineLitterBatch; import fr.ifremer.tutti.persistence.entities.data.Program; +import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.TuttiLocation; import fr.ifremer.tutti.service.PersistenceService; @@ -110,6 +111,38 @@ "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;GWEN DREZ;11242;Vrac;1;100.0;;Poids;;M - Moyen;2;20.0;;Poids;;Femelle;2;50.0;30.0;Poids;;3 - Stade 3;3;10.0;;Poids;;NA;;;;;;;;;;;;;20.0;2000.0;\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;GWEN DREZ;11242;Hors Vrac;1;20.0;;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;;;;;;;2;20.0;1.0;"; + public static final String CATCH_CONTENT_2 = + "Annee;Serie;Serie_Partielle;Engin;Id_Operation;NumOrdre_Station;Poche;Navire;Taxon;VracHorsVrac;Num_Ordre_VracHorsVrac_H2;Tot_VracHorsVrac;Ech_VracHorsVrac;Type_Volume_Poids_VracHorsVrac;Unite_Volume_Poids_VracHorsVrac;Cat_Tri;Num_Ordre_Cat_Tri_H2;Tot_Cat_Tri;Ech_Cat_Tri;Type_Volume_Poids_Cat_Tri;Unite_Volume_Poids_Cat_Tri;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Maturite;Num_Ordre_Maturite_H2;Tot_Maturite;Ech_Maturite;Type_Volume_Poids_Maturite;Unite_Volume_Poids_Maturite;Age;Num_Ordre_Age_H2;Tot_Age;Ech_Age;Type_Volume_Poids_Age;Unite_Volume_Poids_Age;Code_Longueur;Taille;NumOrdre_Taille_H2;Poids_Classe_Taille;Unite_Taille;Precision_Mesure;Nbr;Poids_Reference;Coef_Final_Elevation\n" + + "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;365;Vrac;1;0.005;0.005;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;;;;;;;1;0.005;2.5E-5;\n" + + "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;491;Vrac;2;0.004;0.004;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;;;;;;;1;0.004;1.6000002E-5;\n" + + "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;300;Vrac;3;0.015;0.015;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;;;;;;;1;0.015;2.2499998E-4;\n" + + "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1811;Vrac;4;0.07;0.07;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;;;;;;;1;0.07;0.0049;\n" + + "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1644;Vrac;5;1.06;1.06;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;306;36.0;1;;cm;1.0;1;1.06;1.1235999;\n" + + "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1644;Vrac;5;1.06;1.06;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;306;38.0;2;;cm;1.0;1;1.06;1.1235999;\n" + + "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1362;Vrac;6;0.038;0.038;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;307;10.5;1;;cm;0.5;2;0.038;0.0014439999;\n" + + "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1362;Vrac;6;0.038;0.038;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;307;12.5;2;;cm;0.5;1;0.038;0.0014439999;\n" + + "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1362;Vrac;6;0.038;0.038;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;307;13.0;3;;cm;0.5;1;0.038;0.0014439999;\n" + + "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1986;Vrac;7;0.66;0.66;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;306;25.0;1;;cm;1.0;1;0.66;0.4356;\n" + + "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1986;Vrac;7;0.66;0.66;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;306;28.0;2;;cm;1.0;1;0.66;0.4356;\n" + + "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1986;Vrac;7;0.66;0.66;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;306;30.0;3;;cm;1.0;1;0.66;0.4356;\n" + + "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;489;Vrac;8;0.28;0.28;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;302;9.0;1;;cm;1.0;1;0.28;0.0784;\n" + + "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;489;Vrac;8;0.28;0.28;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;302;10.0;2;;cm;1.0;3;0.28;0.0784;\n" + + "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;489;Vrac;8;0.28;0.28;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;302;11.0;3;;cm;1.0;2;0.28;0.0784;\n" + + "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1988;Vrac;9;0.152;0.152;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;306;15.0;1;;cm;1.0;1;0.152;0.023103999;\n" + + "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1988;Vrac;9;0.152;0.152;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;306;18.0;2;;cm;1.0;1;0.152;0.023103999;\n" + + "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1690;Vrac;10;0.036;0.036;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;306;11.0;1;;cm;1.0;1;0.036;0.0012959999;\n" + + "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1978;Vrac;11;0.852;0.852;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;306;26.0;1;;cm;1.0;1;0.852;0.725904;\n" + + "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1978;Vrac;11;0.852;0.852;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;306;30.0;2;;cm;1.0;1;0.852;0.725904;\n" + + "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1351;Vrac;12;0.022;0.022;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;307;10.5;1;;cm;0.5;1;0.022;4.8400002E-4;\n" + + "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1772;Vrac;13;0.18;0.18;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;306;27.0;1;;cm;1.0;1;0.18;0.0324;\n" + + "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1242;Vrac;14;;;Poids;;NA;;;;;;Femelle;1;1.0;1.0;Poids;;NA;;;;;;NA;;;;;;306;51.0;1;;cm;1.0;1;1.0;1.0;\n" + + "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1242;Vrac;14;;;Poids;;NA;;;;;;Femelle;1;1.0;1.0;Poids;;NA;;;;;;NA;;;;;;306;55.0;2;;cm;1.0;1;1.0;1.0;\n" + + "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1662;Vrac;15;;;Poids;;P - Petit;1;131.12;0.96;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;306;8.0;1;;cm;1.0;1;0.96;126.0;\n" + + "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1662;Vrac;15;;;Poids;;P - Petit;1;131.12;0.96;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;306;9.0;2;;cm;1.0;20;0.96;126.0;\n" + + "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1662;Vrac;15;;;Poids;;P - Petit;1;131.12;0.96;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;306;10.0;3;;cm;1.0;89;0.96;126.0;\n" + + "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1662;Vrac;15;;;Poids;;P - Petit;1;131.12;0.96;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;306;11.0;4;;cm;1.0;5;0.96;126.0;\n" + + "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1662;Vrac;15;;;Poids;;G - Gros;2;0.13;0.13;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;306;23.0;1;;cm;1.0;1;0.13;17.0625;"; + public static final String MARINE_LITTER_CONTENT = "Annee;Serie;Serie_Partielle;Engin;Id_Operation;NumOrdre_Station;Poche;Navire;MarineLitterCategory;MarineLitterSizeCategory;Number;Weight;Comment\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;GWEN DREZ;L1 PLASTIQUE;A: <5*5 cm= 25 cm2;2;5.0;S1;\n" + @@ -140,6 +173,24 @@ "11242;AAPT;Aaptos;;\n" + "11243;AAPTAAP;Aaptos aaptos;;"; + public static final String SPECIES_CONTENT_2 = + "Id;Code_Rubin;Nom Scientifique;Code campagne\n" + + "300;BUCCUND;Buccinum undatum;;\n" + + "365;AEQUOPE;Aequipecten opercularis;;\n" + + "489;LOLIVUL;Loligo vulgaris;LOLIVUL;\n" + + "491;ALLO;Alloteuthis;ALLOSPP;\n" + + "1242;SCYOCAN;Scyliorhinus canicula;SCYOCAN;\n" + + "1351;SARDPIL;Sardina pilchardus;SARDPIL;\n" + + "1362;ENGRENC;Engraulis encrasicolus;ENGRENC;\n" + + "1644;DICELAB;Dicentrarchus labrax;DICELAB;\n" + + "1662;TRACTRA;Trachurus trachurus;TRACTRA;\n" + + "1690;MULLSUR;Mullus surmuletus;MULLSUR;\n" + + "1772;SCOMSCO;Scomber scombrus;SCOMSCO;\n" + + "1811;CALMLYR;Callionymus lyra;CALMLYR;\n" + + "1978;PLEUPLA;Pleuronectes platessa;;\n" + + "1986;LIMDLIM;Limanda limanda;;\n" + + "1988;MICTKIT;Microstomus kitt;;"; + protected TuttiExportService service; protected PersistenceService persistenceService; @@ -234,7 +285,7 @@ @Test public void exportOperations() throws Exception { - loadData(PROGRAM_ID, CRUISE_CGFS_ID); +// loadData(PROGRAM_ID, CRUISE_CGFS_ID); TuttiExportService.ExportContext exportContext = service.createExportContext(dataDirectory, null); @@ -303,6 +354,40 @@ CATCH_CONTENT); } + // To fix http://forge.codelutin.com/issues/2692 + @Test + public void exportCatchesAndSpecies() throws Exception { + + File protocolFile = new File("src/test/resources/tuttiProtocol.tuttiProtocol"); + + TuttiProtocol protocol = dbResource.loadProtocol(protocolFile); + + loadData(PROGRAM_ID, CRUISE_CGFS_ID); + + FishingOperation operation = TuttiEntities.findById(operations, "100000"); + operations = Lists.newArrayList(operation); + + TuttiExportService.ExportContext exportContext = + service.createExportContext(dataDirectory, protocol); + + try { + service.exportCatches(exportContext, cruise, operations); + service.exportSpecies(exportContext, exportContext.getSpeciesToExport()); + } finally { + exportContext.close(); + } + + assertFileContent("species export:\n", + exportContext.speciesFile, + SPECIES_CONTENT_2); + + assertFileContent("Catch export:\n", + exportContext.catchFile, + CATCH_CONTENT_2); + + + } + // To fix http://forge.codelutin.com/issues/2523 @Test public void exportBadCatches() throws Exception { Added: trunk/tutti-service/src/test/resources/tuttiProtocol.tuttiProtocol =================================================================== --- trunk/tutti-service/src/test/resources/tuttiProtocol.tuttiProtocol (rev 0) +++ trunk/tutti-service/src/test/resources/tuttiProtocol.tuttiProtocol 2013-06-13 09:17:55 UTC (rev 1105) @@ -0,0 +1,1782 @@ +id: aefaad71-2731-4184-978b-847f6e60c692 +name: ano-2486 +benthos: +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 907 + speciesSurveyCode: ALPHGLA + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 886 + speciesSurveyCode: CHLOGRA + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 990 + speciesSurveyCode: DARDSPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1140 + speciesSurveyCode: DORILAN + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1012 + speciesSurveyCode: GALADIS + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1013 + speciesSurveyCode: GALAINT + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 951 + speciesSurveyCode: HOMAVUL + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1029 + speciesSurveyCode: HOMOBAR + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1136 + speciesSurveyCode: MACRSPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1111 + speciesSurveyCode: MAJASQU + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1067 + speciesSurveyCode: MCPIDEP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1066 + speciesSurveyCode: MCPITUB + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1075 + speciesSurveyCode: MCPIVER + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1015 + speciesSurveyCode: MUNISPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 999 + speciesSurveyCode: PAGUEXC + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 994 + speciesSurveyCode: PAGUPRI + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 997 + speciesSurveyCode: PAGUSPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 885 + speciesSurveyCode: PAPANAR + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1028 + speciesSurveyCode: PAROCUV + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 868 + speciesSurveyCode: PASISIV + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 866 + speciesSurveyCode: PASISPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 880 + speciesSurveyCode: PLESACA + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 881 + speciesSurveyCode: PLESANT + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 7185 + speciesSurveyCode: PLESEDW + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 882 + speciesSurveyCode: PLESGIG + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 883 + speciesSurveyCode: PLESHET + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 884 + speciesSurveyCode: PLESMAR + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 879 + speciesSurveyCode: PLESSPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 953 + speciesSurveyCode: POLCTYP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 935 + speciesSurveyCode: PONPNOR + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 934 + speciesSurveyCode: PONPSPI + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 928 + speciesSurveyCode: PONTCAT + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 929 + speciesSurveyCode: PONTLAC + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 10607 + speciesSurveyCode: PROCEDU + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 915 + speciesSurveyCode: PROCSPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 858 + speciesSurveyCode: SOLOMEM + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 715 + speciesSurveyCode: SCALSCA + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 837 + speciesSurveyCode: EUPHSPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 831 + speciesSurveyCode: SQUIMAN + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 353 + speciesSurveyCode: ATRIFRA + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 379 + speciesSurveyCode: CARDACU + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 378 + speciesSurveyCode: CARDECH + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 382 + speciesSurveyCode: CARDSPI + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 362 + speciesSurveyCode: PECTSPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 261 + speciesSurveyCode: APORPES + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 262 + speciesSurveyCode: APORSER + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 305 + speciesSurveyCode: BUCCSPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 280 + speciesSurveyCode: CASSECH + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 281 + speciesSurveyCode: CASSTYR + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 2451 + speciesSurveyCode: GIBBSPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 3928 + speciesSurveyCode: MUREBRA + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 292 + speciesSurveyCode: MURETRU + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 318 + speciesSurveyCode: SCAPNIG + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1189 + speciesSurveyCode: MICOSPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1191 + speciesSurveyCode: MICOVUL + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 224 + speciesSurveyCode: MBBRYOZ + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 3671 + speciesSurveyCode: GRYPVIT + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 4626 + speciesSurveyCode: ADAMCAR + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 133 + speciesSurveyCode: ALCYPAL + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 3037 + speciesSurveyCode: ALCYSPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 6758 + speciesSurveyCode: FMVERET + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 6804 + speciesSurveyCode: FUNIQUA + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 2224 + speciesSurveyCode: ORACTIN + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 7390 + speciesSurveyCode: ANTESPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 11181 + speciesSurveyCode: ASTRIRR + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 11943 + speciesSurveyCode: ASTRSPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 6812 + speciesSurveyCode: CIDACID + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1151 + speciesSurveyCode: CLOPHIU + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 4235 + speciesSurveyCode: ECHNACU + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 3397 + speciesSurveyCode: HOLOSPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 4240 + speciesSurveyCode: LEPRSPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1155 + speciesSurveyCode: OPHUOPH + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1177 + speciesSurveyCode: STICREG + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 395 + speciesSurveyCode: SPISSPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 246 + speciesSurveyCode: CANIGRA + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 245 + speciesSurveyCode: CANIZIZ + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 226 + speciesSurveyCode: CLGASTE + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 12060 + speciesSurveyCode: FMAPLYS + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 250 + speciesSurveyCode: TURRSPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 4413 + speciesSurveyCode: APLYSPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 155 + speciesSurveyCode: APHRACU + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 196 + speciesSurveyCode: FMMALDA + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 3032 + speciesSurveyCode: FMSABED + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 209 + speciesSurveyCode: FMSERPU + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 150 + speciesSurveyCode: MBANNEL + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 211 + speciesSurveyCode: STERSCU + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 3668 + speciesSurveyCode: DENTSPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 147 + speciesSurveyCode: SIPSNUD + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 7 + speciesSurveyCode: MBPORIF + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1182 + speciesSurveyCode: CLASCID + weightEnabled: true +gearUseFeaturePmfmId: [] +lengthClassesPmfmId: [] +species: +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 299 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 848 + speciesSurveyCode: ARISFOL + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 299 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 849 + speciesSurveyCode: ARITANT + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 299 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 855 + speciesSurveyCode: PAPELON + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 299 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 949 + speciesSurveyCode: NEPRNOR + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 1417 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 507 + speciesSurveyCode: ILLECOI + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 1417 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 489 + speciesSurveyCode: LOLIVUL + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 1277 + speciesSurveyCode: CENTGRA + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 1282 + speciesSurveyCode: SCYMLIC + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 1245 + speciesSurveyCode: GALUMEL + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 1220 + speciesSurveyCode: HEXAGRI + weightEnabled: true +- !SpeciesProtocol + calcifySampleEnabled: true + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 2050 + speciesSurveyCode: LOPHBUD + weightEnabled: true +- !SpeciesProtocol + calcifySampleEnabled: true + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 2049 + speciesSurveyCode: LOPHPIS + weightEnabled: true +- !SpeciesProtocol + calcifySampleEnabled: true + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 1540 + speciesSurveyCode: MERLMER + weightEnabled: true +- !SpeciesProtocol + calcifySampleEnabled: true + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 1689 + speciesSurveyCode: MULLBAR + weightEnabled: true +- !SpeciesProtocol + calcifySampleEnabled: true + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 1690 + speciesSurveyCode: MULLSUR + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 1257 + speciesSurveyCode: MUSTAST + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 1258 + speciesSurveyCode: MUSTMED + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 1256 + speciesSurveyCode: MUSTMUS + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 1329 + speciesSurveyCode: MYLIAQU + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 1263 + speciesSurveyCode: OXYNCEN + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 1312 + speciesSurveyCode: RAJAALB + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 1313 + speciesSurveyCode: RAJAAST + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 1306 + speciesSurveyCode: RAJABAT + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 1310 + speciesSurveyCode: RAJACIR + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 1302 + speciesSurveyCode: RAJACLA + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 1314 + speciesSurveyCode: RAJAMEL + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 1315 + speciesSurveyCode: RAJAMIR + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 1308 + speciesSurveyCode: RAJAOXY + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 1316 + speciesSurveyCode: RAJAPOL + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 1318 + speciesSurveyCode: RAJAUND + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 1292 + speciesSurveyCode: RHINCEM + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 1293 + speciesSurveyCode: RHINRHI + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 1242 + speciesSurveyCode: SCYOCAN + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 1243 + speciesSurveyCode: SCYOSTE + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 1266 + speciesSurveyCode: SQUAACA + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 1267 + speciesSurveyCode: SQUABLA + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 1288 + speciesSurveyCode: SQUTACU + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 1289 + speciesSurveyCode: SQUTOCL + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 1287 + speciesSurveyCode: SQUTSQU + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + maturityEnabled: true + sexEnabled: true + sizeEnabled: true + speciesReferenceTaxonId: 1297 + speciesSurveyCode: TORPMAR + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 299 + sizeEnabled: true + speciesReferenceTaxonId: 957 + speciesSurveyCode: PALIELE + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 299 + sizeEnabled: true + speciesReferenceTaxonId: 853 + speciesSurveyCode: PENAKER + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 1417 + sizeEnabled: true + speciesReferenceTaxonId: 514 + speciesSurveyCode: OCTOVUL + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 1417 + sizeEnabled: true + speciesReferenceTaxonId: 522 + speciesSurveyCode: ELEDCIR + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 1417 + sizeEnabled: true + speciesReferenceTaxonId: 521 + speciesSurveyCode: ELEDMOS + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 1417 + sizeEnabled: true + speciesReferenceTaxonId: 467 + speciesSurveyCode: SEPIOFF + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 1417 + sizeEnabled: true + speciesReferenceTaxonId: 509 + speciesSurveyCode: TODASAG + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + sizeEnabled: true + speciesReferenceTaxonId: 1912 + speciesSurveyCode: ASPICUC + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + sizeEnabled: true + speciesReferenceTaxonId: 1698 + speciesSurveyCode: BOOPBOO + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + sizeEnabled: true + speciesReferenceTaxonId: 1953 + speciesSurveyCode: CITHMAC + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + sizeEnabled: true + speciesReferenceTaxonId: 1700 + speciesSurveyCode: DIPLANN + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + sizeEnabled: true + speciesReferenceTaxonId: 1702 + speciesSurveyCode: DIPLPUN + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + sizeEnabled: true + speciesReferenceTaxonId: 1703 + speciesSurveyCode: DIPLSAR + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + sizeEnabled: true + speciesReferenceTaxonId: 1704 + speciesSurveyCode: DIPLVUL + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + sizeEnabled: true + speciesReferenceTaxonId: 1362 + speciesSurveyCode: ENGRENC + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + sizeEnabled: true + speciesReferenceTaxonId: 1632 + speciesSurveyCode: EPINSPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + sizeEnabled: true + speciesReferenceTaxonId: 1920 + speciesSurveyCode: EUTRGUR + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + sizeEnabled: true + speciesReferenceTaxonId: 1905 + speciesSurveyCode: HELIDAC + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + sizeEnabled: true + speciesReferenceTaxonId: 1961 + speciesSurveyCode: LEPMBOS + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + sizeEnabled: true + speciesReferenceTaxonId: 1710 + speciesSurveyCode: LITHMOR + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + sizeEnabled: true + speciesReferenceTaxonId: 1553 + speciesSurveyCode: MICMPOU + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + sizeEnabled: true + speciesReferenceTaxonId: 1714 + speciesSurveyCode: PAGEACA + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + sizeEnabled: true + speciesReferenceTaxonId: 1715 + speciesSurveyCode: PAGEBOG + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + sizeEnabled: true + speciesReferenceTaxonId: 1713 + speciesSurveyCode: PAGEERY + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + sizeEnabled: true + speciesReferenceTaxonId: 1695 + speciesSurveyCode: SPARPAG + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + sizeEnabled: true + speciesReferenceTaxonId: 1573 + speciesSurveyCode: PHYIBLE + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + sizeEnabled: true + speciesReferenceTaxonId: 1641 + speciesSurveyCode: POLYAME + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + sizeEnabled: true + speciesReferenceTaxonId: 1957 + speciesSurveyCode: PSETMAX + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + sizeEnabled: true + speciesReferenceTaxonId: 1351 + speciesSurveyCode: SARDPIL + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + sizeEnabled: true + speciesReferenceTaxonId: 3789 + speciesSurveyCode: SCOMPNE + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + sizeEnabled: true + speciesReferenceTaxonId: 1772 + speciesSurveyCode: SCOMSCO + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + sizeEnabled: true + speciesReferenceTaxonId: 1996 + speciesSurveyCode: SOLEVUL + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + sizeEnabled: true + speciesReferenceTaxonId: 1723 + speciesSurveyCode: SPICMAE + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + sizeEnabled: true + speciesReferenceTaxonId: 1724 + speciesSurveyCode: SPICSMA + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + sizeEnabled: true + speciesReferenceTaxonId: 1663 + speciesSurveyCode: TRACMED + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + sizeEnabled: true + speciesReferenceTaxonId: 1662 + speciesSurveyCode: TRACTRA + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + sizeEnabled: true + speciesReferenceTaxonId: 1921 + speciesSurveyCode: TRIGLUC + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + sizeEnabled: true + speciesReferenceTaxonId: 1922 + speciesSurveyCode: TRIPLAS + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + sizeEnabled: true + speciesReferenceTaxonId: 1558 + speciesSurveyCode: TRISCAP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 307 + sizeEnabled: true + speciesReferenceTaxonId: 1619 + speciesSurveyCode: ZEUSFAB + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 495 + speciesSurveyCode: ABRAVER + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 491 + speciesSurveyCode: ALLOSPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1358 + speciesSurveyCode: ALOSALO + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1359 + speciesSurveyCode: ALOSFAL + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1637 + speciesSurveyCode: ANTHANT + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1547 + speciesSurveyCode: ANTOMEG + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1394 + speciesSurveyCode: ARGESPY + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1970 + speciesSurveyCode: ARNOSPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1972 + speciesSurveyCode: ARNOIMP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1971 + speciesSurveyCode: ARNOLAT + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1973 + speciesSurveyCode: ARNORUP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1974 + speciesSurveyCode: ARNOTHO + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1913 + speciesSurveyCode: ASPIOBS + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 523 + speciesSurveyCode: BATISPO + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1818 + speciesSurveyCode: BLENOCE + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 2004 + speciesSurveyCode: BUGLLUT + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1810 + speciesSurveyCode: CALMSPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1811 + speciesSurveyCode: CALMLYR + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1812 + speciesSurveyCode: CALMMAC + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1814 + speciesSurveyCode: CALMRIS + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1624 + speciesSurveyCode: CAPOAPE + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1860 + speciesSurveyCode: CARPACU + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1720 + speciesSurveyCode: CECACIR + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1279 + speciesSurveyCode: CENTUYA + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1654 + speciesSurveyCode: CEPOMAC + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1383 + speciesSurveyCode: CHAUSLO + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1335 + speciesSurveyCode: CHIMMON + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1410 + speciesSurveyCode: CLORAGA + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1532 + speciesSurveyCode: COELCOE + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1533 + speciesSurveyCode: COELOCC + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1467 + speciesSurveyCode: CONGCON + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1474 + speciesSurveyCode: DALOIMB + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1321 + speciesSurveyCode: DASICEN + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1322 + speciesSurveyCode: DASIPAS + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 3003 + speciesSurveyCode: DASITOR + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1323 + speciesSurveyCode: DASIVIO + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1789 + speciesSurveyCode: GOBIQUA + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1706 + speciesSurveyCode: DENTDEN + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1644 + speciesSurveyCode: DICELAB + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 10581 + speciesSurveyCode: DIPLCER + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1475 + speciesSurveyCode: ECHEMIR + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1648 + speciesSurveyCode: EPIGSPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1649 + speciesSurveyCode: EPIGCON + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1650 + speciesSurveyCode: EPIGDEN + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1586 + speciesSurveyCode: GADAMAR + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 7693 + speciesSurveyCode: GADIARG + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1579 + speciesSurveyCode: GAIDMED + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1580 + speciesSurveyCode: GAIDVUL + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1396 + speciesSurveyCode: GLOSLEI + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1783 + speciesSurveyCode: GOBISPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1785 + speciesSurveyCode: GOBINIG + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 501 + speciesSurveyCode: HISTSPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 7700 + speciesSurveyCode: HOPLMED + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1428 + speciesSurveyCode: LAMASPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1429 + speciesSurveyCode: LAMACRO + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1590 + speciesSurveyCode: LEPOLEP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1960 + speciesSurveyCode: LEPMWHS + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1917 + speciesSurveyCode: LEPTCAV + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1918 + speciesSurveyCode: LEPTDIE + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1791 + speciesSurveyCode: GOBIFRI + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1882 + speciesSurveyCode: LIZAAUR + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1881 + speciesSurveyCode: LIZARAM + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1883 + speciesSurveyCode: LIZASAL + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 488 + speciesSurveyCode: LOLISPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 12582 + speciesSurveyCode: LOLIFOR + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1497 + speciesSurveyCode: MACOSCO + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1379 + speciesSurveyCode: MAURMUE + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1551 + speciesSurveyCode: GADUMER + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 2011 + speciesSurveyCode: MICUVAR + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1567 + speciesSurveyCode: MOLVDYP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1568 + speciesSurveyCode: MOLVMAC + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1566 + speciesSurveyCode: MOLVMOL + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1593 + speciesSurveyCode: MORAMOR + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1877 + speciesSurveyCode: MUGICEP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1414 + speciesSurveyCode: MYCOSPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1464 + speciesSurveyCode: NETTMEL + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1527 + speciesSurveyCode: NEZUAEQ + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1528 + speciesSurveyCode: NEZUSCL + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1483 + speciesSurveyCode: NOTABON + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1711 + speciesSurveyCode: OBLAMEL + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 513 + speciesSurveyCode: OCTOSPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 515 + speciesSurveyCode: OCTODEP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 517 + speciesSurveyCode: OCTOSAL + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1476 + speciesSurveyCode: OPHCRUF + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1857 + speciesSurveyCode: OPDIBAR + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1858 + speciesSurveyCode: OPDIROC + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1477 + speciesSurveyCode: OPHISER + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1572 + speciesSurveyCode: PHYIPHY + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 519 + speciesSurveyCode: OCTOTET + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1300 + speciesSurveyCode: RAJASPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1301 + speciesSurveyCode: RAJABRA + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1309 + speciesSurveyCode: RAJAFUL + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1304 + speciesSurveyCode: RAJAMON + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1311 + speciesSurveyCode: RAJANAE + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1317 + speciesSurveyCode: RAJARDA + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 471 + speciesSurveyCode: ROSSMAC + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1775 + speciesSurveyCode: SADASAR + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1716 + speciesSurveyCode: SARPSAL + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1894 + speciesSurveyCode: SCORSPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1895 + speciesSurveyCode: SCORELO + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1897 + speciesSurveyCode: SCORLOP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1898 + speciesSurveyCode: SCORMAD + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1899 + speciesSurveyCode: SCORNOT + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1896 + speciesSurveyCode: SCORPOR + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1900 + speciesSurveyCode: SCORSCO + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 466 + speciesSurveyCode: SEPISPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 468 + speciesSurveyCode: SEPIELE + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 469 + speciesSurveyCode: SEPIORB + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 476 + speciesSurveyCode: SEPOSPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1628 + speciesSurveyCode: SERACAB + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1629 + speciesSurveyCode: SERAHEP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1995 + speciesSurveyCode: SOLESPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1998 + speciesSurveyCode: SOLEIMP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1999 + speciesSurveyCode: SOLEKLE + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 2000 + speciesSurveyCode: SOLELAS + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1997 + speciesSurveyCode: SOLESEN + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1693 + speciesSurveyCode: SPARAUR + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1874 + speciesSurveyCode: SPHYSPY + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1721 + speciesSurveyCode: SPICSPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1718 + speciesSurveyCode: SPODCAN + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1356 + speciesSurveyCode: SPRASPR + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1286 + speciesSurveyCode: SQUTSPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 6835 + speciesSurveyCode: STOMBOA + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 2018 + speciesSurveyCode: SYMPNIG + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1815 + speciesSurveyCode: CALMPHA + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 508 + speciesSurveyCode: TODIEBL + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1295 + speciesSurveyCode: TORPSPP + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1298 + speciesSurveyCode: TORPNOB + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1296 + speciesSurveyCode: TORPTOR + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1760 + speciesSurveyCode: TRAHARA + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1759 + speciesSurveyCode: TRAHDRA + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1761 + speciesSurveyCode: TRAHRAD + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1664 + speciesSurveyCode: TRACPIC + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1910 + speciesSurveyCode: TRIGLYR + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1560 + speciesSurveyCode: TRISLUS + weightEnabled: true +- !SpeciesProtocol + countIfNoFrequencyEnabled: true + speciesReferenceTaxonId: 1764 + speciesSurveyCode: URANSCA + weightEnabled: true +vesselUseFeaturePmfmId: [] Property changes on: trunk/tutti-service/src/test/resources/tuttiProtocol.tuttiProtocol ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseAction.java 2013-06-12 07:45:06 UTC (rev 1104) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseAction.java 2013-06-13 09:17:55 UTC (rev 1105) @@ -109,6 +109,9 @@ TuttiProtocol protocol = null; if (getContext().isProtocolFilled()) { protocol = getDataContext().getProtocol(); + if (log.isInfoEnabled()) { + log.info("Will use protocol "+protocol.getName()); + } } TuttiExportService service = getContext().getTuttiExportService(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProgramAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProgramAction.java 2013-06-12 07:45:06 UTC (rev 1104) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProgramAction.java 2013-06-13 09:17:55 UTC (rev 1105) @@ -113,6 +113,9 @@ TuttiProtocol protocol = null; if (getContext().isProtocolFilled()) { protocol = getDataContext().getProtocol(); + if (log.isInfoEnabled()) { + log.info("Will use protocol "+protocol.getName()); + } } TuttiExportService service = getContext().getTuttiExportService(); service.exportProgram(program.getId(), protocol, file, progressionModel);

1 0

r1104 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table
by kmorin＠users.forge.codelutin.com June 12, 2013

June 12, 2013

Author: kmorin Date: 2013-06-12 09:45:06 +0200 (Wed, 12 Jun 2013) New Revision: 1104 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1104 Log: fixes #2704 [ERGO] - Parcourt des tableaux bloqu?\195?\169 sur certains champs non ?\195?\169ditables Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToNextEditableCellAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToNextEditableRowAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToPreviousEditableCellAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToPreviousEditableRowAction.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToNextEditableCellAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToNextEditableCellAction.java 2013-06-11 16:25:14 UTC (rev 1103) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToNextEditableCellAction.java 2013-06-12 07:45:06 UTC (rev 1104) @@ -67,7 +67,9 @@ int rowCount = getRowCount(); - while (currentRow <= rowCount || currentColumn <= columnCount) { + // I commented the part of the code to skip the not editable cells (ref #2704) +// while (currentRow <= rowCount || currentColumn <= columnCount) { + if (currentRow <= rowCount || currentColumn <= columnCount) { // go to next cell currentColumn++; @@ -85,25 +87,25 @@ // create a new row in model addNewRow(); - } else { - - // can not create new row, so do nothing - break; +// } else { +// +// // can not create new row, so do nothing +// break; } } } - if (isCellEditable(currentRow, currentColumn)) { +// if (isCellEditable(currentRow, currentColumn)) { doSelectCell(currentRow, currentColumn); - break; - } else { - if (log.isDebugEnabled()) { - log.debug("Cell not editable at " + - getCellCoordinate(currentRow, currentColumn)); - } - } +// break; +// } else { +// if (log.isDebugEnabled()) { +// log.debug("Cell not editable at " + +// getCellCoordinate(currentRow, currentColumn)); +// } +// } } } } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToNextEditableRowAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToNextEditableRowAction.java 2013-06-11 16:25:14 UTC (rev 1103) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToNextEditableRowAction.java 2013-06-12 07:45:06 UTC (rev 1104) @@ -64,11 +64,12 @@ int rowCount = getRowCount(); - while (currentRow < rowCount) { - + // I commented the part of the code to skip the not editable cells (ref #2704) +// while (currentRow < rowCount) { + if (currentRow < rowCount) { // go to next cell currentRow++; - boolean canSelect = true; +// boolean canSelect = true; // select next cell if (currentRow >= rowCount) { @@ -80,23 +81,23 @@ // create a new row in model addNewRow(); - } else { - canSelect = false; +// } else { +// canSelect = false; } - } else { - canSelect = isCellEditable(currentRow, currentColumn); +// } else { +// canSelect = isCellEditable(currentRow, currentColumn); } - if (canSelect) { +// if (canSelect) { doSelectCell(currentRow, currentColumn); - break; - } else { - if (log.isDebugEnabled()) { - log.debug("Cell not editable at " + - getCellCoordinate(currentRow, currentColumn)); - } - } +// break; +// } else { +// if (log.isDebugEnabled()) { +// log.debug("Cell not editable at " + +// getCellCoordinate(currentRow, currentColumn)); +// } +// } } } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToPreviousEditableCellAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToPreviousEditableCellAction.java 2013-06-11 16:25:14 UTC (rev 1103) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToPreviousEditableCellAction.java 2013-06-12 07:45:06 UTC (rev 1104) @@ -64,7 +64,9 @@ int columnCount = getColumnCount(); - while (currentRow > 0 || currentColumn > 0) { + // I commented the part of the code to skip the not editable cells (ref #2704) +// while (currentRow > 0 || currentColumn > 0) { + if (currentRow > 0 || currentColumn > 0) { // go to next cell currentColumn--; @@ -76,15 +78,15 @@ currentRow--; } - if (isCellEditable(currentRow, currentColumn)) { +// if (isCellEditable(currentRow, currentColumn)) { doSelectCell(currentRow, currentColumn); - break; - } else { - if (log.isDebugEnabled()) { - log.debug("Cell not editable at " + - getCellCoordinate(currentRow, currentColumn)); - } - } +// break; +// } else { +// if (log.isDebugEnabled()) { +// log.debug("Cell not editable at " + +// getCellCoordinate(currentRow, currentColumn)); +// } +// } } } } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToPreviousEditableRowAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToPreviousEditableRowAction.java 2013-06-11 16:25:14 UTC (rev 1103) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToPreviousEditableRowAction.java 2013-06-12 07:45:06 UTC (rev 1104) @@ -65,22 +65,24 @@ int rowCount = getRowCount(); - while (currentRow > 0) { + // I commented the part of the code to skip the not editable cells (ref #2704) +// while (currentRow > 0) { + if (currentRow > 0) { // go to next cell currentRow--; - boolean canSelect = isCellEditable(currentRow, currentColumn); - - if (canSelect) { +// boolean canSelect = isCellEditable(currentRow, currentColumn); +// +// if (canSelect) { doSelectCell(currentRow, currentColumn); - break; - } else { - if (log.isDebugEnabled()) { - log.debug("Cell not editable at " + - getCellCoordinate(currentRow, currentColumn)); - } - } +// break; +// } else { +// if (log.isDebugEnabled()) { +// log.debug("Cell not editable at " + +// getCellCoordinate(currentRow, currentColumn)); +// } +// } } } }

1 0

Build failed in Jenkins: tutti » Tutti :: Service #906
by admin+hudson＠codelutin.com June 11, 2013

June 11, 2013

See <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/906/c…> Changes: [Tony Chemit] fixes #2701: [EXPORT DONNEES] erreur suite export générique ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Tutti :: Service 2.4-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ tutti-service --- [INFO] Deleting <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/ta…> [INFO] [INFO] --- maven-enforcer-plugin:1.2:enforce (check-project-files) @ tutti-service --- [INFO] [INFO] --- i18n-maven-plugin:2.5.1:parserJava (scan-sources) @ tutti-service --- [INFO] [INFO] --- i18n-maven-plugin:2.5.1:parserValidation (scan-sources) @ tutti-service --- [INFO] Load rules file validation.rules [INFO] [INFO] --- i18n-maven-plugin:2.5.1:get (get) @ tutti-service --- [INFO] Copying tutti-service.properties to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/ta…> [INFO] Copying tutti-service.properties to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/ta…> [INFO] [INFO] --- i18n-maven-plugin:2.5.1:gen (scan-sources) @ tutti-service --- [WARNING] bundle en_GB contains 252/252 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ tutti-service --- [INFO] Copying 22 resources [INFO] [INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ tutti-service --- [INFO] Compiling 82 source files to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/ta…> [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] bootstrap class path not set in conjunction with -source 1.6 <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[487,63] error: ';' expected [INFO] 1 error [INFO] -------------------------------------------------------------

1 1

Build failed in Jenkins: tutti #906
by admin+hudson＠codelutin.com June 11, 2013

June 11, 2013

See <http://ci.nuiton.org/jenkins/job/tutti/906/changes> Changes: [Tony Chemit] fixes #2701: [EXPORT DONNEES] erreur suite export générique ------------------------------------------ [...truncated 80 lines...] [INFO] --- i18n-maven-plugin:2.5.1:get (get) @ tutti-persistence --- [INFO] Copying tutti-persistence.properties to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/ge…> [INFO] Copying tutti-persistence.properties to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/ge…> [INFO] [WARNING] bundle en_GB contains 55/55 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] --- i18n-maven-plugin:2.5.1:gen (scan-sources) @ tutti-persistence --- [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ tutti-persistence --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 8 resources [INFO] Copying 0 resource [INFO] [INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ tutti-persistence --- [INFO] Compiling 132 source files to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/cl…> [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ tutti-persistence --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/su…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ tutti-persistence --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 7 resources [INFO] [INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ tutti-persistence --- [INFO] Compiling 31 source files to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/te…> [INFO] [INFO] --- maven-surefire-plugin:2.14.1:test (default-test) @ tutti-persistence --- [INFO] Surefire report directory: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/su…> ------------------------------------------------------- T E S T S ------------------------------------------------------- Running fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocolsTest Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.373 sec Running fr.ifremer.tutti.persistence.service.CruisePersistenceServiceReadTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.004 sec Running fr.ifremer.tutti.persistence.service.FishingOperationPersistenceServiceReadTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec Running fr.ifremer.tutti.persistence.service.synchro.ReferentialSynchronizeServiceImplTest 2013-06-11 18:15:57,433 0 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.synchro.ReferentialSynchronizeServiceImplTest 2013-06-11 18:15:57,611 178 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/db, test [class fr.ifremer.tutti.persistence.service.synchro.ReferentialSynchronizeServiceImplTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.12 sec Running fr.ifremer.tutti.persistence.service.synchro.ReferentialSynchronizeServiceImplUpTodateTest 2013-06-11 18:15:57,619 186 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.synchro.ReferentialSynchronizeServiceImplUpTodateTest 2013-06-11 18:15:57,622 189 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/db, test [class fr.ifremer.tutti.persistence.service.synchro.ReferentialSynchronizeServiceImplUpTodateTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec Running fr.ifremer.tutti.persistence.service.synchro.ReferentialSynchronizeServiceCopyTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec Running fr.ifremer.tutti.persistence.service.synchro.ReferentialSynchronizeHelperTest 2013-06-11 18:15:57,631 198 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.synchro.ReferentialSynchronizeHelperTest 2013-06-11 18:15:57,634 201 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/db, test [class fr.ifremer.tutti.persistence.service.synchro.ReferentialSynchronizeHelperTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec Running fr.ifremer.tutti.persistence.service.AccidentalBatchPersistenceServiceWriteTest 2013-06-11 18:15:57,654 221 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.AccidentalBatchPersistenceServiceWriteTest 2013-06-11 18:15:57,666 233 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/db, test [class fr.ifremer.tutti.persistence.service.AccidentalBatchPersistenceServiceWriteTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.028 sec Running fr.ifremer.tutti.persistence.service.SpeciesBatchPersistenceServiceReadTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec Running fr.ifremer.tutti.persistence.service.ProgramPersistenceServiceWriteTest 2013-06-11 18:15:57,673 240 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.ProgramPersistenceServiceWriteTest 2013-06-11 18:15:57,680 247 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/db, test [class fr.ifremer.tutti.persistence.service.ProgramPersistenceServiceWriteTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.001 sec Running fr.ifremer.tutti.persistence.service.ProtocolPersistenceServiceReadTest 2013-06-11 18:15:57,693 260 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.ProtocolPersistenceServiceReadTest 2013-06-11 18:15:57,713 280 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/src/test/…,> test [class fr.ifremer.tutti.persistence.service.ProtocolPersistenceServiceReadTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.024 sec Running fr.ifremer.tutti.persistence.service.MarineLitterBatchPersistenceServiceWriteTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec Running fr.ifremer.tutti.persistence.service.BenthosBatchPersistenceServiceReadTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.001 sec Running fr.ifremer.tutti.persistence.service.MarineLitterBatchPersistenceServiceReadTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec Running fr.ifremer.tutti.persistence.service.BenthosBatchPersistenceServiceWriteTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec Running fr.ifremer.tutti.persistence.service.CatchBatchPersistenceServiceReadTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec Running fr.ifremer.tutti.persistence.service.AttachmentPersistenceServiceWriteTest 2013-06-11 18:15:57,722 289 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.AttachmentPersistenceServiceWriteTest 2013-06-11 18:15:57,729 296 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/db, test [class fr.ifremer.tutti.persistence.service.AttachmentPersistenceServiceWriteTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec Running fr.ifremer.tutti.persistence.service.ReferentialPersistenceServiceWriteTest 2013-06-11 18:15:57,737 304 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.ReferentialPersistenceServiceWriteTest 2013-06-11 18:15:57,744 311 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/db, test [class fr.ifremer.tutti.persistence.service.ReferentialPersistenceServiceWriteTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.005 sec Running fr.ifremer.tutti.persistence.service.SpeciesBatchPersistenceServiceWriteTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec Running fr.ifremer.tutti.persistence.service.CruisePersistenceServiceWriteTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec Running fr.ifremer.tutti.persistence.service.TuttiEnumerationFileTest 2013-06-11 18:15:57,746 313 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.TuttiEnumerationFileTest 2013-06-11 18:15:57,767 334 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/src/test/…,> test [class fr.ifremer.tutti.persistence.service.TuttiEnumerationFileTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.01 sec Running fr.ifremer.tutti.persistence.service.IndividualObservationBatchPersistenceServiceWriteTest 2013-06-11 18:15:57,771 338 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.IndividualObservationBatchPersistenceServiceWriteTest 2013-06-11 18:15:57,776 343 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/db, test [class fr.ifremer.tutti.persistence.service.IndividualObservationBatchPersistenceServiceWriteTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.006 sec Running fr.ifremer.tutti.persistence.service.PlanktonBatchPersistenceServiceWriteTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec Running fr.ifremer.tutti.persistence.service.PlanktonBatchPersistenceServiceReadTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.001 sec Running fr.ifremer.tutti.persistence.service.ProtocolPersistenceServiceWriteTest 2013-06-11 18:15:57,785 352 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.ProtocolPersistenceServiceWriteTest 2013-06-11 18:15:57,788 355 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/db, test [class fr.ifremer.tutti.persistence.service.ProtocolPersistenceServiceWriteTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.007 sec Running fr.ifremer.tutti.persistence.service.ReferentialPersistenceServiceReadTest 2013-06-11 18:15:57,805 372 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.ReferentialPersistenceServiceReadTest 2013-06-11 18:15:57,812 379 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/src/test/…,> test [class fr.ifremer.tutti.persistence.service.ReferentialPersistenceServiceReadTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.022 sec Running fr.ifremer.tutti.persistence.service.AccidentalBatchPersistenceServiceReadTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec Running fr.ifremer.tutti.persistence.service.ProgramPersistenceServiceReadTest 2013-06-11 18:15:57,815 382 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.ProgramPersistenceServiceReadTest 2013-06-11 18:15:57,825 392 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/src/test/…,> test [class fr.ifremer.tutti.persistence.service.ProgramPersistenceServiceReadTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.009 sec Running fr.ifremer.tutti.persistence.service.FishingOperationPersistenceServiceWriteTest 2013-06-11 18:15:57,831 398 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.FishingOperationPersistenceServiceWriteTest 2013-06-11 18:15:57,834 401 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/db, test [class fr.ifremer.tutti.persistence.service.FishingOperationPersistenceServiceWriteTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.01 sec Running fr.ifremer.tutti.persistence.service.CatchBatchPersistenceServiceWriteTest 2013-06-11 18:15:57,837 404 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.CatchBatchPersistenceServiceWriteTest 2013-06-11 18:15:57,842 409 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/db, test [class fr.ifremer.tutti.persistence.service.CatchBatchPersistenceServiceWriteTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.004 sec Results : Tests run: 31, Failures: 0, Errors: 0, Skipped: 29 [JENKINS] Recording test results [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ tutti-persistence --- [INFO] Building jar: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/tu…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ tutti-persistence --- [INFO] [INFO] --- maven-install-plugin:2.4:install (default-install) @ tutti-persistence --- [INFO] Installing <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/tu…> to /var/local/maven/data/repository/fr/ifremer/tutti/tutti-persistence/2.4-SNAPSHOT/tutti-persistence-2.4-SNAPSHOT.jar [INFO] Installing <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/pom.xml> to /var/local/maven/data/repository/fr/ifremer/tutti/tutti-persistence/2.4-SNAPSHOT/tutti-persistence-2.4-SNAPSHOT.pom [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Tutti :: Service 2.4-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ tutti-service --- [INFO] Deleting <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target> [INFO] [INFO] --- maven-enforcer-plugin:1.2:enforce (check-project-files) @ tutti-service --- [INFO] [INFO] --- i18n-maven-plugin:2.5.1:parserJava (scan-sources) @ tutti-service --- [INFO] [INFO] --- i18n-maven-plugin:2.5.1:parserValidation (scan-sources) @ tutti-service --- [INFO] Load rules file validation.rules [INFO] [INFO] --- i18n-maven-plugin:2.5.1:get (get) @ tutti-service --- [INFO] Copying tutti-service.properties to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/genera…> [INFO] Copying tutti-service.properties to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/genera…> [INFO] [INFO] --- i18n-maven-plugin:2.5.1:gen (scan-sources) @ tutti-service --- [WARNING] bundle en_GB contains 252/252 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ tutti-service --- [INFO] Copying 22 resources [INFO] [INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ tutti-service --- [INFO] Compiling 82 source files to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/classes> [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] bootstrap class path not set in conjunction with -source 1.6 <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/src/main/java…>:[487,63] error: ';' expected [INFO] 1 error [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Tutti ............................................. SUCCESS [6.703s] [INFO] Tutti :: Persistence .............................. SUCCESS [21.031s] [INFO] Tutti :: Service .................................. FAILURE [1.354s] [INFO] Tutti :: UI ....................................... SKIPPED [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 30.794s [INFO] Finished at: Tue Jun 11 18:16:02 CEST 2013 [INFO] Final Memory: 36M/125M [INFO] ------------------------------------------------------------------------ [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/pom.xml> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-service/builds/2013-06-11_18-15-26/archive/fr.ifremer.tutti/tutti-service/2.4-SNAPSHOT/tutti-service-2.4-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/pom.xml> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-ui-swing/builds/2013-06-11_18-15-26/archive/fr.ifremer.tutti/tutti-ui-swing/2.4-SNAPSHOT/tutti-ui-swing-2.4-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/pom.xml> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer$tutti/builds/2013-06-11_18-15-26/archive/fr.ifremer/tutti/2.4-SNAPSHOT/tutti-2.4-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/target/tutti-2.4-SNAPSHOT-s…> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer$tutti/builds/2013-06-11_18-15-26/archive/fr.ifremer/tutti/2.4-SNAPSHOT/tutti-2.4-SNAPSHOT-site_fr.xml [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/pom.xml> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-persistence/builds/2013-06-11_18-15-26/archive/fr.ifremer.tutti/tutti-persistence/2.4-SNAPSHOT/tutti-persistence-2.4-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/tu…> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-persistence/builds/2013-06-11_18-15-26/archive/fr.ifremer.tutti/tutti-persistence/2.4-SNAPSHOT/tutti-persistence-2.4-SNAPSHOT.jar Waiting for Jenkins to finish collecting data mavenExecutionResult exceptions not empty message : Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile (default-compile) on project tutti-service: Compilation failure bootstrap class path not set in conjunction with -source 1.6 <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/src/main/java…>:[487,63] error: ';' expected cause : Compilation failure bootstrap class path not set in conjunction with -source 1.6 <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/src/main/java…>:[487,63] error: ';' expected Stack trace : org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile (default-compile) on project tutti-service: Compilation failure bootstrap class path not set in conjunction with -source 1.6 <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/src/main/java…>:[487,63] error: ';' expected at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:213) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59) at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:320) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:156) at org.jvnet.hudson.maven3.launcher.Maven3Launcher.main(Maven3Launcher.java:79) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:601) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:329) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:239) at org.jvnet.hudson.maven3.agent.Maven3Main.launch(Maven3Main.java:158) at hudson.maven.Maven3Builder.call(Maven3Builder.java:100) at hudson.maven.Maven3Builder.call(Maven3Builder.java:66) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:326) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334) at java.util.concurrent.FutureTask.run(FutureTask.java:166) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:722) Caused by: org.apache.maven.plugin.CompilationFailureException: Compilation failure bootstrap class path not set in conjunction with -source 1.6 <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/src/main/java…>:[487,63] error: ';' expected at org.apache.maven.plugin.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:729) at org.apache.maven.plugin.CompilerMojo.execute(CompilerMojo.java:128) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:101) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:209) ... 27 more Sending e-mails to: tutti-commits(a)list.forge.codelutin.com chemit(a)codelutin.com channel stopped

1 1

r1103 - in trunk: . tutti-persistence tutti-service tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost tutti-service/src/main/java/fr/ifremer/tutti/service/export tutti-ui-swing
by tchemit＠users.forge.codelutin.com June 11, 2013

June 11, 2013

Author: tchemit Date: 2013-06-11 18:25:14 +0200 (Tue, 11 Jun 2013) New Revision: 1103 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1103 Log: pass to version 2.3.1-SNAPSHOT fix build Modified: trunk/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportRow.java trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-06-11 16:01:59 UTC (rev 1102) +++ trunk/pom.xml 2013-06-11 16:25:14 UTC (rev 1103) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.3.1-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-06-11 16:01:59 UTC (rev 1102) +++ trunk/tutti-persistence/pom.xml 2013-06-11 16:25:14 UTC (rev 1103) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.3.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-06-11 16:01:59 UTC (rev 1102) +++ trunk/tutti-service/pom.xml 2013-06-11 16:25:14 UTC (rev 1103) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.3.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRow.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRowModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRow.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRowModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportRow.java 2013-06-11 16:01:59 UTC (rev 1102) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportRow.java 2013-06-11 16:25:14 UTC (rev 1103) @@ -484,7 +484,6 @@ return TuttiExportService.getValueOrComputedValueComputed( catchBatch.getMarineLitterTotalWeight(), catchBatch.getMarineLitterTotalComputedWeight()); - catchBatch.getMarineLitterTotalComputedWeight()); } protected Serializable getGearUseFeature(Caracteristic caracteristic) { Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-06-11 16:01:59 UTC (rev 1102) +++ trunk/tutti-ui-swing/pom.xml 2013-06-11 16:25:14 UTC (rev 1103) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.3.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1102 - trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export
by tchemit＠users.forge.codelutin.com June 11, 2013

June 11, 2013

Author: tchemit Date: 2013-06-11 18:01:59 +0200 (Tue, 11 Jun 2013) New Revision: 1102 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1102 Log: fixes #2701: [EXPORT DONNEES] erreur suite export g?\195?\169n?\195?\169rique Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java 2013-06-11 15:14:17 UTC (rev 1101) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java 2013-06-11 16:01:59 UTC (rev 1102) @@ -261,7 +261,10 @@ speciesBatch.getRankOrder()); CatchExportRow row = currentRow.copy(); - row.setReferenceWeight(speciesBatch.getSampleCategoryWeight()); + float referenceWeight = TuttiExportService.getValueOrComputedValue( + speciesBatch.getSampleCategoryWeight(), + speciesBatch.getSampleCategoryComputedWeight()); + row.setReferenceWeight(referenceWeight); row.setRaisingFactor(1.f); rows.add(row); } @@ -372,7 +375,11 @@ benthosBatch.getRankOrder()); CatchExportRow row = currentRow.copy(); - row.setReferenceWeight(benthosBatch.getSampleCategoryWeight()); + + float referenceWeight = TuttiExportService.getValueOrComputedValue( + benthosBatch.getSampleCategoryWeight(), + benthosBatch.getSampleCategoryComputedWeight()); + row.setReferenceWeight(referenceWeight); row.setRaisingFactor(1.f); rows.add(row); } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportRow.java 2013-06-11 15:14:17 UTC (rev 1101) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportRow.java 2013-06-11 16:01:59 UTC (rev 1102) @@ -279,172 +279,214 @@ } public Float getCatchTotalWeight() { - return getValueOrComputedValue(catchBatch.getCatchTotalWeight(), catchBatch.getCatchTotalComputedWeight()); + return TuttiExportService.getValueOrComputedValue( + catchBatch.getCatchTotalWeight(), + catchBatch.getCatchTotalComputedWeight()); } public Boolean getCatchTotalWeightComputed() { - return getValueOrComputedValueComputed(catchBatch.getCatchTotalWeight(), catchBatch.getCatchTotalComputedWeight()); + return TuttiExportService.getValueOrComputedValueComputed( + catchBatch.getCatchTotalWeight(), + catchBatch.getCatchTotalComputedWeight()); } public Float getCatchTotalSortedTremisWeight() { - return getValueOrComputedValue(catchBatch.getCatchTotalSortedTremisWeight(), null); + return TuttiExportService.getValueOrComputedValue( + catchBatch.getCatchTotalSortedTremisWeight(), null); } public Boolean getCatchTotalSortedTremisWeightComputed() { - return getValueOrComputedValueComputed(catchBatch.getCatchTotalSortedTremisWeight(), null); + return TuttiExportService.getValueOrComputedValueComputed( + catchBatch.getCatchTotalSortedTremisWeight(), null); } public Float getCatchTotalSortedCarousselWeight() { - return getValueOrComputedValue(catchBatch.getCatchTotalSortedCarousselWeight(), null); + return TuttiExportService.getValueOrComputedValue( + catchBatch.getCatchTotalSortedCarousselWeight(), null); } public Boolean getCatchTotalSortedCarousselWeightComputed() { - return getValueOrComputedValueComputed(catchBatch.getCatchTotalSortedCarousselWeight(), null); + return TuttiExportService.getValueOrComputedValueComputed( + catchBatch.getCatchTotalSortedCarousselWeight(), null); } public Float getCatchTotalSortedWeight() { - return getValueOrComputedValue(null, catchBatch.getCatchTotalSortedComputedWeight()); + return TuttiExportService.getValueOrComputedValue( + null, catchBatch.getCatchTotalSortedComputedWeight()); } public Boolean getCatchTotalSortedWeightComputed() { - return getValueOrComputedValueComputed(null, catchBatch.getCatchTotalSortedComputedWeight()); + return TuttiExportService.getValueOrComputedValueComputed( + null, catchBatch.getCatchTotalSortedComputedWeight()); } public Float getCatchTotalUnsortedWeight() { - return getValueOrComputedValue(null, catchBatch.getCatchTotalUnsortedComputedWeight()); + return TuttiExportService.getValueOrComputedValue( + null, catchBatch.getCatchTotalUnsortedComputedWeight()); } public Boolean getCatchTotalUnsortedWeightComputed() { - return getValueOrComputedValueComputed(null, catchBatch.getCatchTotalUnsortedComputedWeight()); + return TuttiExportService.getValueOrComputedValueComputed( + null, catchBatch.getCatchTotalUnsortedComputedWeight()); } public Float getCatchTotalRejectedWeight() { - return getValueOrComputedValue(catchBatch.getCatchTotalRejectedWeight(), catchBatch.getCatchTotalRejectedComputedWeight()); + return TuttiExportService.getValueOrComputedValue( + catchBatch.getCatchTotalRejectedWeight(), + catchBatch.getCatchTotalRejectedComputedWeight()); } public Boolean getCatchTotalRejectedWeightComputed() { - return getValueOrComputedValueComputed(catchBatch.getCatchTotalRejectedWeight(), catchBatch.getCatchTotalRejectedComputedWeight()); + return TuttiExportService.getValueOrComputedValueComputed( + catchBatch.getCatchTotalRejectedWeight(), + catchBatch.getCatchTotalRejectedComputedWeight()); } public Float getSpeciesTotalWeight() { - return getValueOrComputedValue(null, catchBatch.getSpeciesTotalComputedWeight()); + return TuttiExportService.getValueOrComputedValue( + null, catchBatch.getSpeciesTotalComputedWeight()); } public Boolean getSpeciesTotalWeightComputed() { - return getValueOrComputedValueComputed(null, catchBatch.getSpeciesTotalComputedWeight()); + return TuttiExportService.getValueOrComputedValueComputed( + null, catchBatch.getSpeciesTotalComputedWeight()); } public Float getSpeciesTotalSortedWeight() { - return getValueOrComputedValue(catchBatch.getSpeciesTotalSortedWeight(), catchBatch.getSpeciesTotalSortedComputedWeight()); + return TuttiExportService.getValueOrComputedValue( + catchBatch.getSpeciesTotalSortedWeight(), + catchBatch.getSpeciesTotalSortedComputedWeight()); } public Boolean getSpeciesTotalSortedWeightComputed() { - return getValueOrComputedValueComputed(catchBatch.getSpeciesTotalSortedWeight(), catchBatch.getSpeciesTotalSortedComputedWeight()); + return TuttiExportService.getValueOrComputedValueComputed( + catchBatch.getSpeciesTotalSortedWeight(), + catchBatch.getSpeciesTotalSortedComputedWeight()); } public Float getSpeciesTotalUnsortedWeight() { - return getValueOrComputedValue(null, catchBatch.getSpeciesTotalUnsortedComputedWeight()); + return TuttiExportService.getValueOrComputedValue( + null, catchBatch.getSpeciesTotalUnsortedComputedWeight()); } public Boolean getSpeciesTotalUnsortedWeightComputed() { - return getValueOrComputedValueComputed(null, catchBatch.getSpeciesTotalUnsortedComputedWeight()); + return TuttiExportService.getValueOrComputedValueComputed( + null, catchBatch.getSpeciesTotalUnsortedComputedWeight()); } public Float getSpeciesTotalSampleSortedWeight() { - return getValueOrComputedValue(null, catchBatch.getSpeciesTotalSampleSortedComputedWeight()); + return TuttiExportService.getValueOrComputedValue( + null, catchBatch.getSpeciesTotalSampleSortedComputedWeight()); } public Boolean getSpeciesTotalSampleSortedWeightComputed() { - return getValueOrComputedValueComputed(null, catchBatch.getSpeciesTotalSampleSortedComputedWeight()); + return TuttiExportService.getValueOrComputedValueComputed( + null, catchBatch.getSpeciesTotalSampleSortedComputedWeight()); } public Float getSpeciesTotalInertWeight() { - return getValueOrComputedValue(catchBatch.getSpeciesTotalInertWeight(), catchBatch.getSpeciesTotalInertComputedWeight()); + return TuttiExportService.getValueOrComputedValue( + catchBatch.getSpeciesTotalInertWeight(), + catchBatch.getSpeciesTotalInertComputedWeight()); } public Boolean getSpeciesTotalInertWeightComputed() { - return getValueOrComputedValueComputed(catchBatch.getSpeciesTotalInertWeight(), catchBatch.getSpeciesTotalInertComputedWeight()); + return TuttiExportService.getValueOrComputedValueComputed( + catchBatch.getSpeciesTotalInertWeight(), + catchBatch.getSpeciesTotalInertComputedWeight()); } public Float getSpeciesTotalLivingNotItemizedWeight() { - return getValueOrComputedValue(catchBatch.getSpeciesTotalLivingNotItemizedWeight(), catchBatch.getSpeciesTotalLivingNotItemizedComputedWeight()); + return TuttiExportService.getValueOrComputedValue( + catchBatch.getSpeciesTotalLivingNotItemizedWeight(), + catchBatch.getSpeciesTotalLivingNotItemizedComputedWeight()); } public Boolean getSpeciesTotalLivingNotItemizedWeightComputed() { - return getValueOrComputedValueComputed(catchBatch.getSpeciesTotalLivingNotItemizedWeight(), catchBatch.getSpeciesTotalLivingNotItemizedComputedWeight()); + return TuttiExportService.getValueOrComputedValueComputed( + catchBatch.getSpeciesTotalLivingNotItemizedWeight(), + catchBatch.getSpeciesTotalLivingNotItemizedComputedWeight()); } public Float getBenthosTotalWeight() { - return getValueOrComputedValue(null, catchBatch.getBenthosTotalComputedWeight()); + return TuttiExportService.getValueOrComputedValue( + null, catchBatch.getBenthosTotalComputedWeight()); } public Boolean getBenthosTotalWeightComputed() { - return getValueOrComputedValueComputed(null, catchBatch.getBenthosTotalComputedWeight()); + return TuttiExportService.getValueOrComputedValueComputed( + null, catchBatch.getBenthosTotalComputedWeight()); } public Float getBenthosTotalSortedWeight() { - return getValueOrComputedValue(catchBatch.getBenthosTotalSortedWeight(), catchBatch.getBenthosTotalSortedComputedWeight()); + return TuttiExportService.getValueOrComputedValue( + catchBatch.getBenthosTotalSortedWeight(), + catchBatch.getBenthosTotalSortedComputedWeight()); } public Boolean getBenthosTotalSortedWeightComputed() { - return getValueOrComputedValueComputed(catchBatch.getBenthosTotalSortedWeight(), catchBatch.getBenthosTotalSortedComputedWeight()); + return TuttiExportService.getValueOrComputedValueComputed( + catchBatch.getBenthosTotalSortedWeight(), + catchBatch.getBenthosTotalSortedComputedWeight()); } public Float getBenthosTotalUnsortedWeight() { - return getValueOrComputedValue(null, catchBatch.getBenthosTotalUnsortedComputedWeight()); + return TuttiExportService.getValueOrComputedValue( + null, catchBatch.getBenthosTotalUnsortedComputedWeight()); } public Boolean getBenthosTotalUnsortedWeightComputed() { - return getValueOrComputedValueComputed(null, catchBatch.getBenthosTotalUnsortedComputedWeight()); + return TuttiExportService.getValueOrComputedValueComputed( + null, catchBatch.getBenthosTotalUnsortedComputedWeight()); } public Float getBenthosTotalSampleSortedWeight() { - return getValueOrComputedValue(null, catchBatch.getBenthosTotalSampleSortedComputedWeight()); + return TuttiExportService.getValueOrComputedValue( + null, catchBatch.getBenthosTotalSampleSortedComputedWeight()); } public Boolean getBenthosTotalSampleSortedWeightComputed() { - return getValueOrComputedValueComputed(null, catchBatch.getBenthosTotalSampleSortedComputedWeight()); + return TuttiExportService.getValueOrComputedValueComputed( + null, catchBatch.getBenthosTotalSampleSortedComputedWeight()); } public Float getBenthosTotalInertWeight() { - return getValueOrComputedValue(catchBatch.getBenthosTotalInertWeight(), catchBatch.getBenthosTotalInertComputedWeight()); + return TuttiExportService.getValueOrComputedValue( + catchBatch.getBenthosTotalInertWeight(), + catchBatch.getBenthosTotalInertComputedWeight()); } public Boolean getBenthosTotalInertWeightComputed() { - return getValueOrComputedValueComputed(catchBatch.getBenthosTotalInertWeight(), catchBatch.getBenthosTotalInertComputedWeight()); + return TuttiExportService.getValueOrComputedValueComputed( + catchBatch.getBenthosTotalInertWeight(), + catchBatch.getBenthosTotalInertComputedWeight()); } public Float getBenthosTotalLivingNotItemizedWeight() { - return getValueOrComputedValue(catchBatch.getBenthosTotalLivingNotItemizedWeight(), catchBatch.getBenthosTotalLivingNotItemizedComputedWeight()); + return TuttiExportService.getValueOrComputedValue( + catchBatch.getBenthosTotalLivingNotItemizedWeight(), + catchBatch.getBenthosTotalLivingNotItemizedComputedWeight()); } public Boolean getBenthosTotalLivingNotItemizedWeightComputed() { - return getValueOrComputedValueComputed(catchBatch.getBenthosTotalLivingNotItemizedWeight(), catchBatch.getBenthosTotalLivingNotItemizedComputedWeight()); + return TuttiExportService.getValueOrComputedValueComputed( + catchBatch.getBenthosTotalLivingNotItemizedWeight(), + catchBatch.getBenthosTotalLivingNotItemizedComputedWeight()); } public Float getMarineLitterTotalWeight() { - return getValueOrComputedValue(catchBatch.getMarineLitterTotalWeight(), catchBatch.getMarineLitterTotalComputedWeight()); + return TuttiExportService.getValueOrComputedValue( + catchBatch.getMarineLitterTotalWeight(), + catchBatch.getMarineLitterTotalComputedWeight()); } public Boolean getMarineLitterTotalWeightComputed() { - return getValueOrComputedValueComputed(catchBatch.getMarineLitterTotalWeight(), catchBatch.getMarineLitterTotalComputedWeight()); + return TuttiExportService.getValueOrComputedValueComputed( + catchBatch.getMarineLitterTotalWeight(), + catchBatch.getMarineLitterTotalComputedWeight()); + catchBatch.getMarineLitterTotalComputedWeight()); } - protected Float getValueOrComputedValue(Float value, Float computedValue) { - return value == null ? computedValue : value; - } - - protected Boolean getValueOrComputedValueComputed(Float value, Float computedValue) { - Boolean result; - if (value == null) { - - result = computedValue == null ? null : true; - } else { - result = true; - } - return result; - } - protected Serializable getGearUseFeature(Caracteristic caracteristic) { CaracteristicMap gearUseFeatures = fishingOperation.getGearUseFeatures(); Serializable serializable = gearUseFeatures == null ? null : gearUseFeatures.get(caracteristic); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 2013-06-11 15:14:17 UTC (rev 1101) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 2013-06-11 16:01:59 UTC (rev 1102) @@ -116,6 +116,21 @@ protected Caracteristic pmfmIdCaracteristic; + public static Float getValueOrComputedValue(Float value, Float computedValue) { + return value == null ? computedValue : value; + } + + public static Boolean getValueOrComputedValueComputed(Float value, Float computedValue) { + Boolean result; + if (value == null) { + + result = computedValue == null ? null : true; + } else { + result = true; + } + return result; + } + @Override public void setServiceContext(TuttiServiceContext context) { super.setServiceContext(context);

1 0

r1101 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches: benthos/frequency species/frequency
by kmorin＠users.forge.codelutin.com June 11, 2013

June 11, 2013

Author: kmorin Date: 2013-06-11 17:14:17 +0200 (Tue, 11 Jun 2013) New Revision: 1101 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1101 Log: fixes #2700 [MENSURATION] - Saisie en d?\195?\169nombrement et message affich?\195?\169 sans donn?\195?\169es saisies Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java 2013-06-11 15:09:23 UTC (rev 1100) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java 2013-06-11 15:14:17 UTC (rev 1101) @@ -105,7 +105,7 @@ }); result.setLengthStepCaracteristic(uiModel.getLengthStepCaracteristic()); result.setLengthStep(defaultStep); - result.setValid(true); + result.setValid(defaultStep != null); return result; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css 2013-06-11 15:09:23 UTC (rev 1100) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css 2013-06-11 15:14:17 UTC (rev 1101) @@ -297,7 +297,7 @@ #dataInFrequenciesWarningContainer { background: {new java.awt.Color(245, 218, 88)}; - visible: {model.getRowsInError().size() != model.getRows().size()}; + visible: {(model.getRowsInError().size() + model.getEmptyRows().size()) != model.getRows().size()}; } #dataInFrequenciesWarning { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-06-11 15:09:23 UTC (rev 1100) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-06-11 15:14:17 UTC (rev 1101) @@ -126,6 +126,7 @@ Object newValue) { boolean recomputeAllRows; + BenthosFrequencyUIModel model = getModel(); if (row.getWeight() != null) { // check if no row had a weight, then if one of them now has a weight, @@ -141,7 +142,7 @@ } - List<BenthosFrequencyRowModel> rows = getModel().getRows(); + List<BenthosFrequencyRowModel> rows = model.getRows(); Integer totalNumber = 0; Float totalWeight = 0f; for (BenthosFrequencyRowModel r : rows) { @@ -159,12 +160,17 @@ } } } - getModel().setTotalNumber(totalNumber); - getModel().setTotalWeight(totalWeight); + model.setTotalNumber(totalNumber); + model.setTotalWeight(totalWeight); if (!recomputeAllRows) { recomputeRowValidState(row); } + if (row.isValid() && row.getNumber() == null && row.getWeight() == null) { + model.addEmptyRow(row); + } else { + model.removeEmptyRow(row); + } } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java 2013-06-11 15:09:23 UTC (rev 1100) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java 2013-06-11 15:14:17 UTC (rev 1101) @@ -24,11 +24,15 @@ * #L% */ +import com.google.common.collect.Sets; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIModel; +import java.util.List; +import java.util.Set; + /** * @author tchemit <chemit(a)codelutin.com> * @since 0.2 @@ -65,6 +69,8 @@ public static final String PROPERTY_TOTAL_WEIGHT = "totalWeight"; + public static final String PROPERTY_EMPTY_ROWS = "emptyRows"; + public static enum ConfigurationMode { SIMPLE, AUTO_GEN, @@ -135,10 +141,18 @@ */ protected Float totalWeight; + protected Set<BenthosFrequencyRowModel> emptyRows; + public BenthosFrequencyUIModel() { super(SpeciesBatchRowModel.class, null, null); + setEmptyRows(Sets.<BenthosFrequencyRowModel>newHashSet()); } + public void setRows(List<BenthosFrequencyRowModel> rows) { + super.setRows(rows); + setEmptyRows(Sets.<BenthosFrequencyRowModel>newHashSet()); + } + public ConfigurationMode getConfigurationMode() { return configurationMode; } @@ -263,6 +277,25 @@ firePropertyChange(PROPERTY_TOTAL_WEIGHT, oldValue, totalWeight); } + public Set<BenthosFrequencyRowModel> getEmptyRows() { + return emptyRows; + } + + public void setEmptyRows(Set<BenthosFrequencyRowModel> emptyRows) { + this.emptyRows = emptyRows; + firePropertyChange(PROPERTY_EMPTY_ROWS, null, emptyRows); + } + + public void addEmptyRow(BenthosFrequencyRowModel row) { + emptyRows.add(row); + firePropertyChange(PROPERTY_EMPTY_ROWS, null, emptyRows); + } + + public void removeEmptyRow(BenthosFrequencyRowModel row) { + emptyRows.remove(row); + firePropertyChange(PROPERTY_EMPTY_ROWS, null, emptyRows); + } + @Override protected SpeciesBatchRowModel newEntity() { return new SpeciesBatchRowModel(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java 2013-06-11 15:09:23 UTC (rev 1100) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java 2013-06-11 15:14:17 UTC (rev 1101) @@ -105,7 +105,7 @@ }); result.setLengthStepCaracteristic(uiModel.getLengthStepCaracteristic()); result.setLengthStep(defaultStep); - result.setValid(true); + result.setValid(defaultStep != null); return result; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-06-11 15:09:23 UTC (rev 1100) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-06-11 15:14:17 UTC (rev 1101) @@ -297,7 +297,7 @@ #dataInFrequenciesWarningContainer { background: {new java.awt.Color(245, 218, 88)}; - visible: {model.getRowsInError().size() != model.getRows().size()}; + visible: {(model.getRowsInError().size() + model.getEmptyRows().size()) != model.getRows().size()}; } #dataInFrequenciesWarning { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-06-11 15:09:23 UTC (rev 1100) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-06-11 15:14:17 UTC (rev 1101) @@ -127,6 +127,7 @@ Object newValue) { boolean recomputeAllRows; + SpeciesFrequencyUIModel model = getModel(); if (row.getWeight() != null) { // check if no row had a weight, then if one of them now has a weight, @@ -141,7 +142,7 @@ recomputeAllRows = withWeightRows.isEmpty(); } - List<SpeciesFrequencyRowModel> rows = getModel().getRows(); + List<SpeciesFrequencyRowModel> rows = model.getRows(); Integer totalNumber = 0; Float totalWeight = 0f; for (SpeciesFrequencyRowModel r : rows) { @@ -159,12 +160,17 @@ } } } - getModel().setTotalNumber(totalNumber); - getModel().setTotalWeight(totalWeight); + model.setTotalNumber(totalNumber); + model.setTotalWeight(totalWeight); if (!recomputeAllRows) { recomputeRowValidState(row); } + if (row.isValid() && row.getNumber() == null && row.getWeight() == null) { + model.addEmptyRow(row); + } else { + model.removeEmptyRow(row); + } } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java 2013-06-11 15:09:23 UTC (rev 1100) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java 2013-06-11 15:14:17 UTC (rev 1101) @@ -24,10 +24,14 @@ * #L% */ +import com.google.common.collect.Sets; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIModel; +import java.util.List; +import java.util.Set; + /** * @author tchemit <chemit(a)codelutin.com> * @since 0.2 @@ -64,6 +68,8 @@ public static final String PROPERTY_TOTAL_WEIGHT = "totalWeight"; + public static final String PROPERTY_EMPTY_ROWS = "emptyRows"; + public static enum ConfigurationMode { SIMPLE, AUTO_GEN, @@ -134,10 +140,18 @@ */ protected Integer simpleCount; + protected Set<SpeciesFrequencyRowModel> emptyRows; + public SpeciesFrequencyUIModel() { super(SpeciesBatchRowModel.class, null, null); + setEmptyRows(Sets.<SpeciesFrequencyRowModel>newHashSet()); } + public void setRows(List<SpeciesFrequencyRowModel> rows) { + super.setRows(rows); + setEmptyRows(Sets.<SpeciesFrequencyRowModel>newHashSet()); + } + public ConfigurationMode getConfigurationMode() { return configurationMode; } @@ -262,6 +276,25 @@ firePropertyChange(PROPERTY_TOTAL_WEIGHT, oldValue, totalWeight); } + public Set<SpeciesFrequencyRowModel> getEmptyRows() { + return emptyRows; + } + + public void setEmptyRows(Set<SpeciesFrequencyRowModel> emptyRows) { + this.emptyRows = emptyRows; + firePropertyChange(PROPERTY_EMPTY_ROWS, null, emptyRows); + } + + public void addEmptyRow(SpeciesFrequencyRowModel row) { + emptyRows.add(row); + firePropertyChange(PROPERTY_EMPTY_ROWS, null, emptyRows); + } + + public void removeEmptyRow(SpeciesFrequencyRowModel row) { + emptyRows.remove(row); + firePropertyChange(PROPERTY_EMPTY_ROWS, null, emptyRows); + } + @Override protected SpeciesBatchRowModel newEntity() { return new SpeciesBatchRowModel();

1 0

r1100 - in trunk/tutti-service/src: main/java/fr/ifremer/tutti/service main/java/fr/ifremer/tutti/service/export test/java/fr/ifremer/tutti/service/export
by tchemit＠users.forge.codelutin.com June 11, 2013

June 11, 2013

Author: tchemit Date: 2013-06-11 17:09:23 +0200 (Tue, 11 Jun 2013) New Revision: 1100 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1100 Log: refs #2693: [EXPORT GENERIQUE] lot uniquement avec un nombre d'individus : la valeur du nombre n'est pas dans l'export catch.csv (cas ou il n'y a pas de capture) Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java 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 2013-06-11 14:39:12 UTC (rev 1099) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2013-06-11 15:09:23 UTC (rev 1100) @@ -49,6 +49,7 @@ import java.io.Serializable; import java.io.Writer; +import java.lang.reflect.InvocationTargetException; import java.text.ParseException; import java.util.Collections; import java.util.Date; @@ -241,6 +242,12 @@ value = (T) PropertyUtils.getProperty(object, propertyName); } catch (NestedNullException e) { value = null; + } catch (InvocationTargetException e) { + if (e.getCause() instanceof NullPointerException) { + value = null; + } else { + throw e; + } } return value; } @@ -435,6 +442,7 @@ return Joiner.on('|').join(decoratedValues); } } + protected TuttiCsvUtil() { // no instance } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportModel.java 2013-06-11 14:39:12 UTC (rev 1099) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportModel.java 2013-06-11 15:09:23 UTC (rev 1100) @@ -87,56 +87,56 @@ newColumnForExport("Saisisseur", FishingOperation.PROPERTY_RECORDER_PERSON, TuttiCsvUtil.LIST_PERSON_FORMATTER); newColumnForExport("Commentaire", FishingOperation.PROPERTY_COMMENT); - newColumnForExport("Poids_Total", OperationExportRow.PROPERTY_CATCH_TOTAL_WEIGHT, TuttiCsvUtil.FLOAT); - newColumnForExport("Poids_Total_Calcule", OperationExportRow.PROPERTY_CATCH_TOTAL_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); + newNullableColumnForExport("Poids_Total", OperationExportRow.PROPERTY_CATCH_TOTAL_WEIGHT, TuttiCsvUtil.FLOAT); + newNullableColumnForExport("Poids_Total_Calcule", OperationExportRow.PROPERTY_CATCH_TOTAL_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newColumnForExport("Poids_Total_Vrac", OperationExportRow.PROPERTY_CATCH_TOTAL_SORTED_WEIGHT, TuttiCsvUtil.FLOAT); - newColumnForExport("Poids_Total_Vrac_Calcule", OperationExportRow.PROPERTY_CATCH_TOTAL_SORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); + newNullableColumnForExport("Poids_Total_Vrac", OperationExportRow.PROPERTY_CATCH_TOTAL_SORTED_WEIGHT, TuttiCsvUtil.FLOAT); + newNullableColumnForExport("Poids_Total_Vrac_Calcule", OperationExportRow.PROPERTY_CATCH_TOTAL_SORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newColumnForExport("Poids_Total_HorsVrac", OperationExportRow.PROPERTY_CATCH_TOTAL_UNSORTED_WEIGHT, TuttiCsvUtil.FLOAT); - newColumnForExport("Poids_Total_HorsVrac_Calcule", OperationExportRow.PROPERTY_CATCH_TOTAL_UNSORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); + newNullableColumnForExport("Poids_Total_HorsVrac", OperationExportRow.PROPERTY_CATCH_TOTAL_UNSORTED_WEIGHT, TuttiCsvUtil.FLOAT); + newNullableColumnForExport("Poids_Total_HorsVrac_Calcule", OperationExportRow.PROPERTY_CATCH_TOTAL_UNSORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newColumnForExport("Poids_Total_Non_Trie", OperationExportRow.PROPERTY_CATCH_TOTAL_REJECTED_WEIGHT, TuttiCsvUtil.FLOAT); - newColumnForExport("Poids_Total_Non_Trie_Calcule", OperationExportRow.PROPERTY_CATCH_TOTAL_REJECTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); + newNullableColumnForExport("Poids_Total_Non_Trie", OperationExportRow.PROPERTY_CATCH_TOTAL_REJECTED_WEIGHT, TuttiCsvUtil.FLOAT); + newNullableColumnForExport("Poids_Total_Non_Trie_Calcule", OperationExportRow.PROPERTY_CATCH_TOTAL_REJECTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newColumnForExport("Poids_Total_Espece", OperationExportRow.PROPERTY_SPECIES_TOTAL_WEIGHT, TuttiCsvUtil.FLOAT); - newColumnForExport("Poids_Total_Espece_Calcule", OperationExportRow.PROPERTY_SPECIES_TOTAL_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); + newNullableColumnForExport("Poids_Total_Espece", OperationExportRow.PROPERTY_SPECIES_TOTAL_WEIGHT, TuttiCsvUtil.FLOAT); + newNullableColumnForExport("Poids_Total_Espece_Calcule", OperationExportRow.PROPERTY_SPECIES_TOTAL_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newColumnForExport("Poids_Total_Espece_Vrac", OperationExportRow.PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT, TuttiCsvUtil.FLOAT); - newColumnForExport("Poids_Total_Espece_Vrac_Calcule", OperationExportRow.PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); + newNullableColumnForExport("Poids_Total_Espece_Vrac", OperationExportRow.PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT, TuttiCsvUtil.FLOAT); + newNullableColumnForExport("Poids_Total_Espece_Vrac_Calcule", OperationExportRow.PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newColumnForExport("Poids_Total_Espece_Vrac_Trie", OperationExportRow.PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_WEIGHT, TuttiCsvUtil.FLOAT); - newColumnForExport("Poids_Total_Espece_Vrac_Trie_Calcule", OperationExportRow.PROPERTY_SPECIES_TOTAL_SAMPLE_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_Calcule", OperationExportRow.PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newColumnForExport("Poids_Total_Espece_HorsVrac", OperationExportRow.PROPERTY_SPECIES_TOTAL_UNSORTED_WEIGHT, TuttiCsvUtil.FLOAT); - newColumnForExport("Poids_Total_Espece_HorsVrac_Calcule", OperationExportRow.PROPERTY_SPECIES_TOTAL_UNSORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); + newNullableColumnForExport("Poids_Total_Espece_HorsVrac", OperationExportRow.PROPERTY_SPECIES_TOTAL_UNSORTED_WEIGHT, TuttiCsvUtil.FLOAT); + newNullableColumnForExport("Poids_Total_Espece_HorsVrac_Calcule", OperationExportRow.PROPERTY_SPECIES_TOTAL_UNSORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newColumnForExport("Poids_Total_Espece_Inerte_Trie", OperationExportRow.PROPERTY_SPECIES_TOTAL_INERT_WEIGHT, TuttiCsvUtil.FLOAT); - newColumnForExport("Poids_Total_Espece_Inerte_Trie_Calcule", OperationExportRow.PROPERTY_SPECIES_TOTAL_INERT_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); + newNullableColumnForExport("Poids_Total_Espece_Inerte_Trie", OperationExportRow.PROPERTY_SPECIES_TOTAL_INERT_WEIGHT, TuttiCsvUtil.FLOAT); + newNullableColumnForExport("Poids_Total_Espece_Inerte_Trie_Calcule", OperationExportRow.PROPERTY_SPECIES_TOTAL_INERT_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newColumnForExport("Poids_Total_Espece_Vivant_non_detaille_trie", OperationExportRow.PROPERTY_SPECIES_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT, TuttiCsvUtil.FLOAT); - newColumnForExport("Poids_Total_Espece_Vivant_non_detaille_trie_Calcule", OperationExportRow.PROPERTY_SPECIES_TOTAL_LIVING_NOT_ITEMIZED_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_Calcule", OperationExportRow.PROPERTY_SPECIES_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newColumnForExport("Poids_Total_Benthos", OperationExportRow.PROPERTY_BENTHOS_TOTAL_WEIGHT, TuttiCsvUtil.FLOAT); - newColumnForExport("Poids_Total_Benthos_Calcule", OperationExportRow.PROPERTY_BENTHOS_TOTAL_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); + newNullableColumnForExport("Poids_Total_Benthos", OperationExportRow.PROPERTY_BENTHOS_TOTAL_WEIGHT, TuttiCsvUtil.FLOAT); + newNullableColumnForExport("Poids_Total_Benthos_Calcule", OperationExportRow.PROPERTY_BENTHOS_TOTAL_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newColumnForExport("Poids_Total_Benthos_Vrac", OperationExportRow.PROPERTY_BENTHOS_TOTAL_SORTED_WEIGHT, TuttiCsvUtil.FLOAT); - newColumnForExport("Poids_Total_Benthos_Vrac_Calcule", OperationExportRow.PROPERTY_BENTHOS_TOTAL_SORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); + newNullableColumnForExport("Poids_Total_Benthos_Vrac", OperationExportRow.PROPERTY_BENTHOS_TOTAL_SORTED_WEIGHT, TuttiCsvUtil.FLOAT); + newNullableColumnForExport("Poids_Total_Benthos_Vrac_Calcule", OperationExportRow.PROPERTY_BENTHOS_TOTAL_SORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newColumnForExport("Poids_Total_Benthos_Vrac_Trie", OperationExportRow.PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_WEIGHT, TuttiCsvUtil.FLOAT); - newColumnForExport("Poids_Total_Benthos_Vrac_Trie_Calcule", OperationExportRow.PROPERTY_BENTHOS_TOTAL_SAMPLE_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_Calcule", OperationExportRow.PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newColumnForExport("Poids_Total_Benthos_HorsVrac", OperationExportRow.PROPERTY_BENTHOS_TOTAL_UNSORTED_WEIGHT, TuttiCsvUtil.FLOAT); - newColumnForExport("Poids_Total_Benthos_HorsVrac_Calcule", OperationExportRow.PROPERTY_BENTHOS_TOTAL_UNSORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); + newNullableColumnForExport("Poids_Total_Benthos_HorsVrac", OperationExportRow.PROPERTY_BENTHOS_TOTAL_UNSORTED_WEIGHT, TuttiCsvUtil.FLOAT); + newNullableColumnForExport("Poids_Total_Benthos_HorsVrac_Calcule", OperationExportRow.PROPERTY_BENTHOS_TOTAL_UNSORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newColumnForExport("Poids_Total_Benthos_Inerte_Trie", OperationExportRow.PROPERTY_BENTHOS_TOTAL_INERT_WEIGHT, TuttiCsvUtil.FLOAT); - newColumnForExport("Poids_Total_Benthos_Inerte_Trie_Calcule", OperationExportRow.PROPERTY_BENTHOS_TOTAL_INERT_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); + newNullableColumnForExport("Poids_Total_Benthos_Inerte_Trie", OperationExportRow.PROPERTY_BENTHOS_TOTAL_INERT_WEIGHT, TuttiCsvUtil.FLOAT); + newNullableColumnForExport("Poids_Total_Benthos_Inerte_Trie_Calcule", OperationExportRow.PROPERTY_BENTHOS_TOTAL_INERT_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newColumnForExport("Poids_Total_Benthos_Vivant_non_detaille_trie", OperationExportRow.PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT, TuttiCsvUtil.FLOAT); - newColumnForExport("Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule", OperationExportRow.PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_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_Calcule", OperationExportRow.PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newColumnForExport("Poids_Total_Macro_Dechet", OperationExportRow.PROPERTY_MARINE_LITTER_TOTAL_WEIGHT, TuttiCsvUtil.FLOAT); - newColumnForExport("Poids_Total_Macro_Dechet_Calcule", OperationExportRow.PROPERTY_MARINE_LITTER_TOTAL_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); + newNullableColumnForExport("Poids_Total_Macro_Dechet", OperationExportRow.PROPERTY_MARINE_LITTER_TOTAL_WEIGHT, TuttiCsvUtil.FLOAT); + newNullableColumnForExport("Poids_Total_Macro_Dechet_Calcule", OperationExportRow.PROPERTY_MARINE_LITTER_TOTAL_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); } public void prepareRows(List<OperationExportRow> rows, Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 2013-06-11 14:39:12 UTC (rev 1099) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 2013-06-11 15:09:23 UTC (rev 1100) @@ -179,9 +179,9 @@ log.debug("Will export program: " + programId); } List<Cruise> allCruise = persistenceService.getAllCruise(programId); - for (Cruise cruise : allCruise) { - checkCruise(progressionModel, cruise); - } +// for (Cruise cruise : allCruise) { +// checkCruise(progressionModel, cruise); +// } File basedir = new File(context.getConfig().newTempFile( "exportProgram"), "exportProgram-" + programId); @@ -560,22 +560,6 @@ } } - protected boolean withCatch(FishingOperation operation) { - String operationId = operation.getId(); - - boolean withCatchBatch = - persistenceService.isFishingOperationWithCatchBatch( - operationId); - - if (!withCatchBatch) { - if (log.isWarnEnabled()) { - log.warn("Skip fishing operation " + operationId + - " since no catchBatch associated."); - } - } - return withCatchBatch; - } - protected static class ExportContext implements Closeable { File surveyFile; Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java 2013-06-11 14:39:12 UTC (rev 1099) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java 2013-06-11 15:09:23 UTC (rev 1100) @@ -80,6 +80,9 @@ "Annee;Serie;Serie_Partielle;Navire;Pays;Zone_Etude;Id_Sismer;Nombre_de_poche;Date_Deb_Campagne;Port_Deb_Campagne;Date_Fin_Campagne;Port_Fin_Campagne;Engin;Chef_Mission;Resp_Salle_Tri;Commentaire\n" + "2013;Campagne CGFS;;GWEN DREZ;FRA;CGFS - Manche Est / Sud Mer du Nord;Campagne CGFS_2013;1;01/05/2013 00:00:00;La Barbotière (Gujan-Mestras);31/05/2013 00:00:00;Etang de Palo;GOV1925 GOV 19.7/25.9;Vincent AURECHE;;;"; + public static final String OPERATION_WITH_NO_CATCH_CONTENT = "Annee;Serie;Serie_Partielle;Id_Operation;NumOrdre_Station;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;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_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;GWEN DREZ;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;Id_Operation;NumOrdre_Station;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;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_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;GWEN DREZ;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" + @@ -145,6 +148,8 @@ protected Cruise cruise; + protected Cruise cruiseCGFS; + protected List<FishingOperation> operations; protected List<MarineLitterBatch> marineLitters; @@ -229,6 +234,8 @@ @Test public void exportOperations() throws Exception { + loadData(PROGRAM_ID, CRUISE_CGFS_ID); + TuttiExportService.ExportContext exportContext = service.createExportContext(dataDirectory, null); @@ -243,6 +250,28 @@ } @Test + public void exportOperationsWithNoCatches() throws Exception { + + loadData(PROGRAM_ID, CRUISE_CGFS_ID); + + FishingOperation operation = TuttiEntities.findById(operations, "100105"); + operations = Lists.newArrayList(operation); + + TuttiExportService.ExportContext exportContext = + service.createExportContext(dataDirectory, null); + + try { + service.exportOperations(exportContext, cruise, operations); + } finally { + exportContext.close(); + } + + assertFileContent("Operation export:\n", + exportContext.operationFile, + OPERATION_WITH_NO_CATCH_CONTENT); + } + + @Test public void exportParameters() throws Exception { TuttiExportService.ExportContext exportContext =

1 0

r1099 - in trunk/tutti-service/src: main/java/fr/ifremer/tutti/service main/java/fr/ifremer/tutti/service/export test/java/fr/ifremer/tutti/service/export
by tchemit＠users.forge.codelutin.com June 11, 2013

June 11, 2013

Author: tchemit Date: 2013-06-11 16:39:12 +0200 (Tue, 11 Jun 2013) New Revision: 1099 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1099 Log: refs #2693: [EXPORT GENERIQUE] lot uniquement avec un nombre d'individus : la valeur du nombre n'est pas dans l'export catch.csv Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/AccidentalCatchExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/IndividualObservationExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/MarineLitterExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/MarineLitterExportRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ParameterExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ParameterExportRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SurveyExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SurveyExportRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java 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 2013-06-11 13:29:41 UTC (rev 1098) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2013-06-11 14:39:12 UTC (rev 1099) @@ -30,6 +30,7 @@ import fr.ifremer.tutti.TuttiTechnicalException; import fr.ifremer.tutti.persistence.entities.TuttiEntity; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; +import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Person; import org.apache.commons.beanutils.BeanUtilsBean; import org.apache.commons.beanutils.NestedNullException; @@ -300,6 +301,9 @@ public static final ValueFormatter<List<Person>> LIST_PERSON_FORMATTER = new ListPersonValueFormatter(); + public static final ValueFormatter<List<Gear>> LIST_GEAR_FORMATTER = + new ListGearValueFormatter(); + public static <E> BeanPropertyFormatter<E> newBeanFormatter(String propertyName, String defaultNullValue) { return new BeanPropertyFormatter<E>(propertyName, defaultNullValue); @@ -417,6 +421,20 @@ } } + protected static class ListGearValueFormatter implements ValueFormatter<List<Gear>> { + + @Override + public String format(List<Gear> value) { + List<String> decoratedValues = + Lists.transform(value, new Function<Gear, String>() { + @Override + public String apply(Gear input) { + return input.getLabel() + ' ' + input.getName(); + } + }); + return Joiner.on('|').join(decoratedValues); + } + } protected TuttiCsvUtil() { // no instance } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/AccidentalCatchExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/AccidentalCatchExportModel.java 2013-06-11 13:29:41 UTC (rev 1098) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/AccidentalCatchExportModel.java 2013-06-11 14:39:12 UTC (rev 1099) @@ -75,9 +75,9 @@ newColumnForExport("Serie", Cruise.PROPERTY_PROGRAM, Program.PROPERTY_NAME); newColumnForExport("Serie_Partielle", Cruise.PROPERTY_SURVEY_PART); newColumnForExport("Engin", FishingOperation.PROPERTY_GEAR, Gear.PROPERTY_NAME); - newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); newColumnForExport("Id_Operation", FishingOperation.PROPERTY_STATION_NUMBER); newColumnForExport("NumOrdre_Station", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); + newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); newColumnForExport("Navire", Cruise.PROPERTY_VESSEL, Vessel.PROPERTY_NAME); newColumnForExport("BatchId", AccidentalCatchExportRow.PROPERTY_BATCH_ID, TuttiCsvUtil.PRIMITIVE_INTEGER); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java 2013-06-11 13:29:41 UTC (rev 1098) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java 2013-06-11 14:39:12 UTC (rev 1099) @@ -66,9 +66,9 @@ newColumnForExport("Serie", Cruise.PROPERTY_PROGRAM, Program.PROPERTY_NAME); newColumnForExport("Serie_Partielle", Cruise.PROPERTY_SURVEY_PART); newColumnForExport("Engin", FishingOperation.PROPERTY_GEAR, Gear.PROPERTY_NAME); - newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); newColumnForExport("Id_Operation", FishingOperation.PROPERTY_STATION_NUMBER); newColumnForExport("NumOrdre_Station", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); + newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); newColumnForExport("Navire", Cruise.PROPERTY_VESSEL, Vessel.PROPERTY_NAME); newColumnForExport("Taxon", SpeciesBatch.PROPERTY_SPECIES + "." + Species.PROPERTY_REFERENCE_TAXON_ID, TuttiCsvUtil.INTEGER); @@ -168,7 +168,6 @@ speciesBatch.getSampleCategoryComputedWeight(), speciesBatch.getWeight(), speciesBatch.getNumber(), -// speciesBatch.getComputedNumber(), speciesBatch.getRankOrder()); if (speciesBatch.isChildBatchsEmpty()) { @@ -259,7 +258,6 @@ speciesBatch.getSampleCategoryComputedWeight(), speciesBatch.getWeight(), speciesBatch.getNumber(), -// speciesBatch.getComputedNumber(), speciesBatch.getRankOrder()); CatchExportRow row = currentRow.copy(); @@ -281,7 +279,6 @@ benthosBatch.getSampleCategoryComputedWeight(), benthosBatch.getWeight(), benthosBatch.getNumber(), -// benthosBatch.getComputedNumber(), benthosBatch.getRankOrder()); if (benthosBatch.isChildBatchsEmpty()) { @@ -372,7 +369,6 @@ benthosBatch.getSampleCategoryComputedWeight(), benthosBatch.getWeight(), benthosBatch.getNumber(), -// benthosBatch.getComputedNumber(), benthosBatch.getRankOrder()); CatchExportRow row = currentRow.copy(); @@ -396,9 +392,7 @@ Float sampleCategoryComputedWeight, Float batchWeight, Integer batchNumber, -// Integer batchComputedNumber, - Integer batchRankOrder - ) { + Integer batchRankOrder) { currentRow.setBatchNumber(batchNumber); ExportSampleCategory<Serializable> sampleCategory = @@ -411,7 +405,6 @@ sampleCategory.setSampleWeight(batchWeight); sampleCategory.setComputedWeight(sampleCategoryComputedWeight); -// sampleCategory.setComputedNumber(batchComputedNumber); sampleCategory.setWeightOrVolType(WEIGHT_OR_VOL_TYPE); sampleCategory.setRankOrder(batchRankOrder); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/IndividualObservationExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/IndividualObservationExportModel.java 2013-06-11 13:29:41 UTC (rev 1098) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/IndividualObservationExportModel.java 2013-06-11 14:39:12 UTC (rev 1099) @@ -75,9 +75,9 @@ newColumnForExport("Serie", Cruise.PROPERTY_PROGRAM, Program.PROPERTY_NAME); newColumnForExport("Serie_Partielle", Cruise.PROPERTY_SURVEY_PART); newColumnForExport("Engin", FishingOperation.PROPERTY_GEAR, Gear.PROPERTY_NAME); - newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); newColumnForExport("Id_Operation", FishingOperation.PROPERTY_STATION_NUMBER); newColumnForExport("NumOrdre_Station", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); + newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); newColumnForExport("Navire", Cruise.PROPERTY_VESSEL, Vessel.PROPERTY_NAME); newColumnForExport("BatchId", IndividualObservationExportRow.PROPERTY_BATCH_ID, TuttiCsvUtil.PRIMITIVE_INTEGER); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/MarineLitterExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/MarineLitterExportModel.java 2013-06-11 13:29:41 UTC (rev 1098) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/MarineLitterExportModel.java 2013-06-11 14:39:12 UTC (rev 1099) @@ -25,7 +25,6 @@ */ import fr.ifremer.tutti.persistence.entities.data.BatchContainer; -import fr.ifremer.tutti.persistence.entities.data.CatchBatch; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.MarineLitterBatch; @@ -53,9 +52,9 @@ newColumnForExport("Serie", Cruise.PROPERTY_PROGRAM, Program.PROPERTY_NAME); newColumnForExport("Serie_Partielle", Cruise.PROPERTY_SURVEY_PART); newColumnForExport("Engin", FishingOperation.PROPERTY_GEAR, Gear.PROPERTY_NAME); - newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); newColumnForExport("Id_Operation", FishingOperation.PROPERTY_STATION_NUMBER); newColumnForExport("NumOrdre_Station", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); + newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); newColumnForExport("Navire", Cruise.PROPERTY_VESSEL, Vessel.PROPERTY_NAME); newColumnForExport("MarineLitterCategory", MarineLitterBatch.PROPERTY_MARINE_LITTER_CATEGORY, TuttiCsvUtil.CARACTERISTIC_VALUE_FORMATTER); @@ -63,7 +62,6 @@ newColumnForExport("Number", MarineLitterBatch.PROPERTY_NUMBER, TuttiCsvUtil.INTEGER); newColumnForExport("Weight", MarineLitterBatch.PROPERTY_WEIGHT, TuttiCsvUtil.FLOAT); newColumnForExport("Comment", MarineLitterBatch.PROPERTY_COMMENT); - newColumnForExport("TotalWeight", MarineLitterExportRow.PROPERTY_TOTAL_WEIGHT, TuttiCsvUtil.FLOAT); } public void prepareRows(PersistenceService persistenceService, @@ -71,9 +69,6 @@ Cruise cruise, FishingOperation operation) { - CatchBatch catchBatch = - persistenceService.getCatchBatchFromFishingOperation(operation.getId()); - BatchContainer<MarineLitterBatch> rootMarineLitterBatch = persistenceService.getRootMarineLitterBatch(operation.getId()); @@ -84,7 +79,6 @@ row.setCruise(cruise); row.setFishingOperation(operation); row.setBatch(child); - row.setTotalWeight(catchBatch.getMarineLitterTotalWeight()); rows.add(row); } } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/MarineLitterExportRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/MarineLitterExportRow.java 2013-06-11 13:29:41 UTC (rev 1098) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/MarineLitterExportRow.java 2013-06-11 14:39:12 UTC (rev 1099) @@ -55,16 +55,6 @@ protected MarineLitterBatch batch; - protected Float totalWeight; - - public Float getTotalWeight() { - return totalWeight; - } - - public void setTotalWeight(Float totalWeight) { - this.totalWeight = totalWeight; - } - public void setCruise(Cruise cruise) { this.cruise = cruise; } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportModel.java 2013-06-11 13:29:41 UTC (rev 1098) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportModel.java 2013-06-11 14:39:12 UTC (rev 1099) @@ -24,6 +24,7 @@ * #L% */ +import fr.ifremer.tutti.persistence.entities.data.CatchBatch; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.Program; @@ -63,6 +64,7 @@ newColumnForExport("Serie_Partielle", Cruise.PROPERTY_SURVEY_PART); newColumnForExport("Id_Operation", FishingOperation.PROPERTY_STATION_NUMBER); newColumnForExport("NumOrdre_Station", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); + newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); newColumnForExport("Engin", FishingOperation.PROPERTY_GEAR, Gear.PROPERTY_NAME); newColumnForExport("Navire", FishingOperation.PROPERTY_VESSEL, Vessel.PROPERTY_NAME); @@ -82,22 +84,74 @@ 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("Saisisseur", FishingOperation.PROPERTY_RECORDER_PERSON, TuttiCsvUtil.LIST_PERSON_FORMATTER); newColumnForExport("Commentaire", FishingOperation.PROPERTY_COMMENT); + + newColumnForExport("Poids_Total", OperationExportRow.PROPERTY_CATCH_TOTAL_WEIGHT, TuttiCsvUtil.FLOAT); + newColumnForExport("Poids_Total_Calcule", OperationExportRow.PROPERTY_CATCH_TOTAL_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); + + newColumnForExport("Poids_Total_Vrac", OperationExportRow.PROPERTY_CATCH_TOTAL_SORTED_WEIGHT, TuttiCsvUtil.FLOAT); + newColumnForExport("Poids_Total_Vrac_Calcule", OperationExportRow.PROPERTY_CATCH_TOTAL_SORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); + + newColumnForExport("Poids_Total_HorsVrac", OperationExportRow.PROPERTY_CATCH_TOTAL_UNSORTED_WEIGHT, TuttiCsvUtil.FLOAT); + newColumnForExport("Poids_Total_HorsVrac_Calcule", OperationExportRow.PROPERTY_CATCH_TOTAL_UNSORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); + + newColumnForExport("Poids_Total_Non_Trie", OperationExportRow.PROPERTY_CATCH_TOTAL_REJECTED_WEIGHT, TuttiCsvUtil.FLOAT); + newColumnForExport("Poids_Total_Non_Trie_Calcule", OperationExportRow.PROPERTY_CATCH_TOTAL_REJECTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); + + newColumnForExport("Poids_Total_Espece", OperationExportRow.PROPERTY_SPECIES_TOTAL_WEIGHT, TuttiCsvUtil.FLOAT); + newColumnForExport("Poids_Total_Espece_Calcule", OperationExportRow.PROPERTY_SPECIES_TOTAL_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); + + newColumnForExport("Poids_Total_Espece_Vrac", OperationExportRow.PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT, TuttiCsvUtil.FLOAT); + newColumnForExport("Poids_Total_Espece_Vrac_Calcule", OperationExportRow.PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); + + newColumnForExport("Poids_Total_Espece_Vrac_Trie", OperationExportRow.PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_WEIGHT, TuttiCsvUtil.FLOAT); + newColumnForExport("Poids_Total_Espece_Vrac_Trie_Calcule", OperationExportRow.PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); + + newColumnForExport("Poids_Total_Espece_HorsVrac", OperationExportRow.PROPERTY_SPECIES_TOTAL_UNSORTED_WEIGHT, TuttiCsvUtil.FLOAT); + newColumnForExport("Poids_Total_Espece_HorsVrac_Calcule", OperationExportRow.PROPERTY_SPECIES_TOTAL_UNSORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); + + newColumnForExport("Poids_Total_Espece_Inerte_Trie", OperationExportRow.PROPERTY_SPECIES_TOTAL_INERT_WEIGHT, TuttiCsvUtil.FLOAT); + newColumnForExport("Poids_Total_Espece_Inerte_Trie_Calcule", OperationExportRow.PROPERTY_SPECIES_TOTAL_INERT_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); + + newColumnForExport("Poids_Total_Espece_Vivant_non_detaille_trie", OperationExportRow.PROPERTY_SPECIES_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT, TuttiCsvUtil.FLOAT); + newColumnForExport("Poids_Total_Espece_Vivant_non_detaille_trie_Calcule", OperationExportRow.PROPERTY_SPECIES_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); + + newColumnForExport("Poids_Total_Benthos", OperationExportRow.PROPERTY_BENTHOS_TOTAL_WEIGHT, TuttiCsvUtil.FLOAT); + newColumnForExport("Poids_Total_Benthos_Calcule", OperationExportRow.PROPERTY_BENTHOS_TOTAL_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); + + newColumnForExport("Poids_Total_Benthos_Vrac", OperationExportRow.PROPERTY_BENTHOS_TOTAL_SORTED_WEIGHT, TuttiCsvUtil.FLOAT); + newColumnForExport("Poids_Total_Benthos_Vrac_Calcule", OperationExportRow.PROPERTY_BENTHOS_TOTAL_SORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); + + newColumnForExport("Poids_Total_Benthos_Vrac_Trie", OperationExportRow.PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_WEIGHT, TuttiCsvUtil.FLOAT); + newColumnForExport("Poids_Total_Benthos_Vrac_Trie_Calcule", OperationExportRow.PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); + + newColumnForExport("Poids_Total_Benthos_HorsVrac", OperationExportRow.PROPERTY_BENTHOS_TOTAL_UNSORTED_WEIGHT, TuttiCsvUtil.FLOAT); + newColumnForExport("Poids_Total_Benthos_HorsVrac_Calcule", OperationExportRow.PROPERTY_BENTHOS_TOTAL_UNSORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); + + newColumnForExport("Poids_Total_Benthos_Inerte_Trie", OperationExportRow.PROPERTY_BENTHOS_TOTAL_INERT_WEIGHT, TuttiCsvUtil.FLOAT); + newColumnForExport("Poids_Total_Benthos_Inerte_Trie_Calcule", OperationExportRow.PROPERTY_BENTHOS_TOTAL_INERT_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); + + newColumnForExport("Poids_Total_Benthos_Vivant_non_detaille_trie", OperationExportRow.PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT, TuttiCsvUtil.FLOAT); + newColumnForExport("Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule", OperationExportRow.PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); + + newColumnForExport("Poids_Total_Macro_Dechet", OperationExportRow.PROPERTY_MARINE_LITTER_TOTAL_WEIGHT, TuttiCsvUtil.FLOAT); + newColumnForExport("Poids_Total_Macro_Dechet_Calcule", OperationExportRow.PROPERTY_MARINE_LITTER_TOTAL_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); } public void prepareRows(List<OperationExportRow> rows, Cruise cruise, - List<FishingOperation> operations) { + FishingOperation operation, + CatchBatch catchBatch) { - for (FishingOperation operation : operations) { + OperationExportRow row = new OperationExportRow( + verticalOpeningCaracteristic, + horizontalOpeningWingCaracteristic, + horizontalOpeningDoorCaracteristic); + row.setCruise(cruise); + row.setFishingOperation(operation); + row.setCatchBatch(catchBatch); + rows.add(row); - OperationExportRow row = new OperationExportRow( - verticalOpeningCaracteristic, - horizontalOpeningWingCaracteristic, - horizontalOpeningDoorCaracteristic); - row.setCruise(cruise); - row.setFishingOperation(operation); - rows.add(row); - } } } \ No newline at end of file Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportRow.java 2013-06-11 13:29:41 UTC (rev 1098) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportRow.java 2013-06-11 14:39:12 UTC (rev 1099) @@ -26,16 +26,19 @@ import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.TuttiEntities; +import fr.ifremer.tutti.persistence.entities.data.CatchBatch; 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.Person; import fr.ifremer.tutti.persistence.entities.referential.TuttiLocation; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import java.io.Serializable; import java.util.Date; +import java.util.List; /** * A row in a operation export. @@ -53,13 +56,91 @@ 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"; + + public static final String PROPERTY_CATCH_TOTAL_SORTED_TREMIS_WEIGHT = "catchTotalSortedTremisWeight"; + + public static final String PROPERTY_CATCH_TOTAL_SORTED_TREMIS_WEIGHT_COMPUTED = "catchTotalSortedTremisWeightComputed"; + + public static final String PROPERTY_CATCH_TOTAL_SORTED_CAROUSSEL_WEIGHT = "catchTotalSortedCarousselWeight"; + + public static final String PROPERTY_CATCH_TOTAL_SORTED_CAROUSSEL_WEIGHT_COMPUTED = "catchTotalSortedCarousselWeightComputed"; + + public static final String PROPERTY_CATCH_TOTAL_SORTED_WEIGHT = "catchTotalSortedWeight"; + + public static final String PROPERTY_CATCH_TOTAL_SORTED_WEIGHT_COMPUTED = "catchTotalSortedWeightComputed"; + + public static final String PROPERTY_CATCH_TOTAL_UNSORTED_WEIGHT = "catchTotalUnsortedWeight"; + + public static final String PROPERTY_CATCH_TOTAL_UNSORTED_WEIGHT_COMPUTED = "catchTotalUnsortedWeightComputed"; + + public static final String PROPERTY_CATCH_TOTAL_REJECTED_WEIGHT = "catchTotalRejectedWeight"; + + public static final String PROPERTY_CATCH_TOTAL_REJECTED_WEIGHT_COMPUTED = "catchTotalRejectedWeightComputed"; + + + public static final String PROPERTY_SPECIES_TOTAL_WEIGHT = "speciesTotalWeight"; + + public static final String PROPERTY_SPECIES_TOTAL_WEIGHT_COMPUTED = "speciesTotalWeightComputed"; + + public static final String PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT = "speciesTotalSortedWeight"; + + public static final String PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT_COMPUTED = "speciesTotalSortedWeightComputed"; + + public static final String PROPERTY_SPECIES_TOTAL_UNSORTED_WEIGHT = "speciesTotalUnsortedWeight"; + + public static final String PROPERTY_SPECIES_TOTAL_UNSORTED_WEIGHT_COMPUTED = "speciesTotalUnsortedWeightComputed"; + + public static final String PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_WEIGHT = "speciesTotalSampleSortedWeight"; + + public static final String PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_WEIGHT_COMPUTED = "speciesTotalSampleSortedWeightComputed"; + + public static final String PROPERTY_SPECIES_TOTAL_INERT_WEIGHT = "speciesTotalInertWeight"; + + public static final String PROPERTY_SPECIES_TOTAL_INERT_WEIGHT_COMPUTED = "speciesTotalInertWeightComputed"; + + public static final String PROPERTY_SPECIES_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT = "speciesTotalLivingNotItemizedWeight"; + + public static final String PROPERTY_SPECIES_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT_COMPUTED = "speciesTotalLivingNotItemizedWeightComputed"; + + public static final String PROPERTY_BENTHOS_TOTAL_WEIGHT = "benthosTotalWeight"; + + public static final String PROPERTY_BENTHOS_TOTAL_WEIGHT_COMPUTED = "benthosTotalWeightComputed"; + + public static final String PROPERTY_BENTHOS_TOTAL_SORTED_WEIGHT = "benthosTotalSortedWeight"; + + public static final String PROPERTY_BENTHOS_TOTAL_SORTED_WEIGHT_COMPUTED = "benthosTotalSortedWeightComputed"; + + public static final String PROPERTY_BENTHOS_TOTAL_UNSORTED_WEIGHT = "benthosTotalUnsortedWeight"; + + public static final String PROPERTY_BENTHOS_TOTAL_UNSORTED_WEIGHT_COMPUTED = "benthosTotalUnsortedWeightComputed"; + + public static final String PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_WEIGHT = "benthosTotalSampleSortedWeight"; + + public static final String PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_WEIGHT_COMPUTED = "benthosTotalSampleSortedWeightComputed"; + + public static final String PROPERTY_BENTHOS_TOTAL_INERT_WEIGHT = "benthosTotalInertWeight"; + + public static final String PROPERTY_BENTHOS_TOTAL_INERT_WEIGHT_COMPUTED = "benthosTotalInertWeightComputed"; + + public static final String PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT = "benthosTotalLivingNotItemizedWeight"; + + public static final String PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT_COMPUTED = "benthosTotalLivingNotItemizedWeightComputed"; + + public static final String PROPERTY_MARINE_LITTER_TOTAL_WEIGHT = "marineLitterTotalWeight"; + + public static final String PROPERTY_MARINE_LITTER_TOTAL_WEIGHT_COMPUTED = "marineLitterTotalWeightComputed"; + private static final long serialVersionUID = 1L; protected Cruise cruise; protected FishingOperation fishingOperation; + protected CatchBatch catchBatch; + private Caracteristic verticalOpeningCaracteristic; private Caracteristic horizontalOpeningWingCaracteristic; @@ -83,6 +164,10 @@ this.fishingOperation = fishingOperation; } + public void setCatchBatch(CatchBatch catchBatch) { + this.catchBatch = catchBatch; + } + public Date getBeginDate() { return cruise.getBeginDate(); } @@ -103,6 +188,10 @@ return fishingOperation.getFishingOperationNumber(); } + public String getMultirigAggregation() { + return fishingOperation.getMultirigAggregation(); + } + public Gear getGear() { return fishingOperation.getGear(); } @@ -163,6 +252,10 @@ return fishingOperation.getComment(); } + public List<Person> getRecorderPerson() { + return fishingOperation.getRecorderPerson(); + } + public String getDuration() { return TuttiEntities.getDuration( getGearShootingStartDate(), @@ -185,6 +278,173 @@ return result; } + public Float getCatchTotalWeight() { + return getValueOrComputedValue(catchBatch.getCatchTotalWeight(), catchBatch.getCatchTotalComputedWeight()); + } + + public Boolean getCatchTotalWeightComputed() { + return getValueOrComputedValueComputed(catchBatch.getCatchTotalWeight(), catchBatch.getCatchTotalComputedWeight()); + } + + public Float getCatchTotalSortedTremisWeight() { + return getValueOrComputedValue(catchBatch.getCatchTotalSortedTremisWeight(), null); + } + + public Boolean getCatchTotalSortedTremisWeightComputed() { + return getValueOrComputedValueComputed(catchBatch.getCatchTotalSortedTremisWeight(), null); + } + + public Float getCatchTotalSortedCarousselWeight() { + return getValueOrComputedValue(catchBatch.getCatchTotalSortedCarousselWeight(), null); + } + + public Boolean getCatchTotalSortedCarousselWeightComputed() { + return getValueOrComputedValueComputed(catchBatch.getCatchTotalSortedCarousselWeight(), null); + } + + public Float getCatchTotalSortedWeight() { + return getValueOrComputedValue(null, catchBatch.getCatchTotalSortedComputedWeight()); + } + + public Boolean getCatchTotalSortedWeightComputed() { + return getValueOrComputedValueComputed(null, catchBatch.getCatchTotalSortedComputedWeight()); + } + + public Float getCatchTotalUnsortedWeight() { + return getValueOrComputedValue(null, catchBatch.getCatchTotalUnsortedComputedWeight()); + } + + public Boolean getCatchTotalUnsortedWeightComputed() { + return getValueOrComputedValueComputed(null, catchBatch.getCatchTotalUnsortedComputedWeight()); + } + + public Float getCatchTotalRejectedWeight() { + return getValueOrComputedValue(catchBatch.getCatchTotalRejectedWeight(), catchBatch.getCatchTotalRejectedComputedWeight()); + } + + public Boolean getCatchTotalRejectedWeightComputed() { + return getValueOrComputedValueComputed(catchBatch.getCatchTotalRejectedWeight(), catchBatch.getCatchTotalRejectedComputedWeight()); + } + + public Float getSpeciesTotalWeight() { + return getValueOrComputedValue(null, catchBatch.getSpeciesTotalComputedWeight()); + } + + public Boolean getSpeciesTotalWeightComputed() { + return getValueOrComputedValueComputed(null, catchBatch.getSpeciesTotalComputedWeight()); + } + + public Float getSpeciesTotalSortedWeight() { + return getValueOrComputedValue(catchBatch.getSpeciesTotalSortedWeight(), catchBatch.getSpeciesTotalSortedComputedWeight()); + } + + public Boolean getSpeciesTotalSortedWeightComputed() { + return getValueOrComputedValueComputed(catchBatch.getSpeciesTotalSortedWeight(), catchBatch.getSpeciesTotalSortedComputedWeight()); + } + + public Float getSpeciesTotalUnsortedWeight() { + return getValueOrComputedValue(null, catchBatch.getSpeciesTotalUnsortedComputedWeight()); + } + + public Boolean getSpeciesTotalUnsortedWeightComputed() { + return getValueOrComputedValueComputed(null, catchBatch.getSpeciesTotalUnsortedComputedWeight()); + } + + public Float getSpeciesTotalSampleSortedWeight() { + return getValueOrComputedValue(null, catchBatch.getSpeciesTotalSampleSortedComputedWeight()); + } + + public Boolean getSpeciesTotalSampleSortedWeightComputed() { + return getValueOrComputedValueComputed(null, catchBatch.getSpeciesTotalSampleSortedComputedWeight()); + } + + public Float getSpeciesTotalInertWeight() { + return getValueOrComputedValue(catchBatch.getSpeciesTotalInertWeight(), catchBatch.getSpeciesTotalInertComputedWeight()); + } + + public Boolean getSpeciesTotalInertWeightComputed() { + return getValueOrComputedValueComputed(catchBatch.getSpeciesTotalInertWeight(), catchBatch.getSpeciesTotalInertComputedWeight()); + } + + public Float getSpeciesTotalLivingNotItemizedWeight() { + return getValueOrComputedValue(catchBatch.getSpeciesTotalLivingNotItemizedWeight(), catchBatch.getSpeciesTotalLivingNotItemizedComputedWeight()); + } + + public Boolean getSpeciesTotalLivingNotItemizedWeightComputed() { + return getValueOrComputedValueComputed(catchBatch.getSpeciesTotalLivingNotItemizedWeight(), catchBatch.getSpeciesTotalLivingNotItemizedComputedWeight()); + } + + public Float getBenthosTotalWeight() { + return getValueOrComputedValue(null, catchBatch.getBenthosTotalComputedWeight()); + } + + public Boolean getBenthosTotalWeightComputed() { + return getValueOrComputedValueComputed(null, catchBatch.getBenthosTotalComputedWeight()); + } + + public Float getBenthosTotalSortedWeight() { + return getValueOrComputedValue(catchBatch.getBenthosTotalSortedWeight(), catchBatch.getBenthosTotalSortedComputedWeight()); + } + + public Boolean getBenthosTotalSortedWeightComputed() { + return getValueOrComputedValueComputed(catchBatch.getBenthosTotalSortedWeight(), catchBatch.getBenthosTotalSortedComputedWeight()); + } + + public Float getBenthosTotalUnsortedWeight() { + return getValueOrComputedValue(null, catchBatch.getBenthosTotalUnsortedComputedWeight()); + } + + public Boolean getBenthosTotalUnsortedWeightComputed() { + return getValueOrComputedValueComputed(null, catchBatch.getBenthosTotalUnsortedComputedWeight()); + } + + public Float getBenthosTotalSampleSortedWeight() { + return getValueOrComputedValue(null, catchBatch.getBenthosTotalSampleSortedComputedWeight()); + } + + public Boolean getBenthosTotalSampleSortedWeightComputed() { + return getValueOrComputedValueComputed(null, catchBatch.getBenthosTotalSampleSortedComputedWeight()); + } + + public Float getBenthosTotalInertWeight() { + return getValueOrComputedValue(catchBatch.getBenthosTotalInertWeight(), catchBatch.getBenthosTotalInertComputedWeight()); + } + + public Boolean getBenthosTotalInertWeightComputed() { + return getValueOrComputedValueComputed(catchBatch.getBenthosTotalInertWeight(), catchBatch.getBenthosTotalInertComputedWeight()); + } + + public Float getBenthosTotalLivingNotItemizedWeight() { + return getValueOrComputedValue(catchBatch.getBenthosTotalLivingNotItemizedWeight(), catchBatch.getBenthosTotalLivingNotItemizedComputedWeight()); + } + + public Boolean getBenthosTotalLivingNotItemizedWeightComputed() { + return getValueOrComputedValueComputed(catchBatch.getBenthosTotalLivingNotItemizedWeight(), catchBatch.getBenthosTotalLivingNotItemizedComputedWeight()); + } + + public Float getMarineLitterTotalWeight() { + return getValueOrComputedValue(catchBatch.getMarineLitterTotalWeight(), catchBatch.getMarineLitterTotalComputedWeight()); + } + + public Boolean getMarineLitterTotalWeightComputed() { + return getValueOrComputedValueComputed(catchBatch.getMarineLitterTotalWeight(), catchBatch.getMarineLitterTotalComputedWeight()); + } + + protected Float getValueOrComputedValue(Float value, Float computedValue) { + return value == null ? computedValue : value; + } + + protected Boolean getValueOrComputedValueComputed(Float value, Float computedValue) { + Boolean result; + if (value == null) { + + result = computedValue == null ? null : true; + } else { + result = true; + } + return result; + } + protected Serializable getGearUseFeature(Caracteristic caracteristic) { CaracteristicMap gearUseFeatures = fishingOperation.getGearUseFeatures(); Serializable serializable = gearUseFeatures == null ? null : gearUseFeatures.get(caracteristic); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ParameterExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ParameterExportModel.java 2013-06-11 13:29:41 UTC (rev 1098) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ParameterExportModel.java 2013-06-11 14:39:12 UTC (rev 1099) @@ -52,6 +52,7 @@ newColumnForExport("Serie_Partielle", Cruise.PROPERTY_SURVEY_PART); newColumnForExport("Id_Operation", FishingOperation.PROPERTY_STATION_NUMBER); newColumnForExport("NumOrdre_Station", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); + newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); newColumnForExport("Code_PMFM", ParameterExportRow.PROPERTY_CARACTERISTIC, Caracteristic.PROPERTY_ID); newColumnForExportByDecorator("Libelle_PMFm", ParameterExportRow.PROPERTY_CARACTERISTIC, decoratorService.getDecoratorByType(Caracteristic.class)); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ParameterExportRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ParameterExportRow.java 2013-06-11 13:29:41 UTC (rev 1098) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ParameterExportRow.java 2013-06-11 14:39:12 UTC (rev 1099) @@ -91,6 +91,10 @@ return fishingOperation.getFishingOperationNumber(); } + public String getMultirigAggregation() { + return fishingOperation.getMultirigAggregation(); + } + public Caracteristic getCaracteristic() { return caracteristic; } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SurveyExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SurveyExportModel.java 2013-06-11 13:29:41 UTC (rev 1098) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SurveyExportModel.java 2013-06-11 14:39:12 UTC (rev 1099) @@ -50,10 +50,12 @@ newColumnForExport("Pays", SurveyExportRow.PROPERTY_COUNTRY); newColumnForExport("Zone_Etude", Program.PROPERTY_ZONE, TuttiLocation.PROPERTY_NAME); newColumnForExport("Id_Sismer", Cruise.PROPERTY_NAME); + newColumnForExport("Nombre_de_poche", Cruise.PROPERTY_MULTIRIG_NUMBER, TuttiCsvUtil.PRIMITIVE_INTEGER); newColumnForExport("Date_Deb_Campagne", Cruise.PROPERTY_BEGIN_DATE, TuttiCsvUtil.DAY_TIME_SECOND); newColumnForExport("Port_Deb_Campagne", Cruise.PROPERTY_DEPARTURE_LOCATION, TuttiLocation.PROPERTY_NAME); newColumnForExport("Date_Fin_Campagne", Cruise.PROPERTY_END_DATE, TuttiCsvUtil.DAY_TIME_SECOND); newColumnForExport("Port_Fin_Campagne", Cruise.PROPERTY_RETURN_LOCATION, TuttiLocation.PROPERTY_NAME); + newColumnForExport("Engin", Cruise.PROPERTY_GEAR, TuttiCsvUtil.LIST_GEAR_FORMATTER); newColumnForExport("Chef_Mission", Cruise.PROPERTY_HEAD_OF_MISSION, TuttiCsvUtil.LIST_PERSON_FORMATTER); newColumnForExport("Resp_Salle_Tri", Cruise.PROPERTY_HEAD_OF_SORT_ROOM, TuttiCsvUtil.LIST_PERSON_FORMATTER); newColumnForExport("Commentaire", Cruise.PROPERTY_COMMENT); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SurveyExportRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SurveyExportRow.java 2013-06-11 13:29:41 UTC (rev 1098) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SurveyExportRow.java 2013-06-11 14:39:12 UTC (rev 1099) @@ -26,6 +26,7 @@ import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.Program; +import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.TuttiLocation; import fr.ifremer.tutti.persistence.entities.referential.Vessel; @@ -83,10 +84,13 @@ } public String getName() { - //FIXME return cruise.getName(); } + public List<Gear> getGear() { + return cruise.getGear(); + } + public TuttiLocation getDepartureLocation() { return cruise.getDepartureLocation(); } @@ -110,4 +114,8 @@ public List<Person> getHeadOfSortRoom() { return cruise.getHeadOfSortRoom(); } + + public Integer getMultirigNumber() { + return cruise.getMultirigNumber(); + } } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 2013-06-11 13:29:41 UTC (rev 1098) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 2013-06-11 14:39:12 UTC (rev 1099) @@ -28,7 +28,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import com.google.common.io.Files; import fr.ifremer.tutti.TuttiBusinessException; import fr.ifremer.tutti.TuttiIOUtil; @@ -69,7 +68,6 @@ import java.util.Comparator; import java.util.List; import java.util.Map; -import java.util.Set; import static org.nuiton.i18n.I18n._; @@ -387,7 +385,17 @@ try { List<OperationExportRow> rows = Lists.newArrayList(); - exportContext.operationModel.prepareRows(rows, cruise, operations); + + for (FishingOperation operation : operations) { + + OperationContext operationContext = getOperationContext(operation); + CatchBatch catchBatch = operationContext.getCatchBatch(); + exportContext.operationModel.prepareRows(rows, + cruise, + operation, + catchBatch); + } + exportContext.operationExport.write(rows, exportContext.operationWriter); } catch (Exception e) { throw new TuttiTechnicalException(_("tutti.service.export.operations.error"), e); @@ -418,7 +426,9 @@ try { for (FishingOperation operation : operations) { - boolean withCatchBatch = withCatch(operation); + OperationContext operationContext = getOperationContext(operation); + + boolean withCatchBatch = operationContext.isWithCatchBatch(); if (!withCatchBatch) { continue; } @@ -439,7 +449,9 @@ try { for (FishingOperation operation : operations) { - boolean withCatchBatch = withCatch(operation); + OperationContext operationContext = getOperationContext(operation); + + boolean withCatchBatch = operationContext.isWithCatchBatch(); if (!withCatchBatch) { continue; } @@ -482,30 +494,21 @@ for (FishingOperation operation : operations) { - boolean withCatchBatch = withCatch(operation); + OperationContext operationContext = getOperationContext(operation); + + boolean withCatchBatch = operationContext.isWithCatchBatch(); if (!withCatchBatch) { continue; } - String operationId = operation.getId(); - CatchBatch catchBatch = - persistenceService.getCatchBatchFromFishingOperation( - operationId); + CatchBatch catchBatch = operationContext.getCatchBatch(); + BatchContainer<SpeciesBatch> rootSpeciesBatch = - tuttiWeightComputingService.getComputedSpeciesBatches(operation); + operationContext.getRootSpeciesBatch(); BatchContainer<BenthosBatch> rootBenthosBatch = - tuttiWeightComputingService.getComputedBenthosBatches(operation); + operationContext.getRootBenthosBatch(); - BatchContainer<MarineLitterBatch> rootMarineLitterBatch = - tuttiWeightComputingService.getComputedMarineLitterBatches(operation, catchBatch.getMarineLitterTotalWeight()); - - tuttiWeightComputingService.computeCatchBatchWeights( - catchBatch, - rootSpeciesBatch, - rootBenthosBatch, - rootMarineLitterBatch); - exportContext.speciesModel.prepareBatchRows( exportContext, rootSpeciesBatch, @@ -780,4 +783,105 @@ } } + protected static class OperationContext { + + protected final FishingOperation operation; + + private final CatchBatch catchBatch; + + private final BatchContainer<MarineLitterBatch> rootMarineLitterBatch; + + private final BatchContainer<SpeciesBatch> rootSpeciesBatch; + + private final BatchContainer<BenthosBatch> rootBenthosBatch; + + protected boolean withCatchBatch; + + public OperationContext(FishingOperation operation, + PersistenceService persistenceService, + TuttiWeightComputingService tuttiWeightComputingService) { + this.operation = operation; + + String operationId = operation.getId(); + + withCatchBatch = + persistenceService.isFishingOperationWithCatchBatch( + operationId); + + if (withCatchBatch) { + + + // load batches + + catchBatch = + persistenceService.getCatchBatchFromFishingOperation( + operationId); + + rootSpeciesBatch = + tuttiWeightComputingService.getComputedSpeciesBatches(operation); + + rootBenthosBatch = + tuttiWeightComputingService.getComputedBenthosBatches(operation); + + rootMarineLitterBatch = + tuttiWeightComputingService.getComputedMarineLitterBatches(operation, catchBatch.getMarineLitterTotalWeight()); + + // apply compute weights + + tuttiWeightComputingService.computeCatchBatchWeights( + catchBatch, + rootSpeciesBatch, + rootBenthosBatch, + rootMarineLitterBatch); + } else { + if (log.isWarnEnabled()) { + log.warn("Skip fishing operation " + operationId + + " since no catchBatch associated."); + } + catchBatch = null; + rootSpeciesBatch = null; + rootBenthosBatch = null; + rootMarineLitterBatch = null; + } + + } + + public CatchBatch getCatchBatch() { + return catchBatch; + } + + public BatchContainer<MarineLitterBatch> getRootMarineLitterBatch() { + return rootMarineLitterBatch; + } + + public BatchContainer<SpeciesBatch> getRootSpeciesBatch() { + return rootSpeciesBatch; + } + + public BatchContainer<BenthosBatch> getRootBenthosBatch() { + return rootBenthosBatch; + } + + public boolean isWithCatchBatch() { + return withCatchBatch; + } + } + + protected Map<String, OperationContext> operationContexts = Maps.newTreeMap(); + + protected OperationContext getOperationContext(FishingOperation operation) { + String operationId = operation.getId(); + + OperationContext result = operationContexts.get(operationId); + if (result == null) { + + // create it + result = new OperationContext(operation, + persistenceService, + tuttiWeightComputingService); + operationContexts.put(operationId, result); + } + return result; + + } } Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java 2013-06-11 13:29:41 UTC (rev 1098) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java 2013-06-11 14:39:12 UTC (rev 1099) @@ -77,59 +77,59 @@ public static final String OPERATION_2_ID = "100107"; public static final String SURVEY_CONTENT = - "Annee;Serie;Serie_Partielle;Navire;Pays;Zone_Etude;Id_Sismer;Date_Deb_Campagne;Port_Deb_Campagne;Date_Fin_Campagne;Port_Fin_Campagne;Chef_Mission;Resp_Salle_Tri;Commentaire\n" + - "2013;Campagne CGFS;;GWEN DREZ;FRA;CGFS - Manche Est / Sud Mer du Nord;Campagne CGFS_2013;01/05/2013 00:00:00;La Barbotière (Gujan-Mestras);31/05/2013 00:00:00;Etang de Palo;Vincent AURECHE;;;"; + "Annee;Serie;Serie_Partielle;Navire;Pays;Zone_Etude;Id_Sismer;Nombre_de_poche;Date_Deb_Campagne;Port_Deb_Campagne;Date_Fin_Campagne;Port_Fin_Campagne;Engin;Chef_Mission;Resp_Salle_Tri;Commentaire\n" + + "2013;Campagne CGFS;;GWEN DREZ;FRA;CGFS - Manche Est / Sud Mer du Nord;Campagne CGFS_2013;1;01/05/2013 00:00:00;La Barbotière (Gujan-Mestras);31/05/2013 00:00:00;Etang de Palo;GOV1925 GOV 19.7/25.9;Vincent AURECHE;;;"; public static final String OPERATION_CONTENT = - "Annee;Serie;Serie_Partielle;Id_Operation;NumOrdre_Station;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;Commentaire\n" + - "2013;Campagne CGFS;;A;1;GOV 19.7/25.9;GWEN DREZ;01/05/2013 00:00:00;;;01/05/2013 00:23:00;;;23;Strate 1D;NA;Localité 1D2;?;N;;NA;NA;NA;op1;\n" + - "2013;Campagne CGFS;;A;2;GOV 19.7/25.9;GWEN DREZ;11/05/2013 08:00:00;;;11/05/2013 08:23:00;;;23;Strate 1D;NA;Localité 1D2;?;N;;NA;NA;NA;OP2;"; + "Annee;Serie;Serie_Partielle;Id_Operation;NumOrdre_Station;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;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_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;GWEN DREZ;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;GWEN DREZ;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;Id_Operation;NumOrdre_Station;Code_PMFM;Libelle_PMFm;Valeur\n" + - "2013;Campagne CGFS;;A;1;1164;Catégorie UE - produit/lot - totale - Diffusion par une Halle à marée;Cat UE10;\n" + - "2013;Campagne CGFS;;A;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;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" + - "2013;Campagne CGFS;;A;1;821;Direction vent - air - totale - Instrument de bord;0.1;\n" + - "2013;Campagne CGFS;;A;1;149;Coût de la glace - navire - totale - Déclaration d'un professionnel;10.0;\n" + - "2013;Campagne CGFS;;A;2;1062;Catégorie de fraicheur - produit/lot - totale - Diffusion par une Halle à marée;A - Catégorie A;\n" + - "2013;Campagne CGFS;;A;2;308;Nombre d'engin - engin - totale - Déclaration d'un professionnel;2.0;"; + "Annee;Serie;Serie_Partielle;Id_Operation;NumOrdre_Station;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" + + "2013;Campagne CGFS;;A;1;1;821;Direction vent - air - totale - Instrument de bord;0.1;\n" + + "2013;Campagne CGFS;;A;1;1;149;Coût de la glace - navire - totale - Déclaration d'un professionnel;10.0;\n" + + "2013;Campagne CGFS;;A;2;1;1062;Catégorie de fraicheur - produit/lot - totale - Diffusion par une Halle à marée;A - Catégorie A;\n" + + "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;Poche;Id_Operation;NumOrdre_Station;Navire;Taxon;VracHorsVrac;Num_Ordre_VracHorsVrac_H2;Tot_VracHorsVrac;Ech_VracHorsVrac;Type_Volume_Poids_VracHorsVrac;Unite_Volume_Poids_VracHorsVrac;Cat_Tri;Num_Ordre_Cat_Tri_H2;Tot_Cat_Tri;Ech_Cat_Tri;Type_Volume_Poids_Cat_Tri;Unite_Volume_Poids_Cat_Tri;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Maturite;Num_Ordre_Maturite_H2;Tot_Maturite;Ech_Maturite;Type_Volume_Poids_Maturite;Unite_Volume_Poids_Maturite;Age;Num_Ordre_Age_H2;Tot_Age;Ech_Age;Type_Volume_Poids_Age;Unite_Volume_Poids_Age;Code_Longueur;Taille;NumOrdre_Taille_H2;Poids_Classe_Taille;Unite_Taille;Precision_Mesure;Nbr;Poids_Reference;Coef_Final_Elevation\n" + - "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;11242;Vrac;1;100.0;;Poids;;G - Gros;1;80.0;;Poids;;Mâle;1;30.0;;Poids;;1 - Stade 1;1;10.0;5.0;Poids;;NA;;;;;;307;10.0;1;;cm;0.5;5;5.0;500.0;\n" + - "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;11242;Vrac;1;100.0;;Poids;;G - Gros;1;80.0;;Poids;;Mâle;1;30.0;;Poids;;1 - Stade 1;1;10.0;5.0;Poids;;NA;;;;;;307;10.5;2;;cm;0.5;2;5.0;500.0;\n" + - "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;11242;Vrac;1;100.0;;Poids;;G - Gros;1;80.0;;Poids;;Mâle;1;30.0;;Poids;;1 - Stade 1;1;10.0;5.0;Poids;;NA;;;;;;307;11.0;3;;cm;0.5;1;5.0;500.0;\n" + - "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;11242;Vrac;1;100.0;;Poids;;G - Gros;1;80.0;;Poids;;Mâle;1;30.0;;Poids;;3 - Stade 3;3;10.0;;Poids;;NA;;;;;;307;11.0;1;;cm;0.5;5;10.0;1000.0;\n" + - "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;11242;Vrac;1;100.0;;Poids;;G - Gros;1;80.0;;Poids;;Femelle;2;50.0;30.0;Poids;;3 - Stade 3;3;10.0;;Poids;;NA;;;;;;1425;10.0;1;;cm;;5;30.0;3000.0;\n" + - "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;11242;Vrac;1;100.0;;Poids;;G - Gros;1;80.0;;Poids;;Femelle;2;50.0;30.0;Poids;;3 - Stade 3;3;10.0;;Poids;;NA;;;;;;1425;11.0;2;;cm;;6;30.0;3000.0;\n" + - "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;11242;Vrac;1;100.0;;Poids;;G - Gros;1;80.0;;Poids;;Femelle;2;50.0;30.0;Poids;;3 - Stade 3;3;10.0;;Poids;;NA;;;;;;1425;12.0;3;;cm;;7;30.0;3000.0;\n" + - "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;11242;Vrac;1;100.0;;Poids;;M - Moyen;2;20.0;;Poids;;Femelle;2;50.0;30.0;Poids;;3 - Stade 3;3;10.0;;Poids;;NA;;;;;;;;;;;;;20.0;2000.0;\n" + - "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;11242;Hors Vrac;1;20.0;;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;;;;;;;2;20.0;1.0;"; + "Annee;Serie;Serie_Partielle;Engin;Id_Operation;NumOrdre_Station;Poche;Navire;Taxon;VracHorsVrac;Num_Ordre_VracHorsVrac_H2;Tot_VracHorsVrac;Ech_VracHorsVrac;Type_Volume_Poids_VracHorsVrac;Unite_Volume_Poids_VracHorsVrac;Cat_Tri;Num_Ordre_Cat_Tri_H2;Tot_Cat_Tri;Ech_Cat_Tri;Type_Volume_Poids_Cat_Tri;Unite_Volume_Poids_Cat_Tri;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Maturite;Num_Ordre_Maturite_H2;Tot_Maturite;Ech_Maturite;Type_Volume_Poids_Maturite;Unite_Volume_Poids_Maturite;Age;Num_Ordre_Age_H2;Tot_Age;Ech_Age;Type_Volume_Poids_Age;Unite_Volume_Poids_Age;Code_Longueur;Taille;NumOrdre_Taille_H2;Poids_Classe_Taille;Unite_Taille;Precision_Mesure;Nbr;Poids_Reference;Coef_Final_Elevation\n" + + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;GWEN DREZ;11242;Vrac;1;100.0;;Poids;;G - Gros;1;80.0;;Poids;;Mâle;1;30.0;;Poids;;1 - Stade 1;1;10.0;5.0;Poids;;NA;;;;;;307;10.0;1;;cm;0.5;5;5.0;500.0;\n" + + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;GWEN DREZ;11242;Vrac;1;100.0;;Poids;;G - Gros;1;80.0;;Poids;;Mâle;1;30.0;;Poids;;1 - Stade 1;1;10.0;5.0;Poids;;NA;;;;;;307;10.5;2;;cm;0.5;2;5.0;500.0;\n" + + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;GWEN DREZ;11242;Vrac;1;100.0;;Poids;;G - Gros;1;80.0;;Poids;;Mâle;1;30.0;;Poids;;1 - Stade 1;1;10.0;5.0;Poids;;NA;;;;;;307;11.0;3;;cm;0.5;1;5.0;500.0;\n" + + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;GWEN DREZ;11242;Vrac;1;100.0;;Poids;;G - Gros;1;80.0;;Poids;;Mâle;1;30.0;;Poids;;3 - Stade 3;3;10.0;;Poids;;NA;;;;;;307;11.0;1;;cm;0.5;5;10.0;1000.0;\n" + + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;GWEN DREZ;11242;Vrac;1;100.0;;Poids;;G - Gros;1;80.0;;Poids;;Femelle;2;50.0;30.0;Poids;;3 - Stade 3;3;10.0;;Poids;;NA;;;;;;1425;10.0;1;;cm;;5;30.0;3000.0;\n" + + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;GWEN DREZ;11242;Vrac;1;100.0;;Poids;;G - Gros;1;80.0;;Poids;;Femelle;2;50.0;30.0;Poids;;3 - Stade 3;3;10.0;;Poids;;NA;;;;;;1425;11.0;2;;cm;;6;30.0;3000.0;\n" + + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;GWEN DREZ;11242;Vrac;1;100.0;;Poids;;G - Gros;1;80.0;;Poids;;Femelle;2;50.0;30.0;Poids;;3 - Stade 3;3;10.0;;Poids;;NA;;;;;;1425;12.0;3;;cm;;7;30.0;3000.0;\n" + + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;GWEN DREZ;11242;Vrac;1;100.0;;Poids;;M - Moyen;2;20.0;;Poids;;Femelle;2;50.0;30.0;Poids;;3 - Stade 3;3;10.0;;Poids;;NA;;;;;;;;;;;;;20.0;2000.0;\n" + + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;GWEN DREZ;11242;Hors Vrac;1;20.0;;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;;;;;;;2;20.0;1.0;"; public static final String MARINE_LITTER_CONTENT = - "Annee;Serie;Serie_Partielle;Engin;Poche;Id_Operation;NumOrdre_Station;Navire;MarineLitterCategory;MarineLitterSizeCategory;Number;Weight;Comment;TotalWeight\n" + - "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;L1 PLASTIQUE;A: <5*5 cm= 25 cm2;2;5.0;S1;;\n" + - "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;L1a Sacs;B: <10*10 cm= 100 cm2;3;1.0;S2;;"; + "Annee;Serie;Serie_Partielle;Engin;Id_Operation;NumOrdre_Station;Poche;Navire;MarineLitterCategory;MarineLitterSizeCategory;Number;Weight;Comment\n" + + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;GWEN DREZ;L1 PLASTIQUE;A: <5*5 cm= 25 cm2;2;5.0;S1;\n" + + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;GWEN DREZ;L1a Sacs;B: <10*10 cm= 100 cm2;3;1.0;S2;"; public static final String INDIVIDUAL_OBSERVATION_CONTENT = - "Annee;Serie;Serie_Partielle;Engin;Poche;Id_Operation;NumOrdre_Station;Navire;BatchId;ReferenceTaxonId;ReferenceTaxonName;Comment;CaracteristicId;CaracteristicValue\n" + - "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;100000;11242;Aaptos;P1;1435;A20;\n" + - "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;100000;11242;Aaptos;P1;1436;10;\n" + - "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;100000;11242;Aaptos;P1;220;0.1;\n" + - "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;100000;11242;Aaptos;P1;1433;307;\n" + - "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;100000;11242;Aaptos;P1;307;10.0;\n" + - "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;100000;11242;Aaptos;P1;101;10.0;\n" + - "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;100000;11242;Aaptos;P1;46;0L - 0 VMS - 1 LB;\n" + - "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;100000;11242;Aaptos;P1;1388;5.0;"; + "Annee;Serie;Serie_Partielle;Engin;Id_Operation;NumOrdre_Station;Poche;Navire;BatchId;ReferenceTaxonId;ReferenceTaxonName;Comment;CaracteristicId;CaracteristicValue\n" + + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;GWEN DREZ;100000;11242;Aaptos;P1;1435;A20;\n" + + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;GWEN DREZ;100000;11242;Aaptos;P1;1436;10;\n" + + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;GWEN DREZ;100000;11242;Aaptos;P1;220;0.1;\n" + + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;GWEN DREZ;100000;11242;Aaptos;P1;1433;307;\n" + + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;GWEN DREZ;100000;11242;Aaptos;P1;307;10.0;\n" + + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;GWEN DREZ;100000;11242;Aaptos;P1;101;10.0;\n" + + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;GWEN DREZ;100000;11242;Aaptos;P1;46;0L - 0 VMS - 1 LB;\n" + + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;GWEN DREZ;100000;11242;Aaptos;P1;1388;5.0;"; public static final String ACCIDENTAL_CATCH_CONTENT = - "Annee;Serie;Serie_Partielle;Engin;Poche;Id_Operation;NumOrdre_Station;Navire;BatchId;ReferenceTaxonId;ReferenceTaxonName;Comment;CaracteristicId;CaracteristicValue\n" + - "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;100001;3835;Abalistes;;1393;Rejet mort;\n" + - "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;100001;3835;Abalistes;;196;Femelle;\n" + - "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;100001;3835;Abalistes;;220;10.0;\n" + - "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;100001;3835;Abalistes;;1433;1425;\n" + - "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;100001;3835;Abalistes;;1425;4.0;"; + "Annee;Serie;Serie_Partielle;Engin;Id_Operation;NumOrdre_Station;Poche;Navire;BatchId;ReferenceTaxonId;ReferenceTaxonName;Comment;CaracteristicId;CaracteristicValue\n" + + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;GWEN DREZ;100001;3835;Abalistes;;1393;Rejet mort;\n" + + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;GWEN DREZ;100001;3835;Abalistes;;196;Femelle;\n" + + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;GWEN DREZ;100001;3835;Abalistes;;220;10.0;\n" + + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;GWEN DREZ;100001;3835;Abalistes;;1433;1425;\n" + + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;GWEN DREZ;100001;3835;Abalistes;;1425;4.0;"; public static final String SPECIES_CONTENT = "Id;Code_Rubin;Nom Scientifique;Code campagne\n" +

1 0

r1098 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table
by kmorin＠users.forge.codelutin.com June 11, 2013

June 11, 2013

Author: kmorin Date: 2013-06-11 15:29:41 +0200 (Tue, 11 Jun 2013) New Revision: 1098 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1098 Log: fixes #2699 [ERGO] - Tableau - Principes de d?\195?\169placement entre les champs : SHIFT + ENTREE sans effet Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2013-06-11 13:21:03 UTC (rev 1097) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2013-06-11 13:29:41 UTC (rev 1098) @@ -444,7 +444,8 @@ } nextCellAction.actionPerformed(null); - } else if (keyCode == KeyEvent.VK_UP) { + } else if (keyCode == KeyEvent.VK_UP || + (keyCode == KeyEvent.VK_ENTER && e.isShiftDown())) { e.consume(); if (editor != null) { editor.stopCellEditing();

1 0

r1097 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation
by kmorin＠users.forge.codelutin.com June 11, 2013

June 11, 2013

Author: kmorin Date: 2013-06-11 15:21:03 +0200 (Tue, 11 Jun 2013) New Revision: 1097 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1097 Log: fixes #2702 [ERGO] - Trait : bouton sauvegarde toujours accessible m?\195?\170me sans modifications sur l'?\195?\169cran Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-06-11 13:08:45 UTC (rev 1096) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-06-11 13:21:03 UTC (rev 1097) @@ -567,6 +567,7 @@ text: "tutti.editFishingOperation.action.saveFishingOperation"; toolTipText: "tutti.editFishingOperation.action.saveEditFishingOperation.tip"; i18nMnemonic: "tutti.editFishingOperation.action.saveEditFishingOperation.mnemonic"; + enabled: {model.isValid() && model.isModify()}; _tuttiAction: {SaveFishingOperationAction.class}; _help: {"tutti.editFishingOperation.action.saveEditFishingOperation.help"}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-06-11 13:08:45 UTC (rev 1096) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-06-11 13:21:03 UTC (rev 1097) @@ -312,17 +312,6 @@ vesselUseFeatureModel.setAvailableCaracteristics(getDataContext().getCaracteristics()); setCustomTab(2, vesselUseFeatureModel); - model.addPropertyChangeListener(AbstractTuttiBeanUIModel.PROPERTY_VALID, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - Boolean valid = (Boolean) evt.getNewValue(); - if (valid != null) { - ui.getSaveButton().setEnabled(valid); - } - } - }); - // listen when id becones empty or not toupdate cancel action and button getModel().addPropertyChangeListener( EditFishingOperationUIModel.PROPERTY_ID,

1 0

r1096 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost
by kmorin＠users.forge.codelutin.com June 11, 2013

June 11, 2013

Author: kmorin Date: 2013-06-11 15:08:45 +0200 (Tue, 11 Jun 2013) New Revision: 1096 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1096 Log: fixes #2651 [IMP/EXP] - Import/Export multi-postes : Mauvaise prise en compte des lots lors de r?\195?\169import Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/TuttiMultiPostImportExportService.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java 2013-06-10 15:46:02 UTC (rev 1095) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java 2013-06-11 13:08:45 UTC (rev 1096) @@ -470,9 +470,24 @@ // Start rank order at 1 short rankOrder = (short) 1; if (source.getParentBatch() != null && source.getParentBatch().getChildBatchs() != null) { - rankOrder += (short) source.getParentBatch().getChildBatchs().size(); + int maxRankOrder = 0; + for (BenthosBatch batch : source.getParentBatch().getChildBatchs()) { + Integer r = batch.getRankOrder(); + if (r != null && r > maxRankOrder) { + maxRankOrder = r; + } + } + rankOrder += (short) maxRankOrder; + } else if (target.getParentBatch() != null && target.getParentBatch().getChildBatchs() != null) { - rankOrder += (short) target.getParentBatch().getChildBatchs().size(); + short maxRankOrder = 0; + for (Batch batch : target.getParentBatch().getChildBatchs()) { + Short r = batch.getRankOrder(); + if (r != null && r > maxRankOrder) { + maxRankOrder = r; + } + } + rankOrder += maxRankOrder; } target.setRankOrder(rankOrder); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java 2013-06-10 15:46:02 UTC (rev 1095) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java 2013-06-11 13:08:45 UTC (rev 1096) @@ -227,7 +227,14 @@ // Start rank order at 1, nothing before it short rankOrder = (short) 1; if (target.getParentBatch() != null && target.getParentBatch().getChildBatchs() != null) { - rankOrder += (short) target.getParentBatch().getChildBatchs().size(); + int maxRankOrder = 0; + for (Batch batch : target.getParentBatch().getChildBatchs()) { + Short r = batch.getRankOrder(); + if (r != null && r > maxRankOrder) { + maxRankOrder = r; + } + } + rankOrder += maxRankOrder; } target.setRankOrder(rankOrder); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java 2013-06-10 15:46:02 UTC (rev 1095) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java 2013-06-11 13:08:45 UTC (rev 1096) @@ -512,10 +512,26 @@ // Start rank order at 1 short rankOrder = (short) 1; if (source.getParentBatch() != null && source.getParentBatch().getChildBatchs() != null) { - rankOrder += (short) source.getParentBatch().getChildBatchs().size(); + int maxRankOrder = 0; + for (SpeciesBatch batch : source.getParentBatch().getChildBatchs()) { + Integer r = batch.getRankOrder(); + if (r != null && r > maxRankOrder) { + maxRankOrder = r; + } + } + rankOrder += (short) maxRankOrder; + } else if (target.getParentBatch() != null && target.getParentBatch().getChildBatchs() != null) { - rankOrder += (short) target.getParentBatch().getChildBatchs().size(); + short maxRankOrder = 0; + for (Batch batch : target.getParentBatch().getChildBatchs()) { + Short r = batch.getRankOrder(); + if (r != null && r > maxRankOrder) { + maxRankOrder = r; + } + } + rankOrder += maxRankOrder; } + target.setRankOrder(rankOrder); } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/TuttiMultiPostImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/TuttiMultiPostImportExportService.java 2013-06-10 15:46:02 UTC (rev 1095) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/TuttiMultiPostImportExportService.java 2013-06-11 13:08:45 UTC (rev 1096) @@ -579,7 +579,6 @@ SpeciesBatch parent = null; if (StringUtils.isNotEmpty(parentId)) { parent = batches.get(parentId); - batch.setParentBatch(parent); parentPersistedId = parent.getId(); } @@ -786,7 +785,6 @@ BenthosBatch parent = null; if (StringUtils.isNotEmpty(parentId)) { parent = batches.get(parentId); - batch.setParentBatch(parent); parentPersistedId = parent.getId(); }

1 0

r1095 - in trunk/tutti-service/src/main: java/fr/ifremer/tutti/service/catches/multipost resources/i18n
by kmorin＠users.forge.codelutin.com June 10, 2013

June 10, 2013

Author: kmorin Date: 2013-06-10 17:46:02 +0200 (Mon, 10 Jun 2013) New Revision: 1095 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1095 Log: fixes #2644 [IMP/EXP] - Import/Export multi-postes : Erreur lors de l'import d'un fichier Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/TuttiMultiPostImportExportService.java trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/TuttiMultiPostImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/TuttiMultiPostImportExportService.java 2013-06-10 15:07:19 UTC (rev 1094) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/TuttiMultiPostImportExportService.java 2013-06-10 15:46:02 UTC (rev 1095) @@ -524,13 +524,12 @@ final Map<String, SpeciesBatch> batches = Maps.newHashMap(); File tempDir = Files.createTempDir(); - FileObject fileObject = TuttiIOUtil.resolveFile("zip:" + file.getAbsolutePath(), - _("tutti.service.multipost.resolveArchive.error", file)); - TuttiIOUtil.explode(fileObject, - tempDir, - new AllFileSelector(), - _("tutti.service.multipost.explodeArchive.error", file)); + try { + ZipUtil.uncompress(file, tempDir); + } catch (IOException e) { + throw new TuttiTechnicalException(_("tutti.service.multipost.uncompress.error", file)); + } //check operation CatchWeightsRowModel weightsModel = new CatchWeightsRowModel(csvSeparator); @@ -733,14 +732,12 @@ final Map<String, BenthosBatch> batches = Maps.newHashMap(); File tempDir = Files.createTempDir(); - FileObject fileObject = TuttiIOUtil.resolveFile("zip:" + file.getAbsolutePath(), - _("tutti.service.multipost.resolveArchive.error", file)); + try { + ZipUtil.uncompress(file, tempDir); + } catch (IOException e) { + throw new TuttiTechnicalException(_("tutti.service.multipost.uncompress.error", file)); + } - TuttiIOUtil.explode(fileObject, - tempDir, - new AllFileSelector(), - _("tutti.service.multipost.explodeArchive.error", file)); - //check operation CatchWeightsRowModel weightsModel = new CatchWeightsRowModel(csvSeparator); checkSameOperation(tempDir, weightsModel, operation); @@ -942,14 +939,12 @@ final Map<String, MarineLitterBatch> batches = Maps.newHashMap(); File tempDir = Files.createTempDir(); - FileObject fileObject = TuttiIOUtil.resolveFile("zip:" + file.getAbsolutePath(), - _("tutti.service.multipost.resolveArchive.error", file)); + try { + ZipUtil.uncompress(file, tempDir); + } catch (IOException e) { + throw new TuttiTechnicalException(_("tutti.service.multipost.uncompress.error", file)); + } - TuttiIOUtil.explode(fileObject, - tempDir, - new AllFileSelector(), - _("tutti.service.multipost.explodeArchive.error", file)); - //check operation MarineLitterWeightRowModel weightModel = new MarineLitterWeightRowModel(csvSeparator); checkSameOperation(tempDir, weightModel, operation); @@ -1072,14 +1067,12 @@ final Map<String, IndividualObservationBatch> batches = Maps.newLinkedHashMap(); File tempDir = Files.createTempDir(); - FileObject fileObject = TuttiIOUtil.resolveFile("zip:" + file.getAbsolutePath(), - _("tutti.service.multipost.resolveArchive.error", file)); + try { + ZipUtil.uncompress(file, tempDir); + } catch (IOException e) { + throw new TuttiTechnicalException(_("tutti.service.multipost.uncompress.error", file)); + } - TuttiIOUtil.explode(fileObject, - tempDir, - new AllFileSelector(), - _("tutti.service.multipost.explodeArchive.error", file)); - //check operation FishingOperationRowModel operationModel = new FishingOperationRowModel(csvSeparator); checkSameOperation(tempDir, operationModel, operation); @@ -1188,14 +1181,12 @@ final Map<String, AccidentalBatch> batches = Maps.newLinkedHashMap(); File tempDir = Files.createTempDir(); - FileObject fileObject = TuttiIOUtil.resolveFile("zip:" + file.getAbsolutePath(), - _("tutti.service.multipost.resolveArchive.error", file)); + try { + ZipUtil.uncompress(file, tempDir); + } catch (IOException e) { + throw new TuttiTechnicalException(_("tutti.service.multipost.uncompress.error", file)); + } - TuttiIOUtil.explode(fileObject, - tempDir, - new AllFileSelector(), - _("tutti.service.multipost.explodeArchive.error", file)); - //check operation FishingOperationRowModel operationModel = new FishingOperationRowModel(csvSeparator); checkSameOperation(tempDir, operationModel, operation); Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-06-10 15:07:19 UTC (rev 1094) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-06-10 15:46:02 UTC (rev 1095) @@ -106,6 +106,7 @@ tutti.service.multipost.import.weights.error= tutti.service.multipost.import.wrongOperation.error= tutti.service.multipost.resolveArchive.error= +tutti.service.multipost.uncompress.error= tutti.service.operations.accidental.error.species.required= tutti.service.operations.computeWeights.benthos.error.incoherentCategoryWeight= tutti.service.operations.computeWeights.benthos.error.incoherentParentCategoryWeight= Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-06-10 15:07:19 UTC (rev 1094) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-06-10 15:46:02 UTC (rev 1095) @@ -84,7 +84,6 @@ tutti.service.exportSumatra.header.weight=Total tutti.service.mkDir.error=Erreur à la création du dossier %s tutti.service.multipost.attachment.copy.error=Erreur lors de l'export de la pièce-jointe %s -tutti.service.multipost.explodeArchive.error=Erreur lors de la décompression de l'archive tutti.service.multipost.export.attachments.error=Erreur lors de l'export des pièces-jointes tutti.service.multipost.export.batches.error=Erreur lors de l'export des lots tutti.service.multipost.export.deleteTempDirectory.error=Erreur lors de la suppression du dossier temporaire @@ -99,8 +98,8 @@ tutti.service.multipost.import.frequencies.error=Erreur lors de l'import des mensurations tutti.service.multipost.import.operation.error=Erreur lors de l'import des données du trait tutti.service.multipost.import.weights.error=Erreur lors de l'import des poids -tutti.service.multipost.import.wrongOperation.error=Opération est impossible<hr/>Les lots que vous essayez d'importer proviennent d'un autre trait :<br/>%s -tutti.service.multipost.resolveArchive.error=Erreur lors de l'ouverture de l'archive +tutti.service.multipost.import.wrongOperation.error=Opération est impossible<hr/>Les lots que vous essayez d'importer proviennent d'un autre trait \:<br/>%s +tutti.service.multipost.uncompress.error=Erreur lors de la décompression de l'archive %s tutti.service.operations.computeWeights.error.benthos.incoherentCategoryWeight=Benthos - Le poids total des mensurations du lot de %s/%s - %s (%skg) est supérieur au poids de la catégorie (%skg) tutti.service.operations.computeWeights.error.benthos.incoherentParentCategoryWeight=Benthos - Le poids du lot de %s/%s - %s (%skg) est inférieur à la somme des poids de ses sous-catégories (%skg) tutti.service.operations.computeWeights.error.benthos.incoherentRowWeightCategory=Le poids de sous-échantillon est renseigné alors que le lot n'a pas de poids.

1 0

r1094 - trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export
by tchemit＠users.forge.codelutin.com June 10, 2013

June 10, 2013

Author: tchemit Date: 2013-06-10 17:07:19 +0200 (Mon, 10 Jun 2013) New Revision: 1094 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1094 Log: ignore test Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java 2013-06-10 15:04:25 UTC (rev 1093) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java 2013-06-10 15:07:19 UTC (rev 1094) @@ -44,6 +44,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Ignore; import org.junit.Test; import java.io.File; @@ -182,6 +183,7 @@ progressionModel.setTotal(8); } + @Ignore @Test public void exportProgram() throws Exception {

1 0

r1093 - in trunk/tutti-service/src: main/java/fr/ifremer/tutti/service/export test/java/fr/ifremer/tutti/service/export
by tchemit＠users.forge.codelutin.com June 10, 2013

June 10, 2013

Author: tchemit Date: 2013-06-10 17:04:25 +0200 (Mon, 10 Jun 2013) New Revision: 1093 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1093 Log: refs #2693: [EXPORT GENERIQUE] lot uniquement avec un nombre d'individus : la valeur du nombre n'est pas dans l'export catch.csv Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportSampleCategory.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java 2013-06-10 14:45:01 UTC (rev 1092) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java 2013-06-10 15:04:25 UTC (rev 1093) @@ -76,7 +76,7 @@ switch (sampleCategoryEnum) { case sortedUnsorted: - addSampleCategory("VracHorVrac", CatchExportRow.SORTED_UNSORTED_SAMPLE_CATEGORY); + addSampleCategory("VracHorsVrac", CatchExportRow.SORTED_UNSORTED_SAMPLE_CATEGORY); break; case size: addSampleCategory("Cat_Tri", CatchExportRow.SIZE_SAMPLE_CATEGORY); @@ -101,7 +101,7 @@ newNullableColumnForExport("Poids_Classe_Taille", CatchExportRow.FREQUENCY_WEIGHT, TuttiCsvUtil.FLOAT); newNullableColumnForExport("Unite_Taille", CatchExportRow.FREQUENCY_LENGTH_STEP_CARACTERISTIC + "." + Caracteristic.PROPERTY_UNIT); newNullableColumnForExport("Precision_Mesure", CatchExportRow.FREQUENCY_LENGTH_STEP_CARACTERISTIC + "." + Caracteristic.PROPERTY_PRECISION, TuttiCsvUtil.FLOAT); - newNullableColumnForExport("Nbr", CatchExportRow.FREQUENCY_NUMBER, TuttiCsvUtil.INTEGER); + newNullableColumnForExport("Nbr", CatchExportRow.BATCH_NUMBER, TuttiCsvUtil.INTEGER); newColumnForExport("Poids_Reference", CatchExportRow.REFERENCE_WEIGHT, TuttiCsvUtil.PRIMITIVE_FLOAT); newColumnForExport("Coef_Final_Elevation", CatchExportRow.RAISING_FACTOR, TuttiCsvUtil.PRIMITIVE_FLOAT); @@ -168,7 +168,7 @@ speciesBatch.getSampleCategoryComputedWeight(), speciesBatch.getWeight(), speciesBatch.getNumber(), - speciesBatch.getComputedNumber(), +// speciesBatch.getComputedNumber(), speciesBatch.getRankOrder()); if (speciesBatch.isChildBatchsEmpty()) { @@ -259,7 +259,7 @@ speciesBatch.getSampleCategoryComputedWeight(), speciesBatch.getWeight(), speciesBatch.getNumber(), - speciesBatch.getComputedNumber(), +// speciesBatch.getComputedNumber(), speciesBatch.getRankOrder()); CatchExportRow row = currentRow.copy(); @@ -281,7 +281,7 @@ benthosBatch.getSampleCategoryComputedWeight(), benthosBatch.getWeight(), benthosBatch.getNumber(), - benthosBatch.getComputedNumber(), +// benthosBatch.getComputedNumber(), benthosBatch.getRankOrder()); if (benthosBatch.isChildBatchsEmpty()) { @@ -372,7 +372,7 @@ benthosBatch.getSampleCategoryComputedWeight(), benthosBatch.getWeight(), benthosBatch.getNumber(), - benthosBatch.getComputedNumber(), +// benthosBatch.getComputedNumber(), benthosBatch.getRankOrder()); CatchExportRow row = currentRow.copy(); @@ -396,9 +396,11 @@ Float sampleCategoryComputedWeight, Float batchWeight, Integer batchNumber, - Integer batchComputedNumber, +// Integer batchComputedNumber, Integer batchRankOrder ) { + currentRow.setBatchNumber(batchNumber); + ExportSampleCategory<Serializable> sampleCategory = new ExportSampleCategory<Serializable>(); Caracteristic caracteristic = sampleCategoryToCaracteristics.get(sampleCategoryType); @@ -409,8 +411,7 @@ sampleCategory.setSampleWeight(batchWeight); sampleCategory.setComputedWeight(sampleCategoryComputedWeight); - sampleCategory.setNumber(batchNumber); - sampleCategory.setComputedNumber(batchComputedNumber); +// sampleCategory.setComputedNumber(batchComputedNumber); sampleCategory.setWeightOrVolType(WEIGHT_OR_VOL_TYPE); sampleCategory.setRankOrder(batchRankOrder); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportRow.java 2013-06-10 14:45:01 UTC (rev 1092) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportRow.java 2013-06-10 15:04:25 UTC (rev 1093) @@ -24,6 +24,7 @@ * #L% */ +import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import fr.ifremer.tutti.persistence.entities.data.BenthosBatchFrequency; import fr.ifremer.tutti.persistence.entities.data.Cruise; @@ -73,6 +74,8 @@ public static final String RAISING_FACTOR = "raisingFactor"; + public static final String BATCH_NUMBER = "batchNumber"; + protected Cruise cruise; protected FishingOperation fishingOperation; @@ -88,8 +91,11 @@ protected Species species; protected float referenceWeight; + protected float raisingFactor; + protected Integer batchNumber; + public void setCruise(Cruise cruise) { this.cruise = cruise; } @@ -110,16 +116,24 @@ this.raisingFactor = raisingFactor; } + public void setBatchNumber(Integer batchNumber) { + this.batchNumber = batchNumber; + } + public void addCategory(ExportSampleCategory sampleCategory) { categories.put(sampleCategory.getCategoryType(), sampleCategory); } public void setSpeciesFrequency(SpeciesBatchFrequency speciesFrequency) { + Preconditions.checkNotNull(speciesFrequency); this.speciesFrequency = speciesFrequency; + this.batchNumber = speciesFrequency.getNumber(); } public void setBenthosFrequency(BenthosBatchFrequency benthosFrequency) { + Preconditions.checkNotNull(benthosFrequency); this.benthosFrequency = benthosFrequency; + this.batchNumber = benthosFrequency.getNumber(); } public Date getBeginDate() { @@ -198,17 +212,26 @@ return raisingFactor; } + public Integer getBatchNumber() { + return batchNumber; + } + public CatchExportRow copy() { CatchExportRow result = new CatchExportRow(); result.setCruise(cruise); result.setFishingOperation(fishingOperation); result.setSpeciesCategory(speciesCategory); result.categories.putAll(categories); - result.setBenthosFrequency(benthosFrequency); - result.setSpeciesFrequency(speciesFrequency); + if (benthosFrequency != null) { + result.setBenthosFrequency(benthosFrequency); + } + if (speciesFrequency != null) { + result.setSpeciesFrequency(speciesFrequency); + } result.setSpecies(species); result.setRaisingFactor(raisingFactor); result.setReferenceWeight(referenceWeight); + result.setBatchNumber(batchNumber); return result; } } \ No newline at end of file Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportSampleCategory.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportSampleCategory.java 2013-06-10 14:45:01 UTC (rev 1092) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportSampleCategory.java 2013-06-10 15:04:25 UTC (rev 1093) @@ -58,10 +58,10 @@ public static final String PROPERTY_SAMPLE_WEIGHT = "sampleWeight"; - private Integer number; +// private Integer number; +// +// private Integer computedNumber; - private Integer computedNumber; - private Integer rankOrder; private String weightOrVolType; @@ -70,22 +70,22 @@ private Caracteristic categoryCaracteristic; - public Integer getNumber() { - return number; - } +// public Integer getNumber() { +// return number; +// } +// +// public void setNumber(Integer number) { +// this.number = number; +// } +// +// public Integer getComputedNumber() { +// return computedNumber; +// } +// +// public void setComputedNumber(Integer computedNumber) { +// this.computedNumber = computedNumber; +// } - public void setNumber(Integer number) { - this.number = number; - } - - public Integer getComputedNumber() { - return computedNumber; - } - - public void setComputedNumber(Integer computedNumber) { - this.computedNumber = computedNumber; - } - public String getWeightOrVolType() { return weightOrVolType; } Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java 2013-06-10 14:45:01 UTC (rev 1092) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java 2013-06-10 15:04:25 UTC (rev 1093) @@ -95,7 +95,7 @@ "2013;Campagne CGFS;;A;2;308;Nombre d'engin - engin - totale - Déclaration d'un professionnel;2.0;"; public static final String CATCH_CONTENT = - "Annee;Serie;Serie_Partielle;Engin;Poche;Id_Operation;NumOrdre_Station;Navire;Taxon;Vrac;Num_Ordre_Vrac_H2;Tot_Vrac;Ech_Vrac;Type_Volume_Poids_Vrac;Unite_Volume_Poids_Vrac;Cat_Tri;Num_Ordre_Cat_Tri_H2;Tot_Cat_Tri;Ech_Cat_Tri;Type_Volume_Poids_Cat_Tri;Unite_Volume_Poids_Cat_Tri;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Maturite;Num_Ordre_Maturite_H2;Tot_Maturite;Ech_Maturite;Type_Volume_Poids_Maturite;Unite_Volume_Poids_Maturite;Age;Num_Ordre_Age_H2;Tot_Age;Ech_Age;Type_Volume_Poids_Age;Unite_Volume_Poids_Age;Code_Longueur;Taille;NumOrdre_Taille_H2;Poids_Classe_Taille;Unite_Taille;Precision_Mesure;Nbr;Poids_Reference;Coef_Final_Elevation\n" + + "Annee;Serie;Serie_Partielle;Engin;Poche;Id_Operation;NumOrdre_Station;Navire;Taxon;VracHorsVrac;Num_Ordre_VracHorsVrac_H2;Tot_VracHorsVrac;Ech_VracHorsVrac;Type_Volume_Poids_VracHorsVrac;Unite_Volume_Poids_VracHorsVrac;Cat_Tri;Num_Ordre_Cat_Tri_H2;Tot_Cat_Tri;Ech_Cat_Tri;Type_Volume_Poids_Cat_Tri;Unite_Volume_Poids_Cat_Tri;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Maturite;Num_Ordre_Maturite_H2;Tot_Maturite;Ech_Maturite;Type_Volume_Poids_Maturite;Unite_Volume_Poids_Maturite;Age;Num_Ordre_Age_H2;Tot_Age;Ech_Age;Type_Volume_Poids_Age;Unite_Volume_Poids_Age;Code_Longueur;Taille;NumOrdre_Taille_H2;Poids_Classe_Taille;Unite_Taille;Precision_Mesure;Nbr;Poids_Reference;Coef_Final_Elevation\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;11242;Vrac;1;100.0;;Poids;;G - Gros;1;80.0;;Poids;;Mâle;1;30.0;;Poids;;1 - Stade 1;1;10.0;5.0;Poids;;NA;;;;;;307;10.0;1;;cm;0.5;5;5.0;500.0;\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;11242;Vrac;1;100.0;;Poids;;G - Gros;1;80.0;;Poids;;Mâle;1;30.0;;Poids;;1 - Stade 1;1;10.0;5.0;Poids;;NA;;;;;;307;10.5;2;;cm;0.5;2;5.0;500.0;\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;11242;Vrac;1;100.0;;Poids;;G - Gros;1;80.0;;Poids;;Mâle;1;30.0;;Poids;;1 - Stade 1;1;10.0;5.0;Poids;;NA;;;;;;307;11.0;3;;cm;0.5;1;5.0;500.0;\n" + @@ -104,7 +104,7 @@ "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;11242;Vrac;1;100.0;;Poids;;G - Gros;1;80.0;;Poids;;Femelle;2;50.0;30.0;Poids;;3 - Stade 3;3;10.0;;Poids;;NA;;;;;;1425;11.0;2;;cm;;6;30.0;3000.0;\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;11242;Vrac;1;100.0;;Poids;;G - Gros;1;80.0;;Poids;;Femelle;2;50.0;30.0;Poids;;3 - Stade 3;3;10.0;;Poids;;NA;;;;;;1425;12.0;3;;cm;;7;30.0;3000.0;\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;11242;Vrac;1;100.0;;Poids;;M - Moyen;2;20.0;;Poids;;Femelle;2;50.0;30.0;Poids;;3 - Stade 3;3;10.0;;Poids;;NA;;;;;;;;;;;;;20.0;2000.0;\n" + - "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;11242;Hors Vrac;1;20.0;;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;;;;;;;;20.0;1.0;"; + "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;11242;Hors Vrac;1;20.0;;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;;;;;;;2;20.0;1.0;"; public static final String MARINE_LITTER_CONTENT = "Annee;Serie;Serie_Partielle;Engin;Poche;Id_Operation;NumOrdre_Station;Navire;MarineLitterCategory;MarineLitterSizeCategory;Number;Weight;Comment;TotalWeight\n" +

1 0

r1092 - in trunk/tutti-service/src/main: java/fr/ifremer/tutti/service/catches/multipost resources/i18n
by kmorin＠users.forge.codelutin.com June 10, 2013

June 10, 2013

Author: kmorin Date: 2013-06-10 16:45:01 +0200 (Mon, 10 Jun 2013) New Revision: 1092 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1092 Log: fixes #2615 [IMP/EXP] - Import/Export multi-postes : pas de contr?\195?\180le sur l'ID op?\195?\169ration Added: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRowModel.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/TuttiMultiPostImportExportService.java trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties Added: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRow.java (rev 0) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRow.java 2013-06-10 14:45:01 UTC (rev 1092) @@ -0,0 +1,58 @@ +package fr.ifremer.tutti.service.catches.multipost; + +import java.util.Date; + +/** + * @author kmorin <kmorin(a)codelutin.com> + * @since 2.3.1 + */ +public abstract class AbstractFishingOperationRow { + + public static final String STATION_NUMBER = "stationNumber"; + + public static final String OPERATION_NUMBER = "operationNumber"; + + public static final String MULTIRIG_AGGREGATION = "multirigAggregation"; + + public static final String DATE = "date"; + + protected String stationNumber; + + protected Integer operationNumber; + + protected String multirigAggregation; + + protected Date date; + + public String getStationNumber() { + return stationNumber; + } + + public void setStationNumber(String stationNumber) { + this.stationNumber = stationNumber; + } + + public Integer getOperationNumber() { + return operationNumber; + } + + public void setOperationNumber(Integer operationNumber) { + this.operationNumber = operationNumber; + } + + public String getMultirigAggregation() { + return multirigAggregation; + } + + public void setMultirigAggregation(String multirigAggregation) { + this.multirigAggregation = multirigAggregation; + } + + public Date getDate() { + return date; + } + + public void setDate(Date date) { + this.date = date; + } +} Added: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRowModel.java (rev 0) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRowModel.java 2013-06-10 14:45:01 UTC (rev 1092) @@ -0,0 +1,20 @@ +package fr.ifremer.tutti.service.catches.multipost; + +import fr.ifremer.tutti.service.TuttiCsvUtil; + +/** + * @author kmorin <kmorin(a)codelutin.com> + * @since 2.3.1 + */ +public abstract class AbstractFishingOperationRowModel<FO extends AbstractFishingOperationRow> + extends TuttiCsvUtil.AbstractTuttiImportExportModel<FO> { + + public AbstractFishingOperationRowModel(char separator) { + super(separator); + + newColumnForImportExport(FishingOperationRow.STATION_NUMBER); + newColumnForImportExport(FishingOperationRow.OPERATION_NUMBER, TuttiCsvUtil.INTEGER); + newColumnForImportExport(FishingOperationRow.MULTIRIG_AGGREGATION); + newColumnForImportExport(FishingOperationRow.DATE, TuttiCsvUtil.DAY_TIME); + } +} Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRow.java 2013-06-10 13:40:13 UTC (rev 1091) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRow.java 2013-06-10 14:45:01 UTC (rev 1092) @@ -28,7 +28,7 @@ * @author kmorin <kmorin(a)codelutin.com> * @since 2.3 */ -public class CatchWeightsRow { +public class CatchWeightsRow extends AbstractFishingOperationRow { public static final String TOTAL_SORTED_WEIGHT = "totalSortedWeight"; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRowModel.java 2013-06-10 13:40:13 UTC (rev 1091) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRowModel.java 2013-06-10 14:45:01 UTC (rev 1092) @@ -30,7 +30,7 @@ * @author kmorin <kmorin(a)codelutin.com> * @since 2.3 */ -public class CatchWeightsRowModel extends TuttiCsvUtil.AbstractTuttiImportExportModel<CatchWeightsRow> { +public class CatchWeightsRowModel extends AbstractFishingOperationRowModel<CatchWeightsRow> { public CatchWeightsRowModel(char separator) { super(separator); Added: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRow.java (rev 0) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRow.java 2013-06-10 14:45:01 UTC (rev 1092) @@ -0,0 +1,10 @@ +package fr.ifremer.tutti.service.catches.multipost; + +import java.util.Date; + +/** + * @author kmorin <kmorin(a)codelutin.com> + * @since 2.3.1 + */ +public class FishingOperationRow extends AbstractFishingOperationRow { +} Added: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRowModel.java (rev 0) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRowModel.java 2013-06-10 14:45:01 UTC (rev 1092) @@ -0,0 +1,19 @@ +package fr.ifremer.tutti.service.catches.multipost; + +import fr.ifremer.tutti.service.TuttiCsvUtil; + +/** + * @author kmorin <kmorin(a)codelutin.com> + * @since 2.3.1 + */ +public class FishingOperationRowModel extends AbstractFishingOperationRowModel<FishingOperationRow> { + + public FishingOperationRowModel(char separator) { + super(separator); + } + + @Override + public FishingOperationRow newEmptyInstance() { + return new FishingOperationRow(); + } +} Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRow.java 2013-06-10 13:40:13 UTC (rev 1091) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRow.java 2013-06-10 14:45:01 UTC (rev 1092) @@ -28,7 +28,7 @@ * @author kmorin <kmorin(a)codelutin.com> * @since 2.3 */ -public class MarineLitterWeightRow { +public class MarineLitterWeightRow extends AbstractFishingOperationRow { public static final String TOTAL_WEIGHT = "totalWeight"; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRowModel.java 2013-06-10 13:40:13 UTC (rev 1091) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRowModel.java 2013-06-10 14:45:01 UTC (rev 1092) @@ -30,7 +30,7 @@ * @author kmorin <kmorin(a)codelutin.com> * @since 2.3 */ -public class MarineLitterWeightRowModel extends TuttiCsvUtil.AbstractTuttiImportExportModel<MarineLitterWeightRow> { +public class MarineLitterWeightRowModel extends AbstractFishingOperationRowModel<MarineLitterWeightRow> { public MarineLitterWeightRowModel(char separator) { super(separator); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/TuttiMultiPostImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/TuttiMultiPostImportExportService.java 2013-06-10 13:40:13 UTC (rev 1091) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/TuttiMultiPostImportExportService.java 2013-06-10 14:45:01 UTC (rev 1092) @@ -31,6 +31,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.io.Files; +import fr.ifremer.tutti.TuttiBusinessException; import fr.ifremer.tutti.TuttiIOUtil; import fr.ifremer.tutti.TuttiTechnicalException; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; @@ -46,6 +47,7 @@ import fr.ifremer.tutti.service.TuttiDataContext; import fr.ifremer.tutti.service.TuttiServiceContext; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -158,6 +160,7 @@ weights.setTotalSortedWeight(catchBatch.getSpeciesTotalSortedWeight()); weights.setInertWeight(catchBatch.getSpeciesTotalInertWeight()); weights.setLivingNotItemizedWeight(catchBatch.getSpeciesTotalLivingNotItemizedWeight()); + exportOperation(weights, operation); exportCatches(file, SPECIES_FILE, weights, rows, frequencyRows, attachmentRows); } @@ -191,6 +194,7 @@ weights.setTotalSortedWeight(catchBatch.getBenthosTotalSortedWeight()); weights.setInertWeight(catchBatch.getBenthosTotalInertWeight()); weights.setLivingNotItemizedWeight(catchBatch.getBenthosTotalLivingNotItemizedWeight()); + exportOperation(weights, operation); exportCatches(file, BENTHOS_FILE, weights, rows, frequencyRows, attachmentRows); } @@ -253,6 +257,7 @@ CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operationId); MarineLitterWeightRow weight = new MarineLitterWeightRow(); weight.setTotalWeight(catchBatch.getMarineLitterTotalWeight()); + exportOperation(weight, operation); MarineLitterWeightRowModel weightModel = new MarineLitterWeightRowModel(csvSeparator); @@ -358,6 +363,25 @@ IOUtils.closeQuietly(writer); } + // export operation + FishingOperationRow foRow = new FishingOperationRow(); + exportOperation(foRow, operation); + + FishingOperationRowModel foRowModel = new FishingOperationRowModel(csvSeparator); + + File weightFile = new File(directory, WEIGHTS_FILE); + file2zip.add(weightFile); + try { + writer = Files.newWriter(weightFile, Charsets.UTF_8); + Export export = Export.newExport(foRowModel, Lists.newArrayList(foRow)); + export.write(writer); + writer.close(); + } catch (Exception e) { + throw new TuttiTechnicalException(_("tutti.service.multipost.export.operation.error", weightFile), e); + } finally { + IOUtils.closeQuietly(writer); + } + exportAttachments(directory, file2zip, attachmentRows); try { @@ -446,6 +470,25 @@ IOUtils.closeQuietly(writer); } + // export operation + FishingOperationRow foRow = new FishingOperationRow(); + exportOperation(foRow, operation); + + FishingOperationRowModel foRowModel = new FishingOperationRowModel(csvSeparator); + + File weightFile = new File(directory, WEIGHTS_FILE); + file2zip.add(weightFile); + try { + writer = Files.newWriter(weightFile, Charsets.UTF_8); + Export export = Export.newExport(foRowModel, Lists.newArrayList(foRow)); + export.write(writer); + writer.close(); + } catch (Exception e) { + throw new TuttiTechnicalException(_("tutti.service.multipost.export.operation.error", weightFile), e); + } finally { + IOUtils.closeQuietly(writer); + } + exportAttachments(directory, file2zip, attachmentRows); try { @@ -489,6 +532,10 @@ new AllFileSelector(), _("tutti.service.multipost.explodeArchive.error", file)); + //check operation + CatchWeightsRowModel weightsModel = new CatchWeightsRowModel(csvSeparator); + checkSameOperation(tempDir, weightsModel, operation); + // Import batches File speciesFile = new File(tempDir, SPECIES_FILE); @@ -578,7 +625,7 @@ } CatchFrequencyRowModel frequencyModel = new CatchFrequencyRowModel(csvSeparator, - dataContext.getLengthStepCaracteristics()); + dataContext.getCaracteristics()); Import<CatchFrequencyRow> frequencyImporter = Import.newImport(frequencyModel, reader); @@ -628,7 +675,6 @@ throw new TuttiTechnicalException(_("tutti.service.multipost.import.weights.error", weightsFile), e); } - CatchWeightsRowModel weightsModel = new CatchWeightsRowModel(csvSeparator); Import<CatchWeightsRow> weights = Import.newImport(weightsModel, reader); Iterator<CatchWeightsRow> iterator = weights.iterator(); @@ -695,6 +741,10 @@ new AllFileSelector(), _("tutti.service.multipost.explodeArchive.error", file)); + //check operation + CatchWeightsRowModel weightsModel = new CatchWeightsRowModel(csvSeparator); + checkSameOperation(tempDir, weightsModel, operation); + // Import batches File benthosFile = new File(tempDir, BENTHOS_FILE); @@ -784,7 +834,7 @@ } CatchFrequencyRowModel frequencyModel = new CatchFrequencyRowModel(csvSeparator, - dataContext.getLengthStepCaracteristics()); + dataContext.getCaracteristics()); Import<CatchFrequencyRow> frequencyImporter = Import.newImport(frequencyModel, reader); @@ -834,7 +884,6 @@ throw new TuttiTechnicalException(_("tutti.service.multipost.import.weights.error", weightsFile), e); } - CatchWeightsRowModel weightsModel = new CatchWeightsRowModel(csvSeparator); Import<CatchWeightsRow> weights = Import.newImport(weightsModel, reader); Iterator<CatchWeightsRow> iterator = weights.iterator(); @@ -901,6 +950,10 @@ new AllFileSelector(), _("tutti.service.multipost.explodeArchive.error", file)); + //check operation + MarineLitterWeightRowModel weightModel = new MarineLitterWeightRowModel(csvSeparator); + checkSameOperation(tempDir, weightModel, operation); + // Import batches File marineLitterFile = new File(tempDir, MARINE_LITTER_FILE); @@ -985,7 +1038,6 @@ throw new TuttiTechnicalException(_("tutti.service.multipost.import.weights.error", weightsFile), e); } - MarineLitterWeightRowModel weightModel = new MarineLitterWeightRowModel(csvSeparator); Import<MarineLitterWeightRow> weight = Import.newImport(weightModel, reader); Iterator<MarineLitterWeightRow> iterator = weight.iterator(); @@ -1028,6 +1080,10 @@ new AllFileSelector(), _("tutti.service.multipost.explodeArchive.error", file)); + //check operation + FishingOperationRowModel operationModel = new FishingOperationRowModel(csvSeparator); + checkSameOperation(tempDir, operationModel, operation); + // Import batches File observationFile = new File(tempDir, INDIVIDUAL_OBSERVATION_FILE); @@ -1140,6 +1196,10 @@ new AllFileSelector(), _("tutti.service.multipost.explodeArchive.error", file)); + //check operation + FishingOperationRowModel operationModel = new FishingOperationRowModel(csvSeparator); + checkSameOperation(tempDir, operationModel, operation); + // Import batches File accidentalFile = new File(tempDir, ACCIDENTAL_CATCHES_FILE); @@ -1397,6 +1457,13 @@ } } + protected void exportOperation(AbstractFishingOperationRow afoRow, FishingOperation operation) { + afoRow.setStationNumber(operation.getStationNumber()); + afoRow.setOperationNumber(operation.getFishingOperationNumber()); + afoRow.setMultirigAggregation(operation.getMultirigAggregation()); + afoRow.setDate(operation.getGearShootingStartDate()); + } + protected void exportAttachments(File directory, List<File> file2zip, List<AttachmentRow> attachmentRows) { AttachmentRowModel csvAttachmentModel = new AttachmentRowModel(csvSeparator); @@ -1536,4 +1603,34 @@ } } } + + protected void checkSameOperation(File directory, + AbstractFishingOperationRowModel fishingOperationRowModel, + FishingOperation operation) { + File operationFile = new File(directory, WEIGHTS_FILE); + Reader reader; + + try { + reader = Files.newReader(operationFile, Charsets.UTF_8); + + } catch (FileNotFoundException e) { + throw new TuttiTechnicalException(_("tutti.service.multipost.import.operation.error", operationFile), e); + } + + Import<AbstractFishingOperationRow> fishingOperationImporter = Import.newImport(fishingOperationRowModel, reader); + + Iterator<AbstractFishingOperationRow> iterator = fishingOperationImporter.iterator(); + if (iterator.hasNext()) { + AbstractFishingOperationRow row = iterator.next(); + if (ObjectUtils.notEqual(row.getStationNumber(), operation.getStationNumber()) + || ObjectUtils.notEqual(row.getOperationNumber(), operation.getFishingOperationNumber()) + || ObjectUtils.notEqual(row.getMultirigAggregation(), operation.getMultirigAggregation()) + || ObjectUtils.notEqual(row.getDate(), operation.getGearShootingStartDate())) { + + throw new TuttiBusinessException(_("tutti.service.multipost.import.wrongOperation.error", + decoratorService.getDecoratorByType(FishingOperation.class) + .toString(operation))); + } + } + } } Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-06-10 13:40:13 UTC (rev 1091) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-06-10 14:45:01 UTC (rev 1092) @@ -93,6 +93,7 @@ tutti.service.multipost.export.deleteTempDirectory.error= tutti.service.multipost.export.error= tutti.service.multipost.export.frequencies.error= +tutti.service.multipost.export.operation.error= tutti.service.multipost.export.species.error= tutti.service.multipost.export.weight.error= tutti.service.multipost.export.weights.error= @@ -100,8 +101,10 @@ tutti.service.multipost.import.batches.error= tutti.service.multipost.import.caracteristics.error= tutti.service.multipost.import.frequencies.error= +tutti.service.multipost.import.operation.error= tutti.service.multipost.import.species.error= tutti.service.multipost.import.weights.error= +tutti.service.multipost.import.wrongOperation.error= tutti.service.multipost.resolveArchive.error= tutti.service.operations.accidental.error.species.required= tutti.service.operations.computeWeights.benthos.error.incoherentCategoryWeight= Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-06-10 13:40:13 UTC (rev 1091) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-06-10 14:45:01 UTC (rev 1092) @@ -90,13 +90,16 @@ tutti.service.multipost.export.deleteTempDirectory.error=Erreur lors de la suppression du dossier temporaire tutti.service.multipost.export.error=Erreur lors de la création du fichier d'export tutti.service.multipost.export.frequencies.error=Erreur lors de l'export des mensurations +tutti.service.multipost.export.operation.error=Erreur lors de l'export des données du trait tutti.service.multipost.export.weight.error=Erreur lors de l'export des poids tutti.service.multipost.export.weights.error=Erreur lors de l'export des poids tutti.service.multipost.import.attachments.error=Erreur lors de l'import des pièces-jointes tutti.service.multipost.import.batches.error=Erreur lors de l'import des lots tutti.service.multipost.import.caracteristics.error=Erreur lors de l'import des caractéristiques tutti.service.multipost.import.frequencies.error=Erreur lors de l'import des mensurations +tutti.service.multipost.import.operation.error=Erreur lors de l'import des données du trait tutti.service.multipost.import.weights.error=Erreur lors de l'import des poids +tutti.service.multipost.import.wrongOperation.error=Opération est impossible<hr/>Les lots que vous essayez d'importer proviennent d'un autre trait :<br/>%s tutti.service.multipost.resolveArchive.error=Erreur lors de l'ouverture de l'archive tutti.service.operations.computeWeights.error.benthos.incoherentCategoryWeight=Benthos - Le poids total des mensurations du lot de %s/%s - %s (%skg) est supérieur au poids de la catégorie (%skg) tutti.service.operations.computeWeights.error.benthos.incoherentParentCategoryWeight=Benthos - Le poids du lot de %s/%s - %s (%skg) est inférieur à la somme des poids de ses sous-catégories (%skg)

1 0

r1091 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/spatial tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation
by kmorin＠users.forge.codelutin.com June 10, 2013

June 10, 2013

Author: kmorin Date: 2013-06-10 15:40:13 +0200 (Mon, 10 Jun 2013) New Revision: 1091 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1091 Log: fixes #2613 [TRAIT] saisie des lat long ?\195?\160 36.559 se transforme tout seul en 36.533339 Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/spatial/SexagecimalPosition.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/spatial/SexagecimalPosition.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/spatial/SexagecimalPosition.java 2013-06-10 13:16:14 UTC (rev 1090) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/spatial/SexagecimalPosition.java 2013-06-10 13:40:13 UTC (rev 1091) @@ -48,6 +48,8 @@ protected Integer minute; + protected Float decimalMinute; + protected Integer seconde; /** @@ -86,11 +88,27 @@ } /** + * Methode statique de fabrique de position a partir d'une valeur du format + * degre-minute-seconde. + * + * @param d la valeur des degres + * @param dm la valeur des minutes + * @return une nouvelle instance de position convertie + */ + public static SexagecimalPosition valueOf(boolean sign, int d, Float dm) { + SexagecimalPosition r = new SexagecimalPosition(); + r.setSign(sign); + r.setDegre(d); + r.setMinuteDecimale(dm); + return r; + } + + /** * @return {@code true} si aucune composante n'est renseigné, * {@code false} autrement. */ public boolean isNull() { - return degre == null && minute == null && seconde == null; + return degre == null && minute == null && decimalMinute == null && seconde == null; } /** @@ -105,6 +123,7 @@ public void update(Float decimal) { Integer d = null; Integer m = null; + Float dm = null; Integer s = null; boolean si = false; if (decimal != null) { @@ -116,8 +135,9 @@ d = (int) (Math.round(decimal + 0.5) - 1); m = 0; s = 0; - decimal = 60 * (decimal - d); + decimal = 60.0f * (decimal - d); if (decimal > 0) { + dm = decimal; m = (int) (Math.round(decimal + 0.5) - 1); decimal = 60 * (decimal - m); if (decimal > 0) { @@ -139,6 +159,7 @@ } degre = d; minute = m; + decimalMinute = dm; seconde = s; sign = si; } @@ -149,17 +170,23 @@ } Integer d = degre == null ? 0 : degre; Integer m = minute == null ? 0 : minute; + Float dm = decimalMinute; Integer s = seconde == null ? 0 : seconde; Float result = Float.valueOf(d); - if (m > 0) { - result += (float) m / 60; - if (s == 0) { - result += 0.5f / 3600; + if (decimalMinute != null) { + result += dm / 60.0f; + + } else { + if (m > 0) { + result += (float) m / 60; + if (s == 0) { + result += 0.5f / 3600; + } } + if (s > 0) { + result += ((float) s + 0.5f) / 3600; + } } - if (s > 0) { - result += ((float) s + 0.5f) / 3600; - } if (sign) { result *= -1; } @@ -175,14 +202,7 @@ } public Float getMinuteDecimale() { - Float minuteDecimale = null; - if (minute != null) { - minuteDecimale = minute.floatValue(); - if (seconde != null) { - minuteDecimale += seconde.floatValue() / 60; - } - } - return minuteDecimale; + return decimalMinute; } public Integer getSeconde() { @@ -202,16 +222,7 @@ } public void setMinuteDecimale(Float minuteDecimale) { - if (minuteDecimale == null) { - minute = null; - seconde = null; - - } else { - Double entier = Math.floor(minuteDecimale); - minute = entier.intValue(); - Double reste = Math.floor((minuteDecimale - entier) * 60); - seconde = reste.intValue(); - } + this.decimalMinute = minuteDecimale; } public void setSeconde(Integer seconde) { @@ -236,6 +247,7 @@ SexagecimalPosition other = (SexagecimalPosition) obj; return sign == other.sign && ObjectUtils.equals(degre, other) && + ObjectUtils.equals(decimalMinute, other.decimalMinute) && ObjectUtils.equals(minute, other.minute) && ObjectUtils.equals(seconde, other.seconde); @@ -252,7 +264,8 @@ hash = 5 * (sign ? 1 : 0); hash = 7 * hash + (degre != null ? degre.hashCode() : 0); hash = 11 * hash + (minute != null ? minute.hashCode() : 0); - hash = 13 * hash + (seconde != null ? seconde.hashCode() : 0); + hash = 13 * hash + (decimalMinute != null ? decimalMinute.hashCode() : 0); + hash = 17 * hash + (seconde != null ? seconde.hashCode() : 0); return hash; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-06-10 13:16:14 UTC (rev 1090) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-06-10 13:40:13 UTC (rev 1091) @@ -255,7 +255,6 @@ showReset: false; useFloat: true; useSign: false; - numberPattern: {DECIMAL2_DIGITS_PATTERN}; } .second {

1 0

r1090 - trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export
by tchemit＠users.forge.codelutin.com June 10, 2013

June 10, 2013

Author: tchemit Date: 2013-06-10 15:16:14 +0200 (Mon, 10 Jun 2013) New Revision: 1090 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1090 Log: refs #2693: [EXPORT GENERIQUE] lot uniquement avec un nombre d'individus : la valeur du nombre n'est pas dans l'export catch.csv (renommage de la colonne Vrac) Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java 2013-06-10 09:50:08 UTC (rev 1089) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java 2013-06-10 13:16:14 UTC (rev 1090) @@ -76,7 +76,7 @@ switch (sampleCategoryEnum) { case sortedUnsorted: - addSampleCategory("Vrac", CatchExportRow.SORTED_UNSORTED_SAMPLE_CATEGORY); + addSampleCategory("VracHorVrac", CatchExportRow.SORTED_UNSORTED_SAMPLE_CATEGORY); break; case size: addSampleCategory("Cat_Tri", CatchExportRow.SIZE_SAMPLE_CATEGORY);

1 0

Build failed in Jenkins: tutti #893
by admin+hudson＠codelutin.com June 10, 2013

June 10, 2013

See <http://ci.nuiton.org/jenkins/job/tutti/893/changes> Changes: [Kevin Morin] fixes #2689 [ERGO] Erreur de balise sur le libellé du traitement lors de l'export des données ------------------------------------------ Started by an SCM change Building on master in workspace <http://ci.nuiton.org/jenkins/job/tutti/ws/> Updating http://svn.forge.codelutin.com/svn/tutti/trunk at revision '2013-06-10T11:31:00.636 +0200' U tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties At revision 1088 Parsing POMs [trunk] $ /opt/jdk/bin/java -Xmx256m -XX:-UseGCOverheadLimit -cp /var/local/jenkins/data/plugins/maven-plugin/WEB-INF/lib/maven3-agent-1.2.jar:/opt/maven3/boot/plexus-classworlds-2.4.2.jar org.jvnet.hudson.maven3.agent.Maven3Main /opt/maven3 /opt/repository/apache-tomcat-7.0.40/webapps/jenkins/WEB-INF/lib/remoting-2.22.jar /var/local/jenkins/data/plugins/maven-plugin/WEB-INF/lib/maven3-interceptor-1.2.jar 55832 <===[JENKINS REMOTING CAPACITY]===> channel started log4j:WARN No appenders could be found for logger (org.apache.commons.beanutils.converters.BooleanConverter). log4j:WARN Please initialize the log4j system properly. Executing Maven: -B -f <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/pom.xml> -U -e clean install java.lang.reflect.InvocationTargetException at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:601) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:331) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:239) at org.jvnet.hudson.maven3.agent.Maven3Main.launch(Maven3Main.java:158) at hudson.maven.Maven3Builder.call(Maven3Builder.java:100) at hudson.maven.Maven3Builder.call(Maven3Builder.java:66) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:326) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334) at java.util.concurrent.FutureTask.run(FutureTask.java:166) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:722) Caused by: java.lang.NoClassDefFoundError: org/apache/maven/cli/MavenLoggerManager at org.jvnet.hudson.maven3.launcher.Maven3Launcher.main(Maven3Launcher.java:73) ... 18 more Caused by: java.lang.ClassNotFoundException: org.apache.maven.cli.MavenLoggerManager at org.codehaus.plexus.classworlds.strategy.SelfFirstStrategy.loadClass(SelfFirstStrategy.java:50) at org.codehaus.plexus.classworlds.realm.ClassRealm.loadClass(ClassRealm.java:244) at org.codehaus.plexus.classworlds.realm.ClassRealm.loadClass(ClassRealm.java:230) ... 19 more channel stopped ERROR: Failed to parse POMs hudson.util.IOException2: java.lang.reflect.InvocationTargetException at hudson.maven.Maven3Builder.call(Maven3Builder.java:162) at hudson.maven.Maven3Builder.call(Maven3Builder.java:66) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:326) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334) at java.util.concurrent.FutureTask.run(FutureTask.java:166) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:722) Caused by: java.lang.Exception: java.lang.reflect.InvocationTargetException at org.jvnet.hudson.maven3.agent.Maven3Main.launch(Maven3Main.java:161) at hudson.maven.Maven3Builder.call(Maven3Builder.java:100) ... 10 more Caused by: java.lang.reflect.InvocationTargetException at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:601) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:331) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:239) at org.jvnet.hudson.maven3.agent.Maven3Main.launch(Maven3Main.java:158) ... 11 more Caused by: java.lang.NoClassDefFoundError: org/apache/maven/cli/MavenLoggerManager at org.jvnet.hudson.maven3.launcher.Maven3Launcher.main(Maven3Launcher.java:73) ... 18 more Caused by: java.lang.ClassNotFoundException: org.apache.maven.cli.MavenLoggerManager at org.codehaus.plexus.classworlds.strategy.SelfFirstStrategy.loadClass(SelfFirstStrategy.java:50) at org.codehaus.plexus.classworlds.realm.ClassRealm.loadClass(ClassRealm.java:244) at org.codehaus.plexus.classworlds.realm.ClassRealm.loadClass(ClassRealm.java:230) ... 19 more

1 3