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

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

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

29 May '13

Author: kmorin Date: 2013-05-29 16:50:32 +0200 (Wed, 29 May 2013) New Revision: 1031 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1031 Log: add test on weight computing Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseResource.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingServiceTest.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/test/DatabaseResource.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseResource.java 2013-05-28 15:41:42 UTC (rev 1030) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseResource.java 2013-05-29 14:50:32 UTC (rev 1031) @@ -188,16 +188,7 @@ if (defaultDbName) { dbName = "db"; } - File db = new File("src/test/" + dbName); - if (!db.exists()) { - if (log.isWarnEnabled()) { - log.warn("Could not find db at " + db + ", test [" + - testClass + "] is skipped."); - } - Assume.assumeTrue(false); - } - if (log.isInfoEnabled()) { log.info("Prepare test " + testClass); } @@ -229,6 +220,16 @@ config = new TuttiPersistenceConfig(applicationConfig); + File db = config.getDbDirectory(); + if (!db.exists()) { + + if (log.isWarnEnabled()) { + log.warn("Could not find db at " + db + ", test [" + + testClass + "] is skipped."); + } + Assume.assumeTrue(false); + } + if (writeDb) { copyDb(config.getDbDirectory(), !writeDb, null); } Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingServiceTest.java 2013-05-28 15:41:42 UTC (rev 1030) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingServiceTest.java 2013-05-29 14:50:32 UTC (rev 1031) @@ -24,9 +24,203 @@ * #L% */ +import fr.ifremer.tutti.TuttiBusinessException; +import fr.ifremer.tutti.persistence.entities.data.*; +import fr.ifremer.tutti.service.PersistenceService; +import fr.ifremer.tutti.service.ServiceDbResource; +import fr.ifremer.tutti.service.TuttiServiceContext; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Test; + +import java.util.List; + /** * @author kmorin <kmorin(a)codelutin.com> - * @since x.x + * @since 2.3 */ public class TuttiWeightComputingServiceTest { + + /** Logger. */ + private static final Log log = + LogFactory.getLog(TuttiWeightComputingServiceTest.class); + + @ClassRule + public static final ServiceDbResource dbResource = + ServiceDbResource.readDb("dbCGFS"); + + public static final String PROGRAM_ID = "CAM-CGFS"; + + public static final String CRUISE_ID = "100002"; + + /* the one with the batches to compute */ + public static final String OPERATION_1_ID = "100108"; + + /* the one with the total species weight less than the sum of the batches */ + public static final String OPERATION_2_ID = "100109"; + + /* the one with the total benthos weight less than the sum of the batches */ + public static final String OPERATION_3_ID = "100110"; + + /* the one with the total marine litter weight less than the sum of the batches */ + public static final String OPERATION_4_ID = "100111"; + + /* the one with the total catch weight different from the sum of the sorted and unsorted total weight */ + public static final String OPERATION_5_ID = "100112"; + + /* the one with the total catch weight different from the rejected weight */ + public static final String OPERATION_6_ID = "100113"; + + /* the one working */ + public static final String OPERATION_7_ID = "100114"; + + protected TuttiWeightComputingService tuttiWeightComputingService; + + protected PersistenceService persistenceService; + + @Before + public void setUp() throws Exception { + TuttiServiceContext serviceContext = dbResource.getServiceContext(); + + tuttiWeightComputingService = serviceContext.getService(TuttiWeightComputingService.class); + persistenceService = serviceContext.getService(PersistenceService.class); + } + + @Test + public void computeCatchWeights() { + CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(OPERATION_2_ID); + try { + BatchContainer<SpeciesBatch> batches = persistenceService.getRootSpeciesBatch(OPERATION_2_ID); + tuttiWeightComputingService.computeCatchBatchWeights(catchBatch, batches, null, null); + Assert.fail(); + + } catch (TuttiBusinessException e) { + //ok, it is supposed to throw an exception + if (log.isInfoEnabled()) { + log.info("expected error on operation #2 : " + e.getMessage()); + } + } + + catchBatch = persistenceService.getCatchBatchFromFishingOperation(OPERATION_3_ID); + try { + BatchContainer<BenthosBatch> batches = persistenceService.getRootBenthosBatch(OPERATION_3_ID); + tuttiWeightComputingService.computeCatchBatchWeights(catchBatch, null, batches, null); + Assert.fail(); + + } catch (TuttiBusinessException e) { + //ok, it is supposed to throw an exception + if (log.isInfoEnabled()) { + log.info("expected error on operation #3 : " + e.getMessage()); + } + } + + catchBatch = persistenceService.getCatchBatchFromFishingOperation(OPERATION_4_ID); + try { + BatchContainer<MarineLitterBatch> batches = persistenceService.getRootMarineLitterBatch(OPERATION_4_ID); + tuttiWeightComputingService.computeCatchBatchWeights(catchBatch, null, null, batches); + Assert.fail(); + + } catch (TuttiBusinessException e) { + //ok, it is supposed to throw an exception + if (log.isInfoEnabled()) { + log.info("expected error on operation #4 : " + e.getMessage()); + } + } + + catchBatch = persistenceService.getCatchBatchFromFishingOperation(OPERATION_5_ID); + try { + BatchContainer<SpeciesBatch> speciesBatches = persistenceService.getRootSpeciesBatch(OPERATION_5_ID); + BatchContainer<BenthosBatch> benthosBatches = persistenceService.getRootBenthosBatch(OPERATION_5_ID); + tuttiWeightComputingService.computeCatchBatchWeights(catchBatch, speciesBatches, benthosBatches, null); + Assert.fail(); + + } catch (TuttiBusinessException e) { + //ok, it is supposed to throw an exception + if (log.isInfoEnabled()) { + log.info("expected error on operation #5 : " + e.getMessage()); + } + } + + catchBatch = persistenceService.getCatchBatchFromFishingOperation(OPERATION_6_ID); + try { + tuttiWeightComputingService.computeCatchBatchWeights(catchBatch, null, null, null); + Assert.fail(); + + } catch (TuttiBusinessException e) { + //ok, it is supposed to throw an exception + if (log.isInfoEnabled()) { + log.info("expected error on operation #6 : " + e.getMessage()); + } + } + + catchBatch = persistenceService.getCatchBatchFromFishingOperation(OPERATION_7_ID); + try { + BatchContainer<SpeciesBatch> speciesBatches = persistenceService.getRootSpeciesBatch(OPERATION_7_ID); + BatchContainer<BenthosBatch> benthosBatches = persistenceService.getRootBenthosBatch(OPERATION_7_ID); + tuttiWeightComputingService.computeCatchBatchWeights(catchBatch, speciesBatches, benthosBatches, null); + if (log.isInfoEnabled()) { + log.info("Weight computing worked on operation #7"); + } + + } catch (TuttiBusinessException e) { + Assert.fail(); + } + } + + @Test + public void computeSpeciesBatch() { + BatchContainer<SpeciesBatch> speciesBatchContainer = persistenceService.getRootSpeciesBatch(OPERATION_1_ID); + List<SpeciesBatch> speciesBatches = speciesBatchContainer.getChildren(); + for (int i = 0 ; i < speciesBatches.size() - 1 ; i++) { + try { + SpeciesBatch batch = speciesBatches.get(i); + tuttiWeightComputingService.computeSpeciesBatch(batch); + Assert.fail(); + } catch (TuttiBusinessException e) { + //ok, it is supposed to throw an exception + if (log.isInfoEnabled()) { + log.info("expected error on species batch #" + i + " : " + e.getMessage()); + } + } + } + SpeciesBatch speciesBatch = speciesBatches.get(speciesBatches.size() - 1); + try { + tuttiWeightComputingService.computeSpeciesBatch(speciesBatch); + if (log.isInfoEnabled()) { + log.info("last species batch weight computing worked"); + } + + } catch (TuttiBusinessException e) { + Assert.fail(); + } + + BatchContainer<BenthosBatch> benthosBatchContainer = persistenceService.getRootBenthosBatch(OPERATION_1_ID); + List<BenthosBatch> benthosBatches = benthosBatchContainer.getChildren(); + for (int i = 0 ; i < benthosBatches.size() - 1 ; i++) { + try { + BenthosBatch batch = benthosBatches.get(i); + tuttiWeightComputingService.computeBenthosBatch(batch); + Assert.fail(); + } catch (TuttiBusinessException e) { + //ok, it is supposed to throw an exception + if (log.isInfoEnabled()) { + log.info("expected error on species batch #" + i + " : " + e.getMessage()); + } + } + } + BenthosBatch benthosBatch = benthosBatches.get(benthosBatches.size() - 1); + try { + tuttiWeightComputingService.computeBenthosBatch(benthosBatch); + if (log.isInfoEnabled()) { + log.info("last benthos batch weight computing worked"); + } + + } catch (TuttiBusinessException e) { + Assert.fail(); + } + } + } 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-28 15:41:42 UTC (rev 1030) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java 2013-05-29 14:50:32 UTC (rev 1031) @@ -75,7 +75,7 @@ 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;AURECHE Vincent;;;"; + "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;;;"; 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" +

