Author: kmorin Date: 2013-05-30 10:28:18 +0200 (Thu, 30 May 2013) New Revision: 1034 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1034 Log: refs #2523 [ELEVATION] ?\195?\169l?\195?\169vation non effectu?\195?\169e (lors de l'export g?\195?\169n?\195?\169rique) Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.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/catches/TuttiWeightComputingService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.java 2013-05-29 21:06:38 UTC (rev 1033) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.java 2013-05-30 08:28:18 UTC (rev 1034) @@ -154,6 +154,14 @@ return result; } + /** + * Compute the weights of the catch batch (not the ones of the species, benthos nor marine litter batches) + * + * @param catchBatch the catch batch with the weights to compute + * @param rootSpeciesBatch the species batches with already computed weights + * @param rootBenthosBatch the benthos batches with already computed weights + * @param rootMarineLitterBatch the marine litter batches with already computed weights + */ public void computeCatchBatchWeights(CatchBatch catchBatch, BatchContainer<SpeciesBatch> rootSpeciesBatch, BatchContainer<BenthosBatch> rootBenthosBatch, 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-05-29 21:06:38 UTC (rev 1033) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 2013-05-30 08:28:18 UTC (rev 1034) @@ -492,13 +492,13 @@ operationId); BatchContainer<SpeciesBatch> rootSpeciesBatch = - persistenceService.getRootSpeciesBatch(operationId); + tuttiWeightComputingService.getComputedSpeciesBatches(operation); BatchContainer<BenthosBatch> rootBenthosBatch = - persistenceService.getRootBenthosBatch(operationId); + tuttiWeightComputingService.getComputedBenthosBatches(operation); BatchContainer<MarineLitterBatch> rootMarineLitterBatch = - persistenceService.getRootMarineLitterBatch(operationId); + tuttiWeightComputingService.getComputedMarineLitterBatches(operation, catchBatch.getMarineLitterTotalWeight()); tuttiWeightComputingService.computeCatchBatchWeights( catchBatch, 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-05-29 21:06:38 UTC (rev 1033) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java 2013-05-30 08:28:18 UTC (rev 1034) @@ -274,7 +274,7 @@ } //FIXME (see http://forge.codelutin.com/issues/2523) - @Test(expected = TuttiTechnicalException.class) + @Test public void exportBadCatches() throws Exception { loadData(PROGRAM_ID, CRUISE_CGFS_ID);