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

r1041 - trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export
by tchemit＠users.forge.codelutin.com 30 May '13

30 May '13

Author: tchemit Date: 2013-05-30 15:09:04 +0200 (Thu, 30 May 2013) New Revision: 1041 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1041 Log: fixes #2523: [ELEVATION] ?\195?\169l?\195?\169vation non effectu?\195?\169e (lors de l'export g?\195?\169n?\195?\169rique) 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-05-30 13:08:20 UTC (rev 1040) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java 2013-05-30 13:09:04 UTC (rev 1041) @@ -26,7 +26,6 @@ import com.google.common.collect.Lists; import com.google.common.io.Files; -import fr.ifremer.tutti.TuttiTechnicalException; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Cruise; @@ -273,7 +272,7 @@ CATCH_CONTENT); } - //FIXME (see http://forge.codelutin.com/issues/2523) + // To fix http://forge.codelutin.com/issues/2523 @Test public void exportBadCatches() throws Exception { @@ -287,9 +286,6 @@ } finally { exportContext.close(); } - assertFileContent("Catch export:\n", - exportContext.catchFile, - CATCH_CONTENT); } @Test

1 0

r1040 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing
by kmorin＠users.forge.codelutin.com 30 May '13

30 May '13

Author: kmorin Date: 2013-05-30 15:08:20 +0200 (Thu, 30 May 2013) New Revision: 1040 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1040 Log: add double list state management Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-05-30 13:02:29 UTC (rev 1039) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-05-30 13:08:20 UTC (rev 1040) @@ -54,9 +54,11 @@ import fr.ifremer.tutti.ui.swing.util.UIMessageNotifier; import fr.ifremer.tutti.ui.swing.util.action.TuttiActionUI; import jaxx.runtime.JAXXContext; +import jaxx.runtime.swing.editor.bean.BeanDoubleList; import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import jaxx.runtime.swing.help.JAXXHelpBroker; import jaxx.runtime.swing.help.JAXXHelpUIHandler; +import jaxx.runtime.swing.session.BeanDoubleListState; import jaxx.runtime.swing.session.BeanFilterableComboBoxState; import jaxx.runtime.swing.session.State; import jaxx.runtime.swing.session.SwingSession; @@ -287,6 +289,7 @@ Map<Class, State> additionalStates = Maps.newHashMap(); additionalStates.put(BeanFilterableComboBox.class, new BeanFilterableComboBoxState()); + additionalStates.put(BeanDoubleList.class, new BeanDoubleListState()); this.swingSession = new SwingSession(getConfig().getUIConfigFile(), false, additionalStates); this.errorHelper = new TuttiErrorHelper(this);

1 0

r1039 - 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 30 May '13

30 May '13

Author: kmorin Date: 2013-05-30 15:02:29 +0200 (Thu, 30 May 2013) New Revision: 1039 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1039 Log: fixes #2498 [MENSURATION] perte de la saisie bis 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/species/frequency/SpeciesFrequencyTableModel.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-05-30 12:50:05 UTC (rev 1038) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java 2013-05-30 13:02:29 UTC (rev 1039) @@ -105,6 +105,7 @@ }); result.setLengthStepCaracteristic(uiModel.getLengthStepCaracteristic()); result.setLengthStep(defaultStep); + result.setValid(true); return result; } 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-05-30 12:50:05 UTC (rev 1038) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java 2013-05-30 13:02:29 UTC (rev 1039) @@ -105,6 +105,7 @@ }); result.setLengthStepCaracteristic(uiModel.getLengthStepCaracteristic()); result.setLengthStep(defaultStep); + result.setValid(true); return result; }

1 0

r1038 - 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 30 May '13

30 May '13

