April 2014 - Tutti-commits - mailman.cloud.codelutin.com

r1694 - in trunk: . tutti-ichtyometer tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com April 17, 2014

April 17, 2014

Author: maven-release Date: 2014-04-17 12:57:53 +0200 (Thu, 17 Apr 2014) New Revision: 1694 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1694 Log: [maven-release-plugin] prepare release tutti-3.3.3 Modified: trunk/pom.xml trunk/tutti-ichtyometer/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 2014-04-17 10:52:20 UTC (rev 1693) +++ trunk/pom.xml 2014-04-17 10:57:53 UTC (rev 1694) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-SNAPSHOT</version> + <version>3.3.3</version> <packaging>pom</packaging> <name>Tutti</name> @@ -99,13 +99,13 @@ <scm> <url> - https://forge.codelutin.com/projects/tutti/repository/trunk + https://forge.codelutin.com/projects/tutti/repository/tags/tutti-3.3.3 </url> <connection> - scm:svn:http://svn.codelutin.com/tutti/trunk + scm:svn:http://svn.codelutin.com/tutti/tags/tutti-3.3.3 </connection> <developerConnection> - scm:svn:https://svn.codelutin.com/tutti/trunk + scm:svn:https://svn.codelutin.com/tutti/tags/tutti-3.3.3 </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-ichtyometer/pom.xml =================================================================== --- trunk/tutti-ichtyometer/pom.xml 2014-04-17 10:52:20 UTC (rev 1693) +++ trunk/tutti-ichtyometer/pom.xml 2014-04-17 10:57:53 UTC (rev 1694) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-SNAPSHOT</version> + <version>3.3.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2014-04-17 10:52:20 UTC (rev 1693) +++ trunk/tutti-persistence/pom.xml 2014-04-17 10:57:53 UTC (rev 1694) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-SNAPSHOT</version> + <version>3.3.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2014-04-17 10:52:20 UTC (rev 1693) +++ trunk/tutti-service/pom.xml 2014-04-17 10:57:53 UTC (rev 1694) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-SNAPSHOT</version> + <version>3.3.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2014-04-17 10:52:20 UTC (rev 1693) +++ trunk/tutti-ui-swing/pom.xml 2014-04-17 10:57:53 UTC (rev 1694) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-SNAPSHOT</version> + <version>3.3.3</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1693 - trunk
by tchemit＠users.forge.codelutin.com April 17, 2014

April 17, 2014

Author: tchemit Date: 2014-04-17 12:52:20 +0200 (Thu, 17 Apr 2014) New Revision: 1693 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1693 Log: fixes #4956 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-04-17 10:48:02 UTC (rev 1692) +++ trunk/pom.xml 2014-04-17 10:52:20 UTC (rev 1693) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>5.0.4</version> + <version>5.0.6</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r1692 - in trunk/tutti-service/src/main/java/fr/ifremer/tutti/service: export/generic protocol
by tchemit＠users.forge.codelutin.com April 17, 2014

April 17, 2014