1 0

r1030 - trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches
by kmorin＠users.forge.codelutin.com 28 May '13

28 May '13

Author: kmorin Date: 2013-05-28 17:41:42 +0200 (Tue, 28 May 2013) New Revision: 1030 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1030 Log: fixes #2514 [CAPTURES] Erreur lors de l'?\195?\169l?\195?\169vation des poids quand les mensurations n'ont pas de poids et qu'il y a un poids de sous-?\195?\169chantillon Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.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-28 15:22:30 UTC (rev 1029) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.java 2013-05-28 15:41:42 UTC (rev 1030) @@ -433,7 +433,9 @@ if (categoryWeight == null && rowWeight != null) { // throw new TuttiBusinessException(_("tutti.service.operations.computeWeights.error.incoherentRowWeightCategory")); - } else if (rowWeight != null && !rowWeight.equals(frequencyWeight)) { + } else if (rowWeight != null && frequencyWeight != null + && !rowWeight.equals(frequencyWeight)) { + throw new TuttiWeightComputingException( _("tutti.service.operations.computeWeights.error.species.incoherentRowWeightFrequency", species, batch.getSampleCategoryType().getLabel(), categoryValue, @@ -586,7 +588,9 @@ if (categoryWeight == null && rowWeight != null) { // throw new TuttiBusinessException(_("tutti.service.operations.computeWeights.error.incoherentRowWeightCategory")); - } else if (rowWeight != null && !rowWeight.equals(frequencyWeight)) { + } else if (rowWeight != null && frequencyWeight != null + && !rowWeight.equals(frequencyWeight)) { + throw new TuttiWeightComputingException( _("tutti.service.operations.computeWeights.error.benthos.incoherentRowWeightFrequency", species, batch.getSampleCategoryType().getLabel(), categoryValue,

