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

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 May 29, 2013

May 29, 2013

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 May 28, 2013

May 28, 2013

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 May 28, 2013

May 28, 2013

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 May 28, 2013

May 28, 2013

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

r1027 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency resources/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency resources/i18n
by kmorin＠users.forge.codelutin.com May 28, 2013

May 28, 2013

Author: kmorin Date: 2013-05-28 16:43:34 +0200 (Tue, 28 May 2013) New Revision: 1027 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1027 Log: check if the step is positive in the frequencies Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel-error-validation.xml trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel-error-validation.xml trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css 2013-05-28 14:40:59 UTC (rev 1026) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css 2013-05-28 14:43:34 UTC (rev 1027) @@ -73,6 +73,7 @@ bean: {model}; enabled: {!model.isSimpleCountingMode()}; _selectOnFocus: true; + _validatorLabel: {_("tutti.editBenthosFrequencies.field.step")}; } #totalNumberLabel { @@ -115,6 +116,7 @@ property: lengthStepCaracteristic; selectedItem: {model.getLengthStepCaracteristic()}; enabled: {!model.isSimpleCountingMode()}; + _validatorLabel: {_("tutti.editBenthosFrequencies.field.lengthStepCaracteristic")}; } #minStepLabel { @@ -235,12 +237,16 @@ layout: {dataFieldLayout}; } +#tableScrollPane { + _validatorLabel: {_("tutti.editBenthosFrequencies.field.rows")}; +} + #table { selectionMode: {ListSelectionModel.SINGLE_SELECTION}; selectionBackground: {null}; selectionForeground: {Color.BLACK}; sortable: false; - enabled: {model.getLengthStepCaracteristic() != null} + enabled: {model.getLengthStepCaracteristic() != null && model.getStep() > 0f}; } #simpleCountingLabel { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx 2013-05-28 14:40:59 UTC (rev 1026) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx 2013-05-28 14:43:34 UTC (rev 1027) @@ -74,6 +74,7 @@ uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> <field name='lengthStepCaracteristic' component='lengthStepCaracteristicComboBox'/> + <field name='step' component='stepField'/> <field name='rows' component='tableScrollPane'/> </BeanValidator> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-05-28 14:40:59 UTC (rev 1026) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-05-28 14:43:34 UTC (rev 1027) @@ -73,6 +73,7 @@ bean: {model}; enabled: {!model.isSimpleCountingMode()}; _selectOnFocus: true; + _validatorLabel: {_("tutti.editSpeciesFrequencies.field.step")}; } #totalNumberLabel { @@ -115,6 +116,7 @@ property: lengthStepCaracteristic; selectedItem: {model.getLengthStepCaracteristic()}; enabled: {!model.isSimpleCountingMode()}; + _validatorLabel: {_("tutti.editSpeciesFrequencies.field.lengthStepCaracteristic")}; } #minStepLabel { @@ -235,12 +237,16 @@ layout: {dataFieldLayout}; } +#tableScrollPane { + _validatorLabel: {_("tutti.editSpeciesFrequencies.field.rows")}; +} + #table { selectionMode: {ListSelectionModel.SINGLE_SELECTION}; selectionBackground: {null}; selectionForeground: {Color.BLACK}; sortable: false; - enabled: {model.getLengthStepCaracteristic() != null} + enabled: {model.getLengthStepCaracteristic() != null && model.getStep() > 0f}; } #simpleCountingLabel { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 2013-05-28 14:40:59 UTC (rev 1026) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 2013-05-28 14:43:34 UTC (rev 1027) @@ -74,6 +74,7 @@ uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> <field name='lengthStepCaracteristic' component='lengthStepCaracteristicComboBox'/> + <field name='step' component='stepField'/> <field name='rows' component='tableScrollPane'/> </BeanValidator> Modified: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel-error-validation.xml =================================================================== --- trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel-error-validation.xml 2013-05-28 14:40:59 UTC (rev 1026) +++ trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel-error-validation.xml 2013-05-28 14:43:34 UTC (rev 1027) @@ -34,19 +34,30 @@ <![CDATA[ isSimpleCountingMode() || lengthStepCaracteristic != null ]]> </param> <message> - tutti.validator.error.speciesFrequency.lengthStepCaracteristic.required + tutti.validator.error.benthosFrequency.lengthStepCaracteristic.required </message> </field-validator> </field> + <field name="step"> + + <field-validator type="double" short-circuit="true"> + <param name="minExclusive">0</param> + <message> + tutti.validator.error.benthosFrequency.step.positiveValue + </message> + </field-validator> + + </field> + <field name="rows"> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> <![CDATA[ isSimpleCountingMode() || rows != null ]]> </param> - <message>tutti.validator.error.speciesFrequency.oneRowRequired</message> + <message>tutti.validator.error.benthosFrequency.oneRowRequired</message> </field-validator> </field> Modified: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel-error-validation.xml =================================================================== --- trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel-error-validation.xml 2013-05-28 14:40:59 UTC (rev 1026) +++ trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel-error-validation.xml 2013-05-28 14:43:34 UTC (rev 1027) @@ -40,6 +40,17 @@ </field> + <field name="step"> + + <field-validator type="double" short-circuit="true"> + <param name="minExclusive">0</param> + <message> + tutti.validator.error.speciesFrequency.step.positiveValue + </message> + </field-validator> + + </field> + <field name="rows"> <field-validator type="fieldexpression" short-circuit="true"> Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-05-28 14:40:59 UTC (rev 1026) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-05-28 14:43:34 UTC (rev 1027) @@ -416,6 +416,7 @@ tutti.editBenthosFrequencies.field.mode.simpleCounting.tip= tutti.editBenthosFrequencies.field.rafaleStep= tutti.editBenthosFrequencies.field.rafaleStep.tip= +tutti.editBenthosFrequencies.field.rows= tutti.editBenthosFrequencies.field.simpleCounting= tutti.editBenthosFrequencies.field.simpleCounting.tip= tutti.editBenthosFrequencies.field.step= @@ -954,6 +955,7 @@ tutti.editSpeciesFrequencies.field.mode.simpleCounting.tip= tutti.editSpeciesFrequencies.field.rafaleStep= tutti.editSpeciesFrequencies.field.rafaleStep.tip= +tutti.editSpeciesFrequencies.field.rows= tutti.editSpeciesFrequencies.field.simpleCounting= tutti.editSpeciesFrequencies.field.simpleCounting.tip= tutti.editSpeciesFrequencies.field.step= @@ -1338,6 +1340,9 @@ tutti.validateCruise.navigation.action.export.tip= tutti.validateCruise.navigation.action.refresh.all.tip= tutti.validateCruise.navigation.title= +tutti.validator.error.benthosFrequency.lengthStepCaracteristic.required= +tutti.validator.error.benthosFrequency.oneRowRequired= +tutti.validator.error.benthosFrequency.step.positiveValue= tutti.validator.error.createAccidentalBatch.species.required= tutti.validator.error.createIndividualObservationBatch.lengthStepCaracteristic.required= tutti.validator.error.createIndividualObservationBatch.size.required= @@ -1363,6 +1368,7 @@ tutti.validator.error.program.zone.required= tutti.validator.error.speciesFrequency.lengthStepCaracteristic.required= tutti.validator.error.speciesFrequency.oneRowRequired= +tutti.validator.error.speciesFrequency.step.positiveValue= tutti.validator.error.splitSpeciesBatch.sampleWeight.invalidValue= tutti.validator.error.splitSpeciesBatch.sampleWeight.sampleBatchGreaterThanBatchWeight= tutti.validator.error.splitSpeciesBatch.selectedCategory.required= 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:40:59 UTC (rev 1026) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-28 14:43:34 UTC (rev 1027) @@ -410,6 +410,7 @@ tutti.editBenthosFrequencies.field.mode.simpleCounting.tip=Mode par défaut si la classe de taille n'est pas renseignée dans le protocole tutti.editBenthosFrequencies.field.rafaleStep=Classe de taille à incrémenter tutti.editBenthosFrequencies.field.rafaleStep.tip=Saisir à la suite les différentes tailles mesurées +tutti.editBenthosFrequencies.field.rows=Classes de taille tutti.editBenthosFrequencies.field.simpleCounting=Nombre tutti.editBenthosFrequencies.field.simpleCounting.tip=Saisir le nombre d'individus dans le lot tutti.editBenthosFrequencies.field.step=Pas de la classe de taille @@ -917,6 +918,7 @@ tutti.editSpeciesFrequencies.field.mode.simpleCounting.tip=Mode par défaut si la classe de taille n'est pas renseignée dans le protocole. tutti.editSpeciesFrequencies.field.rafaleStep=Classe de taille à incrémenter tutti.editSpeciesFrequencies.field.rafaleStep.tip=Saisir à la suite les différentes tailles mesurées +tutti.editSpeciesFrequencies.field.rows=Classes de taille tutti.editSpeciesFrequencies.field.simpleCounting=Nombre tutti.editSpeciesFrequencies.field.simpleCounting.tip=Saisir le nombre d'individus dans le lot tutti.editSpeciesFrequencies.field.step=Pas de la classe de taille @@ -1285,6 +1287,9 @@ tutti.validateCruise.navigation.action.export.operation.tip=Exporter les messages de validation de l'opération tutti.validateCruise.navigation.action.refresh.all.tip=Rafraîchir les messages de validation de la campagne tutti.validateCruise.navigation.title=Traits +tutti.validator.error.benthosFrequency.lengthStepCaracteristic.required=La classe de taille est obligatoire +tutti.validator.error.benthosFrequency.oneRowRequired=Au moins une classe de taille doit être observée +tutti.validator.error.benthosFrequency.step.positiveValue=Le pas de la classe de taille doit être strictement positif tutti.validator.error.createAccidentalBatch.species.required=L'espèce est obligatoire tutti.validator.error.createIndividualObservationBatch.lengthStepCaracteristic.required=La classe de taille est obligatoire tutti.validator.error.createIndividualObservationBatch.size.required=La taille est obligatoire @@ -1310,6 +1315,7 @@ tutti.validator.error.program.zone.required=La zone de la série est obligatoire tutti.validator.error.speciesFrequency.lengthStepCaracteristic.required=La classe de taille est obligatoire tutti.validator.error.speciesFrequency.oneRowRequired=Au moins une classe de taille doit être observée +tutti.validator.error.speciesFrequency.step.positiveValue=Le pas de la classe de taille doit être strictement positif tutti.validator.error.splitSpeciesBatch.sampleWeight.invalidValue=La somme des poids ventilés doit être strictement positive tutti.validator.error.splitSpeciesBatch.sampleWeight.sampleBatchGreaterThanBatchWeight=La somme des poids ventilés doit être inférieur ou égale à celle du poids du lot tutti.validator.error.splitSpeciesBatch.selectedCategory.required=La catégorie est obligatoire