Author: tchemit Date: 2014-04-17 12:48:02 +0200 (Thu, 17 Apr 2014) New Revision: 1692 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1692 Log: fixes #4945 Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java 2014-04-17 10:31:12 UTC (rev 1691) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java 2014-04-17 10:48:02 UTC (rev 1692) @@ -93,18 +93,12 @@ protected WeightComputingService weightComputingService; - protected char csvSeparator; - protected Caracteristic verticalOpeningCaracteristic; protected Caracteristic horizontalOpeningWingCaracteristic; protected Caracteristic horizontalOpeningDoorCaracteristic; - protected TuttiLocation country; - - protected SampleCategoryModel sampleCategoryModel; - protected Caracteristic deadOrAliveCaracteristic; protected Caracteristic genderCaracteristic; @@ -120,9 +114,6 @@ decoratorService = getService(DecoratorService.class); weightComputingService = getService(WeightComputingService.class); - sampleCategoryModel = context.getSampleCategoryModel(); - - csvSeparator = context.getConfig().getCsvSeparator(); verticalOpeningCaracteristic = persistenceService.getVerticalOpeningCaracteristic(); horizontalOpeningWingCaracteristic = persistenceService.getHorizontalOpeningWingCaracteristic(); horizontalOpeningDoorCaracteristic = persistenceService.getHorizontalOpeningDoorCaracteristic(); @@ -130,10 +121,6 @@ pmfmIdCaracteristic = persistenceService.getPmfmIdCaracteristic(); deadOrAliveCaracteristic = persistenceService.getDeadOrAliveCaracteristic(); genderCaracteristic = persistenceService.getSexCaracteristic(); - - List<TuttiLocation> allCountry = persistenceService.getAllCountry(); - String countryId = context.getConfig().getExportCountryId(); - country = TuttiEntities.splitById(allCountry).get(countryId); } public void exportProgram(String programId, @@ -302,6 +289,8 @@ List<Species> allReferentSpecies = persistenceService.getAllReferentSpecies(); Map<String, Species> speciesById = TuttiEntities.splitById(allReferentSpecies); + char csvSeparator = context.getConfig().getCsvSeparator(); + return new ExportContext( basedir, csvSeparator, @@ -310,7 +299,7 @@ deadOrAliveCaracteristic, genderCaracteristic, pmfmIdCaracteristic, - sampleCategoryModel, + context.getSampleCategoryModel(), speciesById); } @@ -420,6 +409,11 @@ protected void exportSurvey(ExportContext exportContext, Cruise cruise) { + + List<TuttiLocation> allCountry = persistenceService.getAllCountry(); + String countryId = context.getConfig().getExportCountryId(); + TuttiLocation country = TuttiEntities.splitById(allCountry).get(countryId); + try { List<SurveyExportRow> rows = Lists.newArrayList(); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java 2014-04-17 10:31:12 UTC (rev 1691) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java 2014-04-17 10:48:02 UTC (rev 1692) @@ -32,8 +32,6 @@ import com.google.common.collect.Multimap; import com.google.common.collect.TreeMultimap; import com.google.common.io.Files; -import org.nuiton.jaxx.application.ApplicationTechnicalException; -import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocols; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; @@ -51,6 +49,7 @@ import org.nuiton.csv.Export; import org.nuiton.csv.Import; import org.nuiton.csv.ImportRuntimeException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; @@ -76,15 +75,12 @@ private static final Log log = LogFactory.getLog(ProtocolImportExportService.class); - protected SampleCategoryModel sampleCategoryModel; - protected TuttiEnumerationFile enumerationFile; @Override public void setServiceContext(TuttiServiceContext context) { super.setServiceContext(context); PersistenceService service = getService(PersistenceService.class); - sampleCategoryModel = context.getDataContext().getSampleCategoryModel(); enumerationFile = service.getEnumerationFile(); } @@ -141,19 +137,23 @@ protocol.setLengthClassesPmfmId( mergeIds(protocol.getLengthClassesPmfmId(), - ids.get(CaracteristicType.LENGTH_STEP))); + ids.get(CaracteristicType.LENGTH_STEP)) + ); protocol.setVesselUseFeaturePmfmId( mergeIds(protocol.getVesselUseFeaturePmfmId(), - ids.get(CaracteristicType.VESSEL_USE_FEATURE))); + ids.get(CaracteristicType.VESSEL_USE_FEATURE)) + ); protocol.setGearUseFeaturePmfmId( mergeIds(protocol.getGearUseFeaturePmfmId(), - ids.get(CaracteristicType.GEAR_USE_FEATURE))); + ids.get(CaracteristicType.GEAR_USE_FEATURE)) + ); protocol.setIndividualObservationPmfmId( mergeIds(protocol.getIndividualObservationPmfmId(), - ids.get(CaracteristicType.INDIVIDUAL_OBSERVATION))); + ids.get(CaracteristicType.INDIVIDUAL_OBSERVATION)) + ); }

1 0

r1691 - trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities
by tchemit＠users.forge.codelutin.com April 17, 2014

April 17, 2014

Author: tchemit Date: 2014-04-17 12:31:12 +0200 (Thu, 17 Apr 2014) New Revision: 1691 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1691 Log: fixes #4953 Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java 2014-04-15 08:14:48 UTC (rev 1690) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java 2014-04-17 10:31:12 UTC (rev 1691) @@ -414,7 +414,11 @@ private static final double EARTH_RADIUS = 6378288.0; - private static final MathContext MATH_CONTEXT_4_DIGIT = new MathContext(4); + /** + * Take a {@code 5} digit context beacuse of rounding stuff to + * get exactly 4 correct digits. + */ + private static final MathContext MATH_CONTEXT_4_DIGIT = new MathContext(5); private static DecimalFormatSymbols symbols;

1 0