1 0

r1029 - trunk/tutti-ui-swing/src/main/resources/i18n
by kmorin＠users.forge.codelutin.com 28 May '13

28 May '13

Author: kmorin Date: 2013-05-28 17:22:30 +0200 (Tue, 28 May 2013) New Revision: 1029 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1029 Log: fixes #2518 [MACRO DECHETS] manque unit?\195?\169 de poids sur colonne Poids ...(kg) Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-28 15:16:04 UTC (rev 1028) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-28 15:22:30 UTC (rev 1029) @@ -360,7 +360,7 @@ tutti.editBenthosBatch.split.weightNotNull.help=Que voulez-vous faire ? <ul><li>Annuler pour ne pas catégoriser le lot et garder le poids sous-échantilloné</li><li>OK pour catégoriser le lot et supprimer le poids sous-échantillonné</li></ul>. tutti.editBenthosBatch.split.weightNotNull.message=Pour catégoriser un lot, il ne doit pas avoir de poids sous-échantillonné. tutti.editBenthosBatch.split.weightNotNull.title=Poids sous-échantillonné non nul -tutti.editBenthosBatch.table.header.ageCategory=Age +tutti.editBenthosBatch.table.header.ageCategory=Age (kg) tutti.editBenthosBatch.table.header.ageCategory.tip=Age des individus dans le lot (pour les coquilles St Jacques) tutti.editBenthosBatch.table.header.comment=Commentaire tutti.editBenthosBatch.table.header.comment.tip=Commentaire sur la ligne @@ -370,9 +370,9 @@ tutti.editBenthosBatch.table.header.file.tip=Pièces jointes associées à la ligne tutti.editBenthosBatch.table.header.maturityCategory=Maturité tutti.editBenthosBatch.table.header.maturityCategory.tip=Maturité des individus du lot -tutti.editBenthosBatch.table.header.sexCategory=Sexe +tutti.editBenthosBatch.table.header.sexCategory=Sexe (kg) tutti.editBenthosBatch.table.header.sexCategory.tip=Sexe des individus du lot -tutti.editBenthosBatch.table.header.sizeCategory=Class. Tri +tutti.editBenthosBatch.table.header.sizeCategory=Class. Tri (kg) tutti.editBenthosBatch.table.header.sizeCategory.tip=Classe de taille (petits, gros, …) des individus du lot tutti.editBenthosBatch.table.header.sortedUnsortedCategory=V/HV (kg) tutti.editBenthosBatch.table.header.sortedUnsortedCategory.tip=V \= Vrac ; HV \= Hors Vrac (espèces rares, de grande taille etc. sorties de la capture) @@ -417,8 +417,8 @@ tutti.editBenthosFrequencies.field.step.tip=Pas de la classe de taille pour cette espèce (ex. \: 1 cm, 0,5 cm, 1 mm etc.) tutti.editBenthosFrequencies.field.totalNumber=Nombre total tutti.editBenthosFrequencies.field.totalNumber.tip=Nombre total d'individus des lignes valides -tutti.editBenthosFrequencies.field.totalWeight=Poids total -tutti.editBenthosFrequencies.field.totalWeight.tip=Poids total des lignes valides +tutti.editBenthosFrequencies.field.totalWeight=Poids total (kg) +tutti.editBenthosFrequencies.field.totalWeight.tip=Poids total des lignes valides (kg) tutti.editBenthosFrequencies.label.no.configuration=< Pas de configuration > tutti.editBenthosFrequencies.simpleCountingAndFrequencies=Des mensurations ont été saisies dans le tableau. Saisir un simple dénombrement les effacera. tutti.editBenthosFrequencies.title=Mensuration @@ -439,35 +439,35 @@ tutti.editCatchBatch.askCancelEditBeforeLeaving.cancelEditCatchBatch=La capture n'est pas valide et ne peut pas être enregistrée tutti.editCatchBatch.askSaveBeforeLeaving.saveCatchBatch=Des modifications sur la capture n'ont pas été enregistrées tutti.editCatchBatch.field.benthosTotalSampleSortedWeight=Poids VRAC trié (kg) -tutti.editCatchBatch.field.benthosTotalSampleSortedWeight.tip=Poids du VRAC trié dans le benthos +tutti.editCatchBatch.field.benthosTotalSampleSortedWeight.tip=Poids du VRAC trié dans le benthos (kg) tutti.editCatchBatch.field.benthosTotalSortedWeight=Poids total VRAC (kg) -tutti.editCatchBatch.field.benthosTotalSortedWeight.tip=Poids total du VRAC benthos +tutti.editCatchBatch.field.benthosTotalSortedWeight.tip=Poids total du VRAC benthos (kg) tutti.editCatchBatch.field.benthosTotalUnsortedWeight=Poids total HORS VRAC (kg) -tutti.editCatchBatch.field.benthosTotalUnsortedWeight.tip=Poids total du HORS VRAC benthos +tutti.editCatchBatch.field.benthosTotalUnsortedWeight.tip=Poids total du HORS VRAC benthos (kg) tutti.editCatchBatch.field.benthosTotalWeight=Poids TOTAL (kg) -tutti.editCatchBatch.field.benthosTotalWeight.tip=Poids total du benthos dans la capture (\= poids total Vrac + poids total Hors Vrac) +tutti.editCatchBatch.field.benthosTotalWeight.tip=Poids total du benthos dans la capture (\= poids total Vrac + poids total Hors Vrac) (kg) tutti.editCatchBatch.field.catchTotalRejectedWeight=Poids total NON TRIÉ (kg) -tutti.editCatchBatch.field.catchTotalRejectedWeight.tip=Poids de la fraction non triée à bord +tutti.editCatchBatch.field.catchTotalRejectedWeight.tip=Poids de la fraction non triée à bord (kg) tutti.editCatchBatch.field.catchTotalSortedCarousselWeight=Carrousel observé (kg) -tutti.editCatchBatch.field.catchTotalSortedCarousselWeight.tip=Sur Thalassa, poids total de la capture pesé sur la balance carrousel +tutti.editCatchBatch.field.catchTotalSortedCarousselWeight.tip=Sur Thalassa, poids total de la capture pesé sur la balance carrousel (kg) tutti.editCatchBatch.field.catchTotalSortedTremisWeight=Trémie (kg) -tutti.editCatchBatch.field.catchTotalSortedTremisWeight.tip=Sur Thalassa, poids total de la capture pesé sur la balance trémie et envoyée sur la chaîne de tri +tutti.editCatchBatch.field.catchTotalSortedTremisWeight.tip=Sur Thalassa, poids total de la capture pesé sur la balance trémie et envoyée sur la chaîne de tri (kg) tutti.editCatchBatch.field.catchTotalSortedWeight=Poids total VRAC (kg) -tutti.editCatchBatch.field.catchTotalSortedWeight.tip=Poids total VRAC des espèces dans la capture (sans les captures accidentelles) +tutti.editCatchBatch.field.catchTotalSortedWeight.tip=Poids total VRAC des espèces dans la capture (sans les captures accidentelles) (kg) tutti.editCatchBatch.field.catchTotalUnsortedWeight=Poids total HORS VRAC (kg) -tutti.editCatchBatch.field.catchTotalUnsortedWeight.tip=Poids total HORS VRAC des espèces dans la capture (sans les captures accidentelles) +tutti.editCatchBatch.field.catchTotalUnsortedWeight.tip=Poids total HORS VRAC des espèces dans la capture (sans les captures accidentelles) (kg) tutti.editCatchBatch.field.catchTotalWeight=Poids TOTAL (kg) -tutti.editCatchBatch.field.catchTotalWeight.tip=Poids total de la capture (sauf macro déchets et captures accidentelles) +tutti.editCatchBatch.field.catchTotalWeight.tip=Poids total de la capture (sauf macro déchets et captures accidentelles) (kg) tutti.editCatchBatch.field.marineLitterTotalWeight=Poids TOTAL (kg) -tutti.editCatchBatch.field.marineLitterTotalWeight.tip=Poids total des macro déchets dans la capture +tutti.editCatchBatch.field.marineLitterTotalWeight.tip=Poids total des macro déchets dans la capture (kg) tutti.editCatchBatch.field.speciesTotalSampleSortedWeight=Poids VRAC trié (kg) -tutti.editCatchBatch.field.speciesTotalSampleSortedWeight.tip=Poids total des espèces triées (poissons, crustacés etc.) +tutti.editCatchBatch.field.speciesTotalSampleSortedWeight.tip=Poids total des espèces triées (poissons, crustacés etc.) (kg) tutti.editCatchBatch.field.speciesTotalSortedWeight=Poids total VRAC (kg) -tutti.editCatchBatch.field.speciesTotalSortedWeight.tip=Poids total VRAC des espèces dans la capture (poissons, crustacés etc.) +tutti.editCatchBatch.field.speciesTotalSortedWeight.tip=Poids total VRAC des espèces dans la capture (poissons, crustacés etc.) (kg) tutti.editCatchBatch.field.speciesTotalUnsortedWeight=Poids total HORS VRAC (kg) -tutti.editCatchBatch.field.speciesTotalUnsortedWeight.tip=Poids total HORS VRAC des espèces dans la capture (poissons, crustacés etc.) +tutti.editCatchBatch.field.speciesTotalUnsortedWeight.tip=Poids total HORS VRAC des espèces dans la capture (poissons, crustacés etc.) (kg) tutti.editCatchBatch.field.speciesTotalWeight=Poids TOTAL (kg) -tutti.editCatchBatch.field.speciesTotalWeight.tip=Poids total des espèces dans la capture (poissons, crustacés etc.) +tutti.editCatchBatch.field.speciesTotalWeight.tip=Poids total des espèces dans la capture (poissons, crustacés etc.) (kg) tutti.editCatchBatch.legend.benthos=Benthos tutti.editCatchBatch.legend.marineLitter=Macro déchets tutti.editCatchBatch.legend.species=Espèces @@ -700,7 +700,7 @@ tutti.editMarineLitterBatch.table.header.marineLitterSizeCategory.tip=Catégorie de taille tutti.editMarineLitterBatch.table.header.number=Nombre tutti.editMarineLitterBatch.table.header.number.tip=Nombre d'objets -tutti.editMarineLitterBatch.table.header.weight=Poids +tutti.editMarineLitterBatch.table.header.weight=Poids (kg) tutti.editMarineLitterBatch.table.header.weight.tip=Poids (kg) tutti.editProgram.action.closeEditProgram=Fermer tutti.editProgram.action.closeEditProgram.mnemonic=r @@ -857,17 +857,17 @@ tutti.editSpeciesBatch.action.splitBatch.mnemonic=C tutti.editSpeciesBatch.action.splitBatch.tip=Catégoriser le lot courant (celui de la ligne sélectionné) tutti.editSpeciesBatch.field.speciesTotalInertWeight=Poids inerte trié (kg) -tutti.editSpeciesBatch.field.speciesTotalInertWeight.tip=Poids de la fraction inerte restante après le tri des espèces (cailloux, vase, débris coquilliers, etc.) +tutti.editSpeciesBatch.field.speciesTotalInertWeight.tip=Poids de la fraction inerte restante après le tri des espèces (cailloux, vase, débris coquilliers, etc.) (kg) tutti.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight=Poids vivant non détaillé trié (kg) -tutti.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight.tip=Poids de la fraction vivante restante après le tri des espèces (algues, matières vivantes non reconnaissable, etc.) +tutti.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight.tip=Poids de la fraction vivante restante après le tri des espèces (algues, matières vivantes non reconnaissable, etc.) (kg) tutti.editSpeciesBatch.field.speciesTotalSampleSortedWeight=Poids VRAC trié (kg) -tutti.editSpeciesBatch.field.speciesTotalSampleSortedWeight.tip=Poids total des espèces triées (poissons, crustacés etc.) +tutti.editSpeciesBatch.field.speciesTotalSampleSortedWeight.tip=Poids total des espèces triées (poissons, crustacés etc.) (kg) tutti.editSpeciesBatch.field.speciesTotalSortedWeight=Poids total VRAC (kg) -tutti.editSpeciesBatch.field.speciesTotalSortedWeight.tip=Poids total VRAC des espèces dans la capture (poissons, crustacés etc.) +tutti.editSpeciesBatch.field.speciesTotalSortedWeight.tip=Poids total VRAC des espèces dans la capture (poissons, crustacés etc.) (kg) tutti.editSpeciesBatch.field.speciesTotalUnsortedWeight=Poids total HORS VRAC (kg) -tutti.editSpeciesBatch.field.speciesTotalUnsortedWeight.tip=Poids total HORS VRAC des espèces dans la capture (sans les captures accidentelles) +tutti.editSpeciesBatch.field.speciesTotalUnsortedWeight.tip=Poids total HORS VRAC des espèces dans la capture (sans les captures accidentelles) (kg) tutti.editSpeciesBatch.field.speciesTotalWeight=Poids TOTAL (kg) -tutti.editSpeciesBatch.field.speciesTotalWeight.tip=Poids total des espèces dans la capture (poissons, crustacés etc.) +tutti.editSpeciesBatch.field.speciesTotalWeight.tip=Poids total des espèces dans la capture (poissons, crustacés etc.) (kg) tutti.editSpeciesBatch.filterBatch=Filtre tutti.editSpeciesBatch.filterBatch.mode.all=Aucun tutti.editSpeciesBatch.filterBatch.mode.all.tip=Pas de filtre (tous les lots sont visibles) @@ -879,12 +879,12 @@ tutti.editSpeciesBatch.split.weightNotNull.help=Que voulez-vous faire ? <ul><li>Annuler pour ne pas catégoriser le lot et garder le poids sous-échantilloné</li><li>OK pour catégoriser le lot et supprimer le poids sous-échantillonné</li></ul>. tutti.editSpeciesBatch.split.weightNotNull.message=Pour catégoriser un lot, il ne doit pas avoir de poids sous-échantillonné tutti.editSpeciesBatch.split.weightNotNull.title=Poids sous-échantillonné non nul -tutti.editSpeciesBatch.table.header.ageCategory=Age +tutti.editSpeciesBatch.table.header.ageCategory=Age (kg) tutti.editSpeciesBatch.table.header.comment=Commentaire tutti.editSpeciesBatch.table.header.computedNumber=Nombre tutti.editSpeciesBatch.table.header.file=Pièces jointes -tutti.editSpeciesBatch.table.header.maturityCategory=Maturité -tutti.editSpeciesBatch.table.header.sexCategory=Sexe +tutti.editSpeciesBatch.table.header.maturityCategory=Maturité (kg) +tutti.editSpeciesBatch.table.header.sexCategory=Sexe (kg) tutti.editSpeciesBatch.table.header.sizeCategory=Class. Tri tutti.editSpeciesBatch.table.header.sortedUnsortedCategory=V/HV (kg) tutti.editSpeciesBatch.table.header.species=Espèce @@ -925,8 +925,8 @@ tutti.editSpeciesFrequencies.field.step.tip=Pas de la classe de taille pour cette espèce (ex. \: 1 cm, 0,5 cm, 1 mm etc.) tutti.editSpeciesFrequencies.field.totalNumber=Nombre total tutti.editSpeciesFrequencies.field.totalNumber.tip=Nombre total d'individus des lignes valides -tutti.editSpeciesFrequencies.field.totalWeight=Poids total -tutti.editSpeciesFrequencies.field.totalWeight.tip=Poids total des lignes valides +tutti.editSpeciesFrequencies.field.totalWeight=Poids total (kg) +tutti.editSpeciesFrequencies.field.totalWeight.tip=Poids total des lignes valides (kg) tutti.editSpeciesFrequencies.label.no.configuration=< Pas de configuration > tutti.editSpeciesFrequencies.simpleCountingAndFrequencies=Des mensurations ont été saisies dans le tableau. Saisir un simple dénombrement les effacera. tutti.editSpeciesFrequencies.table.header.lengthStep=Classe de taille @@ -1010,8 +1010,8 @@ tutti.importPupitri.trunkFile.extension=tnk tutti.importPupitri.trunkFile.extension.description=Fichier du trémie (.tnk) tutti.io.directory.delete.error=Erreur lors de la suppression du contenu du dossier %s -tutti.label.catches.planktonTotalSampleWeight=Poids total échantillonné -tutti.label.catches.planktonTotalWeight=Poids total +tutti.label.catches.planktonTotalSampleWeight=Poids total échantillonné (kg) +tutti.label.catches.planktonTotalWeight=Poids total (kg) tutti.label.tab.accidental=Captures accidentelles tutti.label.tab.benthos=Benthos tutti.label.tab.catches=Captures @@ -1231,12 +1231,12 @@ tutti.splitBenthosBatch.action.save=Enregistrer tutti.splitBenthosBatch.action.save.mnemonic=E tutti.splitBenthosBatch.action.save.tip=Sauver le sous-échantillonnage -tutti.splitBenthosBatch.field.batchWeight=Poids total à catégoriser -tutti.splitBenthosBatch.field.batchWeightField.tip=Poids du lot père (si renseigné) +tutti.splitBenthosBatch.field.batchWeight=Poids total à catégoriser (kg) +tutti.splitBenthosBatch.field.batchWeightField.tip=Poids du lot père (si renseigné) (kg) tutti.splitBenthosBatch.field.category=Catégorie tutti.splitBenthosBatch.field.categoryField.tip=Choisir le mode de catégorisation -tutti.splitBenthosBatch.field.sampleWeight=Poids total catégorisé -tutti.splitBenthosBatch.field.sampleWeightField.tip=Somme des poids saisis ci-dessous +tutti.splitBenthosBatch.field.sampleWeight=Poids total catégorisé (kg) +tutti.splitBenthosBatch.field.sampleWeightField.tip=Somme des poids saisis ci-dessous (kg) tutti.splitBenthosBatch.field.species=Espèce tutti.splitBenthosBatch.field.speciesField.tip=Espèce du lot père tutti.splitBenthosBatch.table.header.category=Catégorie @@ -1249,12 +1249,12 @@ tutti.splitSpeciesBatch.action.save=Enregistrer tutti.splitSpeciesBatch.action.save.mnemonic=E tutti.splitSpeciesBatch.action.save.tip=Sauver le sous-échantillonnage -tutti.splitSpeciesBatch.field.batchWeight=Poids total à catégoriser -tutti.splitSpeciesBatch.field.batchWeightField.tip=Poids du lot père (si renseigné) +tutti.splitSpeciesBatch.field.batchWeight=Poids total à catégoriser (kg) +tutti.splitSpeciesBatch.field.batchWeightField.tip=Poids du lot père (si renseigné) (kg) tutti.splitSpeciesBatch.field.category=Catégorie tutti.splitSpeciesBatch.field.categoryField.tip=Choisir le mode de catégorisation -tutti.splitSpeciesBatch.field.sampleWeight=Poids total catégorisé -tutti.splitSpeciesBatch.field.sampleWeightField.tip=Somme des poids saisis ci-dessous +tutti.splitSpeciesBatch.field.sampleWeight=Poids total catégorisé (kg) +tutti.splitSpeciesBatch.field.sampleWeightField.tip=Somme des poids saisis ci-dessous (kg) tutti.splitSpeciesBatch.field.species=Espèce tutti.splitSpeciesBatch.field.speciesField.tip=Espèce du lot père tutti.splitSpeciesBatch.table.header.category=Catégorie