Author: kmorin Date: 2013-05-30 14:50:05 +0200 (Thu, 30 May 2013) New Revision: 1038 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1038 Log: fixes #2498 [MENSURATION] perte de la saisie bis Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 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/BenthosFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.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/SpeciesFrequencyUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2013-05-30 12:39:31 UTC (rev 1037) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2013-05-30 12:50:05 UTC (rev 1038) @@ -177,7 +177,10 @@ // transfer rows to editor for (BenthosFrequencyRowModel row : frequencyModel.getRows()) { - if (row.isValid()) { + // the row is valid even if there is no data (just for the highlighter) + // but we save it only if there is data + if (row.isValid() + && !(row.getNumber() == null && row.getWeight() == null)) { // can keep this row frequency.add(row); 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-05-30 12:39:31 UTC (rev 1037) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java 2013-05-30 12:50:05 UTC (rev 1038) @@ -105,7 +105,6 @@ }); result.setLengthStepCaracteristic(uiModel.getLengthStepCaracteristic()); result.setLengthStep(defaultStep); - result.setValid(false); return result; } 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-05-30 12:39:31 UTC (rev 1037) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-05-30 12:50:05 UTC (rev 1038) @@ -113,8 +113,9 @@ protected boolean isRowValid(BenthosFrequencyRowModel row) { return row.getLengthStepCaracteristic() != null && row.getLengthStep() != null && - row.getNumber() != null && row.getNumber() > 0 && - (withWeightRows.isEmpty() || row.getWeight() != null && row.getWeight() > 0); + ((row.getNumber() == null && row.getWeight() == null) || + (row.getNumber() != null && row.getNumber() > 0 && + (withWeightRows.isEmpty() || row.getWeight() != null && row.getWeight() > 0))); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2013-05-30 12:39:31 UTC (rev 1037) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2013-05-30 12:50:05 UTC (rev 1038) @@ -177,7 +177,10 @@ // transfer rows to editor for (SpeciesFrequencyRowModel row : frequencyModel.getRows()) { - if (row.isValid()) { + // the row is valid even if there is no data (just for the highlighter) + // but we save it only if there is data + if (row.isValid() + && !(row.getNumber() == null && row.getWeight() == null)) { // can keep this row frequency.add(row); 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-05-30 12:39:31 UTC (rev 1037) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java 2013-05-30 12:50:05 UTC (rev 1038) @@ -105,7 +105,6 @@ }); result.setLengthStepCaracteristic(uiModel.getLengthStepCaracteristic()); result.setLengthStep(defaultStep); - result.setValid(false); return result; } 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-05-30 12:39:31 UTC (rev 1037) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-05-30 12:50:05 UTC (rev 1038) @@ -114,8 +114,9 @@ protected boolean isRowValid(SpeciesFrequencyRowModel row) { return row.getLengthStepCaracteristic() != null && row.getLengthStep() != null && - row.getNumber() != null && row.getNumber() > 0 && - (withWeightRows.isEmpty() || row.getWeight() != null && row.getWeight() > 0); + ((row.getNumber() == null && row.getWeight() == null) || + (row.getNumber() != null && row.getNumber() > 0 && + (withWeightRows.isEmpty() || row.getWeight() != null && row.getWeight() > 0))); } @Override

1 0

r1037 - in trunk: . tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config
by tchemit＠users.forge.codelutin.com 30 May '13

30 May '13

Author: tchemit Date: 2013-05-30 14:39:31 +0200 (Thu, 30 May 2013) New Revision: 1037 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1037 Log: fixes #2515: [CONF] - Impossible de modifier le navire pour le carroussel Modified: trunk/pom.xml trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-30 10:10:45 UTC (rev 1036) +++ trunk/pom.xml 2013-05-30 12:39:31 UTC (rev 1037) @@ -132,7 +132,7 @@ <eugenePluginVersion>2.6.2</eugenePluginVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> - <jaxxVersion>2.5.20</jaxxVersion> + <jaxxVersion>2.5.21-SNAPSHOT</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.14.1</xworkVersion> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java 2013-05-30 10:10:45 UTC (rev 1036) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java 2013-05-30 12:39:31 UTC (rev 1037) @@ -147,7 +147,7 @@ protected File configFile; - protected File getConfigFile() { + public File getConfigFile() { if (configFile == null) { File dir = getTuttiBasedir(); if (dir == null || !dir.exists() || !isFullLaunchMode()) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java 2013-05-30 10:10:45 UTC (rev 1036) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java 2013-05-30 12:39:31 UTC (rev 1037) @@ -88,7 +88,8 @@ TuttiApplicationConfig config = getConfig(); - ConfigUIHelper helper = new ConfigUIHelper(config.getApplicationConfig()); + ConfigUIHelper helper = new ConfigUIHelper(config.getApplicationConfig(), + config.getConfigFile()); helper.registerCallBack( CALLBACK_UI, n_("tutti.config.action.reload.ui"),

1 0

r1036 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation
by kmorin＠users.forge.codelutin.com 30 May '13

30 May '13

