Author: tchemit Date: 2014-03-20 13:16:26 +0100 (Thu, 20 Mar 2014) New Revision: 1630 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1630 Log: fixes #4799: [EXPORT GENERIQUE] Perte du code campagne Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.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/TuttiExportService.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2014-03-20 11:09:06 UTC (rev 1629) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2014-03-20 12:16:26 UTC (rev 1630) @@ -921,6 +921,14 @@ surveyCodeByTaxonId.put(taxonId, surveyCode); } } + for (SpeciesProtocol speciesProtocol : protocol.getBenthos()) { + String surveyCode = speciesProtocol.getSpeciesSurveyCode(); + if (StringUtils.isNotBlank(surveyCode)) { + Integer taxonId = + speciesProtocol.getSpeciesReferenceTaxonId(); + surveyCodeByTaxonId.put(taxonId, surveyCode); + } + } for (Species species : speciesList) { Integer taxonId = species.getReferenceTaxonId(); String surveyCode = surveyCodeByTaxonId.get(taxonId); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java 2014-03-20 11:09:06 UTC (rev 1629) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java 2014-03-20 12:16:26 UTC (rev 1630) @@ -755,6 +755,8 @@ } lengthStepCaracteristics = null; defaultIndividualObservationCaracteristics = null; + // survey code must be refresh + resetSpecies(); } public void resetGears() { @@ -884,7 +886,7 @@ boolean result = gearShootingStartDate == null || gearShootingEndDate == null; if (!result) { int minutes = DateUtil.getDifferenceInMinutes(gearShootingStartDate, gearShootingEndDate); - result |= minutes <= 45 && minutes >= 20; + result = minutes <= 45 && minutes >= 20; } return result; } 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-03-20 11:09:06 UTC (rev 1629) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportModel.java 2014-03-20 12:16:26 UTC (rev 1630) @@ -197,13 +197,15 @@ currentRow.addComment(speciesBatch.getComment()); + Integer number = TuttiEntities.getValueOrComputedValue(speciesBatch.getNumber(), + speciesBatch.getComputedNumber()); prepareBatch(currentRow, speciesBatch.getSampleCategoryId(), speciesBatch.getSampleCategoryValue(), speciesBatch.getSampleCategoryWeight(), speciesBatch.getSampleCategoryComputedWeight(), speciesBatch.getWeight(), - speciesBatch.getNumber(), + number, speciesBatch.getRankOrder()); if (speciesBatch.isChildBatchsEmpty()) { @@ -291,15 +293,16 @@ protected void prepareUnsortedRows(CatchExportRow currentRow, List<CatchExportRow> rows, SpeciesBatch speciesBatch) { + Integer number = TuttiEntities.getValueOrComputedValue(speciesBatch.getNumber(), + speciesBatch.getComputedNumber()); - prepareBatch(currentRow, speciesBatch.getSampleCategoryId(), speciesBatch.getSampleCategoryValue(), speciesBatch.getSampleCategoryWeight(), speciesBatch.getSampleCategoryComputedWeight(), speciesBatch.getWeight(), - speciesBatch.getNumber(), + number, speciesBatch.getRankOrder()); CatchExportRow row = currentRow.copy(); @@ -320,13 +323,17 @@ currentRow.addComment(benthosBatch.getComment()); + Integer number = TuttiEntities.getValueOrComputedValue( + benthosBatch.getNumber(), + benthosBatch.getComputedNumber()); + prepareBatch(currentRow, benthosBatch.getSampleCategoryId(), benthosBatch.getSampleCategoryValue(), benthosBatch.getSampleCategoryWeight(), benthosBatch.getSampleCategoryComputedWeight(), benthosBatch.getWeight(), - benthosBatch.getNumber(), + number, benthosBatch.getRankOrder()); if (benthosBatch.isChildBatchsEmpty()) { @@ -414,13 +421,17 @@ List<CatchExportRow> rows, BenthosBatch benthosBatch) { + Integer number = TuttiEntities.getValueOrComputedValue( + benthosBatch.getNumber(), + benthosBatch.getComputedNumber()); + prepareBatch(currentRow, benthosBatch.getSampleCategoryId(), benthosBatch.getSampleCategoryValue(), benthosBatch.getSampleCategoryWeight(), benthosBatch.getSampleCategoryComputedWeight(), benthosBatch.getWeight(), - benthosBatch.getNumber(), + number, benthosBatch.getRankOrder()); CatchExportRow row = currentRow.copy(); 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-03-20 11:09:06 UTC (rev 1629) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java 2014-03-20 12:16:26 UTC (rev 1630) @@ -576,6 +576,7 @@ BatchContainer<BenthosBatch> rootBenthosBatch = operationContext.getRootBenthosBatch(); + // Warning! This will also add the survey code to bathc species exportContext.speciesModel.prepareBatchRows( exportContext, rootSpeciesBatch, @@ -865,6 +866,8 @@ SpeciesExportRow row = new SpeciesExportRow(); row.setSpecies(fullSpecies); speciesToExport.put(speciesId, row); + // add the survey code (see http://forge.codelutin.com/issues/4799) + species.setSurveyCode(fullSpecies.getSurveyCode()); } }