1 0

r1028 - trunk/tutti-ui-swing/src/main/resources/i18n
by kmorin＠users.forge.codelutin.com 28 May '13

28 May '13

Author: kmorin Date: 2013-05-28 17:16:04 +0200 (Tue, 28 May 2013) New Revision: 1028 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1028 Log: fixes #2516 [CAPTURE] manque unit?\195?\169 en face des champs Carroussel et Tr?\195?\169mie ...(kg) Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-28 14:43:34 UTC (rev 1027) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-28 15:16:04 UTC (rev 1028) @@ -448,9 +448,9 @@ tutti.editCatchBatch.field.benthosTotalWeight.tip=Poids total du benthos dans la capture (\= poids total Vrac + poids total Hors Vrac) tutti.editCatchBatch.field.catchTotalRejectedWeight=Poids total NON TRIÉ (kg) tutti.editCatchBatch.field.catchTotalRejectedWeight.tip=Poids de la fraction non triée à bord -tutti.editCatchBatch.field.catchTotalSortedCarousselWeight=Carrousel observé +tutti.editCatchBatch.field.catchTotalSortedCarousselWeight=Carrousel observé (kg) tutti.editCatchBatch.field.catchTotalSortedCarousselWeight.tip=Sur Thalassa, poids total de la capture pesé sur la balance carrousel -tutti.editCatchBatch.field.catchTotalSortedTremisWeight=Trémie +tutti.editCatchBatch.field.catchTotalSortedTremisWeight=Trémie (kg) tutti.editCatchBatch.field.catchTotalSortedTremisWeight.tip=Sur Thalassa, poids total de la capture pesé sur la balance trémie et envoyée sur la chaîne de tri tutti.editCatchBatch.field.catchTotalSortedWeight=Poids total VRAC (kg) tutti.editCatchBatch.field.catchTotalSortedWeight.tip=Poids total VRAC des espèces dans la capture (sans les captures accidentelles)

1 0