Author: kmorin Date: 2013-05-30 12:10:45 +0200 (Thu, 30 May 2013) New Revision: 1036 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1036 Log: fixes #2525 [TRAIT] warning ?\195?\160 contr?\195?\180ler Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java 2013-05-30 08:38:30 UTC (rev 1035) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java 2013-05-30 10:10:45 UTC (rev 1036) @@ -115,7 +115,7 @@ * * @since 1.1 */ - protected boolean catchEnabled; + protected boolean catchEnabled = true; /** * Flag setted to true when no catch found.

1 0

r1035 - 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 30 May '13

30 May '13

Author: kmorin Date: 2013-05-30 10:38:30 +0200 (Thu, 30 May 2013) New Revision: 1035 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1035 Log: fixes #2524 [MENSURATION] - Erreur si on supprime la valeur dans une cellule 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/species/frequency/SpeciesFrequencyUIHandler.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-05-30 08:28:18 UTC (rev 1034) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-05-30 08:38:30 UTC (rev 1035) @@ -148,7 +148,10 @@ recomputeRowValidState(r); } if (r.isValid()) { - totalNumber += r.getNumber(); + Integer number = r.getNumber(); + if (number != null) { + totalNumber += number; + } Float weight = r.getWeight(); if (weight != null) { totalWeight += weight; 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-05-30 08:28:18 UTC (rev 1034) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-05-30 08:38:30 UTC (rev 1035) @@ -148,7 +148,10 @@ recomputeRowValidState(r); } if (r.isValid()) { - totalNumber += r.getNumber(); + Integer number = r.getNumber(); + if (number != null) { + totalNumber += number; + } Float weight = r.getWeight(); if (weight != null) { totalWeight += weight;

1 0

r1034 - in trunk/tutti-service/src: main/java/fr/ifremer/tutti/service/catches main/java/fr/ifremer/tutti/service/export test/java/fr/ifremer/tutti/service/export
by kmorin＠users.forge.codelutin.com 30 May '13

30 May '13

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);

1 0

r1033 - in trunk/tutti-service/src: main/java/fr/ifremer/tutti/service/catches test/java/fr/ifremer/tutti/service/export
by tchemit＠users.forge.codelutin.com 29 May '13

29 May '13

Author: tchemit Date: 2013-05-29 23:06:38 +0200 (Wed, 29 May 2013) New Revision: 1033 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1033 Log: refs #2523: [ELEVATION] ?\195?\169l?\195?\169vation non effectu?\195?\169e (lors de l'export g?\195?\169n?\195?\169rique) (ajout d'un test + correction (je crois) sur l'?\195?\169l?\195?\169vation des poids) Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.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 20:02:11 UTC (rev 1032) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.java 2013-05-29 21:06:38 UTC (rev 1033) @@ -171,7 +171,7 @@ weight = row.getSampleCategoryComputedWeight(); } if (weight == null) { - return; + break; } CaracteristicQualitativeValue value = (CaracteristicQualitativeValue) row.getSampleCategoryValue(); @@ -227,7 +227,7 @@ weight = row.getSampleCategoryComputedWeight(); } if (weight == null) { - return; + break; } CaracteristicQualitativeValue value = (CaracteristicQualitativeValue) row.getSampleCategoryValue(); 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 20:02:11 UTC (rev 1032) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java 2013-05-29 21:06:38 UTC (rev 1033) @@ -26,6 +26,7 @@ import com.google.common.collect.Lists; import com.google.common.io.Files; +import fr.ifremer.tutti.TuttiTechnicalException; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Cruise; @@ -69,6 +70,8 @@ public static final String CRUISE_ID = "100001"; + public static final String CRUISE_CGFS_ID = "100000"; + public static final String OPERATION_1_ID = "100106"; public static final String OPERATION_2_ID = "100107"; @@ -171,29 +174,11 @@ service = serviceContext.getService(TuttiExportService.class); - - program = persistenceService.getProgram(PROGRAM_ID); - Assert.assertNotNull(program); - - cruise = persistenceService.getCruise(CRUISE_ID); - Assert.assertNotNull(cruise); - - operations = persistenceService.getAllFishingOperation(cruise.getId()); - Assert.assertNotNull(operations); + loadData(PROGRAM_ID, CRUISE_ID); Assert.assertEquals(2, operations.size()); Assert.assertEquals(OPERATION_1_ID, operations.get(0).getId()); Assert.assertEquals(OPERATION_2_ID, operations.get(1).getId()); - // load fully operations - List<FishingOperation> loadedOperations = - Lists.newArrayListWithCapacity(operations.size()); - for (FishingOperation operation : operations) { - FishingOperation loadedOeration = - persistenceService.getFishingOperation(operation.getId()); - loadedOperations.add(loadedOeration); - } - operations = loadedOperations; - progressionModel = new ProgressionModel(); progressionModel.setTotal(8); } @@ -288,6 +273,25 @@ CATCH_CONTENT); } + //FIXME (see http://forge.codelutin.com/issues/2523) + @Test(expected = TuttiTechnicalException.class) + public void exportBadCatches() throws Exception { + + loadData(PROGRAM_ID, CRUISE_CGFS_ID); + + TuttiExportService.ExportContext exportContext = + service.createExportContext(dataDirectory, null); + + try { + service.exportCatches(exportContext, cruise, operations); + } finally { + exportContext.close(); + } + assertFileContent("Catch export:\n", + exportContext.catchFile, + CATCH_CONTENT); + } + @Test public void exportMarineLitters() throws Exception { @@ -336,7 +340,6 @@ ACCIDENTAL_CATCH_CONTENT); } - @Test public void exportSpecies() throws Exception { @@ -363,6 +366,7 @@ SPECIES_CONTENT); } + protected void assertFileContent(String message, File actualFile, String expectedContent) throws IOException { @@ -375,4 +379,25 @@ log.info(message + fileContent); } } + + protected void loadData(String programId, String cruiseId) { + program = persistenceService.getProgram(programId); + Assert.assertNotNull(program); + + cruise = persistenceService.getCruise(cruiseId); + Assert.assertNotNull(cruise); + + operations = persistenceService.getAllFishingOperation(cruise.getId()); + Assert.assertNotNull(operations); + + // load fully operations + List<FishingOperation> loadedOperations = + Lists.newArrayListWithCapacity(operations.size()); + for (FishingOperation operation : operations) { + FishingOperation loadedOeration = + persistenceService.getFishingOperation(operation.getId()); + loadedOperations.add(loadedOeration); + } + operations = loadedOperations; + } }