[ANN] - Tutti 3.3.2 released
by codelutin.com Release Notification April 15, 2014

April 15, 2014

The Tutti team is pleased to announce the tutti-3.3.2 release! Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques. Documentation of the project can be found here: https://doc.codelutin.com/projects/tutti Changes ------- Changes in this version include: Fixed Bugs: o [EXPORT GENERIQUE] dans toutes les tables, exporter les poids en kg avec une précision avec 3 décimales et différencier espèces et benthos Issue: 4923. Thanks to Vincent BADTS. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: https://forge.codelutin.com/projects/tutti/files * tutti-ichtyometer-3.3.2-tools.zip - https://forge.codelutin.com/attachments/download/1711 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Tutti team

1 0

r1690 - in trunk: . tutti-ichtyometer tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com April 15, 2014

April 15, 2014

Author: maven-release Date: 2014-04-15 10:14:48 +0200 (Tue, 15 Apr 2014) New Revision: 1690 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1690 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/tutti-ichtyometer/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 2014-04-15 08:14:41 UTC (rev 1689) +++ trunk/pom.xml 2014-04-15 08:14:48 UTC (rev 1690) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.3.2</version> + <version>4.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> @@ -99,13 +99,13 @@ <scm> <url> - https://forge.codelutin.com/projects/tutti/repository/tags/tutti-3.3.2 + https://forge.codelutin.com/projects/tutti/repository/trunk </url> <connection> - scm:svn:http://svn.codelutin.com/tutti/tags/tutti-3.3.2 + scm:svn:http://svn.codelutin.com/tutti/trunk </connection> <developerConnection> - scm:svn:https://svn.codelutin.com/tutti/tags/tutti-3.3.2 + scm:svn:https://svn.codelutin.com/tutti/trunk </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-ichtyometer/pom.xml =================================================================== --- trunk/tutti-ichtyometer/pom.xml 2014-04-15 08:14:41 UTC (rev 1689) +++ trunk/tutti-ichtyometer/pom.xml 2014-04-15 08:14:48 UTC (rev 1690) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.3.2</version> + <version>4.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2014-04-15 08:14:41 UTC (rev 1689) +++ trunk/tutti-persistence/pom.xml 2014-04-15 08:14:48 UTC (rev 1690) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.3.2</version> + <version>4.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2014-04-15 08:14:41 UTC (rev 1689) +++ trunk/tutti-service/pom.xml 2014-04-15 08:14:48 UTC (rev 1690) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.3.2</version> + <version>4.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2014-04-15 08:14:41 UTC (rev 1689) +++ trunk/tutti-ui-swing/pom.xml 2014-04-15 08:14:48 UTC (rev 1690) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.3.2</version> + <version>4.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1689 - tags
by maven-release＠users.forge.codelutin.com April 15, 2014

April 15, 2014

Author: maven-release Date: 2014-04-15 10:14:41 +0200 (Tue, 15 Apr 2014) New Revision: 1689 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1689 Log: [maven-release-plugin] copy for tag tutti-3.3.2 Added: tags/tutti-3.3.2/

1 0

r1688 - in trunk: . tutti-ichtyometer tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com April 15, 2014

April 15, 2014

Author: maven-release Date: 2014-04-15 10:14:34 +0200 (Tue, 15 Apr 2014) New Revision: 1688 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1688 Log: [maven-release-plugin] prepare release tutti-3.3.2 Modified: trunk/pom.xml trunk/tutti-ichtyometer/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 2014-04-15 08:09:17 UTC (rev 1687) +++ trunk/pom.xml 2014-04-15 08:14:34 UTC (rev 1688) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-SNAPSHOT</version> + <version>3.3.2</version> <packaging>pom</packaging> <name>Tutti</name> @@ -99,13 +99,13 @@ <scm> <url> - https://forge.codelutin.com/projects/tutti/repository/trunk + https://forge.codelutin.com/projects/tutti/repository/tags/tutti-3.3.2 </url> <connection> - scm:svn:http://svn.codelutin.com/tutti/trunk + scm:svn:http://svn.codelutin.com/tutti/tags/tutti-3.3.2 </connection> <developerConnection> - scm:svn:https://svn.codelutin.com/tutti/trunk + scm:svn:https://svn.codelutin.com/tutti/tags/tutti-3.3.2 </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-ichtyometer/pom.xml =================================================================== --- trunk/tutti-ichtyometer/pom.xml 2014-04-15 08:09:17 UTC (rev 1687) +++ trunk/tutti-ichtyometer/pom.xml 2014-04-15 08:14:34 UTC (rev 1688) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-SNAPSHOT</version> + <version>3.3.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2014-04-15 08:09:17 UTC (rev 1687) +++ trunk/tutti-persistence/pom.xml 2014-04-15 08:14:34 UTC (rev 1688) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-SNAPSHOT</version> + <version>3.3.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2014-04-15 08:09:17 UTC (rev 1687) +++ trunk/tutti-service/pom.xml 2014-04-15 08:14:34 UTC (rev 1688) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-SNAPSHOT</version> + <version>3.3.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2014-04-15 08:09:17 UTC (rev 1687) +++ trunk/tutti-ui-swing/pom.xml 2014-04-15 08:14:34 UTC (rev 1688) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-SNAPSHOT</version> + <version>3.3.2</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1687 - in trunk/tutti-service/src: main/java/fr/ifremer/tutti/service main/java/fr/ifremer/tutti/service/export/generic test/java/fr/ifremer/tutti/service/export/generic
by tchemit＠users.forge.codelutin.com April 15, 2014