1 0

r1026 - trunk/tutti-persistence/src/main/resources
by kmorin＠users.forge.codelutin.com May 28, 2013

May 28, 2013

Author: kmorin Date: 2013-05-28 16:40:59 +0200 (Tue, 28 May 2013) New Revision: 1026 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1026 Log: fixes #2485 [DONNEES] Les noms et pr?\195?\169noms des personnes sont invers?\195?\169s dans l'UI Modified: trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml Modified: trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml =================================================================== --- trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml 2013-05-28 12:37:11 UTC (rev 1025) +++ trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml 2013-05-28 14:40:59 UTC (rev 1026) @@ -803,8 +803,8 @@ <![CDATA[ SELECT DISTINCT p.id, + p.lastname, p.firstname, - p.lastname, p.department.code, p.status FROM PersonImpl p

1 0

r1025 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com May 28, 2013

May 28, 2013

Author: maven-release Date: 2013-05-28 14:37:11 +0200 (Tue, 28 May 2013) New Revision: 1025 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1025 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-28 12:37:03 UTC (rev 1024) +++ trunk/pom.xml 2013-05-28 12:37:11 UTC (rev 1025) @@ -33,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-rc-1</version> + <version>2.3-rc-2-SNAPSHOT</version> <modules> <module>tutti-persistence</module> @@ -89,12 +89,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.3-rc-1</url> + <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.3-rc-1 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.3-rc-1 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </developerConnection> </scm> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-05-28 12:37:03 UTC (rev 1024) +++ trunk/tutti-persistence/pom.xml 2013-05-28 12:37:11 UTC (rev 1025) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-rc-1</version> + <version>2.3-rc-2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-05-28 12:37:03 UTC (rev 1024) +++ trunk/tutti-service/pom.xml 2013-05-28 12:37:11 UTC (rev 1025) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-rc-1</version> + <version>2.3-rc-2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-05-28 12:37:03 UTC (rev 1024) +++ trunk/tutti-ui-swing/pom.xml 2013-05-28 12:37:11 UTC (rev 1025) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-rc-1</version> + <version>2.3-rc-2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1024 - tags
by maven-release＠users.forge.codelutin.com May 28, 2013