1 0

r1032 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities tutti-service/src/main/java/fr/ifremer/tutti/service/export tutti-service/src/test/java/fr/ifremer/tutti/service/export
by tchemit＠users.forge.codelutin.com 29 May '13

29 May '13

Author: tchemit Date: 2013-05-29 22:02:11 +0200 (Wed, 29 May 2013) New Revision: 1032 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1032 Log: fixes #2522: [IMP/EXP] Il manque des exports de captures Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.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/TuttiExportService.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.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 2013-05-29 14:50:32 UTC (rev 1031) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java 2013-05-29 20:02:11 UTC (rev 1032) @@ -102,7 +102,7 @@ public boolean apply(SpeciesBatch input) { return SampleCategoryEnum.sortedUnsorted == input.getSampleCategoryType() && - SortedUnsortedEnum.SORTED.getFieldValue().equals(input.getSampleCategoryValue()); + SortedUnsortedEnum.SORTED.getFieldValue().equals(((CaracteristicQualitativeValue)input.getSampleCategoryValue()).getIdAsInt()); } }; @@ -110,7 +110,7 @@ public boolean apply(BenthosBatch input) { return SampleCategoryEnum.sortedUnsorted == input.getSampleCategoryType() && - SortedUnsortedEnum.SORTED.getFieldValue().equals(input.getSampleCategoryValue()); + SortedUnsortedEnum.SORTED.getFieldValue().equals(((CaracteristicQualitativeValue)input.getSampleCategoryValue()).getIdAsInt()); } }; 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-05-29 14:50:32 UTC (rev 1031) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java 2013-05-29 20:02:11 UTC (rev 1032) @@ -178,10 +178,9 @@ List<SpeciesBatchFrequency> speciesBatchFrequency = persistenceService.getAllSpeciesBatchFrequency(speciesBatch.getId()); - if (CollectionUtils.isEmpty(speciesBatchFrequency) || - speciesBatchFrequency.get(0).getWeight() == null) { + if (CollectionUtils.isEmpty(speciesBatchFrequency)) { - // no frequency or frequencies with no weight + // no frequency CatchExportRow row = currentRow.copy(); @@ -203,14 +202,31 @@ rows.add(row); } else { - // there is some frequencies with weight + // there is some frequencies + Float referenceWeight = null; + if (speciesBatchFrequency.get(0).getWeight() == null) { + + // no weight on frequencies use upper reference weight + + referenceWeight = speciesBatch.getWeight(); + + if (referenceWeight == null) { + referenceWeight = speciesBatch.getSampleCategoryWeight(); + } + + if (referenceWeight == null) { + referenceWeight = speciesBatch.getSampleCategoryComputedWeight(); + } + } for (SpeciesBatchFrequency batchFrequency : speciesBatchFrequency) { CatchExportRow row = currentRow.copy(); row.setSpeciesFrequency(batchFrequency); rows.add(row); - Float referenceWeight = batchFrequency.getWeight(); + if (referenceWeight == null) { + referenceWeight = batchFrequency.getWeight(); + } computeRaisingFactor(row, catchRaisingFactor, @@ -275,10 +291,9 @@ List<BenthosBatchFrequency> benthosBatchFrequency = persistenceService.getAllBenthosBatchFrequency(benthosBatch.getId()); - if (CollectionUtils.isEmpty(benthosBatchFrequency) || - benthosBatchFrequency.get(0).getWeight() == null) { + if (CollectionUtils.isEmpty(benthosBatchFrequency)) { - // no frequency or frequencies with no weight + // no frequency CatchExportRow row = currentRow.copy(); @@ -300,14 +315,33 @@ rows.add(row); } else { - // there is some frequencies with weight + // there is some frequencies + Float referenceWeight = null; + + if (benthosBatchFrequency.get(0).getWeight() == null) { + + // no weight on frequencies use upper reference weight + + referenceWeight = benthosBatch.getWeight(); + + if (referenceWeight == null) { + referenceWeight = benthosBatch.getSampleCategoryWeight(); + } + + if (referenceWeight == null) { + referenceWeight = benthosBatch.getSampleCategoryComputedWeight(); + } + } + for (BenthosBatchFrequency batchFrequency : benthosBatchFrequency) { CatchExportRow row = currentRow.copy(); row.setBenthosFrequency(batchFrequency); rows.add(row); - Float referenceWeight = batchFrequency.getWeight(); + if (referenceWeight == null) { + referenceWeight = batchFrequency.getWeight(); + } computeRaisingFactor(row, catchRaisingFactor, referenceWeight); } @@ -356,14 +390,14 @@ } protected void prepareBatch(CatchExportRow currentRow, - SampleCategoryEnum sampleCategoryType, - Serializable sampleCategoryValue, - Float sampleCategoryWeight, - Float sampleCategoryComputedWeight, - Float batchWeight, - Integer batchNumber, - Integer batchComputedNumber, - Integer batchRankOrder + SampleCategoryEnum sampleCategoryType, + Serializable sampleCategoryValue, + Float sampleCategoryWeight, + Float sampleCategoryComputedWeight, + Float batchWeight, + Integer batchNumber, + Integer batchComputedNumber, + Integer batchRankOrder ) { ExportSampleCategory<Serializable> sampleCategory = new ExportSampleCategory<Serializable>(); 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 14:50:32 UTC (rev 1031) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 2013-05-29 20:02:11 UTC (rev 1032) @@ -511,8 +511,6 @@ rootSpeciesBatch, rootBenthosBatch); - - Float totalWeight = catchBatch.getCatchTotalWeight(); if (totalWeight == null) { @@ -524,8 +522,8 @@ Float totalSpeciesWeight = catchBatch.getSpeciesTotalSampleSortedComputedWeight(); Float totalBenthosWeight = catchBatch.getBenthosTotalSampleSortedComputedWeight(); - Float speciesCatchRaisingFactor =(totalWeight-totalUnsortedWeight) / (totalSpeciesWeight); - Float benthosCatchRaisingFactor =(totalWeight-totalUnsortedWeight) / (totalBenthosWeight); + Float speciesCatchRaisingFactor = (totalWeight - totalUnsortedWeight) / (totalSpeciesWeight); + Float benthosCatchRaisingFactor = (totalWeight - totalUnsortedWeight) / (totalBenthosWeight); List<CatchExportRow> rows = Lists.newArrayList(); exportContext.catchModel.prepareRows(persistenceService, 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 14:50:32 UTC (rev 1031) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java 2013-05-29 20:02:11 UTC (rev 1032) @@ -93,16 +93,16 @@ "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\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;\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;\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;\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;\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;\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;\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;\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;;;;;;;;;;;;;\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;;;;;;;;;;;;;"; + "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" + + "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;;;;;;;;;;;;;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