April 15, 2014

Author: tchemit Date: 2014-04-15 10:09:17 +0200 (Tue, 15 Apr 2014) New Revision: 1687 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1687 Log: fixes #4923 Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/OperationExportModel.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/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 2014-04-09 08:18:56 UTC (rev 1686) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2014-04-15 08:09:17 UTC (rev 1687) @@ -75,6 +75,33 @@ */ public class TuttiCsvUtil extends Common { + /** + * To parse / format possible nullable weight. + * + * @since 3.3.2 + */ + public static final ValueParserFormatter<Float> WEIGHT_NULL_TO_9 = + new FloatParserFormatter(-9f, true) { + @Override + public String format(Float value) { + if (value == null) { + // if value is null then use the default value + value = defaultValue; + } + return TuttiEntities.getWeightStringValue(value); + } + + @Override + protected Float parseNoneEmptyValue(String value) { + Float aFloat = super.parseNoneEmptyValue(value); + if (defaultValue.equals(aFloat)) { + // if having -9, then value is null + aFloat = null; + } + return aFloat; + } + }; + public static final ValueParserFormatter<Float> FLOAT_NULL_TO_9 = new FloatParserFormatter(-9f, true) { @Override @@ -129,7 +156,7 @@ public static final ValueFormatter<Number> NUMBER_OR_NA = new ValueFormatter<Number>() { @Override public String format(Number s) { - return s==null?"NA": s.toString(); + return s == null ? "NA" : s.toString(); } }; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportModel.java 2014-04-09 08:18:56 UTC (rev 1686) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportModel.java 2014-04-15 08:09:17 UTC (rev 1687) @@ -316,6 +316,15 @@ number, benthosBatch.getRankOrder()); + if (currentRow.getSampleCategory().size() == 1) { + + //FIXME Remove this when improve export for import + // See https://forge.codelutin.com/issues/4923 + ExportSampleCategory exportSampleCategory = currentRow.getSampleCategory().get(0); + Integer rankOrder = exportSampleCategory.getRankOrder(); + exportSampleCategory.setRankOrder(100 + rankOrder); + } + if (benthosBatch.isChildBatchsEmpty()) { // on a leaf, get frequencies Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/OperationExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/OperationExportModel.java 2014-04-09 08:18:56 UTC (rev 1686) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/OperationExportModel.java 2014-04-15 08:09:17 UTC (rev 1687) @@ -72,61 +72,61 @@ newColumnForExport("Navire_Associe", FishingOperation.PROPERTY_SECONDARY_VESSEL, TuttiCsvUtil.newListVesselFormatter(vesselDecorator)); newColumnForExport("Commentaire", FishingOperation.PROPERTY_COMMENT, TuttiCsvUtil.COMMENT_FORMATTER); - newNullableColumnForExport("Poids_Total", OperationExportRow.PROPERTY_CATCH_TOTAL_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); + newNullableColumnForExport("Poids_Total", OperationExportRow.PROPERTY_CATCH_TOTAL_WEIGHT, TuttiCsvUtil.WEIGHT_NULL_TO_9); newNullableColumnForExport("Poids_Total_Calcule", OperationExportRow.PROPERTY_CATCH_TOTAL_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newNullableColumnForExport("Poids_Total_Vrac", OperationExportRow.PROPERTY_CATCH_TOTAL_SORTED_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); + newNullableColumnForExport("Poids_Total_Vrac", OperationExportRow.PROPERTY_CATCH_TOTAL_SORTED_WEIGHT, TuttiCsvUtil.WEIGHT_NULL_TO_9); newNullableColumnForExport("Poids_Total_Vrac_Calcule", OperationExportRow.PROPERTY_CATCH_TOTAL_SORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newNullableColumnForExport("Poids_Total_HorsVrac", OperationExportRow.PROPERTY_CATCH_TOTAL_UNSORTED_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); + newNullableColumnForExport("Poids_Total_HorsVrac", OperationExportRow.PROPERTY_CATCH_TOTAL_UNSORTED_WEIGHT, TuttiCsvUtil.WEIGHT_NULL_TO_9); newNullableColumnForExport("Poids_Total_HorsVrac_Calcule", OperationExportRow.PROPERTY_CATCH_TOTAL_UNSORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newNullableColumnForExport("Poids_Total_Non_Trie", OperationExportRow.PROPERTY_CATCH_TOTAL_REJECTED_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); + newNullableColumnForExport("Poids_Total_Non_Trie", OperationExportRow.PROPERTY_CATCH_TOTAL_REJECTED_WEIGHT, TuttiCsvUtil.WEIGHT_NULL_TO_9); newNullableColumnForExport("Poids_Total_Non_Trie_Calcule", OperationExportRow.PROPERTY_CATCH_TOTAL_REJECTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newNullableColumnForExport("Poids_Total_Tremis", OperationExportRow.PROPERTY_CATCH_TOTAL_SORTED_TREMIS_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); + newNullableColumnForExport("Poids_Total_Tremis", OperationExportRow.PROPERTY_CATCH_TOTAL_SORTED_TREMIS_WEIGHT, TuttiCsvUtil.WEIGHT_NULL_TO_9); newNullableColumnForExport("Poids_Total_Tremis_Calcule", OperationExportRow.PROPERTY_CATCH_TOTAL_SORTED_TREMIS_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newNullableColumnForExport("Poids_Total_Carroussel", OperationExportRow.PROPERTY_CATCH_TOTAL_SORTED_CAROUSSEL_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); + newNullableColumnForExport("Poids_Total_Carroussel", OperationExportRow.PROPERTY_CATCH_TOTAL_SORTED_CAROUSSEL_WEIGHT, TuttiCsvUtil.WEIGHT_NULL_TO_9); newNullableColumnForExport("Poids_Total_Carroussel_Calcule", OperationExportRow.PROPERTY_CATCH_TOTAL_SORTED_CAROUSSEL_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newNullableColumnForExport("Poids_Total_Espece", OperationExportRow.PROPERTY_SPECIES_TOTAL_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); + newNullableColumnForExport("Poids_Total_Espece", OperationExportRow.PROPERTY_SPECIES_TOTAL_WEIGHT, TuttiCsvUtil.WEIGHT_NULL_TO_9); newNullableColumnForExport("Poids_Total_Espece_Calcule", OperationExportRow.PROPERTY_SPECIES_TOTAL_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newNullableColumnForExport("Poids_Total_Espece_Vrac", OperationExportRow.PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); + newNullableColumnForExport("Poids_Total_Espece_Vrac", OperationExportRow.PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT, TuttiCsvUtil.WEIGHT_NULL_TO_9); newNullableColumnForExport("Poids_Total_Espece_Vrac_Calcule", OperationExportRow.PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newNullableColumnForExport("Poids_Total_Espece_Vrac_Trie", OperationExportRow.PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); + newNullableColumnForExport("Poids_Total_Espece_Vrac_Trie", OperationExportRow.PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_WEIGHT, TuttiCsvUtil.WEIGHT_NULL_TO_9); newNullableColumnForExport("Poids_Total_Espece_Vrac_Trie_Calcule", OperationExportRow.PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newNullableColumnForExport("Poids_Total_Espece_HorsVrac", OperationExportRow.PROPERTY_SPECIES_TOTAL_UNSORTED_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); + newNullableColumnForExport("Poids_Total_Espece_HorsVrac", OperationExportRow.PROPERTY_SPECIES_TOTAL_UNSORTED_WEIGHT, TuttiCsvUtil.WEIGHT_NULL_TO_9); newNullableColumnForExport("Poids_Total_Espece_HorsVrac_Calcule", OperationExportRow.PROPERTY_SPECIES_TOTAL_UNSORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newNullableColumnForExport("Poids_Total_Espece_Inerte_Trie", OperationExportRow.PROPERTY_SPECIES_TOTAL_INERT_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); + newNullableColumnForExport("Poids_Total_Espece_Inerte_Trie", OperationExportRow.PROPERTY_SPECIES_TOTAL_INERT_WEIGHT, TuttiCsvUtil.WEIGHT_NULL_TO_9); newNullableColumnForExport("Poids_Total_Espece_Inerte_Trie_Calcule", OperationExportRow.PROPERTY_SPECIES_TOTAL_INERT_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newNullableColumnForExport("Poids_Total_Espece_Vivant_non_detaille_trie", OperationExportRow.PROPERTY_SPECIES_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); + newNullableColumnForExport("Poids_Total_Espece_Vivant_non_detaille_trie", OperationExportRow.PROPERTY_SPECIES_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT, TuttiCsvUtil.WEIGHT_NULL_TO_9); newNullableColumnForExport("Poids_Total_Espece_Vivant_non_detaille_trie_Calcule", OperationExportRow.PROPERTY_SPECIES_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newNullableColumnForExport("Poids_Total_Benthos", OperationExportRow.PROPERTY_BENTHOS_TOTAL_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); + newNullableColumnForExport("Poids_Total_Benthos", OperationExportRow.PROPERTY_BENTHOS_TOTAL_WEIGHT, TuttiCsvUtil.WEIGHT_NULL_TO_9); newNullableColumnForExport("Poids_Total_Benthos_Calcule", OperationExportRow.PROPERTY_BENTHOS_TOTAL_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newNullableColumnForExport("Poids_Total_Benthos_Vrac", OperationExportRow.PROPERTY_BENTHOS_TOTAL_SORTED_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); + newNullableColumnForExport("Poids_Total_Benthos_Vrac", OperationExportRow.PROPERTY_BENTHOS_TOTAL_SORTED_WEIGHT, TuttiCsvUtil.WEIGHT_NULL_TO_9); newNullableColumnForExport("Poids_Total_Benthos_Vrac_Calcule", OperationExportRow.PROPERTY_BENTHOS_TOTAL_SORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newNullableColumnForExport("Poids_Total_Benthos_Vrac_Trie", OperationExportRow.PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); + newNullableColumnForExport("Poids_Total_Benthos_Vrac_Trie", OperationExportRow.PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_WEIGHT, TuttiCsvUtil.WEIGHT_NULL_TO_9); newNullableColumnForExport("Poids_Total_Benthos_Vrac_Trie_Calcule", OperationExportRow.PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newNullableColumnForExport("Poids_Total_Benthos_HorsVrac", OperationExportRow.PROPERTY_BENTHOS_TOTAL_UNSORTED_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); + newNullableColumnForExport("Poids_Total_Benthos_HorsVrac", OperationExportRow.PROPERTY_BENTHOS_TOTAL_UNSORTED_WEIGHT, TuttiCsvUtil.WEIGHT_NULL_TO_9); newNullableColumnForExport("Poids_Total_Benthos_HorsVrac_Calcule", OperationExportRow.PROPERTY_BENTHOS_TOTAL_UNSORTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newNullableColumnForExport("Poids_Total_Benthos_Inerte_Trie", OperationExportRow.PROPERTY_BENTHOS_TOTAL_INERT_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); + newNullableColumnForExport("Poids_Total_Benthos_Inerte_Trie", OperationExportRow.PROPERTY_BENTHOS_TOTAL_INERT_WEIGHT, TuttiCsvUtil.WEIGHT_NULL_TO_9); newNullableColumnForExport("Poids_Total_Benthos_Inerte_Trie_Calcule", OperationExportRow.PROPERTY_BENTHOS_TOTAL_INERT_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newNullableColumnForExport("Poids_Total_Benthos_Vivant_non_detaille_trie", OperationExportRow.PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); + newNullableColumnForExport("Poids_Total_Benthos_Vivant_non_detaille_trie", OperationExportRow.PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT, TuttiCsvUtil.WEIGHT_NULL_TO_9); newNullableColumnForExport("Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule", OperationExportRow.PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); - newNullableColumnForExport("Poids_Total_Macro_Dechet", OperationExportRow.PROPERTY_MARINE_LITTER_TOTAL_WEIGHT, TuttiCsvUtil.FLOAT_NULL_TO_9); + newNullableColumnForExport("Poids_Total_Macro_Dechet", OperationExportRow.PROPERTY_MARINE_LITTER_TOTAL_WEIGHT, TuttiCsvUtil.WEIGHT_NULL_TO_9); newNullableColumnForExport("Poids_Total_Macro_Dechet_Calcule", OperationExportRow.PROPERTY_MARINE_LITTER_TOTAL_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); } Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportServiceTest.java 2014-04-09 08:18:56 UTC (rev 1686) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportServiceTest.java 2014-04-15 08:09:17 UTC (rev 1687) @@ -104,10 +104,10 @@ "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;|||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Mâle;1;30.0;;Poids;kg;1 - Stade 1;1;10.0;5.0;Poids;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;10.5;2;;cm;0.5;2;5.0;20.0;2.0\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;|||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Mâle;1;30.0;;Poids;kg;1 - Stade 1;1;10.0;5.0;Poids;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;11.0;3;;cm;0.5;1;5.0;20.0;2.0\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;|||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Mâle;1;30.0;;Poids;kg;3 - Stade 3;3;10.0;;Poids;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;11.0;1;;cm;0.5;5;10.0;10.0;1.0\n" + - "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Femelle;2;50.0;30.0;Poids;kg;3 - Stade 3;3;10.0;;Poids;kg;NA;;;;;kg;1425;Longueur totale (LT) - individu - queue - Mesure au cm par un observateur;10.0;1;;cm;;5;30.0;3.3333333;1.6666666\n" + - "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Femelle;2;50.0;30.0;Poids;kg;3 - Stade 3;3;10.0;;Poids;kg;NA;;;;;kg;1425;Longueur totale (LT) - individu - queue - Mesure au cm par un observateur;11.0;2;;cm;;6;30.0;3.3333333;1.6666666\n" + - "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Femelle;2;50.0;30.0;Poids;kg;3 - Stade 3;3;10.0;;Poids;kg;NA;;;;;kg;1425;Longueur totale (LT) - individu - queue - Mesure au cm par un observateur;12.0;3;;cm;;7;30.0;3.3333333;1.6666666\n" + - "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;|;Vrac;1;100.0;;Poids;kg;M - Moyen;2;20.0;;Poids;kg;Femelle;2;50.0;30.0;Poids;kg;3 - Stade 3;3;10.0;;Poids;kg;NA;;;;;kg;;;;;;;;;20.0;5.0;1.6666666\n" + + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Femelle;2;50.0;30.0;Poids;kg;NA;;;;;kg;NA;;;;;kg;1425;Longueur totale (LT) - individu - queue - Mesure au cm par un observateur;10.0;1;;cm;;5;30.0;3.3333333;1.6666666\n" + + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Femelle;2;50.0;30.0;Poids;kg;NA;;;;;kg;NA;;;;;kg;1425;Longueur totale (LT) - individu - queue - Mesure au cm par un observateur;11.0;2;;cm;;6;30.0;3.3333333;1.6666666\n" + + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Femelle;2;50.0;30.0;Poids;kg;NA;;;;;kg;NA;;;;;kg;1425;Longueur totale (LT) - individu - queue - Mesure au cm par un observateur;12.0;3;;cm;;7;30.0;3.3333333;1.6666666\n" + + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;|;Vrac;1;100.0;;Poids;kg;M - Moyen;2;20.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;20.0;5.0;1.0\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;;Hors Vrac;1;20.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;2;20.0;1.0;1.0"; public static final String CATCH_CONTENT_2 =

1 0

[ANN] - Tutti 3.3.1 released
by codelutin.com Release Notification April 9, 2014

April 9, 2014

The Tutti team is pleased to announce the tutti-3.3.1 release! Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques. Documentation of the project can be found here: https://doc.codelutin.com/projects/tutti Changes ------- Changes in this version include: Fixed Bugs: o [EXPORT GENERIQUE] Les catégorisations ne sont pas bien exportées (table catch) Issue: 4904. Thanks to Vincent BADTS. Resolved by tchemit. o Mauvaise traduction (export sumatra v2) Issue: 4866. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: https://forge.codelutin.com/projects/tutti/files * tutti-ichtyometer-3.3.1-tools.zip - https://forge.codelutin.com/attachments/download/1690 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Tutti team

1 0