May 28, 2013

Author: maven-release Date: 2013-05-28 14:37:03 +0200 (Tue, 28 May 2013) New Revision: 1024 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1024 Log: [maven-release-plugin] copy for tag tutti-2.3-rc-1 Added: tags/tutti-2.3-rc-1/

1 0

r1023 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com May 28, 2013

May 28, 2013

Author: maven-release Date: 2013-05-28 14:36:55 +0200 (Tue, 28 May 2013) New Revision: 1023 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1023 Log: [maven-release-plugin] prepare release tutti-2.3-rc-1 Modified: trunk/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-28 12:34:39 UTC (rev 1022) +++ trunk/pom.xml 2013-05-28 12:36:55 UTC (rev 1023) @@ -33,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-rc-1-SNAPSHOT</version> + <version>2.3-rc-1</version> <modules> <module>tutti-persistence</module> @@ -89,12 +89,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> + <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.3-rc-1</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.3-rc-1 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.3-rc-1 </developerConnection> </scm> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-05-28 12:34:39 UTC (rev 1022) +++ trunk/tutti-persistence/pom.xml 2013-05-28 12:36:55 UTC (rev 1023) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-rc-1-SNAPSHOT</version> + <version>2.3-rc-1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-05-28 12:34:39 UTC (rev 1022) +++ trunk/tutti-service/pom.xml 2013-05-28 12:36:55 UTC (rev 1023) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-rc-1-SNAPSHOT</version> + <version>2.3-rc-1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-05-28 12:34:39 UTC (rev 1022) +++ trunk/tutti-ui-swing/pom.xml 2013-05-28 12:36:55 UTC (rev 1023) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-rc-1-SNAPSHOT</version> + <version>2.3-rc-1</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1022 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by tchemit＠users.forge.codelutin.com May 28, 2013

May 28, 2013

Author: tchemit Date: 2013-05-28 14:34:39 +0200 (Tue, 28 May 2013) New Revision: 1022 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1022 Log: pass to snapshot Modified: trunk/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-28 09:29:07 UTC (rev 1021) +++ trunk/pom.xml 2013-05-28 12:34:39 UTC (rev 1022) @@ -33,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-rc-1</version> + <version>2.3-rc-1-SNAPSHOT</version> <modules> <module>tutti-persistence</module> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-05-28 09:29:07 UTC (rev 1021) +++ trunk/tutti-persistence/pom.xml 2013-05-28 12:34:39 UTC (rev 1022) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-rc-1</version> + <version>2.3-rc-1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-05-28 09:29:07 UTC (rev 1021) +++ trunk/tutti-service/pom.xml 2013-05-28 12:34:39 UTC (rev 1022) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-rc-1</version> + <version>2.3-rc-1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-05-28 09:29:07 UTC (rev 1021) +++ trunk/tutti-ui-swing/pom.xml 2013-05-28 12:34:39 UTC (rev 1022) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-rc-1</version> + <version>2.3-rc-1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0