Tutti-commits

Download

tutti-commits@list.forge.codelutin.com

April 2013

5 participants
210 discussions

r847 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/content/home resources/i18n
by tchemit＠users.forge.codelutin.com 22 Apr '13

22 Apr '13

Author: tchemit Date: 2013-04-22 11:31:26 +0200 (Mon, 22 Apr 2013) New Revision: 847 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/847 Log: fix i18n - fix after export program action Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 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/home/SelectCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2013-04-22 08:42:40 UTC (rev 846) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2013-04-22 09:31:26 UTC (rev 847) @@ -275,7 +275,7 @@ public void resetEditProgramAction() { resetEditProgramAction = true; try { - ui.getEditCruiseComboBox().setSelectedIndex(0); + ui.getEditProgramComboBox().setSelectedIndex(0); } finally { resetEditProgramAction = false; } 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-04-22 08:42:40 UTC (rev 846) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-04-22 09:31:26 UTC (rev 847) @@ -861,6 +861,7 @@ tutti.label.tab.individualObservations= tutti.label.tab.marineLitter= tutti.label.tab.plancton= +tutti.label.tab.species= tutti.legend.frequencyConfiguration= tutti.legend.splitBenthosBatchConfiguration= tutti.legend.splitSpeciesBatchConfiguration= 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-04-22 08:42:40 UTC (rev 846) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-04-22 09:31:26 UTC (rev 847) @@ -7,7 +7,6 @@ tutti.about.bottomText=Copyright %s - %s - version %s tutti.about.message=<h3>Tutti</h3><p><strong>Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques.</strong></p><br/><p>Ce logiciel permettra la saisie en mer des données d'opération de pêche (positions, environnement, engin, etc) et des captures associées (composition de la capture en espèces scientifiques avec poids, nombres, tailles etc) pour l'ensemble des campagnes halieutiques réalisées par l'Ifremer.</p><p>Ce projet a été initiée en 2012 par l'<a href\="http\://www.ifremer.fr">Ifremer</a> et réalisé par la société <a href\="http\://codelutin.com">Codelutin</a>.</p><hr/><br/><p>Pour plus d'informations, vous pouvez visiter le <a href\="http\://maven-site.forge.codelutin.com/tutti">site du projet</a>.</p><p>Projet hébergé sur la forge <a href\="http\://forge.codelutin.com/projects/tutti">Forge.codelutin.com</a>.</p> tutti.about.title=À propos de Tutti -tutti.label.tab.species=Espèces tutti.about.translate.content=<h2>Comment traduire Tutti</h2>Vous pouvez nous aider à traduire Tutti.<hr/><br/><ul><li>Récupérer le fichier <a href\="%s">tutti-i18n.csv</a> dans le répertoire <strong>i18n</strong></li><li>ouvrez le avec un tableur (le caractère séprateur est une Tabultation)</li><li>Traduisez, Améliorer, ...</li><li>Enfin renvoyez-le nous</li></ul><br/>Nous intégrerons vos modifications avant la prochaine version. tutti.about.translate.title=Traduire Tutti tutti.about.update.app.noup.detail=<tr><td>%1$s</td><td>%2$s</td><td>%2$s<td><td></td></tr> @@ -799,9 +798,9 @@ tutti.error.errorpane.htmlmessage=<html><body><b>Une erreur s'est produite</b>\:<br/>%s</body></html> tutti.error.ui.business.error=Erreur tutti.error.ui.other.error=Erreur -tutti.exportCruise.action.success=La campagne %s a été exporté dans le fichier %s avec succès. -tutti.exportProgram.action.success=La série de campagne a été exportée dans le fichier %s avec succès. -tutti.exportProtocol.action.success=Protocole [%1s] exporté dans le fichier %2s. +tutti.exportCruise.action.success=La campagne <strong>%s</strong> a été exportée dans le fichier <strong>%s</strong>. +tutti.exportProgram.action.success=La série de campagne <strong>%s</strong> a été exportée dans le fichier <strong>%s</strong>. +tutti.exportProtocol.action.success=Protocole [%1s] exporté dans le fichier <strong>%2s</strong>. tutti.fishingOperations.action.newFishingOperation.mnemonic=N tutti.fishingOperations.action.newFishingOperation.tip=Créer une nouvelle opération de pêche tutti.fishingOperations.info.no.fishingOperation.selected=< Aucun trait sélectionné > @@ -861,8 +860,9 @@ tutti.label.tab.individualObservations=Observatiosn individuelles tutti.label.tab.marineLitter=Macro déchets tutti.label.tab.plancton=Plancton +tutti.label.tab.species=Espèces tutti.legend.frequencyConfiguration=Configuration -tutti.legend.splitBenthosBatchConfiguration= +tutti.legend.splitBenthosBatchConfiguration=Configuration tutti.legend.splitSpeciesBatchConfiguration=Configuration tutti.main.action.about=À propos tutti.main.action.about.mnemonic=À

1 0

r846 - in trunk: tutti-service/src/main/java/fr/ifremer/tutti/service tutti-service/src/main/java/fr/ifremer/tutti/service/export tutti-service/src/main/resources/i18n tutti-service/src/test/java/fr/ifremer/tutti/service/export tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos tutti-ui-swing/src/
by tchemit＠users.forge.codelutin.com 22 Apr '13

22 Apr '13

Author: tchemit Date: 2013-04-22 10:42:40 +0200 (Mon, 22 Apr 2013) New Revision: 846 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/846 Log: - fix missing i18n - fishing operation are no more persisted - refs #1875: [IMP/EXP] - Export des donn?\195?\169es de campagne : format g?\195?\169n?\195?\169rique Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ParameterExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProgramAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java 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-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2013-04-22 06:53:55 UTC (rev 845) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2013-04-22 08:42:40 UTC (rev 846) @@ -24,7 +24,9 @@ * #L% */ +import com.google.common.base.Function; import com.google.common.base.Joiner; +import com.google.common.collect.Lists; import fr.ifremer.tutti.TuttiTechnicalException; import fr.ifremer.tutti.persistence.entities.TuttiEntity; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; @@ -336,6 +338,9 @@ @Override public String format(Serializable value) { + if (value == null) { + return "NA"; + } if (value instanceof Float) { return floatDelegate.format((Float) value); } @@ -355,7 +360,14 @@ @Override public String format(List<Person> value) { - return Joiner.on('|').join(value); + List<String> decoratedValues = + Lists.transform(value, new Function<Person, String>() { + @Override + public String apply(Person input) { + return input.getFirstName() + ' ' + input.getLastName(); + } + }); + return Joiner.on('|').join(decoratedValues); } } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportModel.java 2013-04-22 06:53:55 UTC (rev 845) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportModel.java 2013-04-22 08:42:40 UTC (rev 846) @@ -64,8 +64,8 @@ newColumnForExport("Id_Operation", FishingOperation.PROPERTY_STATION_NUMBER); newColumnForExport("NumOrdre_Station", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); - newColumnForExport("Engin", Cruise.PROPERTY_GEAR, Gear.PROPERTY_NAME); - newColumnForExport("Navire", Cruise.PROPERTY_VESSEL, Vessel.PROPERTY_NAME); + newColumnForExport("Engin", FishingOperation.PROPERTY_GEAR, Gear.PROPERTY_NAME); + newColumnForExport("Navire", FishingOperation.PROPERTY_VESSEL, Vessel.PROPERTY_NAME); newColumnForExport("DateDeb_Op", FishingOperation.PROPERTY_GEAR_SHOOTING_START_DATE, TuttiCsvUtil.DAY_TIME_SECOND); newColumnForExport("LatDeb", FishingOperation.PROPERTY_GEAR_SHOOTING_START_LATITUDE, TuttiCsvUtil.FLOAT); newColumnForExport("LongDeb", FishingOperation.PROPERTY_GEAR_SHOOTING_START_LONGITUDE, TuttiCsvUtil.FLOAT); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportRow.java 2013-04-22 06:53:55 UTC (rev 845) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportRow.java 2013-04-22 08:42:40 UTC (rev 846) @@ -108,7 +108,7 @@ } public Vessel getVessel() { - return cruise.getVessel(); + return fishingOperation.getVessel(); } public Date getGearShootingStartDate() { @@ -187,7 +187,7 @@ protected Serializable getGearUseFeature(Caracteristic caracteristic) { CaracteristicMap gearUseFeatures = fishingOperation.getGearUseFeatures(); - Serializable serializable = gearUseFeatures.get(caracteristic); + Serializable serializable = gearUseFeatures == null ? null : gearUseFeatures.get(caracteristic); return serializable; } } \ No newline at end of file Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ParameterExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ParameterExportModel.java 2013-04-22 06:53:55 UTC (rev 845) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ParameterExportModel.java 2013-04-22 08:42:40 UTC (rev 846) @@ -24,6 +24,7 @@ * #L% */ +import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.Program; @@ -61,25 +62,31 @@ Cruise cruise, FishingOperation operation) { - for (Map.Entry<Caracteristic, Serializable> entry : operation.getGearUseFeatures().entrySet()) { - Caracteristic caracteristic = entry.getKey(); + CaracteristicMap gearUseFeatures = operation.getGearUseFeatures(); + if (gearUseFeatures != null) { + for (Map.Entry<Caracteristic, Serializable> entry : gearUseFeatures.entrySet()) { + Caracteristic caracteristic = entry.getKey(); - ParameterExportRow row = new ParameterExportRow(); - row.setCruise(cruise); - row.setFishingOperation(operation); - row.setCaracteristic(caracteristic); - row.setValue(entry.getValue()); - rows.add(row); + ParameterExportRow row = new ParameterExportRow(); + row.setCruise(cruise); + row.setFishingOperation(operation); + row.setCaracteristic(caracteristic); + row.setValue(entry.getValue()); + rows.add(row); + } } - for (Map.Entry<Caracteristic, Serializable> entry : operation.getVesselUseFeatures().entrySet()) { - Caracteristic caracteristic = entry.getKey(); + CaracteristicMap vesselUseFeatures = operation.getVesselUseFeatures(); + if (vesselUseFeatures!=null) { + for (Map.Entry<Caracteristic, Serializable> entry : vesselUseFeatures.entrySet()) { + Caracteristic caracteristic = entry.getKey(); - ParameterExportRow row = new ParameterExportRow(); - row.setCruise(cruise); - row.setFishingOperation(operation); - row.setCaracteristic(caracteristic); - row.setValue(entry.getValue()); - rows.add(row); + ParameterExportRow row = new ParameterExportRow(); + row.setCruise(cruise); + row.setFishingOperation(operation); + row.setCaracteristic(caracteristic); + row.setValue(entry.getValue()); + rows.add(row); + } } } 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-04-22 06:53:55 UTC (rev 845) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 2013-04-22 08:42:40 UTC (rev 846) @@ -31,6 +31,7 @@ import fr.ifremer.tutti.TuttiBusinessException; import fr.ifremer.tutti.TuttiIOUtil; 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.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; @@ -109,7 +110,9 @@ country = TuttiEntities.splitById(allCountry).get(countryId); } - public void exportProgram(String programId, File exportFile) { + public void exportProgram(String programId, + File exportFile, + ProgressionModel progressionModel) { Preconditions.checkNotNull(programId); Preconditions.checkNotNull(exportFile); @@ -118,7 +121,7 @@ List<Cruise> allCruise = persistenceService.getAllCruise(programId); for (Cruise cruise : allCruise) { - checkCruise(cruise); + checkCruise(progressionModel, cruise); } File basedir = new File(context.getConfig().newTempFile( @@ -132,17 +135,23 @@ for (Cruise cruise : allCruise) { // load full cruise cruise = persistenceService.getCruise(cruise.getId()); - exportCruise(cruise, exportContext); + exportCruise(cruise, exportContext, progressionModel); } TuttiIOUtil.close(exportContext, "Could not close export context"); + progressionModel.setMessage( + _("tutti.service.exportCruise.buildZip", exportFile)); + TuttiIOUtil.zip(basedir, exportFile, "Could not create export zip"); + progressionModel.increments(1); } finally { IOUtils.closeQuietly(exportContext); } } - public void exportCruise(String cruiseId, File exportFile) { + public void exportCruise(String cruiseId, + File exportFile, + ProgressionModel progressionModel) { Preconditions.checkNotNull(cruiseId); Preconditions.checkNotNull(exportFile); @@ -151,7 +160,7 @@ Preconditions.checkNotNull(cruise); // check cruise fishing operations - checkCruise(cruise); + checkCruise(progressionModel, cruise); File basedir = new File(context.getConfig().newTempFile( "exportCruise"), "exportCruise-" + cruiseId); @@ -161,10 +170,14 @@ ExportContext exportContext = createExportContext(basedir); try { - exportCruise(cruise, exportContext); + exportCruise(cruise, exportContext, progressionModel); TuttiIOUtil.close(exportContext, "Could not close export context"); + progressionModel.setMessage( + _("tutti.service.exportCruise.buildZip", exportFile)); + TuttiIOUtil.zip(basedir, exportFile, "Could not create export zip"); + progressionModel.increments(1); } finally { IOUtils.closeQuietly(exportContext); } @@ -180,13 +193,19 @@ horizontalOpeningDoorCaracteristic); } - protected void checkCruise(Cruise cruise) { + protected void checkCruise(ProgressionModel progressionModel, Cruise cruise) { Preconditions.checkNotNull(cruise); + + progressionModel.setMessage( + _("tutti.service.exportCruise.checkCruise", cruise.getName())); + // check cruise fishing operations Map<String, String> errors = tuttiWeightComputingService.checkCruise(cruise.getId()); + progressionModel.increments(1); + if (MapUtils.isNotEmpty(errors)) { // there is some fishing operations with some errors @@ -210,18 +229,41 @@ } protected void exportCruise(Cruise cruise, - ExportContext exportContext) { + ExportContext exportContext, + ProgressionModel progressionModel) { List<FishingOperation> operations = persistenceService.getAllFishingOperation(cruise.getId()); + // load fully operations + List<FishingOperation> loadedOperations = + Lists.newArrayListWithCapacity(operations.size()); + for (FishingOperation operation : operations) { + FishingOperation loadedOeration = + persistenceService.getFishingOperation(operation.getId()); + loadedOperations.add(loadedOeration); + } + + String cruiseName = cruise.getName(); + progressionModel.setMessage( + _("tutti.service.exportCruise.exportSurvey", cruiseName)); exportSurvey(exportContext, cruise); + progressionModel.increments(1); - exportOperations(exportContext, cruise, operations); + progressionModel.setMessage( + _("tutti.service.exportCruise.exportOperations", cruiseName)); + exportOperations(exportContext, cruise, loadedOperations); + progressionModel.increments(1); - exportParameters(exportContext, cruise, operations); + progressionModel.setMessage( + _("tutti.service.exportCruise.exportParameters", cruiseName)); + exportParameters(exportContext, cruise, loadedOperations); + progressionModel.increments(1); -// exportCatches(exportContext, cruise, operations); + progressionModel.setMessage( + _("tutti.service.exportCruise.exportCatches", cruiseName)); +// exportCatches(exportContext, cruise, loadedOperations); + progressionModel.increments(1); } protected void exportSurvey(ExportContext exportContext, @@ -241,6 +283,7 @@ protected void exportOperations(ExportContext exportContext, Cruise cruise, List<FishingOperation> operations) { + try { List<OperationExportRow> rows = Lists.newArrayList(); Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-04-22 06:53:55 UTC (rev 845) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-04-22 08:42:40 UTC (rev 846) @@ -49,6 +49,12 @@ tutti.service.catches.computeWeights.species.error.incoherentSampleWeight= tutti.service.export.invalid.cruise= tutti.service.export.invalid.fishingOperation= +tutti.service.exportCruise.buildZip= +tutti.service.exportCruise.checkCruise= +tutti.service.exportCruise.exportCatches= +tutti.service.exportCruise.exportOperations= +tutti.service.exportCruise.exportParameters= +tutti.service.exportCruise.exportSurvey= tutti.service.operations.computeWeights.benthos.error.incoherentCategoryWeight= tutti.service.operations.computeWeights.benthos.error.incoherentParentCategoryWeight= tutti.service.operations.computeWeights.benthos.error.incoherentRowWeightFrequency= Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-04-22 06:53:55 UTC (rev 845) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-04-22 08:42:40 UTC (rev 846) @@ -49,6 +49,12 @@ tutti.service.catches.computeWeights.species.error.incoherentSampleWeight= tutti.service.export.invalid.cruise=L'export de la campagne %s ne peut pas être réalisé suite aux erreurs rencontrées sur ses traits lors de l'élévation des poids \:\n%s tutti.service.export.invalid.fishingOperation=L'élévation des poids ne peut pas être réalisé sur le trait %s, pour la raison suivante %s +tutti.service.exportCruise.buildZip=Création de l'archive de l'export (fichier %s) +tutti.service.exportCruise.checkCruise=Vérification de la campagne %s +tutti.service.exportCruise.exportCatches=Export du fichier <strong>catch.csv</strong> pour la campagne %s +tutti.service.exportCruise.exportOperations=Export du fichier <strong>operations.csv</strong> pour la campagne %s +tutti.service.exportCruise.exportParameters=Export du fichier <strong>parameters.csv</strong> pour la campagne %s +tutti.service.exportCruise.exportSurvey=Export du fichier <strong>survey.csv</strong> pour la campagne %s tutti.service.operations.computeWeights.benthos.error.incoherentCategoryWeight=Le poids total des mensurations d'un lot du benthos est supérieur au poids de la catégorie tutti.service.operations.computeWeights.benthos.error.incoherentParentCategoryWeight=Le poids de la catégorie d'un lot du benthos est différent de la somme des poids de ses sous-catégories tutti.service.operations.computeWeights.benthos.error.incoherentRowWeightFrequency=Le poids total des mensurations d'un lot du benthos est différent du poids du sous-échantillon 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-04-22 06:53:55 UTC (rev 845) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java 2013-04-22 08:42:40 UTC (rev 846) @@ -26,9 +26,11 @@ import com.google.common.collect.Lists; import com.google.common.io.Files; +import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.RessourceClassLoader; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.TuttiBeanFactory; +import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.Program; @@ -56,6 +58,7 @@ import java.io.File; import java.util.Date; import java.util.List; +import java.util.Map; /** * @author tchemit <chemit(a)codelutin.com> @@ -77,6 +80,8 @@ protected List<FishingOperation> operations; + protected ProgressionModel progressionModel; + @Override protected TuttiServiceContext createServiceContext(RessourceClassLoader loader, TuttiServiceConfig config) { @@ -96,6 +101,8 @@ cruise = createCruise(); operations = createOperations(cruise); + Map<String,FishingOperation> operationMap = TuttiEntities.splitById(operations); + serviceContext.getConfig().setCsvSeparator(';'); PersistenceService persistenceService = Mockito.mock(PersistenceService.class); @@ -109,6 +116,10 @@ Mockito.when(persistenceService.getAllCruise(Mockito.<String>any())).thenReturn(Lists.newArrayList(cruise)); Mockito.when(persistenceService.getAllCountry()).thenReturn(countries); Mockito.when(persistenceService.getAllFishingOperation(Mockito.<String>any())).thenReturn(operations); + Mockito.when(persistenceService.getFishingOperation("0")).thenReturn(operationMap.get("0")); + Mockito.when(persistenceService.getFishingOperation("1")).thenReturn(operationMap.get("1")); + Mockito.when(persistenceService.getFishingOperation("2")).thenReturn(operationMap.get("2")); + Mockito.when(persistenceService.getFishingOperation("3")).thenReturn(operationMap.get("3")); TuttiServiceContext serviceContextSpy = Mockito.spy(serviceContext); Mockito.when(serviceContextSpy.getService(Mockito.eq(PersistenceService.class))).thenReturn(persistenceService); @@ -124,6 +135,9 @@ service.tuttiWeightComputingService = tuttiWeightComputingService; + progressionModel = new ProgressionModel(); + progressionModel.setTotal(6); + } @Test @@ -135,7 +149,7 @@ Assert.assertFalse(exportFile.exists()); - service.exportProgram(cruise.getId(), exportFile); + service.exportProgram(cruise.getId(), exportFile, progressionModel); Assert.assertTrue(exportFile.exists()); } @@ -148,7 +162,7 @@ Assert.assertFalse(exportFile.exists()); - service.exportCruise(cruise.getId(), exportFile); + service.exportCruise(cruise.getId(), exportFile, progressionModel); Assert.assertTrue(exportFile.exists()); } @@ -353,7 +367,6 @@ private List<FishingOperation> createOperations(Cruise cruise) { List<FishingOperation> result = Lists.newArrayList(); - Caracteristic caracteristicInteger = TuttiBeanFactory.newCaracteristic(); caracteristicInteger.setCaracteristicType(CaracteristicType.NUMBER); caracteristicInteger.setId(0); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseAction.java 2013-04-22 06:53:55 UTC (rev 845) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseAction.java 2013-04-22 08:42:40 UTC (rev 846) @@ -26,6 +26,7 @@ import com.google.common.base.Preconditions; import fr.ifremer.tutti.TuttiIOUtil; +import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.service.export.TuttiExportService; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; @@ -99,9 +100,13 @@ " to file: " + file); } - // export cruise + ProgressionModel progressionModel = new ProgressionModel(); + setProgressionModel(progressionModel); + // check cruise / export cruise / operation / parameter / catches / zip + progressionModel.setTotal(6); + TuttiExportService service = getContext().getTuttiExportService(); - service.exportCruise(cruise.getId(), file); + service.exportCruise(cruise.getId(), file, progressionModel); getHandler().resetEditCruiseAction(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProgramAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProgramAction.java 2013-04-22 06:53:55 UTC (rev 845) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProgramAction.java 2013-04-22 08:42:40 UTC (rev 846) @@ -26,6 +26,8 @@ import com.google.common.base.Preconditions; import fr.ifremer.tutti.TuttiIOUtil; +import fr.ifremer.tutti.persistence.ProgressionModel; +import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.service.export.TuttiExportService; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; @@ -34,6 +36,7 @@ import org.apache.commons.logging.LogFactory; import java.io.File; +import java.util.List; import static org.nuiton.i18n.I18n._; @@ -98,9 +101,16 @@ " to file: " + file); } - // export cruise + // nbCruise * (check cruise / export cruise / operation / parameter / catches) + zip + List<Cruise> allCruise = + getContext().getPersistenceService().getAllCruise(program.getId()); + + ProgressionModel progressionModel = new ProgressionModel(); + setProgressionModel(progressionModel); + progressionModel.setTotal(5 * allCruise.size() + 1); + TuttiExportService service = getContext().getTuttiExportService(); - service.exportProgram(program.getId(), file); + service.exportProgram(program.getId(), file, progressionModel); getHandler().resetEditProgramAction(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2013-04-22 06:53:55 UTC (rev 845) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2013-04-22 08:42:40 UTC (rev 846) @@ -237,7 +237,7 @@ getValidator().setBean(model); - ui.applyDataBinding(SelectCruiseUI.BINDING_EDIT_PROGRAM_BUTTON_ENABLED); +// ui.applyDataBinding(SelectCruiseUI.BINDING_EDIT_PROGRAM_BUTTON_ENABLED); ui.applyDataBinding(SelectCruiseUI.BINDING_NEW_CRUISE_BUTTON_ENABLED); ui.applyDataBinding(SelectCruiseUI.BINDING_EDIT_CATCHES_BUTTON_ENABLED); ui.applyDataBinding(SelectCruiseUI.BINDING_VALIDATE_CATCHES_BUTTON_ENABLED); @@ -248,18 +248,18 @@ return getUI().getEditCatchesButton(); } - protected boolean resetEditProtolAction; + protected boolean resetEditProtocolAction; protected boolean resetEditProgramAction; protected boolean resetEditCruiseAction; public void resetEditProtolAction() { - resetEditProtolAction = true; + resetEditProtocolAction = true; try { ui.getEditProtocolComboBox().setSelectedIndex(0); } finally { - resetEditProtolAction = false; + resetEditProtocolAction = false; } } @@ -294,72 +294,99 @@ } public void startEditProgramAction(MouseEvent event) { - JComboBox existingProgramCombo = (JComboBox) event.getSource(); - TuttiActionHelper.runAction((AbstractButton) existingProgramCombo.getItemAt(0)); + startComboFirstAction(event); +// JComboBox existingProgramCombo = (JComboBox) event.getSource(); +// TuttiActionHelper.runAction((AbstractButton) existingProgramCombo.getItemAt(0)); } public void startEditProgramAction(ActionEvent event) { - JComboBox existingProgramCombo = (JComboBox) event.getSource(); - JButton selectedAction = (JButton) existingProgramCombo.getSelectedItem(); - // hide popup before performing the action, otherwise, if the action - // opens a popup, the user must click a first time to hide the combobox - // popup to then interact with the popup opened by the action - // (see http://forge.codelutin.com/issues/2032) - existingProgramCombo.setSelectedIndex(0); - existingProgramCombo.hidePopup(); - TuttiActionHelper.runAction(selectedAction); + startEditAction(!resetEditProgramAction, event); +// JComboBox existingProgramCombo = (JComboBox) event.getSource(); +// JButton selectedAction = (JButton) existingProgramCombo.getSelectedItem(); +// // hide popup before performing the action, otherwise, if the action +// // opens a popup, the user must click a first time to hide the combobox +// // popup to then interact with the popup opened by the action +// // (see http://forge.codelutin.com/issues/2032) +// existingProgramCombo.setSelectedIndex(0); +// existingProgramCombo.hidePopup(); +// TuttiActionHelper.runAction(selectedAction); } public void startEditCruiseAction(MouseEvent event) { - JComboBox existingCruiseCombo = (JComboBox) event.getSource(); - TuttiActionHelper.runAction((AbstractButton) existingCruiseCombo.getItemAt(0)); + startComboFirstAction(event); +// JComboBox existingCruiseCombo = (JComboBox) event.getSource(); +// TuttiActionHelper.runAction((AbstractButton) existingCruiseCombo.getItemAt(0)); } public void startEditCruiseAction(ActionEvent event) { - JComboBox existingCruiseCombo = (JComboBox) event.getSource(); - JButton selectedAction = (JButton) existingCruiseCombo.getSelectedItem(); - // hide popup before performing the action, otherwise, if the action - // opens a popup, the user must click a first time to hide the combobox - // popup to then interact with the popup opened by the action - // (see http://forge.codelutin.com/issues/2032) - existingCruiseCombo.setSelectedIndex(0); - existingCruiseCombo.hidePopup(); - TuttiActionHelper.runAction(selectedAction); + startEditAction(!resetEditCruiseAction, event); +// JComboBox existingCruiseCombo = (JComboBox) event.getSource(); +// JButton selectedAction = (JButton) existingCruiseCombo.getSelectedItem(); +// // hide popup before performing the action, otherwise, if the action +// // opens a popup, the user must click a first time to hide the combobox +// // popup to then interact with the popup opened by the action +// // (see http://forge.codelutin.com/issues/2032) +// existingCruiseCombo.setSelectedIndex(0); +// existingCruiseCombo.hidePopup(); +// TuttiActionHelper.runAction(selectedAction); } public void startExistingProtocolAction(MouseEvent event) { - JComboBox existingProtocolCombo = (JComboBox) event.getSource(); - TuttiActionHelper.runAction((AbstractButton) existingProtocolCombo.getItemAt(0)); + startComboFirstAction(event); +// JComboBox existingProtocolCombo = (JComboBox) event.getSource(); +// TuttiActionHelper.runAction((AbstractButton) existingProtocolCombo.getItemAt(0)); } public void startExistingProtocolAction(ActionEvent event) { - if (!resetEditProtolAction) { - JComboBox existingProtocolCombo = (JComboBox) event.getSource(); - JButton selectedAction = (JButton) existingProtocolCombo.getSelectedItem(); + startEditAction(!resetEditProtocolAction, event); +// if (!resetEditProtocolAction) { +// JComboBox existingProtocolCombo = (JComboBox) event.getSource(); +// JButton selectedAction = (JButton) existingProtocolCombo.getSelectedItem(); +// // hide popup before performing the action, otherwise, if the action +// // opens a popup, the user must click a first time to hide the combobox +// // popup to then interact with the popup opened by the action +// // (see http://forge.codelutin.com/issues/2032) +// existingProtocolCombo.setSelectedIndex(0); +// existingProtocolCombo.hidePopup(); +// TuttiActionHelper.runAction(selectedAction); +// } + } + + public void startNewProtocolAction(MouseEvent event) { + startComboFirstAction(event); +// JComboBox newProtocolCombo = (JComboBox) event.getSource(); +// TuttiActionHelper.runAction((AbstractButton) newProtocolCombo.getItemAt(0)); + } + + public void startNewProtocolAction(ActionEvent event) { + startEditAction(true, event); +// JComboBox newProtocolCombo = (JComboBox) event.getSource(); +// JButton selectedAction = (JButton) newProtocolCombo.getSelectedItem(); +// // hide popup before performing the action, otherwise, if the action +// // opens a popup, the user must click a first time to hide the combobox +// // popup to then interact with the popup opened by the action +// // (see http://forge.codelutin.com/issues/2032) +// newProtocolCombo.setSelectedIndex(0); +// newProtocolCombo.hidePopup(); +// TuttiActionHelper.runAction(selectedAction); + } + + protected void startComboFirstAction(MouseEvent event) { + JComboBox combo = (JComboBox) event.getSource(); + TuttiActionHelper.runAction((AbstractButton) combo.getItemAt(0)); + } + + protected void startEditAction(boolean canEdit, ActionEvent event) { + if (canEdit) { + JComboBox existingCombo = (JComboBox) event.getSource(); + JButton selectedAction = (JButton) existingCombo.getSelectedItem(); // hide popup before performing the action, otherwise, if the action // opens a popup, the user must click a first time to hide the combobox // popup to then interact with the popup opened by the action // (see http://forge.codelutin.com/issues/2032) - existingProtocolCombo.setSelectedIndex(0); - existingProtocolCombo.hidePopup(); + existingCombo.setSelectedIndex(0); + existingCombo.hidePopup(); TuttiActionHelper.runAction(selectedAction); } } - - public void startNewProtocolAction(MouseEvent event) { - JComboBox newProtocolCombo = (JComboBox) event.getSource(); - TuttiActionHelper.runAction((AbstractButton) newProtocolCombo.getItemAt(0)); - } - - public void startNewProtocolAction(ActionEvent event) { - JComboBox newProtocolCombo = (JComboBox) event.getSource(); - JButton selectedAction = (JButton) newProtocolCombo.getSelectedItem(); - // hide popup before performing the action, otherwise, if the action - // opens a popup, the user must click a first time to hide the combobox - // popup to then interact with the popup opened by the action - // (see http://forge.codelutin.com/issues/2032) - newProtocolCombo.setSelectedIndex(0); - newProtocolCombo.hidePopup(); - TuttiActionHelper.runAction(selectedAction); - } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java 2013-04-22 06:53:55 UTC (rev 845) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java 2013-04-22 08:42:40 UTC (rev 846) @@ -24,17 +24,12 @@ * #L% */ -import com.google.common.collect.Lists; -import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; -import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.ui.swing.content.operation.AbstractTuttiBatchUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; import fr.ifremer.tutti.ui.swing.util.TabContentModel; -import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentModelAware; import org.apache.commons.collections.CollectionUtils; -import java.util.Collection; -import java.util.List; +import static org.nuiton.i18n.I18n.n_; /** * @author tchemit <chemit(a)codelutin.com> @@ -88,7 +83,7 @@ @Override public String getTitle() { - return "tutti.label.tab.accidental"; + return n_("tutti.label.tab.accidental"); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java 2013-04-22 06:53:55 UTC (rev 845) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java 2013-04-22 08:42:40 UTC (rev 846) @@ -41,6 +41,8 @@ import java.util.Collection; import java.util.List; +import static org.nuiton.i18n.I18n.n_; + /** * @author tchemit <chemit(a)codelutin.com> * @since 0.1 @@ -154,7 +156,7 @@ @Override public String getTitle() { - return "tutti.label.tab.benthos"; + return n_("tutti.label.tab.benthos"); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java 2013-04-22 06:53:55 UTC (rev 845) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java 2013-04-22 08:42:40 UTC (rev 846) @@ -22,18 +22,13 @@ * #L% */ -import com.google.common.collect.Lists; -import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; -import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.content.operation.AbstractTuttiBatchUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; import fr.ifremer.tutti.ui.swing.util.TabContentModel; -import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentModelAware; import org.apache.commons.collections.CollectionUtils; -import java.util.Collection; -import java.util.List; +import static org.nuiton.i18n.I18n.n_; /** * @author kmorin <kmorin(a)codelutin.com> @@ -95,7 +90,7 @@ @Override public String getTitle() { - return "tutti.label.tab.individualObservations"; + return n_("tutti.label.tab.individualObservations"); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIModel.java 2013-04-22 06:53:55 UTC (rev 845) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIModel.java 2013-04-22 08:42:40 UTC (rev 846) @@ -39,6 +39,8 @@ import java.util.Collection; import java.util.List; +import static org.nuiton.i18n.I18n.n_; + /** * @author tchemit <chemit(a)codelutin.com> * @since 0.2 @@ -178,7 +180,7 @@ @Override public String getTitle() { - return "tutti.label.tab.marineLitter"; + return n_("tutti.label.tab.marineLitter"); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java 2013-04-22 06:53:55 UTC (rev 845) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java 2013-04-22 08:42:40 UTC (rev 846) @@ -41,6 +41,8 @@ import java.util.Collection; import java.util.List; +import static org.nuiton.i18n.I18n.n_; + /** * @author tchemit <chemit(a)codelutin.com> * @since 0.1 @@ -404,7 +406,7 @@ @Override public String getTitle() { - return "tutti.label.tab.species"; + return n_("tutti.label.tab.species"); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java 2013-04-22 06:53:55 UTC (rev 845) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java 2013-04-22 08:42:40 UTC (rev 846) @@ -80,6 +80,7 @@ protected void onRowModified(int rowIndex, RM row, String propertyName, Object oldValue, Object newValue) { recomputeRowValidState(row); super.onRowModified(rowIndex, row, propertyName, oldValue, newValue); + saveSelectedRowIfNeeded(); } @Override 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-04-22 06:53:55 UTC (rev 845) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-04-22 08:42:40 UTC (rev 846) @@ -853,9 +853,12 @@ tutti.importPupitri.trunkFile.extension.description= tutti.label.catches.planktonTotalSampleWeight= tutti.label.catches.planktonTotalWeight= +tutti.label.tab.accidental= +tutti.label.tab.benthos= tutti.label.tab.catches= tutti.label.tab.catchesCaracteristics= tutti.label.tab.fishingOperation= +tutti.label.tab.individualObservations= tutti.label.tab.marineLitter= tutti.label.tab.plancton= tutti.legend.frequencyConfiguration= 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-04-22 06:53:55 UTC (rev 845) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-04-22 08:42:40 UTC (rev 846) @@ -7,6 +7,7 @@ tutti.about.bottomText=Copyright %s - %s - version %s tutti.about.message=<h3>Tutti</h3><p><strong>Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques.</strong></p><br/><p>Ce logiciel permettra la saisie en mer des données d'opération de pêche (positions, environnement, engin, etc) et des captures associées (composition de la capture en espèces scientifiques avec poids, nombres, tailles etc) pour l'ensemble des campagnes halieutiques réalisées par l'Ifremer.</p><p>Ce projet a été initiée en 2012 par l'<a href\="http\://www.ifremer.fr">Ifremer</a> et réalisé par la société <a href\="http\://codelutin.com">Codelutin</a>.</p><hr/><br/><p>Pour plus d'informations, vous pouvez visiter le <a href\="http\://maven-site.forge.codelutin.com/tutti">site du projet</a>.</p><p>Projet hébergé sur la forge <a href\="http\://forge.codelutin.com/projects/tutti">Forge.codelutin.com</a>.</p> tutti.about.title=À propos de Tutti +tutti.label.tab.species=Espèces tutti.about.translate.content=<h2>Comment traduire Tutti</h2>Vous pouvez nous aider à traduire Tutti.<hr/><br/><ul><li>Récupérer le fichier <a href\="%s">tutti-i18n.csv</a> dans le répertoire <strong>i18n</strong></li><li>ouvrez le avec un tableur (le caractère séprateur est une Tabultation)</li><li>Traduisez, Améliorer, ...</li><li>Enfin renvoyez-le nous</li></ul><br/>Nous intégrerons vos modifications avant la prochaine version. tutti.about.translate.title=Traduire Tutti tutti.about.update.app.noup.detail=<tr><td>%1$s</td><td>%2$s</td><td>%2$s<td><td></td></tr> @@ -852,9 +853,12 @@ tutti.importPupitri.trunkFile.extension.description=Fichier du trémie (.tnk) tutti.label.catches.planktonTotalSampleWeight=Poids total échantillonné tutti.label.catches.planktonTotalWeight=Poids total +tutti.label.tab.accidental=Captures accidentelles +tutti.label.tab.benthos=Benthos tutti.label.tab.catches=Captures tutti.label.tab.catchesCaracteristics=Résumé tutti.label.tab.fishingOperation=Trait +tutti.label.tab.individualObservations=Observatiosn individuelles tutti.label.tab.marineLitter=Macro déchets tutti.label.tab.plancton=Plancton tutti.legend.frequencyConfiguration=Configuration

1 0

r845 - in trunk/tutti-ui-swing/src/main: filtered-resources help/fr java/fr/ifremer/tutti/ui/swing java/fr/ifremer/tutti/ui/swing/content/db java/fr/ifremer/tutti/ui/swing/content/home java/fr/ifremer/tutti/ui/swing/content/protocol java/fr/ifremer/tutti/ui/swing/content/referential resources/i18n
by tchemit＠users.forge.codelutin.com 22 Apr '13

22 Apr '13

Author: tchemit Date: 2013-04-22 08:53:55 +0200 (Mon, 22 Apr 2013) New Revision: 845 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/845 Log: add missing svn properties + license headers fixes #2343: [ERGO] Proposer le nom d'un fichier pour chaque sauvegarde Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProgramAction.java Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties trunk/tutti-ui-swing/src/main/help/fr/createAccidentalBatch.html trunk/tutti-ui-swing/src/main/help/fr/createBenthosBatch.html trunk/tutti-ui-swing/src/main/help/fr/createIndividualObservationBatch.html trunk/tutti-ui-swing/src/main/help/fr/createMarineLitterBatch.html trunk/tutti-ui-swing/src/main/help/fr/editBenthosFrequencies.html trunk/tutti-ui-swing/src/main/help/fr/editIndividualObservationBatch.html trunk/tutti-ui-swing/src/main/help/fr/index.html trunk/tutti-ui-swing/src/main/help/fr/splitBenthosBatch.html trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ExportAndCleanDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ExportDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SendCruiseReportAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportAllCaracteristicAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolBenthosAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolCaracteristicAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolSpeciesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportPupitriAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java 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/filtered-resources/tutti-help-en.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-04-22 06:53:55 UTC (rev 845) @@ -22,15 +22,16 @@ # #L% ### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Sun Apr 21 13:23:05 CEST 2013 -tutti.createAccidentalBatch.action.cancel.help=createAccidentalBatch.html#actions -tutti.createAccidentalBatch.action.save.help=createAccidentalBatch.html#actions -tutti.createAccidentalBatch.field.accidentalDeadOrAlive.help=createAccidentalBatch.html#fields -tutti.createAccidentalBatch.field.accidentalGender.help=createAccidentalBatch.html#fields -tutti.createAccidentalBatch.field.accidentalLengthStepCaracteristic.help=createAccidentalBatch.html#fields -tutti.createAccidentalBatch.field.accidentalSize.help=createAccidentalBatch.html#fields -tutti.createAccidentalBatch.field.accidentalSpecies.help=createAccidentalBatch.html#fields -tutti.createAccidentalBatch.field.accidentalWeight.help=createAccidentalBatch.html#fields +#Mon Apr 22 08:30:46 CEST 2013 +tutti.config.help=config.html +tutti.createAccidentalBatch.action.cancel.help=createAccidentalBatch.html\#actions +tutti.createAccidentalBatch.action.save.help=createAccidentalBatch.html\#actions +tutti.createAccidentalBatch.field.accidentalDeadOrAlive.help=createAccidentalBatch.html\#fields +tutti.createAccidentalBatch.field.accidentalGender.help=createAccidentalBatch.html\#fields +tutti.createAccidentalBatch.field.accidentalLengthStepCaracteristic.help=createAccidentalBatch.html\#fields +tutti.createAccidentalBatch.field.accidentalSize.help=createAccidentalBatch.html\#fields +tutti.createAccidentalBatch.field.accidentalSpecies.help=createAccidentalBatch.html\#fields +tutti.createAccidentalBatch.field.accidentalWeight.help=createAccidentalBatch.html\#fields tutti.createAccidentalBatch.help=createAccidentalBatch.html tutti.createBenthosBatch.action.addSpecies.help=createBenthosBatch.html\#actions tutti.createBenthosBatch.action.cancel.help=createBenthosBatch.html\#actions @@ -39,19 +40,19 @@ tutti.createBenthosBatch.field.sortedUnsortedCategory.help=createBenthosBatch.html\#fields tutti.createBenthosBatch.field.species.help=createBenthosBatch.html\#fields tutti.createBenthosBatch.help=createBenthosBatch.html -tutti.createIndividualObservationBatch.action.addSpecies.help=createIndividualObservationBatch.html#actions -tutti.createIndividualObservationBatch.action.cancel.help=createIndividualObservationBatch.html#actions -tutti.createIndividualObservationBatch.action.save.help=createIndividualObservationBatch.html#actions -tutti.createIndividualObservationBatch.field.individualObservationLengthStepCaracteristic.help=createIndividualObservationBatch.html#fields -tutti.createIndividualObservationBatch.field.individualObservationSize.help=createIndividualObservationBatch.html#fields -tutti.createIndividualObservationBatch.field.individualObservationSpecies.help=createIndividualObservationBatch.html#fields -tutti.createIndividualObservationBatch.field.individualObservationWeight.help=createIndividualObservationBatch.html#fields +tutti.createIndividualObservationBatch.action.addSpecies.help=createIndividualObservationBatch.html\#actions +tutti.createIndividualObservationBatch.action.cancel.help=createIndividualObservationBatch.html\#actions +tutti.createIndividualObservationBatch.action.save.help=createIndividualObservationBatch.html\#actions +tutti.createIndividualObservationBatch.field.individualObservationLengthStepCaracteristic.help=createIndividualObservationBatch.html\#fields +tutti.createIndividualObservationBatch.field.individualObservationSize.help=createIndividualObservationBatch.html\#fields +tutti.createIndividualObservationBatch.field.individualObservationSpecies.help=createIndividualObservationBatch.html\#fields +tutti.createIndividualObservationBatch.field.individualObservationWeight.help=createIndividualObservationBatch.html\#fields tutti.createIndividualObservationBatch.help=createIndividualObservationBatch.html -tutti.createMarineLitterBatch.action.cancel.help=createMarineLitterBatch.html#actions -tutti.createMarineLitterBatch.action.save.help=createMarineLitterBatch.html#actions -tutti.createMarineLitterBatch.field.marineLitterCategory.help=createMarineLitterBatch.html#fields -tutti.createMarineLitterBatch.field.marineLitterSizeCategory.help=createMarineLitterBatch.html#fields -tutti.createMarineLitterBatch.field.number.help=createMarineLitterBatch.html#fields +tutti.createMarineLitterBatch.action.cancel.help=createMarineLitterBatch.html\#actions +tutti.createMarineLitterBatch.action.save.help=createMarineLitterBatch.html\#actions +tutti.createMarineLitterBatch.field.marineLitterCategory.help=createMarineLitterBatch.html\#fields +tutti.createMarineLitterBatch.field.marineLitterSizeCategory.help=createMarineLitterBatch.html\#fields +tutti.createMarineLitterBatch.field.number.help=createMarineLitterBatch.html\#fields tutti.createMarineLitterBatch.help=createMarineLitterBatch.html tutti.createSpeciesBatch.action.addSpecies.help=createSpeciesBatch.html\#actions tutti.createSpeciesBatch.action.cancel.help=createSpeciesBatch.html\#actions @@ -68,8 +69,9 @@ tutti.dbManager.action.openDb.help=dbManager.html\#actions tutti.dbManager.action.upgradeDb.help=dbManager.html\#actions tutti.dbManager.help=dbManager.html -tutti.editAccidentalBatch.action.createBatch.help=editAccidentalBatch.html#actions -tutti.editAccidentalBatch.action.removeBatch.help=editAccidentalBatch.html#actions +tutti.editAccidentalBatch.action.createBatch.help=editAccidentalBatch.html\#actions +tutti.editAccidentalBatch.action.removeBatch.help=editAccidentalBatch.html\#actions +tutti.editAccidentalBatch.help=editAccidentalBatch.html tutti.editBenthosBatch.action.createBatch.help=editBenthosBatch.html\#actions tutti.editBenthosBatch.action.createMelag.help=editBenthosBatch.html\#actions tutti.editBenthosBatch.action.removeBatch.help=editBenthosBatch.html\#actions @@ -175,11 +177,14 @@ tutti.editFishingOperation.field.trawlDistance.help=editFishingOperation.html\#fields tutti.editFishingOperation.field.vessel.help=editFishingOperation.html\#fields tutti.editFishingOperation.help=editFishingOperation.html -tutti.editIndividualObservationBatch.action.createBatch.help=editIndividualObservationBatch.html#actions -tutti.editIndividualObservationBatch.action.removeBatch.help=editIndividualObservationBatch.html#actions -tutti.editMarineLitterBatch.action.createBatch.help=editIndividualObservationBatch.html#actions -tutti.editMarineLitterBatch.action.removeBatch.help=editIndividualObservationBatch.html#actions -tutti.editMarineLitterBatch.field.marineLitterTotalWeight.help=editIndividualObservationBatch.html#fields +tutti.editIndividualObservationBatch.action.createBatch.help=editIndividualObservationBatch.html\#actions +tutti.editIndividualObservationBatch.action.removeBatch.help=editIndividualObservationBatch.html\#actions +tutti.editIndividualObservationBatch.help=editIndividualObservationBatch.html +tutti.editMarineLitterBatch.action.createBatch.help=editIndividualObservationBatch.html\#actions +tutti.editMarineLitterBatch.action.removeBatch.help=editIndividualObservationBatch.html\#actions +tutti.editMarineLitterBatch.field.marineLitterTotalWeight.help=editIndividualObservationBatch.html\#fields +tutti.editMarineLitterBatch.help=editMarineLitterBatch.html +tutti.editPlanktonBatch.help=editPlanktonBatch.html tutti.editProgram.action.cancelProgram.help=editProgram.html\#actions tutti.editProgram.action.saveProgram.help=editProgram.html\#actions tutti.editProgram.field.description.help=editProgram.html\#fields @@ -242,12 +247,13 @@ tutti.fishingOperations.action.newFishingOperation.help=fishingOperations.html\#actions tutti.fishingOperations.field.fishingOperation.help=fishingOperations.html\#fields tutti.fishingOperations.help=fishingOperations.html +tutti.index.help=index.html +tutti.main.action.showHelp.help=index.html\#menu +tutti.main.help=index.html +tutti.main.menu.action.about.help=index.html\#menu tutti.main.menu.action.changeLocale.help=index.html\#menu tutti.main.menu.action.changeLocaleFR.help=index.html\#menu tutti.main.menu.action.changeLocaleUK.help=index.html\#menu -tutti.main.action.showHelp.help=index.html\#menu -tutti.main.help=index.html -tutti.main.menu.action.about.help=index.html\#menu tutti.main.menu.action.configuration.help=index.html\#menu tutti.main.menu.action.editCatches.help=index.html\#menu tutti.main.menu.action.editCruise.help=index.html\#menu @@ -276,6 +282,8 @@ tutti.selectCruise.action.editCruise.help=selectCruise.html\#actions tutti.selectCruise.action.editProgram.help=selectCruise.html\#actions tutti.selectCruise.action.editProtocol.help=selectCruise.html\#actions +tutti.selectCruise.action.exportCruise.help= +tutti.selectCruise.action.exportProgram.help= tutti.selectCruise.action.exportProtocol.help=selectCruise.html\#actions tutti.selectCruise.action.importProtocol.help=selectCruise.html\#actions tutti.selectCruise.action.newCruise.help=selectCruise.html\#actions @@ -302,9 +310,3 @@ tutti.splitSpeciesBatch.field.sampleWeightField.help=splitSpeciesBatch.html\#fields tutti.splitSpeciesBatch.field.speciesField.help=splitSpeciesBatch.html\#fields tutti.splitSpeciesBatch.help=splitSpeciesBatch.html -tutti.config.help=config.html -tutti.editAccidentalBatch.help=editAccidentalBatch.html -tutti.editIndividualObservationBatch.help=editIndividualObservationBatch.html -tutti.editMarineLitterBatch.help=editMarineLitterBatch.html -tutti.editPlanktonBatch.help=editPlanktonBatch.html -tutti.index.help=index.html \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-04-22 06:53:55 UTC (rev 845) @@ -22,15 +22,16 @@ # #L% ### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Thu Apr 18 16:32:55 CEST 2013 -tutti.createAccidentalBatch.action.cancel.help=createAccidentalBatch.html#actions -tutti.createAccidentalBatch.action.save.help=createAccidentalBatch.html#actions -tutti.createAccidentalBatch.field.accidentalDeadOrAlive.help=createAccidentalBatch.html#fields -tutti.createAccidentalBatch.field.accidentalGender.help=createAccidentalBatch.html#fields -tutti.createAccidentalBatch.field.accidentalLengthStepCaracteristic.help=createAccidentalBatch.html#fields -tutti.createAccidentalBatch.field.accidentalSize.help=createAccidentalBatch.html#fields -tutti.createAccidentalBatch.field.accidentalSpecies.help=createAccidentalBatch.html#fields -tutti.createAccidentalBatch.field.accidentalWeight.help=createAccidentalBatch.html#fields +#Mon Apr 22 08:30:46 CEST 2013 +tutti.config.help=config.html +tutti.createAccidentalBatch.action.cancel.help=createAccidentalBatch.html\#actions +tutti.createAccidentalBatch.action.save.help=createAccidentalBatch.html\#actions +tutti.createAccidentalBatch.field.accidentalDeadOrAlive.help=createAccidentalBatch.html\#fields +tutti.createAccidentalBatch.field.accidentalGender.help=createAccidentalBatch.html\#fields +tutti.createAccidentalBatch.field.accidentalLengthStepCaracteristic.help=createAccidentalBatch.html\#fields +tutti.createAccidentalBatch.field.accidentalSize.help=createAccidentalBatch.html\#fields +tutti.createAccidentalBatch.field.accidentalSpecies.help=createAccidentalBatch.html\#fields +tutti.createAccidentalBatch.field.accidentalWeight.help=createAccidentalBatch.html\#fields tutti.createAccidentalBatch.help=createAccidentalBatch.html tutti.createBenthosBatch.action.addSpecies.help=createBenthosBatch.html\#actions tutti.createBenthosBatch.action.cancel.help=createBenthosBatch.html\#actions @@ -39,19 +40,19 @@ tutti.createBenthosBatch.field.sortedUnsortedCategory.help=createBenthosBatch.html\#fields tutti.createBenthosBatch.field.species.help=createBenthosBatch.html\#fields tutti.createBenthosBatch.help=createBenthosBatch.html -tutti.createIndividualObservationBatch.action.addSpecies.help=createIndividualObservationBatch.html#actions -tutti.createIndividualObservationBatch.action.cancel.help=createIndividualObservationBatch.html#actions -tutti.createIndividualObservationBatch.action.save.help=createIndividualObservationBatch.html#actions -tutti.createIndividualObservationBatch.field.individualObservationLengthStepCaracteristic.help=createIndividualObservationBatch.html#fields -tutti.createIndividualObservationBatch.field.individualObservationSize.help=createIndividualObservationBatch.html#fields -tutti.createIndividualObservationBatch.field.individualObservationSpecies.help=createIndividualObservationBatch.html#fields -tutti.createIndividualObservationBatch.field.individualObservationWeight.help=createIndividualObservationBatch.html#fields +tutti.createIndividualObservationBatch.action.addSpecies.help=createIndividualObservationBatch.html\#actions +tutti.createIndividualObservationBatch.action.cancel.help=createIndividualObservationBatch.html\#actions +tutti.createIndividualObservationBatch.action.save.help=createIndividualObservationBatch.html\#actions +tutti.createIndividualObservationBatch.field.individualObservationLengthStepCaracteristic.help=createIndividualObservationBatch.html\#fields +tutti.createIndividualObservationBatch.field.individualObservationSize.help=createIndividualObservationBatch.html\#fields +tutti.createIndividualObservationBatch.field.individualObservationSpecies.help=createIndividualObservationBatch.html\#fields +tutti.createIndividualObservationBatch.field.individualObservationWeight.help=createIndividualObservationBatch.html\#fields tutti.createIndividualObservationBatch.help=createIndividualObservationBatch.html -tutti.createMarineLitterBatch.action.cancel.help=createMarineLitterBatch.html#actions -tutti.createMarineLitterBatch.action.save.help=createMarineLitterBatch.html#actions -tutti.createMarineLitterBatch.field.marineLitterCategory.help=createMarineLitterBatch.html#fields -tutti.createMarineLitterBatch.field.marineLitterSizeCategory.help=createMarineLitterBatch.html#fields -tutti.createMarineLitterBatch.field.number.help=createMarineLitterBatch.html#fields +tutti.createMarineLitterBatch.action.cancel.help=createMarineLitterBatch.html\#actions +tutti.createMarineLitterBatch.action.save.help=createMarineLitterBatch.html\#actions +tutti.createMarineLitterBatch.field.marineLitterCategory.help=createMarineLitterBatch.html\#fields +tutti.createMarineLitterBatch.field.marineLitterSizeCategory.help=createMarineLitterBatch.html\#fields +tutti.createMarineLitterBatch.field.number.help=createMarineLitterBatch.html\#fields tutti.createMarineLitterBatch.help=createMarineLitterBatch.html tutti.createSpeciesBatch.action.addSpecies.help=createSpeciesBatch.html\#actions tutti.createSpeciesBatch.action.cancel.help=createSpeciesBatch.html\#actions @@ -68,8 +69,9 @@ tutti.dbManager.action.openDb.help=dbManager.html\#actions tutti.dbManager.action.upgradeDb.help=dbManager.html\#actions tutti.dbManager.help=dbManager.html -tutti.editAccidentalBatch.action.createBatch.help=editAccidentalBatch.html#actions -tutti.editAccidentalBatch.action.removeBatch.help=editAccidentalBatch.html#actions +tutti.editAccidentalBatch.action.createBatch.help=editAccidentalBatch.html\#actions +tutti.editAccidentalBatch.action.removeBatch.help=editAccidentalBatch.html\#actions +tutti.editAccidentalBatch.help=editAccidentalBatch.html tutti.editBenthosBatch.action.createBatch.help=editBenthosBatch.html\#actions tutti.editBenthosBatch.action.createMelag.help=editBenthosBatch.html\#actions tutti.editBenthosBatch.action.removeBatch.help=editBenthosBatch.html\#actions @@ -175,11 +177,14 @@ tutti.editFishingOperation.field.trawlDistance.help=editFishingOperation.html\#fields tutti.editFishingOperation.field.vessel.help=editFishingOperation.html\#fields tutti.editFishingOperation.help=editFishingOperation.html -tutti.editIndividualObservationBatch.action.createBatch.help=editIndividualObservationBatch.html#actions -tutti.editIndividualObservationBatch.action.removeBatch.help=editIndividualObservationBatch.html#actions -tutti.editMarineLitterBatch.action.createBatch.help=editIndividualObservationBatch.html#actions -tutti.editMarineLitterBatch.action.removeBatch.help=editIndividualObservationBatch.html#actions -tutti.editMarineLitterBatch.field.marineLitterTotalWeight.help=editIndividualObservationBatch.html#fields +tutti.editIndividualObservationBatch.action.createBatch.help=editIndividualObservationBatch.html\#actions +tutti.editIndividualObservationBatch.action.removeBatch.help=editIndividualObservationBatch.html\#actions +tutti.editIndividualObservationBatch.help=editIndividualObservationBatch.html +tutti.editMarineLitterBatch.action.createBatch.help=editIndividualObservationBatch.html\#actions +tutti.editMarineLitterBatch.action.removeBatch.help=editIndividualObservationBatch.html\#actions +tutti.editMarineLitterBatch.field.marineLitterTotalWeight.help=editIndividualObservationBatch.html\#fields +tutti.editMarineLitterBatch.help=editMarineLitterBatch.html +tutti.editPlanktonBatch.help=editPlanktonBatch.html tutti.editProgram.action.cancelProgram.help=editProgram.html\#actions tutti.editProgram.action.saveProgram.help=editProgram.html\#actions tutti.editProgram.field.description.help=editProgram.html\#fields @@ -242,12 +247,13 @@ tutti.fishingOperations.action.newFishingOperation.help=fishingOperations.html\#actions tutti.fishingOperations.field.fishingOperation.help=fishingOperations.html\#fields tutti.fishingOperations.help=fishingOperations.html +tutti.index.help=index.html +tutti.main.action.showHelp.help=index.html\#menu +tutti.main.help=index.html +tutti.main.menu.action.about.help=index.html\#menu tutti.main.menu.action.changeLocale.help=index.html\#menu tutti.main.menu.action.changeLocaleFR.help=index.html\#menu tutti.main.menu.action.changeLocaleUK.help=index.html\#menu -tutti.main.action.showHelp.help=index.html\#menu -tutti.main.help=index.html -tutti.main.menu.action.about.help=index.html\#menu tutti.main.menu.action.configuration.help=index.html\#menu tutti.main.menu.action.editCatches.help=index.html\#menu tutti.main.menu.action.editCruise.help=index.html\#menu @@ -276,6 +282,8 @@ tutti.selectCruise.action.editCruise.help=selectCruise.html\#actions tutti.selectCruise.action.editProgram.help=selectCruise.html\#actions tutti.selectCruise.action.editProtocol.help=selectCruise.html\#actions +tutti.selectCruise.action.exportCruise.help= +tutti.selectCruise.action.exportProgram.help= tutti.selectCruise.action.exportProtocol.help=selectCruise.html\#actions tutti.selectCruise.action.importProtocol.help=selectCruise.html\#actions tutti.selectCruise.action.newCruise.help=selectCruise.html\#actions @@ -302,9 +310,3 @@ tutti.splitSpeciesBatch.field.sampleWeightField.help=splitSpeciesBatch.html\#fields tutti.splitSpeciesBatch.field.speciesField.help=splitSpeciesBatch.html\#fields tutti.splitSpeciesBatch.help=splitSpeciesBatch.html -tutti.config.help=config.html -tutti.editAccidentalBatch.help=editAccidentalBatch.html -tutti.editIndividualObservationBatch.help=editIndividualObservationBatch.html -tutti.editMarineLitterBatch.help=editMarineLitterBatch.html -tutti.editPlanktonBatch.help=editPlanktonBatch.html -tutti.index.help=index.html Modified: trunk/tutti-ui-swing/src/main/help/fr/createAccidentalBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/createAccidentalBatch.html 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/help/fr/createAccidentalBatch.html 2013-04-22 06:53:55 UTC (rev 845) @@ -1,3 +1,26 @@ + <!DOCTYPE html> <html lang="fr"> Property changes on: trunk/tutti-ui-swing/src/main/help/fr/createAccidentalBatch.html ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/help/fr/createBenthosBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/createBenthosBatch.html 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/help/fr/createBenthosBatch.html 2013-04-22 06:53:55 UTC (rev 845) @@ -1,3 +1,26 @@ + <!DOCTYPE html> <html lang="fr"> Property changes on: trunk/tutti-ui-swing/src/main/help/fr/createBenthosBatch.html ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/help/fr/createIndividualObservationBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/createIndividualObservationBatch.html 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/help/fr/createIndividualObservationBatch.html 2013-04-22 06:53:55 UTC (rev 845) @@ -1,3 +1,26 @@ + <!DOCTYPE html> <html lang="fr"> Property changes on: trunk/tutti-ui-swing/src/main/help/fr/createIndividualObservationBatch.html ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/help/fr/createMarineLitterBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/createMarineLitterBatch.html 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/help/fr/createMarineLitterBatch.html 2013-04-22 06:53:55 UTC (rev 845) @@ -1,3 +1,26 @@ + <!DOCTYPE html> <html lang="fr"> Property changes on: trunk/tutti-ui-swing/src/main/help/fr/createMarineLitterBatch.html ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/help/fr/editBenthosFrequencies.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/editBenthosFrequencies.html 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/help/fr/editBenthosFrequencies.html 2013-04-22 06:53:55 UTC (rev 845) @@ -1,3 +1,26 @@ + <!DOCTYPE html> <html lang="fr"> Property changes on: trunk/tutti-ui-swing/src/main/help/fr/editBenthosFrequencies.html ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/help/fr/editIndividualObservationBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/editIndividualObservationBatch.html 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/help/fr/editIndividualObservationBatch.html 2013-04-22 06:53:55 UTC (rev 845) @@ -1,3 +1,26 @@ + <!DOCTYPE html> <html lang="fr"> Property changes on: trunk/tutti-ui-swing/src/main/help/fr/editIndividualObservationBatch.html ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/help/fr/index.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/index.html 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/help/fr/index.html 2013-04-22 06:53:55 UTC (rev 845) @@ -1,3 +1,26 @@ + <!DOCTYPE html> <html lang="fr"> Property changes on: trunk/tutti-ui-swing/src/main/help/fr/index.html ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/help/fr/splitBenthosBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/splitBenthosBatch.html 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/help/fr/splitBenthosBatch.html 2013-04-22 06:53:55 UTC (rev 845) @@ -1,3 +1,26 @@ + <!DOCTYPE html> <html lang="fr"> Property changes on: trunk/tutti-ui-swing/src/main/help/fr/splitBenthosBatch.html ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-04-22 06:53:55 UTC (rev 845) @@ -39,6 +39,7 @@ import fr.ifremer.tutti.service.catches.ExportCatchesReportService; import fr.ifremer.tutti.service.catches.TuttiWeightComputingService; import fr.ifremer.tutti.service.catches.ValidateCruiseOperationsService; +import fr.ifremer.tutti.service.export.TuttiExportService; import fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService; import fr.ifremer.tutti.service.pupitri.TuttiPupitriImportExportService; import fr.ifremer.tutti.service.referential.TuttiReferentialImportExportService; @@ -537,6 +538,10 @@ return serviceContext.getService(ExportCatchesReportService.class); } + public TuttiExportService getTuttiExportService() { + return serviceContext.getService(TuttiExportService.class); + } + public boolean useRealPersistenceService() { return isDbExist() && isDbLoaded(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ExportAndCleanDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ExportAndCleanDbAction.java 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ExportAndCleanDbAction.java 2013-04-22 06:53:55 UTC (rev 845) @@ -37,6 +37,9 @@ import org.apache.commons.logging.LogFactory; import java.io.File; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; import static org.nuiton.i18n.I18n._; @@ -49,8 +52,11 @@ public class ExportAndCleanDbAction extends AbstractMainUITuttiAction { /** Logger. */ - private static final Log log = LogFactory.getLog(ExportAndCleanDbAction.class); + private static final Log log = + LogFactory.getLog(ExportAndCleanDbAction.class); + public static final DateFormat df = new SimpleDateFormat("yyy-MM-dd"); + protected File file; public ExportAndCleanDbAction(MainUIHandler handler) { @@ -67,7 +73,8 @@ // ask user file where to export db // choose file to import - file = TuttiUIUtil.chooseFile( + file = TuttiUIUtil.saveFile( + "tutti-db-" + df.format(new Date()) + ".zip", getContext().getMainUI(), _("tutti.dbManager.title.choose.dbExportFile"), _("tutti.dbManager.action.chooseDbExportFile"), Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ExportDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ExportDbAction.java 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ExportDbAction.java 2013-04-22 06:53:55 UTC (rev 845) @@ -34,6 +34,9 @@ import org.apache.commons.logging.LogFactory; import java.io.File; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; import static org.nuiton.i18n.I18n._; @@ -50,6 +53,8 @@ protected File file; + public static final DateFormat df = new SimpleDateFormat("yyy-MM-dd"); + public ExportDbAction(MainUIHandler handler) { super(handler, true); } @@ -64,7 +69,8 @@ // ask user file where to export db // choose file to import - file = TuttiUIUtil.chooseFile( + file = TuttiUIUtil.saveFile( + "tutti-db-" + df.format(new Date()) + ".zip", getContext().getMainUI(), _("tutti.dbManager.title.choose.dbExportFile"), _("tutti.dbManager.action.chooseDbExportFile"), Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseAction.java (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseAction.java 2013-04-22 06:53:55 UTC (rev 845) @@ -0,0 +1,116 @@ +package fr.ifremer.tutti.ui.swing.content.home; + +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import com.google.common.base.Preconditions; +import fr.ifremer.tutti.TuttiIOUtil; +import fr.ifremer.tutti.persistence.entities.data.Cruise; +import fr.ifremer.tutti.service.export.TuttiExportService; +import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; +import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.File; + +import static org.nuiton.i18n.I18n._; + +/** + * To export a selected cruise. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class ExportCruiseAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { + + /** Logger. */ + private static final Log log = LogFactory.getLog(ExportCruiseAction.class); + + protected File file; + + public ExportCruiseAction(SelectCruiseUIHandler handler) { + super(handler, true); + } + + @Override + protected boolean prepareAction() throws Exception { + + boolean doAction = super.prepareAction(); + + if (doAction) { + + Cruise cruise = getModel().getCruise(); + + // choose file to export + file = TuttiUIUtil.saveFile( + "exportCruise-" + cruise.getName() + ".zip", + getContext().getMainUI(), + _("tutti.selectCruise.title.choose.exportCruiseFile"), + _("tutti.selectCruise.action.chooseCruiseExportFile"), + "^.+\\.zip$", _("tutti.common.file.zip") + ); + doAction = file != null; + if (doAction) { + file = TuttiIOUtil.addExtensionIfMissing(file, ".zip"); + + // ask user to confirm overwrite. + doAction = getHandler().askOverwriteFile(file); + } + } + return doAction; + } + + @Override + protected void releaseAction() { + file = null; + super.releaseAction(); + } + + @Override + protected void doAction() throws Exception { + Cruise cruise = getModel().getCruise(); + Preconditions.checkNotNull(cruise); + Preconditions.checkNotNull(file); + + if (log.isInfoEnabled()) { + log.info("Will save cruise " + cruise.getId() + + " to file: " + file); + } + + // export cruise + TuttiExportService service = getContext().getTuttiExportService(); + service.exportCruise(cruise.getId(), file); + + getHandler().resetEditCruiseAction(); + } + + @Override + public void postSuccessAction() { + super.postSuccessAction(); + Cruise cruise = getModel().getCruise(); + sendMessage(_("tutti.exportCruise.action.success", + cruise.getName(), file.getName())); + } +} Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProgramAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProgramAction.java (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProgramAction.java 2013-04-22 06:53:55 UTC (rev 845) @@ -0,0 +1,115 @@ +package fr.ifremer.tutti.ui.swing.content.home; + +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import com.google.common.base.Preconditions; +import fr.ifremer.tutti.TuttiIOUtil; +import fr.ifremer.tutti.persistence.entities.data.Program; +import fr.ifremer.tutti.service.export.TuttiExportService; +import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; +import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.File; + +import static org.nuiton.i18n.I18n._; + +/** + * To export a selected program. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class ExportProgramAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { + + /** Logger. */ + private static final Log log = LogFactory.getLog(ExportProgramAction.class); + + protected File file; + + public ExportProgramAction(SelectCruiseUIHandler handler) { + super(handler, true); + } + + @Override + protected boolean prepareAction() throws Exception { + + boolean doAction = super.prepareAction(); + + Program program = getModel().getProgram(); + if (doAction) { + + // choose file to export + file = TuttiUIUtil.saveFile( + "exportProgram-" + program.getName() + ".zip", + getContext().getMainUI(), + _("tutti.selectCruise.title.choose.exportProgramFile"), + _("tutti.selectCruise.action.chooseProgramExportFile"), + "^.+\\.zip$", _("tutti.common.file.zip") + ); + doAction = file != null; + if (doAction) { + file = TuttiIOUtil.addExtensionIfMissing(file, ".zip"); + + // ask user to confirm overwrite. + doAction = getHandler().askOverwriteFile(file); + } + } + return doAction; + } + + @Override + protected void releaseAction() { + file = null; + super.releaseAction(); + } + + @Override + protected void doAction() throws Exception { + Program program = getModel().getProgram(); + Preconditions.checkNotNull(program); + Preconditions.checkNotNull(file); + + if (log.isInfoEnabled()) { + log.info("Will save program " + program.getId() + + " to file: " + file); + } + + // export cruise + TuttiExportService service = getContext().getTuttiExportService(); + service.exportProgram(program.getId(), file); + + getHandler().resetEditProgramAction(); + } + + @Override + public void postSuccessAction() { + super.postSuccessAction(); + Program program = getModel().getProgram(); + sendMessage(_("tutti.exportProgram.action.success", program.getName(), + file.getName())); + } +} Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProgramAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProtocolAction.java 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProtocolAction.java 2013-04-22 06:53:55 UTC (rev 845) @@ -62,11 +62,13 @@ if (doAction) { + TuttiProtocol protocol = getModel().getProtocol(); // choose file to export - file = TuttiUIUtil.chooseFile( + file = TuttiUIUtil.saveFile( + "protocol-" + protocol.getName().replaceAll(" ", "_") + ".tuttiProtocol", getContext().getMainUI(), _("tutti.selectCruise.title.choose.exportFile"), - _("tutti.selectCruise.action.chooseProtocolFile"), + _("tutti.selectCruise.action.exportProtocol"), "^.+\\.tuttiProtocol$", _("tutti.common.file.protocol") ); doAction = file != null; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java 2013-04-22 06:53:55 UTC (rev 845) @@ -69,7 +69,7 @@ file = TuttiUIUtil.chooseFile( getContext().getMainUI(), _("tutti.selectCruise.title.choose.importFile"), - _("tutti.selectCruise.action.chooseProtocolFile"), + _("tutti.selectCruise.action.importProtocol"), "^.+\\.tuttiProtocol$", _("tutti.common.file.protocol") ); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css 2013-04-22 06:53:55 UTC (rev 845) @@ -58,6 +58,12 @@ _validatorLabel: {_("tutti.selectCruise.field.program")}; } +#editProgramComboBox { + model: {handler.newComboModel(editProgramButton, exportProgramButton)}; + enabled: {model.isProgramFound()}; + renderer: {new ActionListCellRenderer()}; +} + #editProgramButton { actionIcon: edit; text: "tutti.selectCruise.action.editProgram"; @@ -67,6 +73,15 @@ _help: {"tutti.selectCruise.action.editProgram.help"}; } +#exportProgramButton { + actionIcon: export; + text: "tutti.selectCruise.action.exportProgram"; + enabled: {model.isProgramFound()}; + _tuttiAction: {ExportProgramAction.class}; + toolTipText: "tutti.selectCruise.action.exportProgram.tip"; + _help: {"tutti.selectCruise.action.exportProgram.help"}; +} + #newProgramButton { actionIcon: add; text: "tutti.selectCruise.action.newProgram"; @@ -91,7 +106,7 @@ } #editCruiseComboBox { - model: {handler.newComboModel(editCruiseButton, sendCruiseReportButton)}; + model: {handler.newComboModel(editCruiseButton, exportCruiseButton, sendCruiseReportButton)}; enabled: {model.isProgramFound() && model.isCruiseFound()}; renderer: {new ActionListCellRenderer()}; } @@ -104,6 +119,14 @@ _help: {"tutti.selectCruise.action.editCruise.help"}; } +#exportCruiseButton { + actionIcon: export; + text: "tutti.selectCruise.action.exportCruise"; + _tuttiAction: {ExportCruiseAction.class}; + toolTipText: "tutti.selectCruise.action.exportCruise.tip"; + _help: {"tutti.selectCruise.action.exportCruise.help"}; +} + #sendCruiseReportButton { actionIcon: email; text: "tutti.selectCruise.action.sendCruiseReport"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx 2013-04-22 06:53:55 UTC (rev 845) @@ -73,7 +73,10 @@ <TuttiHelpBroker id='broker' constructorParams='"tutti.selectCruise.help"'/> + <JButton id='editProgramButton'/> + <JButton id='exportProgramButton'/> <JButton id='editCruiseButton'/> + <JButton id='exportCruiseButton'/> <JButton id='sendCruiseReportButton'/> <JButton id='newProtocolButton'/> <JButton id='importProtocolButton'/> @@ -100,7 +103,10 @@ </cell> <cell> <JPanel layout='{new GridLayout(1,0)}'> - <JButton id='editProgramButton'/> + <JComboBox id='editProgramComboBox' + onMouseEntered='if (editProgramComboBox.isEnabled()) { editProgramComboBox.showPopup(); }' + onMouseClicked='if (editProgramComboBox.isEnabled()) { handler.startEditProgramAction(event); }' + onActionPerformed='handler.startEditProgramAction(event)'/> <JButton id='newProgramButton'/> </JPanel> </cell> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2013-04-22 06:53:55 UTC (rev 845) @@ -165,6 +165,7 @@ model.getProtocol()); ui.getEditCruiseComboBox().putClientProperty("JComboBox.isTableCellEditor", Boolean.TRUE); + ui.getEditProgramComboBox().putClientProperty("JComboBox.isTableCellEditor", Boolean.TRUE); ui.getEditProtocolComboBox().putClientProperty("JComboBox.isTableCellEditor", Boolean.TRUE); ui.getNewProtocolComboBox().putClientProperty("JComboBox.isTableCellEditor", Boolean.TRUE); @@ -249,6 +250,10 @@ protected boolean resetEditProtolAction; + protected boolean resetEditProgramAction; + + protected boolean resetEditCruiseAction; + public void resetEditProtolAction() { resetEditProtolAction = true; try { @@ -258,6 +263,24 @@ } } + public void resetEditCruiseAction() { + resetEditCruiseAction = true; + try { + ui.getEditCruiseComboBox().setSelectedIndex(0); + } finally { + resetEditCruiseAction = false; + } + } + + public void resetEditProgramAction() { + resetEditProgramAction = true; + try { + ui.getEditCruiseComboBox().setSelectedIndex(0); + } finally { + resetEditProgramAction = false; + } + } + @Override public void onCloseUI() { if (log.isDebugEnabled()) { @@ -270,6 +293,23 @@ clearValidators(); } + public void startEditProgramAction(MouseEvent event) { + JComboBox existingProgramCombo = (JComboBox) event.getSource(); + TuttiActionHelper.runAction((AbstractButton) existingProgramCombo.getItemAt(0)); + } + + public void startEditProgramAction(ActionEvent event) { + JComboBox existingProgramCombo = (JComboBox) event.getSource(); + JButton selectedAction = (JButton) existingProgramCombo.getSelectedItem(); + // hide popup before performing the action, otherwise, if the action + // opens a popup, the user must click a first time to hide the combobox + // popup to then interact with the popup opened by the action + // (see http://forge.codelutin.com/issues/2032) + existingProgramCombo.setSelectedIndex(0); + existingProgramCombo.hidePopup(); + TuttiActionHelper.runAction(selectedAction); + } + public void startEditCruiseAction(MouseEvent event) { JComboBox existingCruiseCombo = (JComboBox) event.getSource(); TuttiActionHelper.runAction((AbstractButton) existingCruiseCombo.getItemAt(0)); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SendCruiseReportAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SendCruiseReportAction.java 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SendCruiseReportAction.java 2013-04-22 06:53:55 UTC (rev 845) @@ -62,8 +62,10 @@ if (doAction) { + Cruise cruise = getModel().getCruise(); // choose file to export - file = TuttiUIUtil.chooseFile( + file = TuttiUIUtil.saveFile( + "exportCruise-" + cruise.getName() + ".pdf", getContext().getMainUI(), _("tutti.sendCruiseReport.title.choose.exportFile"), _("tutti.sendCruiseReport.action.chooseFile"), Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportAllCaracteristicAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportAllCaracteristicAction.java 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportAllCaracteristicAction.java 2013-04-22 06:53:55 UTC (rev 845) @@ -62,7 +62,8 @@ if (doAction) { // choose file to export - file = TuttiUIUtil.chooseFile( + file = TuttiUIUtil.saveFile( + "tuttiProtocol-" + getModel().getName() + "-allCaracteristics.csv", getContext().getMainUI(), _("tutti.editProtocol.title.choose.caracteristicExportFile"), _("tutti.editProtocol.action.chooseProtocolCaracteristicFile"), Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolBenthosAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolBenthosAction.java 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolBenthosAction.java 2013-04-22 06:53:55 UTC (rev 845) @@ -65,7 +65,8 @@ if (doAction) { // choose file to export - file = TuttiUIUtil.chooseFile( + file = TuttiUIUtil.saveFile( + "tuttiProtocol-" + getModel().getName() + "-benthos.csv", getContext().getMainUI(), _("tutti.editProtocol.title.choose.benthosExportFile"), _("tutti.editProtocol.action.chooseProtocolBenthosFile"), Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolCaracteristicAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolCaracteristicAction.java 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolCaracteristicAction.java 2013-04-22 06:53:55 UTC (rev 845) @@ -63,7 +63,8 @@ if (doAction) { // choose file to export - file = TuttiUIUtil.chooseFile( + file = TuttiUIUtil.saveFile( + "tuttiProtocol-" + getModel().getName() + "-caracteristics.csv", getContext().getMainUI(), _("tutti.editProtocol.title.choose.caracteristicExportFile"), _("tutti.editProtocol.action.chooseProtocolCaracteristicFile"), Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolSpeciesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolSpeciesAction.java 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolSpeciesAction.java 2013-04-22 06:53:55 UTC (rev 845) @@ -65,7 +65,8 @@ if (doAction) { // choose file to export - file = TuttiUIUtil.chooseFile( + file = TuttiUIUtil.saveFile( + "tuttiProtocol-" + getModel().getName() + "-species.csv", getContext().getMainUI(), _("tutti.editProtocol.title.choose.speciesExportFile"), _("tutti.editProtocol.action.chooseProtocolSpeciesFile"), Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportPupitriAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportPupitriAction.java 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportPupitriAction.java 2013-04-22 06:53:55 UTC (rev 845) @@ -64,7 +64,8 @@ if (doAction) { // choose file to export - file = TuttiUIUtil.chooseFile( + file = TuttiUIUtil.saveFile( + "tuttiProtocol-" + getModel().getName() + "-pupitri.csv", getContext().getMainUI(), _("tutti.editProtocol.title.choose.speciesExportFile"), _("tutti.editProtocol.action.chooseProtocolSpeciesFile") Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java 2013-04-22 06:53:55 UTC (rev 845) @@ -63,7 +63,8 @@ if (doAction) { // choose file to export - file = TuttiUIUtil.chooseFile( + file = TuttiUIUtil.saveFile( + "exportGearExample.csv", getContext().getMainUI(), _("tutti.manageTemporaryReferential.title.choose.exportTemporaryGearExampleFile"), _("tutti.manageTemporaryReferential.action.chooseReferentialGearFile"), Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java 2013-04-22 06:53:55 UTC (rev 845) @@ -64,7 +64,8 @@ if (doAction) { // choose file to export - file = TuttiUIUtil.chooseFile( + file = TuttiUIUtil.saveFile( + "exportPersonExample.csv", getContext().getMainUI(), _("tutti.manageTemporaryReferential.title.choose.exportTemporaryPersonExampleFile"), _("tutti.manageTemporaryReferential.action.chooseReferentialPersonFile"), Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java 2013-04-22 06:53:55 UTC (rev 845) @@ -63,7 +63,8 @@ if (doAction) { // choose file to export - file = TuttiUIUtil.chooseFile( + file = TuttiUIUtil.saveFile( + "exportSpeciesExample.csv", getContext().getMainUI(), _("tutti.manageTemporaryReferential.title.choose.exportTemporarySpeciesExampleFile"), _("tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile"), Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java 2013-04-22 06:53:55 UTC (rev 845) @@ -63,7 +63,8 @@ if (doAction) { // choose file to export - file = TuttiUIUtil.chooseFile( + file = TuttiUIUtil.saveFile( + "exportVesselExample.csv", getContext().getMainUI(), _("tutti.manageTemporaryReferential.title.choose.exportTemporaryVesselExampleFile"), _("tutti.manageTemporaryReferential.action.chooseReferentialVesselFile"), 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-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-04-22 06:53:55 UTC (rev 845) @@ -55,6 +55,7 @@ tutti.common.cancel= tutti.common.cancel.mnemonic= tutti.common.file.csv= +tutti.common.file.export= tutti.common.file.pdf= tutti.common.file.protocol= tutti.common.file.zip= @@ -798,6 +799,8 @@ tutti.error.errorpane.htmlmessage= tutti.error.ui.business.error= tutti.error.ui.other.error= +tutti.exportCruise.action.success= +tutti.exportProgram.action.success= tutti.exportProtocol.action.success= tutti.fishingOperations.action.newFishingOperation.mnemonic= tutti.fishingOperations.action.newFishingOperation.tip= @@ -983,6 +986,8 @@ tutti.manageTemporaryReferential.title.choose.importTemporaryVesselFile= tutti.message.action.running= tutti.selectBenthos.title= +tutti.selectCruise.action.chooseCruiseExportFile= +tutti.selectCruise.action.chooseProgramExportFile= tutti.selectCruise.action.chooseProtocolFile= tutti.selectCruise.action.cloneProtocol= tutti.selectCruise.action.cloneProtocol.tip= @@ -999,6 +1004,10 @@ tutti.selectCruise.action.editProgram.tip= tutti.selectCruise.action.editProtocol= tutti.selectCruise.action.editProtocol.tip= +tutti.selectCruise.action.exportCruise= +tutti.selectCruise.action.exportCruise.tip= +tutti.selectCruise.action.exportProgram= +tutti.selectCruise.action.exportProgram.tip= tutti.selectCruise.action.exportProtocol= tutti.selectCruise.action.exportProtocol.tip= tutti.selectCruise.action.importProtocol= @@ -1021,7 +1030,9 @@ tutti.selectCruise.field.protocol= tutti.selectCruise.field.protocol.tip= tutti.selectCruise.title= +tutti.selectCruise.title.choose.exportCruiseFile= tutti.selectCruise.title.choose.exportFile= +tutti.selectCruise.title.choose.exportProgramFile= tutti.selectCruise.title.choose.importFile= tutti.selectCruise.warn.invalid.selected.data= tutti.selectSpecies.action.cancel= 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-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-04-22 06:53:55 UTC (rev 845) @@ -798,6 +798,8 @@ tutti.error.errorpane.htmlmessage=<html><body><b>Une erreur s'est produite</b>\:<br/>%s</body></html> tutti.error.ui.business.error=Erreur tutti.error.ui.other.error=Erreur +tutti.exportCruise.action.success=La campagne %s a été exporté dans le fichier %s avec succès. +tutti.exportProgram.action.success=La série de campagne a été exportée dans le fichier %s avec succès. tutti.exportProtocol.action.success=Protocole [%1s] exporté dans le fichier %2s. tutti.fishingOperations.action.newFishingOperation.mnemonic=N tutti.fishingOperations.action.newFishingOperation.tip=Créer une nouvelle opération de pêche @@ -983,7 +985,8 @@ tutti.manageTemporaryReferential.title.choose.importTemporaryVesselFile=Importer un réferentiel Navire tutti.message.action.running=<html>Action <strong>%s</strong> en cours d'execution...<hr/></html> tutti.selectBenthos.title=Choisissez un benthos -tutti.selectCruise.action.chooseProtocolFile=Choisir le fichier de protocole +tutti.selectCruise.action.chooseCruiseExportFile=Exporter +tutti.selectCruise.action.chooseProgramExportFile=Exporter tutti.selectCruise.action.cloneProtocol=Cloner tutti.selectCruise.action.cloneProtocol.tip=Dupliquer le protocole sélectionné tutti.selectCruise.action.deleteProtocol=Supprimer @@ -999,6 +1002,10 @@ tutti.selectCruise.action.editProgram.tip=Éditer le programme sélectionné tutti.selectCruise.action.editProtocol=Éditer tutti.selectCruise.action.editProtocol.tip=Éditer le protocole sélectionné +tutti.selectCruise.action.exportCruise=Exporter +tutti.selectCruise.action.exportCruise.tip=Exporter la campagne au format générique +tutti.selectCruise.action.exportProgram=Exporter +tutti.selectCruise.action.exportProgram.tip=Exporter les campagnes de la série au format générique tutti.selectCruise.action.exportProtocol=Exporter tutti.selectCruise.action.exportProtocol.tip=Exporter le protocole sélectionné tutti.selectCruise.action.importProtocol=Importer @@ -1021,7 +1028,9 @@ tutti.selectCruise.field.protocol=Protocole de saisie tutti.selectCruise.field.protocol.tip=Nom du protocole de saisie tutti.selectCruise.title=Sélection de la campagne +tutti.selectCruise.title.choose.exportCruiseFile=Exporter une campagne tutti.selectCruise.title.choose.exportFile=Exporter le protocole +tutti.selectCruise.title.choose.exportProgramFile=Exporter une série de campagne tutti.selectCruise.title.choose.importFile=Importer le protocole tutti.selectCruise.warn.invalid.selected.data=Les données sélectionnées ne sont pas valides, impossible de saisir ou valider les captures. tutti.selectSpecies.action.cancel=Annuler

1 0

r844 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service tutti-service/src/main/java/fr/ifremer/tutti/service/catches
by tchemit＠users.forge.codelutin.com 21 Apr '13

21 Apr '13

Author: tchemit Date: 2013-04-21 17:12:42 +0200 (Sun, 21 Apr 2013) New Revision: 844 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/844 Log: fix since Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MeasurementPersistenceHelper.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/VesselPersonFeaturesPersistenceHelper.java trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceWriteTest.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingException.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-04-21 15:07:10 UTC (rev 843) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-04-21 15:12:42 UTC (rev 844) @@ -200,7 +200,7 @@ * @return the species or {@code null} if not found. * @see Species#getReferenceTaxonId() * @see Species#getVernacularCode() - * @since 1.5 + * @since 2.0 */ Species getSpeciesByReferenceTaxonIdWithVernacularCode(Integer referenceTaxonId); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MeasurementPersistenceHelper.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MeasurementPersistenceHelper.java 2013-04-21 15:07:10 UTC (rev 843) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MeasurementPersistenceHelper.java 2013-04-21 15:12:42 UTC (rev 844) @@ -37,7 +37,7 @@ * Helper around {@link Measurement}. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.5 + * @since 2.0 */ @Component("measurementPersistenceHelper") public class MeasurementPersistenceHelper extends AbstractPersistenceService { Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java 2013-04-21 15:07:10 UTC (rev 843) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java 2013-04-21 15:12:42 UTC (rev 844) @@ -183,7 +183,7 @@ * @return the species or {@code null} if not found. * @see Species#getReferenceTaxonId() * @see Species#getVernacularCode() - * @since 1.5 + * @since 2.0 */ @Cacheable(value = "referentSpeciesByIdVernacular", key = "#referenceTaxonId", condition = "#referenceTaxonId != null") Species getSpeciesByReferenceTaxonIdWithVernacularCode(Integer referenceTaxonId); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/VesselPersonFeaturesPersistenceHelper.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/VesselPersonFeaturesPersistenceHelper.java 2013-04-21 15:07:10 UTC (rev 843) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/VesselPersonFeaturesPersistenceHelper.java 2013-04-21 15:12:42 UTC (rev 844) @@ -38,7 +38,7 @@ * Helper around {@link VesselPersonFeatures}. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.5 + * @since 2.0 */ @Component("vesselPersonFeaturesPersistenceHelper") public class VesselPersonFeaturesPersistenceHelper extends AbstractPersistenceService { Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceWriteTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceWriteTest.java 2013-04-21 15:07:10 UTC (rev 843) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceWriteTest.java 2013-04-21 15:12:42 UTC (rev 844) @@ -44,7 +44,7 @@ * operation. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.5 + * @since 2.0 */ public class IndividualObservationBatchPersistenceServiceWriteTest { Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingException.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingException.java 2013-04-21 15:07:10 UTC (rev 843) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingException.java 2013-04-21 15:12:42 UTC (rev 844) @@ -28,7 +28,7 @@ /** * @author kmorin <kmorin(a)codelutin.com> - * @since 1.5 + * @since 2.0 */ public class TuttiWeightComputingException extends TuttiBusinessException {

1 0

r843 - trunk/tutti-service/src/main/java/fr/ifremer/tutti/service
by tchemit＠users.forge.codelutin.com 21 Apr '13

21 Apr '13

Author: tchemit Date: 2013-04-21 17:07:10 +0200 (Sun, 21 Apr 2013) New Revision: 843 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/843 Log: fixes #2320: Si on change de base alors il cherche encore les donn?\195?\169es anciennes Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java 2013-04-21 14:40:42 UTC (rev 842) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java 2013-04-21 15:07:10 UTC (rev 843) @@ -197,55 +197,76 @@ public void checkDbContext() { + String saneProtocolId = null; + String saneProgramId = null; + String saneCruiseId = null; + + String oldProtocolId = getProtocolId(); + String oldProgramId = getProgramId(); + String oldCruiseId = getCruiseId(); + if (isProtocolFilled()) { - if (!service.isProtocolExist(getProtocolId())) { + if (!service.isProtocolExist(oldProtocolId)) { // not found in this db if (log.isWarnEnabled()) { - log.warn("Remove invalid protocolId: " + getProtocolId()); + log.warn("Remove invalid protocolId: " + oldProtocolId); } - setProtocolId(null); } else { if (log.isInfoEnabled()) { - log.info("protocolId valid: " + getProtocolId()); + log.info("protocolId valid: " + oldProtocolId); } - setProtocolId(getProtocolId()); + // can keep this id + saneProtocolId = oldProtocolId; } } if (isProgramFilled()) { - Program program = service.getProgram(getProgramId()); + + Program program = null; + + try { + program = service.getProgram(oldProgramId); + } catch (Exception e) { + // program does not exist + } if (program == null) { // not found in this db if (log.isWarnEnabled()) { - log.warn("Remove invalid programId: " + getProgramId()); + log.warn("Remove invalid programId: " + oldProgramId); } - setProgramId(null); - setCruiseId(null); - } else { if (log.isInfoEnabled()) { - log.info("ProgramId valid: " + getProgramId()); + log.info("ProgramId valid: " + oldProgramId); } - setProgramId(getProgramId()); + // can keep this id + saneProgramId = oldProgramId; + // test cruiseId if (isCruiseFilled()) { - Cruise cruise = service.getCruise(getCruiseId()); + Cruise cruise = null; + + try { + cruise = service.getCruise(oldCruiseId); + } catch (Exception e) { + // cruise does not exist + } + if (cruise != null && - !cruise.getProgram().getId().equals(getProgramId())) { + !cruise.getProgram().getId().equals(oldProgramId)) { // not matchin program, reset cruise id cruise = null; @@ -256,19 +277,36 @@ // not found in this db if (log.isWarnEnabled()) { - log.warn("Remove invalid cruiseId: " + getCruiseId()); + log.warn("Remove invalid cruiseId: " + oldCruiseId); } setCruiseId(null); } else { if (log.isInfoEnabled()) { - log.info("CruiseId valid: " + getCruiseId()); + log.info("CruiseId valid: " + oldCruiseId); } + + // can keep this id + saneCruiseId = oldCruiseId; } } } } + + boolean oldProtocolFilled = isProtocolFilled(); + boolean oldProgramFilled = isProgramFilled(); + boolean oldCruiseFilled = isCruiseFilled(); + this.programId = saneProgramId; + this.cruiseId = saneCruiseId; + this.protocolId = saneProtocolId; + + firePropertyChange(PROPERTY_PROGRAM_FILLED, oldProgramFilled, isProgramFilled()); + firePropertyChange(PROPERTY_PROTOCOL_FILLED, oldProtocolFilled, isProtocolFilled()); + firePropertyChange(PROPERTY_CRUISE__FILLED, oldCruiseFilled, isCruiseFilled()); + firePropertyChange(PROPERTY_PROGRAM_ID, oldProgramId, saneProgramId); + firePropertyChange(PROPERTY_PROTOCOL_ID, oldProtocolId, saneProtocolId); + firePropertyChange(PROPERTY_CRUISE_ID, oldCruiseId, saneCruiseId); } public String getProgramId() {

1 0

r842 - in trunk: tutti-service/src/main/java/fr/ifremer/tutti/service tutti-service/src/test/java/fr/ifremer/tutti/service tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config
by tchemit＠users.forge.codelutin.com 21 Apr '13

21 Apr '13

Author: tchemit Date: 2013-04-21 16:40:42 +0200 (Sun, 21 Apr 2013) New Revision: 842 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/842 Log: fixes #2342: D?\195?\169coration de l'ordre des cat?\195?\169gories ko dans la configuration Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/DecoratorServiceTest.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/SampleOrderEditorUIHandler.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-04-21 14:27:12 UTC (rev 841) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-04-21 14:40:42 UTC (rev 842) @@ -32,6 +32,7 @@ import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; +import fr.ifremer.tutti.persistence.entities.referential.CaracteristicBean; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Person; @@ -98,7 +99,7 @@ registerTuttiDecorator(Gear.class, "${label}$s#${name}$s", SEPARATOR, " - "); registerTuttiDecorator(Person.class, "${firstName}$s#${lastName}$s#${department}$s", SEPARATOR, " "); registerTuttiDecorator(Caracteristic.class, "${parameterName}$s#${matrixName}$s#${fractionName}$s#${methodName}$s", SEPARATOR, " - "); - registerTuttiDecorator(Caracteristic.class, CARACTERISTIC_PARAMETER_ONLY, "${parameterName}$s", SEPARATOR, " - "); + registerTuttiDecorator(CaracteristicBean.class, CARACTERISTIC_PARAMETER_ONLY, "${parameterName}$s", SEPARATOR, " - "); // registerMultiJXPathDecorator(Caracteristic.class, CARACTERISTIC_WITH_UNIT, "${parameterName}$s#${matrixName}$s#${fractionName}$s#${methodName}$s (${unit}$s)", SEPARATOR, " - "); registerTuttiDecorator(CaracteristicQualitativeValue.class, "${name}$s", SEPARATOR, " - "); registerTuttiDecorator(SpeciesProtocol.class, "${speciesReferenceTaxonId}", SEPARATOR, " - "); Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/DecoratorServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/DecoratorServiceTest.java 2013-04-21 14:27:12 UTC (rev 841) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/DecoratorServiceTest.java 2013-04-21 14:40:42 UTC (rev 842) @@ -34,6 +34,7 @@ import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; +import fr.ifremer.tutti.persistence.entities.referential.CaracteristicBean; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Person; @@ -80,7 +81,7 @@ assertDecoratorByTypeFound(Gear.class); assertDecoratorByTypeFound(Person.class); assertDecoratorByTypeFound(Caracteristic.class); - assertDecoratorByTypeFound(DecoratorService.CARACTERISTIC_PARAMETER_ONLY, Caracteristic.class); + assertDecoratorByTypeFound(DecoratorService.CARACTERISTIC_PARAMETER_ONLY, CaracteristicBean.class); assertDecoratorByTypeFound(SpeciesProtocol.class); assertDecoratorByTypeFound(CaracteristicQualitativeValue.class); assertDecoratorByTypeFound(Attachment.class); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/SampleOrderEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/SampleOrderEditorUIHandler.java 2013-04-21 14:27:12 UTC (rev 841) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/SampleOrderEditorUIHandler.java 2013-04-21 14:40:42 UTC (rev 842) @@ -25,6 +25,7 @@ */ import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; +import fr.ifremer.tutti.persistence.entities.referential.CaracteristicBean; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import jaxx.runtime.SwingUtil; @@ -142,9 +143,9 @@ jToolBar.setFloatable(false); ui.getSampleOrderEditorTopPanel().setRightDecoration(jToolBar); - JXPathDecorator<Caracteristic> decorator = - (JXPathDecorator<Caracteristic>) context.getDecoratorService().getDecoratorByType( - Caracteristic.class, DecoratorService.CARACTERISTIC_PARAMETER_ONLY); + JXPathDecorator<CaracteristicBean> decorator = + (JXPathDecorator<CaracteristicBean>) context.getDecoratorService().getDecoratorByType( + CaracteristicBean.class, DecoratorService.CARACTERISTIC_PARAMETER_ONLY); ui.getList().setCellRenderer(new MultiDecoratorListCellRenderer(decorator)); ui.getList().addKeyListener(new KeyAdapter() {

1 0

21 Apr '13

Author: tchemit Date: 2013-04-21 16:27:12 +0200 (Sun, 21 Apr 2013) New Revision: 841 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/841 Log: refs #1841: [AIDE] - Aide globale refs #1842: [AIDE] - Aide par ?\195?\169cran Added: trunk/tutti-ui-swing/src/main/help/fr/createAccidentalBatch.html trunk/tutti-ui-swing/src/main/help/fr/createBenthosBatch.html trunk/tutti-ui-swing/src/main/help/fr/createIndividualObservationBatch.html trunk/tutti-ui-swing/src/main/help/fr/createMarineLitterBatch.html trunk/tutti-ui-swing/src/main/help/fr/editBenthosFrequencies.html trunk/tutti-ui-swing/src/main/help/fr/editIndividualObservationBatch.html trunk/tutti-ui-swing/src/main/help/fr/editMarineLitterBatch.html trunk/tutti-ui-swing/src/main/help/fr/index.html trunk/tutti-ui-swing/src/main/help/fr/splitBenthosBatch.html Removed: trunk/tutti-ui-swing/src/main/help/en/main.html trunk/tutti-ui-swing/src/main/help/fr/editMacroWasteBatch.html trunk/tutti-ui-swing/src/main/help/fr/main.html Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties trunk/tutti-ui-swing/src/main/help/en/createSpeciesBatch.html trunk/tutti-ui-swing/src/main/help/en/dbManager.html trunk/tutti-ui-swing/src/main/help/en/editAccidentalBatch.html trunk/tutti-ui-swing/src/main/help/en/editBenthosBatch.html trunk/tutti-ui-swing/src/main/help/en/editCatchBatch.html trunk/tutti-ui-swing/src/main/help/en/editCruise.html trunk/tutti-ui-swing/src/main/help/en/editFishingOperation.html trunk/tutti-ui-swing/src/main/help/en/editMacroWasteBatch.html trunk/tutti-ui-swing/src/main/help/en/editPlanktonBatch.html trunk/tutti-ui-swing/src/main/help/en/editProgram.html trunk/tutti-ui-swing/src/main/help/en/editProtocol.html trunk/tutti-ui-swing/src/main/help/en/editSpeciesBatch.html trunk/tutti-ui-swing/src/main/help/en/editSpeciesFrequencies.html trunk/tutti-ui-swing/src/main/help/en/fishingOperations.html trunk/tutti-ui-swing/src/main/help/en/manageTemporaryReferential.html trunk/tutti-ui-swing/src/main/help/en/selectCruise.html trunk/tutti-ui-swing/src/main/help/en/splitSpeciesBatch.html trunk/tutti-ui-swing/src/main/help/fr/config.html trunk/tutti-ui-swing/src/main/help/fr/createSpeciesBatch.html trunk/tutti-ui-swing/src/main/help/fr/dbManager.html trunk/tutti-ui-swing/src/main/help/fr/editAccidentalBatch.html trunk/tutti-ui-swing/src/main/help/fr/editBenthosBatch.html trunk/tutti-ui-swing/src/main/help/fr/editCatchBatch.html trunk/tutti-ui-swing/src/main/help/fr/editCruise.html trunk/tutti-ui-swing/src/main/help/fr/editFishingOperation.html trunk/tutti-ui-swing/src/main/help/fr/editPlanktonBatch.html trunk/tutti-ui-swing/src/main/help/fr/editProgram.html trunk/tutti-ui-swing/src/main/help/fr/editProtocol.html trunk/tutti-ui-swing/src/main/help/fr/editSpeciesBatch.html trunk/tutti-ui-swing/src/main/help/fr/editSpeciesFrequencies.html trunk/tutti-ui-swing/src/main/help/fr/fishingOperations.html trunk/tutti-ui-swing/src/main/help/fr/manageTemporaryReferential.html trunk/tutti-ui-swing/src/main/help/fr/selectCruise.html trunk/tutti-ui-swing/src/main/help/fr/splitSpeciesBatch.html trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiHelpBroker.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/SampleOrderIdsTableCell.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchUI.jaxx trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2013-04-21 14:27:12 UTC (rev 841) @@ -15,17 +15,17 @@ tutti.config.option.persistence.jdbc.username.description=Login de l'utilisateur pour se connecter à la base de données tutti.config.persistence=Configuration de la persistance de Tutti tutti.persistence.batch.validation.horsVracBenthosNotFound=Lot 'Hors Vrac > Benthos' non trouvé ou configuré avec d'autres critères de classement. -tutti.persistence.batch.validation.horsVracMarineLitterNotFound= +tutti.persistence.batch.validation.horsVracMarineLitterNotFound=Lot 'Hors Vrac > Macro-déchet' non trouvé, ou configuré avec d'autres critères de classement. tutti.persistence.batch.validation.horsVracSpeciesNotFound=Lot 'Hors Vrac > Espèces' non trouvé ou configuré avec d'autres critères de classement. tutti.persistence.batch.validation.unsortedNotFound=Lot 'Hors Vrac > Espèces' non trouvé ou configuré avec d'autres critères de classement. -tutti.persistence.batch.validation.vracBenthosAliveItemizedNotFound= +tutti.persistence.batch.validation.vracBenthosAliveItemizedNotFound=Lot 'Vrac > Benthos > Vivant Trié' non trouvé, ou configuré avec d'autres critères de classement. tutti.persistence.batch.validation.vracBenthosInertNotFound=Lot 'Vrac > Benthos > Inerte' non trouvé, ou configuré avec d'autres critères de classement. -tutti.persistence.batch.validation.vracBenthosLifeNotFound=Lot 'Vrac > Benthos > Biota' non trouvé, ou configuré avec d'autres critères de classement. +tutti.persistence.batch.validation.vracBenthosLifeNotFound=Lot 'Vrac > Benthos > Vivant' non trouvé, ou configuré avec d'autres critères de classement. tutti.persistence.batch.validation.vracBenthosNotFound=Lot 'Vrac > Benthos' non trouvé, ou configuré avec d'autres critères de classement. tutti.persistence.batch.validation.vracNotFound=Lot 'Vrac' non trouvé, ou configuré avec d'autres critères de classement. -tutti.persistence.batch.validation.vracSpeciesAliveItemizedNotFound= +tutti.persistence.batch.validation.vracSpeciesAliveItemizedNotFound=Lot 'Vrac > Espèces > Vivant Trié' non trouvé, ou configuré avec d'autres critères de classement. tutti.persistence.batch.validation.vracSpeciesInertNotFound=Lot 'Vrac > Espèces > Inerte' non trouvé, ou configuré avec d'autres critères de classement. -tutti.persistence.batch.validation.vracSpeciesLifeNotFound=Lot 'Vrac > Espèces > Biota' non trouvé, ou configuré avec d'autres critères de classement. +tutti.persistence.batch.validation.vracSpeciesLifeNotFound=Lot 'Vrac > Espèces > Vivant' non trouvé, ou configuré avec d'autres critères de classement. tutti.persistence.batch.validation.vracSpeciesNotFound=Lot 'Vrac > Espèces' non trouvé, ou configuré avec d'autres critères de classement. tutti.sampleCategoryType.age=Age tutti.sampleCategoryType.maturity=Maturité Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-04-21 14:27:12 UTC (rev 841) @@ -23,14 +23,15 @@ ### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo #Sun Apr 21 13:23:05 CEST 2013 -tutti.createAccidentalBatch.action.cancel.help= -tutti.createAccidentalBatch.action.save.help= -tutti.createAccidentalBatch.field.accidentalDeadOrAlive.help= -tutti.createAccidentalBatch.field.accidentalGender.help= -tutti.createAccidentalBatch.field.accidentalLengthStepCaracteristic.help= -tutti.createAccidentalBatch.field.accidentalSize.help= -tutti.createAccidentalBatch.field.accidentalSpecies.help= -tutti.createAccidentalBatch.field.accidentalWeight.help= +tutti.createAccidentalBatch.action.cancel.help=createAccidentalBatch.html#actions +tutti.createAccidentalBatch.action.save.help=createAccidentalBatch.html#actions +tutti.createAccidentalBatch.field.accidentalDeadOrAlive.help=createAccidentalBatch.html#fields +tutti.createAccidentalBatch.field.accidentalGender.help=createAccidentalBatch.html#fields +tutti.createAccidentalBatch.field.accidentalLengthStepCaracteristic.help=createAccidentalBatch.html#fields +tutti.createAccidentalBatch.field.accidentalSize.help=createAccidentalBatch.html#fields +tutti.createAccidentalBatch.field.accidentalSpecies.help=createAccidentalBatch.html#fields +tutti.createAccidentalBatch.field.accidentalWeight.help=createAccidentalBatch.html#fields +tutti.createAccidentalBatch.help=createAccidentalBatch.html tutti.createBenthosBatch.action.addSpecies.help=createBenthosBatch.html\#actions tutti.createBenthosBatch.action.cancel.help=createBenthosBatch.html\#actions tutti.createBenthosBatch.action.save.help=createBenthosBatch.html\#actions @@ -38,20 +39,20 @@ tutti.createBenthosBatch.field.sortedUnsortedCategory.help=createBenthosBatch.html\#fields tutti.createBenthosBatch.field.species.help=createBenthosBatch.html\#fields tutti.createBenthosBatch.help=createBenthosBatch.html -tutti.createIndividualObservationBatch.action.addSpecies.help= -tutti.createIndividualObservationBatch.action.cancel.help= -tutti.createIndividualObservationBatch.action.save.help= -tutti.createIndividualObservationBatch.field.individualObservationLengthStepCaracteristic.help= -tutti.createIndividualObservationBatch.field.individualObservationSize.help= -tutti.createIndividualObservationBatch.field.individualObservationSpecies.help= -tutti.createIndividualObservationBatch.field.individualObservationWeight.help= -tutti.createIndividualObservationBatch.help= -tutti.createMarineLitterBatch.action.cancel.help= -tutti.createMarineLitterBatch.action.save.help= -tutti.createMarineLitterBatch.field.marineLitterCategory.help= -tutti.createMarineLitterBatch.field.marineLitterSizeCategory.help= -tutti.createMarineLitterBatch.field.number.help= -tutti.createMarineLitterBatch.help= +tutti.createIndividualObservationBatch.action.addSpecies.help=createIndividualObservationBatch.html#actions +tutti.createIndividualObservationBatch.action.cancel.help=createIndividualObservationBatch.html#actions +tutti.createIndividualObservationBatch.action.save.help=createIndividualObservationBatch.html#actions +tutti.createIndividualObservationBatch.field.individualObservationLengthStepCaracteristic.help=createIndividualObservationBatch.html#fields +tutti.createIndividualObservationBatch.field.individualObservationSize.help=createIndividualObservationBatch.html#fields +tutti.createIndividualObservationBatch.field.individualObservationSpecies.help=createIndividualObservationBatch.html#fields +tutti.createIndividualObservationBatch.field.individualObservationWeight.help=createIndividualObservationBatch.html#fields +tutti.createIndividualObservationBatch.help=createIndividualObservationBatch.html +tutti.createMarineLitterBatch.action.cancel.help=createMarineLitterBatch.html#actions +tutti.createMarineLitterBatch.action.save.help=createMarineLitterBatch.html#actions +tutti.createMarineLitterBatch.field.marineLitterCategory.help=createMarineLitterBatch.html#fields +tutti.createMarineLitterBatch.field.marineLitterSizeCategory.help=createMarineLitterBatch.html#fields +tutti.createMarineLitterBatch.field.number.help=createMarineLitterBatch.html#fields +tutti.createMarineLitterBatch.help=createMarineLitterBatch.html tutti.createSpeciesBatch.action.addSpecies.help=createSpeciesBatch.html\#actions tutti.createSpeciesBatch.action.cancel.help=createSpeciesBatch.html\#actions tutti.createSpeciesBatch.action.save.help=createSpeciesBatch.html\#actions @@ -67,20 +68,27 @@ tutti.dbManager.action.openDb.help=dbManager.html\#actions tutti.dbManager.action.upgradeDb.help=dbManager.html\#actions tutti.dbManager.help=dbManager.html -tutti.editAccidentalBatch.action.createBatch.help= -tutti.editAccidentalBatch.action.removeBatch.help= -tutti.editBenthosBatch.action.createBatch.help=editBenthosBatch.html\#fields -tutti.editBenthosBatch.action.removeBatch.help=editBenthosBatch.html\#fields -tutti.editBenthosBatch.action.removeSubBatch.help= -tutti.editBenthosBatch.action.renameBatch.help=editBenthosBatch.html\#fields -tutti.editBenthosBatch.action.splitBatch.help=editBenthosBatch.html\#fields +tutti.editAccidentalBatch.action.createBatch.help=editAccidentalBatch.html#actions +tutti.editAccidentalBatch.action.removeBatch.help=editAccidentalBatch.html#actions +tutti.editBenthosBatch.action.createBatch.help=editBenthosBatch.html\#actions +tutti.editBenthosBatch.action.createMelag.help=editBenthosBatch.html\#actions +tutti.editBenthosBatch.action.removeBatch.help=editBenthosBatch.html\#actions +tutti.editBenthosBatch.action.removeSubBatch.help=editBenthosBatch.html\#actions +tutti.editBenthosBatch.action.renameBatch.help=editBenthosBatch.html\#actions +tutti.editBenthosBatch.action.splitBatch.help=editBenthosBatch.html\#actions tutti.editBenthosBatch.field.benthosTotalInertWeight.help=editBenthosBatch.html\#fields tutti.editBenthosBatch.field.benthosTotalLivingNotItemizedWeight.help=editBenthosBatch.html\#fields tutti.editBenthosBatch.field.benthosTotalSampleSortedWeight.help=editBenthosBatch.html\#fields tutti.editBenthosBatch.field.benthosTotalSortedWeight.help=editBenthosBatch.html\#fields tutti.editBenthosBatch.field.benthosTotalUnsortedWeight.help=editBenthosBatch.html\#fields tutti.editBenthosBatch.field.benthosTotalWeight.help=editBenthosBatch.html\#fields -tutti.editBenthosBatch.filterBatch.help=editBenthosBatch.html\#fields +tutti.editBenthosBatch.field.speciesTotalInertWeight.help=editBenthosBatch.html\#fields +tutti.editBenthosBatch.field.speciesTotalLivingNotItemizedWeight.help=editBenthosBatch.html\#fields +tutti.editBenthosBatch.field.speciesTotalSampleSortedWeight.help=editBenthosBatch.html\#fields +tutti.editBenthosBatch.field.speciesTotalSortedWeight.help=editBenthosBatch.html\#fields +tutti.editBenthosBatch.field.speciesTotalUnsortedWeight.help=editBenthosBatch.html\#fields +tutti.editBenthosBatch.field.speciesTotalWeight.help=editBenthosBatch.html\#fields +tutti.editBenthosBatch.filterBatch.help=editBenthosBatch.html tutti.editBenthosBatch.help=editBenthosBatch.html tutti.editBenthosFrequencies.action.cancel.help=editBenthosFrequencies.html\#actions tutti.editBenthosFrequencies.action.generate.help=editBenthosFrequencies.html\#actions @@ -95,6 +103,7 @@ tutti.editBenthosFrequencies.field.rafaleStep.help=editBenthosFrequencies.html\#fields tutti.editBenthosFrequencies.field.simpleCounting.help=editBenthosFrequencies.html\#fields tutti.editBenthosFrequencies.field.step.help=editBenthosFrequencies.html\#fields +tutti.editBenthosFrequencies.help=editBenthosFrequencies.html tutti.editCatchBatch.action.cancelEditCatchBatch.help=editCatchBatch.html\#actions tutti.editCatchBatch.action.computeWeights.help=editCatchBatch.html\#actions tutti.editCatchBatch.action.importPupitri.help=editCatchBatch.html\#actions @@ -166,42 +175,42 @@ tutti.editFishingOperation.field.trawlDistance.help=editFishingOperation.html\#fields tutti.editFishingOperation.field.vessel.help=editFishingOperation.html\#fields tutti.editFishingOperation.help=editFishingOperation.html -tutti.editIndividualObservationBatch.action.createBatch.help= -tutti.editIndividualObservationBatch.action.removeBatch.help= -tutti.editMarineLitterBatch.action.createBatch.help= -tutti.editMarineLitterBatch.action.removeBatch.help= -tutti.editMarineLitterBatch.field.marineLitterTotalWeight.help= +tutti.editIndividualObservationBatch.action.createBatch.help=editIndividualObservationBatch.html#actions +tutti.editIndividualObservationBatch.action.removeBatch.help=editIndividualObservationBatch.html#actions +tutti.editMarineLitterBatch.action.createBatch.help=editIndividualObservationBatch.html#actions +tutti.editMarineLitterBatch.action.removeBatch.help=editIndividualObservationBatch.html#actions +tutti.editMarineLitterBatch.field.marineLitterTotalWeight.help=editIndividualObservationBatch.html#fields tutti.editProgram.action.cancelProgram.help=editProgram.html\#actions tutti.editProgram.action.saveProgram.help=editProgram.html\#actions tutti.editProgram.field.description.help=editProgram.html\#fields tutti.editProgram.field.name.help=editProgram.html\#fields tutti.editProgram.field.zone.help=editProgram.html\#fields tutti.editProgram.help=editProgram.html -tutti.editProtocol.action.addBenthosProtocol.help=editProtocol.html\#actions -tutti.editProtocol.action.addSpeciesProtocol.help=editProtocol.html\#actions +tutti.editProtocol.action.addBenthosProtocol.help=editProtocol.html\#actionsBenthos +tutti.editProtocol.action.addSpeciesProtocol.help=editProtocol.html\#actionsSpecies tutti.editProtocol.action.closeEditProtocol.help=editProtocol.html\#actions -tutti.editProtocol.action.exportProtocolAllCaracteristic.help=editProtocol.html\#actions -tutti.editProtocol.action.exportProtocolBenthos.help=editProtocol.html\#actions -tutti.editProtocol.action.exportProtocolCaracteristic.tip=editProtocol.html\#actions -tutti.editProtocol.action.exportProtocolSpecies.help=editProtocol.html\#actions -tutti.editProtocol.action.exportPupitri.help= -tutti.editProtocol.action.importProtocolBenthos.help=editProtocol.html\#actions -tutti.editProtocol.action.importProtocolCaracteristic.help=editProtocol.html\#actions -tutti.editProtocol.action.importProtocolSpecies.help=editProtocol.html\#actions -tutti.editProtocol.action.removeBenthosProtocol.help=editProtocol.html\#actions -tutti.editProtocol.action.removeSpeciesProtocol.help=editProtocol.html\#actions +tutti.editProtocol.action.exportProtocolAllCaracteristic.help=editProtocol.html\#actionsCaracteristics +tutti.editProtocol.action.exportProtocolBenthos.help=editProtocol.html\#actionsBenthos +tutti.editProtocol.action.exportProtocolCaracteristic.tip=editProtocol.html\#actionsCaracteristics +tutti.editProtocol.action.exportProtocolSpecies.help=editProtocol.html\#actionsSpecies +tutti.editProtocol.action.exportPupitri.help=editProtocol.html\#actionsSpecies +tutti.editProtocol.action.importProtocolBenthos.help=editProtocol.html\#actionsBenthos +tutti.editProtocol.action.importProtocolCaracteristic.help=editProtocol.html\#actionsCaracteristics +tutti.editProtocol.action.importProtocolSpecies.help=editProtocol.html\#actionsSpecies +tutti.editProtocol.action.removeBenthosProtocol.help=editProtocol.html\#actionsBenthos +tutti.editProtocol.action.removeSpeciesProtocol.help=editProtocol.html\#actionsSpecies tutti.editProtocol.action.saveProtocol.help=editProtocol.html\#actions -tutti.editProtocol.action.selectOtherBenthos.help=editProtocol.html\#actions -tutti.editProtocol.action.selectOtherSpecies.help=editProtocol.html\#actions -tutti.editProtocol.field.benthos.help=editProtocol.html\#fields +tutti.editProtocol.action.selectOtherBenthos.help=editProtocol.html\#actionsBenthos +tutti.editProtocol.action.selectOtherSpecies.help=editProtocol.html\#actionsSpecies +tutti.editProtocol.field.benthos.help=editProtocol.html\#fieldsBenthos tutti.editProtocol.field.comment.help=editProtocol.html\#fields -tutti.editProtocol.field.gearUseFeature.help=editProtocol.html\#fields -tutti.editProtocol.field.lengthClasses.help=editProtocol.html\#fields +tutti.editProtocol.field.gearUseFeature.help=editProtocol.html\#fieldsCaracteristics +tutti.editProtocol.field.lengthClasses.help=editProtocol.html\#fieldsCaracteristics tutti.editProtocol.field.name.help=editProtocol.html\#fields -tutti.editProtocol.field.species.help=editProtocol.html\#fields -tutti.editProtocol.field.vesselUseFeature.help=editProtocol.html\#fields +tutti.editProtocol.field.species.help=editProtocol.html\#fieldsSpecies +tutti.editProtocol.field.vesselUseFeature.help=editProtocol.html\#fieldsCaracteristics tutti.editProtocol.help=editProtocol.html -tutti.editProtocol.pane.caracteristic.help=editProtocol.html\#fields +tutti.editProtocol.pane.caracteristic.help=editProtocol.html\#fieldsCaracteristics tutti.editSpeciesBatch.action.createBatch.help=editSpeciesBatch.html\#actions tutti.editSpeciesBatch.action.createMelag.help=editSpeciesBatch.html\#actions tutti.editSpeciesBatch.action.removeBatch.help=editSpeciesBatch.html\#actions @@ -233,25 +242,25 @@ tutti.fishingOperations.action.newFishingOperation.help=fishingOperations.html\#actions tutti.fishingOperations.field.fishingOperation.help=fishingOperations.html\#fields tutti.fishingOperations.help=fishingOperations.html -tutti.main.action.changeLocale.help=main.html\#menu_ -tutti.main.action.changeLocaleFR.help=main.html\#menu_ -tutti.main.action.changeLocaleUK.help=main.html\#menu_ -tutti.main.action.showHelp.help=main.html\#menu_ -tutti.main.help=main.html -tutti.main.menu.action.about.help=main.html\#menu_ -tutti.main.menu.action.configuration.help=main.html\#menu_ -tutti.main.menu.action.editCatches.help=main.html\#menu_ -tutti.main.menu.action.editCruise.help=main.html\#menu_ -tutti.main.menu.action.editProgram.help=main.html\#menu_ -tutti.main.menu.action.editProtocol.help=main.html\#menu_ -tutti.main.menu.action.exit.help=main.html\#menu_ -tutti.main.menu.action.importTemporaryReferential.help=main.html\#menu_ -tutti.main.menu.action.manageDb.help=main.html\#menu_ -tutti.main.menu.action.selectCruise.help=main.html\#menu_ -tutti.main.menu.action.showHelp.help=main.html\#menu_ -tutti.main.menu.action.site.help=main.html\#menu_ -tutti.main.menu.action.updateApplication.help=main.html\#menu_ -tutti.main.menu.action.validateCatches.help=main.html\#menu_ +tutti.main.menu.action.changeLocale.help=index.html\#menu +tutti.main.menu.action.changeLocaleFR.help=index.html\#menu +tutti.main.menu.action.changeLocaleUK.help=index.html\#menu +tutti.main.action.showHelp.help=index.html\#menu +tutti.main.help=index.html +tutti.main.menu.action.about.help=index.html\#menu +tutti.main.menu.action.configuration.help=index.html\#menu +tutti.main.menu.action.editCatches.help=index.html\#menu +tutti.main.menu.action.editCruise.help=index.html\#menu +tutti.main.menu.action.editProgram.help=index.html\#menu +tutti.main.menu.action.editProtocol.help=index.html\#menu +tutti.main.menu.action.exit.help=index.html\#menu +tutti.main.menu.action.importTemporaryReferential.help=index.html\#menu +tutti.main.menu.action.manageDb.help=index.html\#menu +tutti.main.menu.action.selectCruise.help=index.html\#menu +tutti.main.menu.action.showHelp.help=index.html\#menu +tutti.main.menu.action.site.help=index.html\#menu +tutti.main.menu.action.updateApplication.help=index.html\#menu +tutti.main.menu.action.validateCatches.help=index.html\#menu tutti.manageTemporaryReferential.action.exportTemporaryGearExample.help=manageTemporaryReferential.html\#actions tutti.manageTemporaryReferential.action.exportTemporaryPersonExample.help=manageTemporaryReferential.html\#actions tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample.help=manageTemporaryReferential.html\#actions @@ -272,9 +281,9 @@ tutti.selectCruise.action.newCruise.help=selectCruise.html\#actions tutti.selectCruise.action.newProgram.help=selectCruise.html\#actions tutti.selectCruise.action.newProtocol.help=selectCruise.html\#actions -tutti.selectCruise.action.sendCruiseReport.help= +tutti.selectCruise.action.sendCruiseReport.help=selectCruise.html\#actions tutti.selectCruise.action.validateCatches.help=selectCruise.html\#actions -tutti.selectCruise.action.validateCruise.help= +tutti.selectCruise.action.validateCruise.help=selectCruise.html\#actions tutti.selectCruise.field.cruise.help=selectCruise.html\#fields tutti.selectCruise.field.program.help=selectCruise.html\#fields tutti.selectCruise.field.protocol.help=selectCruise.html\#fields @@ -293,9 +302,9 @@ tutti.splitSpeciesBatch.field.sampleWeightField.help=splitSpeciesBatch.html\#fields tutti.splitSpeciesBatch.field.speciesField.help=splitSpeciesBatch.html\#fields tutti.splitSpeciesBatch.help=splitSpeciesBatch.html -tuttihelp.config.help=config.help -tuttihelp.editAccidentalBatch.help=editAccidentalBatch.html -tuttihelp.editIndividualObservationBatch.help= -tuttihelp.editMacroWasteBatch.help= -tuttihelp.editMarineLitterBatch.help=editMarineLitterBatch.html -tuttihelp.editPlanktonBatch.help=editPlanktonBatch.html +tutti.config.help=config.html +tutti.editAccidentalBatch.help=editAccidentalBatch.html +tutti.editIndividualObservationBatch.help=editIndividualObservationBatch.html +tutti.editMarineLitterBatch.help=editMarineLitterBatch.html +tutti.editPlanktonBatch.help=editPlanktonBatch.html +tutti.index.help=index.html \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-04-21 14:27:12 UTC (rev 841) @@ -23,14 +23,15 @@ ### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo #Thu Apr 18 16:32:55 CEST 2013 -tutti.createAccidentalBatch.action.cancel.help= -tutti.createAccidentalBatch.action.save.help= -tutti.createAccidentalBatch.field.accidentalDeadOrAlive.help= -tutti.createAccidentalBatch.field.accidentalGender.help= -tutti.createAccidentalBatch.field.accidentalLengthStepCaracteristic.help= -tutti.createAccidentalBatch.field.accidentalSize.help= -tutti.createAccidentalBatch.field.accidentalSpecies.help= -tutti.createAccidentalBatch.field.accidentalWeight.help= +tutti.createAccidentalBatch.action.cancel.help=createAccidentalBatch.html#actions +tutti.createAccidentalBatch.action.save.help=createAccidentalBatch.html#actions +tutti.createAccidentalBatch.field.accidentalDeadOrAlive.help=createAccidentalBatch.html#fields +tutti.createAccidentalBatch.field.accidentalGender.help=createAccidentalBatch.html#fields +tutti.createAccidentalBatch.field.accidentalLengthStepCaracteristic.help=createAccidentalBatch.html#fields +tutti.createAccidentalBatch.field.accidentalSize.help=createAccidentalBatch.html#fields +tutti.createAccidentalBatch.field.accidentalSpecies.help=createAccidentalBatch.html#fields +tutti.createAccidentalBatch.field.accidentalWeight.help=createAccidentalBatch.html#fields +tutti.createAccidentalBatch.help=createAccidentalBatch.html tutti.createBenthosBatch.action.addSpecies.help=createBenthosBatch.html\#actions tutti.createBenthosBatch.action.cancel.help=createBenthosBatch.html\#actions tutti.createBenthosBatch.action.save.help=createBenthosBatch.html\#actions @@ -38,20 +39,20 @@ tutti.createBenthosBatch.field.sortedUnsortedCategory.help=createBenthosBatch.html\#fields tutti.createBenthosBatch.field.species.help=createBenthosBatch.html\#fields tutti.createBenthosBatch.help=createBenthosBatch.html -tutti.createIndividualObservationBatch.action.addSpecies.help= -tutti.createIndividualObservationBatch.action.cancel.help= -tutti.createIndividualObservationBatch.action.save.help= -tutti.createIndividualObservationBatch.field.individualObservationLengthStepCaracteristic.help= -tutti.createIndividualObservationBatch.field.individualObservationSize.help= -tutti.createIndividualObservationBatch.field.individualObservationSpecies.help= -tutti.createIndividualObservationBatch.field.individualObservationWeight.help= -tutti.createIndividualObservationBatch.help= -tutti.createMarineLitterBatch.action.cancel.help= -tutti.createMarineLitterBatch.action.save.help= -tutti.createMarineLitterBatch.field.marineLitterCategory.help= -tutti.createMarineLitterBatch.field.marineLitterSizeCategory.help= -tutti.createMarineLitterBatch.field.number.help= -tutti.createMarineLitterBatch.help= +tutti.createIndividualObservationBatch.action.addSpecies.help=createIndividualObservationBatch.html#actions +tutti.createIndividualObservationBatch.action.cancel.help=createIndividualObservationBatch.html#actions +tutti.createIndividualObservationBatch.action.save.help=createIndividualObservationBatch.html#actions +tutti.createIndividualObservationBatch.field.individualObservationLengthStepCaracteristic.help=createIndividualObservationBatch.html#fields +tutti.createIndividualObservationBatch.field.individualObservationSize.help=createIndividualObservationBatch.html#fields +tutti.createIndividualObservationBatch.field.individualObservationSpecies.help=createIndividualObservationBatch.html#fields +tutti.createIndividualObservationBatch.field.individualObservationWeight.help=createIndividualObservationBatch.html#fields +tutti.createIndividualObservationBatch.help=createIndividualObservationBatch.html +tutti.createMarineLitterBatch.action.cancel.help=createMarineLitterBatch.html#actions +tutti.createMarineLitterBatch.action.save.help=createMarineLitterBatch.html#actions +tutti.createMarineLitterBatch.field.marineLitterCategory.help=createMarineLitterBatch.html#fields +tutti.createMarineLitterBatch.field.marineLitterSizeCategory.help=createMarineLitterBatch.html#fields +tutti.createMarineLitterBatch.field.number.help=createMarineLitterBatch.html#fields +tutti.createMarineLitterBatch.help=createMarineLitterBatch.html tutti.createSpeciesBatch.action.addSpecies.help=createSpeciesBatch.html\#actions tutti.createSpeciesBatch.action.cancel.help=createSpeciesBatch.html\#actions tutti.createSpeciesBatch.action.save.help=createSpeciesBatch.html\#actions @@ -67,8 +68,8 @@ tutti.dbManager.action.openDb.help=dbManager.html\#actions tutti.dbManager.action.upgradeDb.help=dbManager.html\#actions tutti.dbManager.help=dbManager.html -tutti.editAccidentalBatch.action.createBatch.help= -tutti.editAccidentalBatch.action.removeBatch.help= +tutti.editAccidentalBatch.action.createBatch.help=editAccidentalBatch.html#actions +tutti.editAccidentalBatch.action.removeBatch.help=editAccidentalBatch.html#actions tutti.editBenthosBatch.action.createBatch.help=editBenthosBatch.html\#actions tutti.editBenthosBatch.action.createMelag.help=editBenthosBatch.html\#actions tutti.editBenthosBatch.action.removeBatch.help=editBenthosBatch.html\#actions @@ -174,42 +175,42 @@ tutti.editFishingOperation.field.trawlDistance.help=editFishingOperation.html\#fields tutti.editFishingOperation.field.vessel.help=editFishingOperation.html\#fields tutti.editFishingOperation.help=editFishingOperation.html -tutti.editIndividualObservationBatch.action.createBatch.help= -tutti.editIndividualObservationBatch.action.removeBatch.help= -tutti.editMarineLitterBatch.action.createBatch.help= -tutti.editMarineLitterBatch.action.removeBatch.help= -tutti.editMarineLitterBatch.field.marineLitterTotalWeight.help= +tutti.editIndividualObservationBatch.action.createBatch.help=editIndividualObservationBatch.html#actions +tutti.editIndividualObservationBatch.action.removeBatch.help=editIndividualObservationBatch.html#actions +tutti.editMarineLitterBatch.action.createBatch.help=editIndividualObservationBatch.html#actions +tutti.editMarineLitterBatch.action.removeBatch.help=editIndividualObservationBatch.html#actions +tutti.editMarineLitterBatch.field.marineLitterTotalWeight.help=editIndividualObservationBatch.html#fields tutti.editProgram.action.cancelProgram.help=editProgram.html\#actions tutti.editProgram.action.saveProgram.help=editProgram.html\#actions tutti.editProgram.field.description.help=editProgram.html\#fields tutti.editProgram.field.name.help=editProgram.html\#fields tutti.editProgram.field.zone.help=editProgram.html\#fields tutti.editProgram.help=editProgram.html -tutti.editProtocol.action.addBenthosProtocol.help=editProtocol.html\#actions -tutti.editProtocol.action.addSpeciesProtocol.help=editProtocol.html\#actions +tutti.editProtocol.action.addBenthosProtocol.help=editProtocol.html\#actionsBenthos +tutti.editProtocol.action.addSpeciesProtocol.help=editProtocol.html\#actionsSpecies tutti.editProtocol.action.closeEditProtocol.help=editProtocol.html\#actions -tutti.editProtocol.action.exportProtocolAllCaracteristic.help=editProtocol.html\#actions -tutti.editProtocol.action.exportProtocolBenthos.help=editProtocol.html\#actions -tutti.editProtocol.action.exportProtocolCaracteristic.tip=editProtocol.html\#actions -tutti.editProtocol.action.exportProtocolSpecies.help=editProtocol.html\#actions -tutti.editProtocol.action.exportPupitri.help= -tutti.editProtocol.action.importProtocolBenthos.help=editProtocol.html\#actions -tutti.editProtocol.action.importProtocolCaracteristic.help=editProtocol.html\#actions -tutti.editProtocol.action.importProtocolSpecies.help=editProtocol.html\#actions -tutti.editProtocol.action.removeBenthosProtocol.help=editProtocol.html\#actions -tutti.editProtocol.action.removeSpeciesProtocol.help=editProtocol.html\#actions +tutti.editProtocol.action.exportProtocolAllCaracteristic.help=editProtocol.html\#actionsCaracteristics +tutti.editProtocol.action.exportProtocolBenthos.help=editProtocol.html\#actionsBenthos +tutti.editProtocol.action.exportProtocolCaracteristic.tip=editProtocol.html\#actionsCaracteristics +tutti.editProtocol.action.exportProtocolSpecies.help=editProtocol.html\#actionsSpecies +tutti.editProtocol.action.exportPupitri.help=editProtocol.html\#actionsSpecies +tutti.editProtocol.action.importProtocolBenthos.help=editProtocol.html\#actionsBenthos +tutti.editProtocol.action.importProtocolCaracteristic.help=editProtocol.html\#actionsCaracteristics +tutti.editProtocol.action.importProtocolSpecies.help=editProtocol.html\#actionsSpecies +tutti.editProtocol.action.removeBenthosProtocol.help=editProtocol.html\#actionsBenthos +tutti.editProtocol.action.removeSpeciesProtocol.help=editProtocol.html\#actionsSpecies tutti.editProtocol.action.saveProtocol.help=editProtocol.html\#actions -tutti.editProtocol.action.selectOtherBenthos.help=editProtocol.html\#actions -tutti.editProtocol.action.selectOtherSpecies.help=editProtocol.html\#actions -tutti.editProtocol.field.benthos.help=editProtocol.html\#fields +tutti.editProtocol.action.selectOtherBenthos.help=editProtocol.html\#actionsBenthos +tutti.editProtocol.action.selectOtherSpecies.help=editProtocol.html\#actionsSpecies +tutti.editProtocol.field.benthos.help=editProtocol.html\#fieldsBenthos tutti.editProtocol.field.comment.help=editProtocol.html\#fields -tutti.editProtocol.field.gearUseFeature.help=editProtocol.html\#fields -tutti.editProtocol.field.lengthClasses.help=editProtocol.html\#fields +tutti.editProtocol.field.gearUseFeature.help=editProtocol.html\#fieldsCaracteristics +tutti.editProtocol.field.lengthClasses.help=editProtocol.html\#fieldsCaracteristics tutti.editProtocol.field.name.help=editProtocol.html\#fields -tutti.editProtocol.field.species.help=editProtocol.html\#fields -tutti.editProtocol.field.vesselUseFeature.help=editProtocol.html\#fields +tutti.editProtocol.field.species.help=editProtocol.html\#fieldsSpecies +tutti.editProtocol.field.vesselUseFeature.help=editProtocol.html\#fieldsCaracteristics tutti.editProtocol.help=editProtocol.html -tutti.editProtocol.pane.caracteristic.help=editProtocol.html\#fields +tutti.editProtocol.pane.caracteristic.help=editProtocol.html\#fieldsCaracteristics tutti.editSpeciesBatch.action.createBatch.help=editSpeciesBatch.html\#actions tutti.editSpeciesBatch.action.createMelag.help=editSpeciesBatch.html\#actions tutti.editSpeciesBatch.action.removeBatch.help=editSpeciesBatch.html\#actions @@ -241,25 +242,25 @@ tutti.fishingOperations.action.newFishingOperation.help=fishingOperations.html\#actions tutti.fishingOperations.field.fishingOperation.help=fishingOperations.html\#fields tutti.fishingOperations.help=fishingOperations.html -tutti.main.action.changeLocale.help=main.html\#menu_ -tutti.main.action.changeLocaleFR.help=main.html\#menu_ -tutti.main.action.changeLocaleUK.help=main.html\#menu_ -tutti.main.action.showHelp.help=main.html\#menu_ -tutti.main.help=main.html -tutti.main.menu.action.about.help=main.html\#menu_ -tutti.main.menu.action.configuration.help=main.html\#menu_ -tutti.main.menu.action.editCatches.help=main.html\#menu_ -tutti.main.menu.action.editCruise.help=main.html\#menu_ -tutti.main.menu.action.editProgram.help=main.html\#menu_ -tutti.main.menu.action.editProtocol.help=main.html\#menu_ -tutti.main.menu.action.exit.help=main.html\#menu_ -tutti.main.menu.action.importTemporaryReferential.help=main.html\#menu_ -tutti.main.menu.action.manageDb.help=main.html\#menu_ -tutti.main.menu.action.selectCruise.help=main.html\#menu_ -tutti.main.menu.action.showHelp.help=main.html\#menu_ -tutti.main.menu.action.site.help=main.html\#menu_ -tutti.main.menu.action.updateApplication.help=main.html\#menu_ -tutti.main.menu.action.validateCatches.help=main.html\#menu_ +tutti.main.menu.action.changeLocale.help=index.html\#menu +tutti.main.menu.action.changeLocaleFR.help=index.html\#menu +tutti.main.menu.action.changeLocaleUK.help=index.html\#menu +tutti.main.action.showHelp.help=index.html\#menu +tutti.main.help=index.html +tutti.main.menu.action.about.help=index.html\#menu +tutti.main.menu.action.configuration.help=index.html\#menu +tutti.main.menu.action.editCatches.help=index.html\#menu +tutti.main.menu.action.editCruise.help=index.html\#menu +tutti.main.menu.action.editProgram.help=index.html\#menu +tutti.main.menu.action.editProtocol.help=index.html\#menu +tutti.main.menu.action.exit.help=index.html\#menu +tutti.main.menu.action.importTemporaryReferential.help=index.html\#menu +tutti.main.menu.action.manageDb.help=index.html\#menu +tutti.main.menu.action.selectCruise.help=index.html\#menu +tutti.main.menu.action.showHelp.help=index.html\#menu +tutti.main.menu.action.site.help=index.html\#menu +tutti.main.menu.action.updateApplication.help=index.html\#menu +tutti.main.menu.action.validateCatches.help=index.html\#menu tutti.manageTemporaryReferential.action.exportTemporaryGearExample.help=manageTemporaryReferential.html\#actions tutti.manageTemporaryReferential.action.exportTemporaryPersonExample.help=manageTemporaryReferential.html\#actions tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample.help=manageTemporaryReferential.html\#actions @@ -280,9 +281,9 @@ tutti.selectCruise.action.newCruise.help=selectCruise.html\#actions tutti.selectCruise.action.newProgram.help=selectCruise.html\#actions tutti.selectCruise.action.newProtocol.help=selectCruise.html\#actions -tutti.selectCruise.action.sendCruiseReport.help= +tutti.selectCruise.action.sendCruiseReport.help=selectCruise.html\#actions tutti.selectCruise.action.validateCatches.help=selectCruise.html\#actions -tutti.selectCruise.action.validateCruise.help= +tutti.selectCruise.action.validateCruise.help=selectCruise.html\#actions tutti.selectCruise.field.cruise.help=selectCruise.html\#fields tutti.selectCruise.field.program.help=selectCruise.html\#fields tutti.selectCruise.field.protocol.help=selectCruise.html\#fields @@ -301,9 +302,9 @@ tutti.splitSpeciesBatch.field.sampleWeightField.help=splitSpeciesBatch.html\#fields tutti.splitSpeciesBatch.field.speciesField.help=splitSpeciesBatch.html\#fields tutti.splitSpeciesBatch.help=splitSpeciesBatch.html -tuttihelp.config.help=config.help -tuttihelp.editAccidentalBatch.help=editAccidentalBatch.html -tuttihelp.editIndividualObservationBatch.help= -tuttihelp.editMacroWasteBatch.help= -tuttihelp.editMarineLitterBatch.help=editMarineLitterBatch.html -tuttihelp.editPlanktonBatch.help=editPlanktonBatch.html +tutti.config.help=config.html +tutti.editAccidentalBatch.help=editAccidentalBatch.html +tutti.editIndividualObservationBatch.help=editIndividualObservationBatch.html +tutti.editMarineLitterBatch.help=editMarineLitterBatch.html +tutti.editPlanktonBatch.help=editPlanktonBatch.html +tutti.index.help=index.html Modified: trunk/tutti-ui-swing/src/main/help/en/createSpeciesBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/createSpeciesBatch.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/en/createSpeciesBatch.html 2013-04-21 14:27:12 UTC (rev 841) @@ -36,13 +36,13 @@ <strong>Documentation à rédiger</strong> -<h2>Champs</h2> +<h2>Champs<a name="fields"></a></h2> <ul> <li>Nom</li> <li>Commentaire</li> </ul> -<h2>Actions</h2> +<h2>Actions<a name="actions"></a></h2> Actions possibles : <ul> Modified: trunk/tutti-ui-swing/src/main/help/en/dbManager.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/dbManager.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/en/dbManager.html 2013-04-21 14:27:12 UTC (rev 841) @@ -36,13 +36,13 @@ <strong>Documentation à rédiger</strong> -<h2>Champs</h2> +<h2>Champs<a name="fields"></a></h2> <ul> <li>Nom</li> <li>Commentaire</li> </ul> -<h2>Actions</h2> +<h2>Actions<a name="actions"></a></h2> Actions possibles : <ul> Modified: trunk/tutti-ui-swing/src/main/help/en/editAccidentalBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/editAccidentalBatch.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/en/editAccidentalBatch.html 2013-04-21 14:27:12 UTC (rev 841) @@ -36,13 +36,13 @@ <strong>Documentation à rédiger</strong> -<h2>Champs</h2> +<h2>Champs<a name="fields"></a></h2> <ul> <li>Nom</li> <li>Commentaire</li> </ul> -<h2>Actions</h2> +<h2>Actions<a name="actions"></a></h2> Actions possibles : <ul> Modified: trunk/tutti-ui-swing/src/main/help/en/editBenthosBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/editBenthosBatch.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/en/editBenthosBatch.html 2013-04-21 14:27:12 UTC (rev 841) @@ -36,13 +36,13 @@ <strong>Documentation à rédiger</strong> -<h2>Champs</h2> +<h2>Champs<a name="fields"></a></h2> <ul> <li>Nom</li> <li>Commentaire</li> </ul> -<h2>Actions</h2> +<h2>Actions<a name="actions"></a></h2> Actions possibles : <ul> Modified: trunk/tutti-ui-swing/src/main/help/en/editCatchBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/editCatchBatch.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/en/editCatchBatch.html 2013-04-21 14:27:12 UTC (rev 841) @@ -36,13 +36,13 @@ <strong>Documentation à rédiger</strong> -<h2>Champs</h2> +<h2>Champs<a name="fields"></a></h2> <ul> <li>Nom</li> <li>Commentaire</li> </ul> -<h2>Actions</h2> +<h2>Actions<a name="actions"></a></h2> Actions possibles : <ul> Modified: trunk/tutti-ui-swing/src/main/help/en/editCruise.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/editCruise.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/en/editCruise.html 2013-04-21 14:27:12 UTC (rev 841) @@ -36,13 +36,13 @@ <strong>Documentation à rédiger</strong> -<h2>Champs</h2> +<h2>Champs<a name="fields"></a></h2> <ul> <li>Nom</li> <li>Commentaire</li> </ul> -<h2>Actions</h2> +<h2>Actions<a name="actions"></a></h2> Actions possibles : <ul> Modified: trunk/tutti-ui-swing/src/main/help/en/editFishingOperation.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/editFishingOperation.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/en/editFishingOperation.html 2013-04-21 14:27:12 UTC (rev 841) @@ -36,13 +36,13 @@ <strong>Documentation à rédiger</strong> -<h2>Champs</h2> +<h2>Champs<a name="fields"></a></h2> <ul> <li>Nom</li> <li>Commentaire</li> </ul> -<h2>Actions</h2> +<h2>Actions<a name="actions"></a></h2> Actions possibles : <ul> Modified: trunk/tutti-ui-swing/src/main/help/en/editMacroWasteBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/editMacroWasteBatch.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/en/editMacroWasteBatch.html 2013-04-21 14:27:12 UTC (rev 841) @@ -36,13 +36,13 @@ <strong>Documentation à rédiger</strong> -<h2>Champs</h2> +<h2>Champs<a name="fields"></a></h2> <ul> <li>Nom</li> <li>Commentaire</li> </ul> -<h2>Actions</h2> +<h2>Actions<a name="actions"></a></h2> Actions possibles : <ul> Modified: trunk/tutti-ui-swing/src/main/help/en/editPlanktonBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/editPlanktonBatch.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/en/editPlanktonBatch.html 2013-04-21 14:27:12 UTC (rev 841) @@ -36,13 +36,13 @@ <strong>Documentation à rédiger</strong> -<h2>Champs</h2> +<h2>Champs<a name="fields"></a></h2> <ul> <li>Nom</li> <li>Commentaire</li> </ul> -<h2>Actions</h2> +<h2>Actions<a name="actions"></a></h2> Actions possibles : <ul> Modified: trunk/tutti-ui-swing/src/main/help/en/editProgram.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/editProgram.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/en/editProgram.html 2013-04-21 14:27:12 UTC (rev 841) @@ -36,14 +36,14 @@ <strong>Documentation à rédiger</strong> -<h2>Champs</h2> +<h2>Champs<a name="fields"></a></h2> <ul> <li>Nom</li> <li>Zone</li> <li>Commentaire</li> </ul> -<h2>Actions</h2> +<h2>Actions<a name="actions"></a></h2> Actions possibles : <ul> Modified: trunk/tutti-ui-swing/src/main/help/en/editProtocol.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/editProtocol.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/en/editProtocol.html 2013-04-21 14:27:12 UTC (rev 841) @@ -36,13 +36,13 @@ <strong>Documentation à rédiger</strong> -<h2>Champs</h2> +<h2>Champs<a name="fields"></a></h2> <ul> <li>Nom</li> <li>Commentaire</li> </ul> -<h2>Actions</h2> +<h2>Actions<a name="actions"></a></h2> Actions possibles : <ul> Modified: trunk/tutti-ui-swing/src/main/help/en/editSpeciesBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/editSpeciesBatch.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/en/editSpeciesBatch.html 2013-04-21 14:27:12 UTC (rev 841) @@ -36,13 +36,13 @@ <strong>Documentation à rédiger</strong> -<h2>Champs</h2> +<h2>Champs<a name="fields"></a></h2> <ul> <li>Nom</li> <li>Commentaire</li> </ul> -<h2>Actions</h2> +<h2>Actions<a name="actions"></a></h2> Actions possibles : <ul> Modified: trunk/tutti-ui-swing/src/main/help/en/editSpeciesFrequencies.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/editSpeciesFrequencies.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/en/editSpeciesFrequencies.html 2013-04-21 14:27:12 UTC (rev 841) @@ -36,13 +36,13 @@ <strong>Documentation à rédiger</strong> -<h2>Champs</h2> +<h2>Champs<a name="fields"></a></h2> <ul> <li>Nom</li> <li>Commentaire</li> </ul> -<h2>Actions</h2> +<h2>Actions<a name="actions"></a></h2> Actions possibles : <ul> Modified: trunk/tutti-ui-swing/src/main/help/en/fishingOperations.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/fishingOperations.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/en/fishingOperations.html 2013-04-21 14:27:12 UTC (rev 841) @@ -36,13 +36,13 @@ <strong>Documentation à rédiger</strong> -<h2>Champs</h2> +<h2>Champs<a name="fields"></a></h2> <ul> <li>Nom</li> <li>Commentaire</li> </ul> -<h2>Actions</h2> +<h2>Actions<a name="actions"></a></h2> Actions possibles : <ul> Deleted: trunk/tutti-ui-swing/src/main/help/en/main.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/main.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/en/main.html 2013-04-21 14:27:12 UTC (rev 841) @@ -1,48 +0,0 @@ - -<!DOCTYPE html> -<html lang="fr"> - -<head> - <meta charset="utf-8"/> - <title>Tutti - Écran principal</title> -</head> -<body> - -<h1>Écran principal</h1> - -<p>...</p> - -<strong>Documentation à rédiger</strong> - -<h2>Menu</h2> -Actions possibles depuis le menu : - -<ul> - <li>Configuration</li> - <li>Gérerles bases</li> - <li>Quitter l'application</li> -</ul> -</body> -</html> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/help/en/manageTemporaryReferential.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/manageTemporaryReferential.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/en/manageTemporaryReferential.html 2013-04-21 14:27:12 UTC (rev 841) @@ -36,13 +36,13 @@ <strong>Documentation à rédiger</strong> -<h2>Champs</h2> +<h2>Champs<a name="fields"></a></h2> <ul> <li>Nom</li> <li>Commentaire</li> </ul> -<h2>Actions</h2> +<h2>Actions<a name="actions"></a></h2> Actions possibles : <ul> Modified: trunk/tutti-ui-swing/src/main/help/en/selectCruise.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/selectCruise.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/en/selectCruise.html 2013-04-21 14:27:12 UTC (rev 841) @@ -36,13 +36,13 @@ <strong>Documentation à rédiger</strong> -<h2>Champs</h2> +<h2>Champs<a name="fields"></a></h2> <ul> <li>Nom</li> <li>Commentaire</li> </ul> -<h2>Actions</h2> +<h2>Actions<a name="actions"></a></h2> Actions possibles : <ul> Modified: trunk/tutti-ui-swing/src/main/help/en/splitSpeciesBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/splitSpeciesBatch.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/en/splitSpeciesBatch.html 2013-04-21 14:27:12 UTC (rev 841) @@ -36,13 +36,13 @@ <strong>Documentation à rédiger</strong> -<h2>Champs</h2> +<h2>Champs<a name="fields"></a></h2> <ul> <li>Nom</li> <li>Commentaire</li> </ul> -<h2>Actions</h2> +<h2>Actions<a name="actions"></a></h2> Actions possibles : <ul> Modified: trunk/tutti-ui-swing/src/main/help/fr/config.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/config.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/fr/config.html 2013-04-21 14:27:12 UTC (rev 841) @@ -34,14 +34,32 @@ <p>Sur cette écran on peut configurer l'application...</p> -<strong>Documentation à rédiger</strong> +<strong>Documentation à valider</strong> -<h2>Actions</h2> -Actions possibles : +<h2>Champs<a name="fields"></a></h2> +<dl> + <dt>Onglet Application</dt> + <dd>contient la configuration métier de l'application</dd> + <dt>Onglet interface utilisateur</dt> + <dd>contient la configuration des interfaces graphiques + (couleurs, format de dates,...) + </dd> + <dt>Onglet technique</dt> + <dd>contient la configuration technique de l'application, la plupart des + options sont non modifables (elles sont là plus à titre indicatif) + </dd> +</dl> +<h2 accesskey="actions">Actions<a name="actions"></a></h2> -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> +<dl> + <dt>Annuler</dt> + <dd>Annuler les modifications sur la configuration</dd> + <dt>Enregistrer</dt> + <dd>Enregister les modifications sur la configuration</dd> + <dt>Quitter</dt> + <dd>Quitter l'écran de configuration</dd> +</dl> +<hr> +<a href="index.html">Retour sur la table des matières</a> </body> </html> \ No newline at end of file Added: trunk/tutti-ui-swing/src/main/help/fr/createAccidentalBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/createAccidentalBatch.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/fr/createAccidentalBatch.html 2013-04-21 14:27:12 UTC (rev 841) @@ -0,0 +1,39 @@ +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Saisir une capture accidentelle</title> +</head> +<body> + +<h1>Saisir une capture accidentelle</h1> + +<p>Sur cette écran on peut saisir une capture accidentelle...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs<a name="fields"></a></h2> +<dl> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> + +<h2>Actions<a name="actions"></a></h2> +<dl> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> + +<hr> +<a href="index.html">Retour sur la table des matières</a> +</body> +</html> \ No newline at end of file Property changes on: trunk/tutti-ui-swing/src/main/help/fr/createAccidentalBatch.html ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-ui-swing/src/main/help/fr/createBenthosBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/createBenthosBatch.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/fr/createBenthosBatch.html 2013-04-21 14:27:12 UTC (rev 841) @@ -0,0 +1,39 @@ +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Créer un lot de benthos</title> +</head> +<body> + +<h1>Créer un lot de benthos</h1> + +<p>Sur cette écran on peut créer un lot de benthos...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs<a name="fields"></a></h2> +<dl> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> + +<h2>Actions<a name="actions"></a></h2> +<dl> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> + +<hr> +<a href="index.html">Retour sur la table des matières</a> +</body> +</html> \ No newline at end of file Property changes on: trunk/tutti-ui-swing/src/main/help/fr/createBenthosBatch.html ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-ui-swing/src/main/help/fr/createIndividualObservationBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/createIndividualObservationBatch.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/fr/createIndividualObservationBatch.html 2013-04-21 14:27:12 UTC (rev 841) @@ -0,0 +1,39 @@ +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Saisir une observation individuelle</title> +</head> +<body> + +<h1>Saisir une observation individuelle</h1> + +<p>Sur cette écran on peut saisir une observation individuelle...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs<a name="fields"></a></h2> +<dl> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> + +<h2>Actions<a name="actions"></a></h2> +<dl> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> + +<hr> +<a href="index.html">Retour sur la table des matières</a> +</body> +</html> \ No newline at end of file Property changes on: trunk/tutti-ui-swing/src/main/help/fr/createIndividualObservationBatch.html ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-ui-swing/src/main/help/fr/createMarineLitterBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/createMarineLitterBatch.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/fr/createMarineLitterBatch.html 2013-04-21 14:27:12 UTC (rev 841) @@ -0,0 +1,39 @@ +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Saisir un macro-dêchet</title> +</head> +<body> + +<h1>Saisir un macro-dêchet</h1> + +<p>Sur cette écran on peut saisir un macro-dêchet...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs<a name="fields"></a></h2> +<dl> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> + +<h2>Actions<a name="actions"></a></h2> +<dl> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> + +<hr> +<a href="index.html">Retour sur la table des matières</a> +</body> +</html> \ No newline at end of file Property changes on: trunk/tutti-ui-swing/src/main/help/fr/createMarineLitterBatch.html ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/help/fr/createSpeciesBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/createSpeciesBatch.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/fr/createSpeciesBatch.html 2013-04-21 14:27:12 UTC (rev 841) @@ -36,18 +36,27 @@ <strong>Documentation à rédiger</strong> -<h2>Champs</h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> +<h2>Champs<a name="fields"></a></h2> +<dl> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> -<h2>Actions</h2> -Actions possibles : +<h2>Actions<a name="actions"></a></h2> +<dl> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> +<hr> +<a href="index.html">Retour sur la table des matières</a> </body> </html> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/help/fr/dbManager.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/dbManager.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/fr/dbManager.html 2013-04-21 14:27:12 UTC (rev 841) @@ -32,22 +32,52 @@ <h1>Gérer la base de données</h1> -<p>Sur cette écran on peut gérer la base de données...</p> +<p>Sur cette écran on peut gérer la base de données utilisée par Tutti...</p> <strong>Documentation à rédiger</strong> -<h2>Champs</h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> +<h2>Actions<a name="actions"></a></h2> +<dl> + <dt>Installer une base</dt> + <dd>Lors du premier démarrage de Tutti, permet de télécharger la dernière + base disponible sur le réseau via le mécanisme de mise à jour. + </dd> + <dt>Vérifier les mises à jour</dt> + <dd>Vérifie si il existe une base plus récente sur le réseau, si tel est le + cas, alors a base sera téléchargée et une synchronisation des + référentiels sera lancée. + </dd> + <dt>Ouvrir</dt> + <dd>Lorsqu'aucune base de données n'est ouverte, permet d'ouvrir la base de + données. + </dd> + <dt>Importer</dt> + <dd>Permet d'importer des données dans Tutti précédemment exporter depuis + une autre instance de Tutti. + Cette opération n'est possible que lorsqu'il n'y a pas de données dans + Tutti (au premier démarrage de l'application ou suite à l'action + Exporter et supprimer). + </dd> + <dt>Exporter</dt> + <dd>Permet d'exporter les données de Tutti sous forme d'une archive Zip + contenant : + <ul> + <li>la base de données</li> + <li>le répertoire des protocoles</li> + <li>le répertoire des picèes jointes</li> + </ul> + A noter que cette archive pourra ensuite être importer dans Tutti. + </dd> + <dt>Exporter et supprimer</dt> + <dd>Exporte la données de Tutti, puis les supprime de cette instance. Il est + alors possible ensuite d'importer une nouvelle base dans Tutti via la + fonction d'import. + </dd> + <dt>Fermer</dt> + <dd>Ferme la base en cours d'utilisation.</dd> +</dl> -<h2>Actions</h2> -Actions possibles : - -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> +<hr> +<a href="index.html">Retour sur la table des matières</a> </body> </html> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/help/fr/editAccidentalBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/editAccidentalBatch.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/fr/editAccidentalBatch.html 2013-04-21 14:27:12 UTC (rev 841) @@ -36,18 +36,27 @@ <strong>Documentation à rédiger</strong> -<h2>Champs</h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> +<h2>Champs<a name="fields"></a></h2> +<dl> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> -<h2>Actions</h2> -Actions possibles : +<h2>Actions<a name="actions"></a></h2> +<dl> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> +<hr> +<a href="index.html">Retour sur la table des matières</a> </body> </html> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/help/fr/editBenthosBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/editBenthosBatch.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/fr/editBenthosBatch.html 2013-04-21 14:27:12 UTC (rev 841) @@ -36,18 +36,27 @@ <strong>Documentation à rédiger</strong> -<h2>Champs</h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> +<h2>Champs<a name="fields"></a></h2> +<dl> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> -<h2>Actions</h2> -Actions possibles : +<h2>Actions<a name="actions"></a></h2> +<dl> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> +<hr> +<a href="index.html">Retour sur la table des matières</a> </body> </html> \ No newline at end of file Added: trunk/tutti-ui-swing/src/main/help/fr/editBenthosFrequencies.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/editBenthosFrequencies.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/fr/editBenthosFrequencies.html 2013-04-21 14:27:12 UTC (rev 841) @@ -0,0 +1,39 @@ +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Éditer les mensurations d'un lot de benthos</title> +</head> +<body> + +<h1>Éditer les mensurations d'un lot de benthos</h1> + +<p>Sur cette écran on peut editer les mensurations d'un lot de benthos...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs<a name="fields"></a></h2> +<dl> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> + +<h2>Actions<a name="actions"></a></h2> +<dl> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> + +<hr> +<a href="index.html">Retour sur la table des matières</a> +</body> +</html> \ No newline at end of file Property changes on: trunk/tutti-ui-swing/src/main/help/fr/editBenthosFrequencies.html ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/help/fr/editCatchBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/editCatchBatch.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/fr/editCatchBatch.html 2013-04-21 14:27:12 UTC (rev 841) @@ -36,18 +36,27 @@ <strong>Documentation à rédiger</strong> -<h2>Champs</h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> +<h2>Champs<a name="fields"></a></h2> +<dl> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> -<h2>Actions</h2> -Actions possibles : +<h2>Actions<a name="actions"></a></h2> +<dl> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> +<hr> +<a href="index.html">Retour sur la table des matières</a> </body> </html> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/help/fr/editCruise.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/editCruise.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/fr/editCruise.html 2013-04-21 14:27:12 UTC (rev 841) @@ -36,18 +36,49 @@ <strong>Documentation à rédiger</strong> -<h2>Champs</h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> +<h2>Champs<a name="fields"></a></h2> +<dl> + <dt>Série</dt> + <dd></dd> + <dt>Série partielle</dt> + <dd></dd> + <dt>Port de départ</dt> + <dd></dd> + <dt>Port d'arrivée</dt> + <dd></dd> + <dt>Date de début</dt> + <dd></dd> + <dt>Date de fin</dt> + <dd></dd> + <dt>Nom</dt> + <dd></dd> + <dt>Nombre de poches</dt> + <dd></dd> + <dt>Filtre (sur les navire / engins)</dt> + <dd></dd> + <dt>Navire</dt> + <dd></dd> + <dt>Engin(s)</dt> + <dd></dd> + <dt>Chef(s) de mission</dt> + <dd></dd> + <dt>Responsable(s) de salle de tri</dt> + <dd></dd> + <dt>Commentaire</dt> + <dd></dd> +</dl> -<h2>Actions</h2> -Actions possibles : +<h2>Actions<a name="actions"></a></h2> +<dl> + <dt>Générer le nom</dt> + <dd></dd> + <dt>Fermer</dt> + <dd></dd> + <dt>Enregistrer</dt> + <dd></dd> +</dl> -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> +<hr> +<a href="index.html">Retour sur la table des matières</a> </body> </html> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/help/fr/editFishingOperation.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/editFishingOperation.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/fr/editFishingOperation.html 2013-04-21 14:27:12 UTC (rev 841) @@ -36,18 +36,27 @@ <strong>Documentation à rédiger</strong> -<h2>Champs</h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> +<h2>Champs<a name="fields"></a></h2> +<dl> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> -<h2>Actions</h2> -Actions possibles : +<h2>Actions<a name="actions"></a></h2> +<dl> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> +<hr> +<a href="index.html">Retour sur la table des matières</a> </body> </html> \ No newline at end of file Added: trunk/tutti-ui-swing/src/main/help/fr/editIndividualObservationBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/editIndividualObservationBatch.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/fr/editIndividualObservationBatch.html 2013-04-21 14:27:12 UTC (rev 841) @@ -0,0 +1,39 @@ +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Éditer une observation individuelle</title> +</head> +<body> + +<h1>Éditer une observation individuelle</h1> + +<p>Sur cette écran on peut éditer une observation individuelle...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs<a name="fields"></a></h2> +<dl> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> + +<h2>Actions<a name="actions"></a></h2> +<dl> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> + +<hr> +<a href="index.html">Retour sur la table des matières</a> +</body> +</html> \ No newline at end of file Property changes on: trunk/tutti-ui-swing/src/main/help/fr/editIndividualObservationBatch.html ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Deleted: trunk/tutti-ui-swing/src/main/help/fr/editMacroWasteBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/editMacroWasteBatch.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/fr/editMacroWasteBatch.html 2013-04-21 14:27:12 UTC (rev 841) @@ -1,53 +0,0 @@ - -<!DOCTYPE html> -<html lang="fr"> - -<head> - <meta charset="utf-8"/> - <title>Tutti - Éditer une capture de macro-déchêts</title> -</head> -<body> - -<h1>Éditer une capture de macro-déchêts</h1> - -<p>Sur cette écran on peut éditer une capture de macro-déchêts...</p> - -<strong>Documentation à rédiger</strong> - -<h2>Champs</h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> - -<h2>Actions</h2> -Actions possibles : - -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> -</body> -</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/fr/editMarineLitterBatch.html (from rev 837, trunk/tutti-ui-swing/src/main/help/fr/editMacroWasteBatch.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/editMarineLitterBatch.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/fr/editMarineLitterBatch.html 2013-04-21 14:27:12 UTC (rev 841) @@ -0,0 +1,62 @@ + +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Éditer une capture de macro-déchêts</title> +</head> +<body> + +<h1>Éditer une capture de macro-déchêts</h1> + +<p>Sur cette écran on peut éditer une capture de macro-déchêts...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs<a name="fields"></a></h2> +<dl> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> + +<h2>Actions<a name="actions"></a></h2> +<dl> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> + +<hr> +<a href="index.html">Retour sur la table des matières</a> +</body> +</html> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/help/fr/editPlanktonBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/editPlanktonBatch.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/fr/editPlanktonBatch.html 2013-04-21 14:27:12 UTC (rev 841) @@ -36,18 +36,27 @@ <strong>Documentation à rédiger</strong> -<h2>Champs</h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> +<h2>Champs<a name="fields"></a></h2> +<dl> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> -<h2>Actions</h2> -Actions possibles : +<h2>Actions<a name="actions"></a></h2> +<dl> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> +<hr> +<a href="index.html">Retour sur la table des matières</a> </body> </html> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/help/fr/editProgram.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/editProgram.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/fr/editProgram.html 2013-04-21 14:27:12 UTC (rev 841) @@ -36,19 +36,25 @@ <strong>Documentation à rédiger</strong> -<h2>Champs</h2> -<ul> - <li>Nom</li> - <li>Zone</li> - <li>Commentaire</li> -</ul> +<h2>Champs<a name="fields"></a></h2> +<dl> + <dt>Nom</dt> + <dd></dd> + <dt>Zone</dt> + <dd></dd> + <dt>Description</dt> + <dd></dd> +</dl> -<h2>Actions</h2> -Actions possibles : +<h2>Actions<a name="actions"></a></h2> +<dl> + <dt>Fermer</dt> + <dd></dd> + <dt>Enregister</dt> + <dd></dd> +</dl> -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> +<hr> +<a href="index.html">Retour sur la table des matières</a> </body> </html> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/help/fr/editProtocol.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/editProtocol.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/fr/editProtocol.html 2013-04-21 14:27:12 UTC (rev 841) @@ -36,18 +36,95 @@ <strong>Documentation à rédiger</strong> -<h2>Champs</h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> +<h2>Onglet informations générales</h2> -<h2>Actions</h2> -Actions possibles : +<h3>Champs<a name="fields"></a></h3> +<dl> + <dt>Nom</dt> + <dd></dd> + <dt>Commentaire</dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> +<h3>Actions<a name="actions"></a></h3> +<dl> + <dt>Fermer</dt> + <dd></dd> + <dt>Enregistrer</dt> + <dd></dd> +</dl> + +<h2>Onglet Caractéristiques</h2> + +<h3>Champs<a name="fieldsCaracteristics"></a></h3> +<dl> + <dt>Classes de taille</dt> + <dd></dd> + <dt>Mise en oeuvre de l'engin</dt> + <dd></dd> + <dt>Mise en oeuvre du navire</dt> + <dd></dd> +</dl> + +<h3>Actions<a name="actionsCaracteristics"></a></h3> +<dl> + <dt>Import les caractéristiques</dt> + <dd></dd> + <dt>Exporter les caractéristiques</dt> + <dd></dd> + <dt>Exporter toutes les caractéristiques</dt> + <dd></dd> +</dl> + +<h2>Onglet Espèces</h2> + +<h3>Champs<a name="fieldsSpecies"></a></h3> +<dl> + <dt>Espèce (référent)</dt> + <dd></dd> + <dt>Tableau des espèces</dt> + <dd></dd> +</dl> + +<h3>Actions<a name="actionsSpecies"></a></h3> +<dl> + <dt>Importer les espèces</dt> + <dd></dd> + <dt>Exporter les espèces</dt> + <dd></dd> + <dt>Export Pupitri</dt> + <dd></dd> + <dt>Choisir une autre espèce</dt> + <dd></dd> + <dt>Ajouter une espèce</dt> + <dd></dd> +</dl> + +<h2>Onglet Benthos</h2> + +<h3>Champs<a name="fieldsBenthos"></a></h3> +<dl> + <dt>Espèce (référent)</dt> + <dd></dd> + <dt>Tableau des espèces</dt> + <dd></dd> +</dl> + +<h3>Actions<a name="actionsBenthos"></a></h3> +<dl> + <dt>Importer les benthos</dt> + <dd></dd> + <dt>Exporter les benthos</dt> + <dd></dd> + <dt>Choisir une autre benthos</dt> + <dd></dd> + <dt>Ajouter une ligne de benthos</dt> + <dd></dd> +</dl> + +<hr> +<a href="index.html">Retour sur la table des matières</a> </body> </html> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/help/fr/editSpeciesBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/editSpeciesBatch.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/fr/editSpeciesBatch.html 2013-04-21 14:27:12 UTC (rev 841) @@ -36,18 +36,27 @@ <strong>Documentation à rédiger</strong> -<h2>Champs</h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> +<h2>Champs<a name="fields"></a></h2> +<dl> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> -<h2>Actions</h2> -Actions possibles : +<h2>Actions<a name="actions"></a></h2> +<dl> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> +<hr> +<a href="index.html">Retour sur la table des matières</a> </body> </html> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/help/fr/editSpeciesFrequencies.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/editSpeciesFrequencies.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/fr/editSpeciesFrequencies.html 2013-04-21 14:27:12 UTC (rev 841) @@ -36,18 +36,27 @@ <strong>Documentation à rédiger</strong> -<h2>Champs</h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> +<h2>Champs<a name="fields"></a></h2> +<dl> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> -<h2>Actions</h2> -Actions possibles : +<h2>Actions<a name="actions"></a></h2> +<dl> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> +<hr> +<a href="index.html">Retour sur la table des matières</a> </body> </html> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/help/fr/fishingOperations.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/fishingOperations.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/fr/fishingOperations.html 2013-04-21 14:27:12 UTC (rev 841) @@ -36,18 +36,27 @@ <strong>Documentation à rédiger</strong> -<h2>Champs</h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> +<h2>Champs<a name="fields"></a></h2> +<dl> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> -<h2>Actions</h2> -Actions possibles : +<h2>Actions<a name="actions"></a></h2> +<dl> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> +<hr> +<a href="index.html">Retour sur la table des matières</a> </body> </html> \ No newline at end of file Added: trunk/tutti-ui-swing/src/main/help/fr/index.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/index.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/fr/index.html 2013-04-21 14:27:12 UTC (rev 841) @@ -0,0 +1,93 @@ +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Aide en ligne</title> +</head> +<body> + +<h1>Documentation de Tutti</h1> + +<strong>Documentation à rédiger</strong> + +<h2>Table des matières</h2> +<ul> + <li><a href="selectCruise.html">Sélection Série / Campagne / Protocole</a></li> + <li><a href="dbManager.html">Gestionnaire de base</a></li> + <li><a href="config.html">Configuration</a></li> + <li><a href="manageTemporaryReferential.html">Gestionnaire de référentiels temporaires</a></li> + <li><a href="editProgram.html">Créer / Éditer une série de campagne</a></li> + <li><a href="editCruise.html">Créer / Éditer une campagne</a></li> + <li><a href="editProtocol.html">Créer / Éditer un protocole</a></li> + <li><a href="fishingOperations.html">Opérations de pêche</a></li> + <li><a href="editFishingOperation.html">Créer / Éditer une opération de pêche</a></li> + <li><a href="editCatchBatch.html">Editer une capture</a></li> + <li><a href="editSpeciesBatch.html">Editer les captures poisson</a></li> + <li><a href="createSpeciesBatch.html">Créer une capture poisson</a></li> + <li><a href="splitSpeciesBatch.html">Catégories une capture poisson</a></li> + <li><a href="editSpeciesFrequencies.html">Editer les mensurations poisson</a></li> + <li><a href="editBenthosBatch.html">Editer les captures benthos</a></li> + <li><a href="createBenthosBatch.html">Créer une capture benthos</a></li> + <li><a href="splitBenthosBatch.html">Catégories une capture benthos</a></li> + <li><a href="editBenthosFrequencies.html">Editer les mensurations benthos</a></li> + <li><a href="editAccidentalBatch.html">Editer les captures accidentelles</a></li> + <li><a href="createAccidentalBatch.html">Créer une capture accidentelle</a></li> + <li><a href="editIndividualObservationBatch.html">Éditer les observations indivuduelles</a></li> + <li><a href="createIndividualObservationBatch.html">Créer une observation individuelles</a></li> +</ul> + +<h2>Menu</h2> + +Actions possibles depuis le menu : + +<ul> + <li>Menu Fichier + <dl> + <dt>Configuration</dt> + <dd></dd> + <dt>Vérifier les mises à jours</dt> + <dd></dd> + <dt>Gestionnaire de base</dt> + <dd></dd> + <dt>Quitter</dt> + <dd></dd> + </dl> + </li> + <li>Menu Actions + <dl> + <dt>Sélectionner une campagne</dt> + <dd></dd> + <dt>Série de campagne</dt> + <dd></dd> + <dt>Campagne</dt> + <dd></dd> + <dt>Protocole</dt> + <dd></dd> + <dt>Saisir les captures</dt> + <dd></dd> + <dt>Valider les captures</dt> + <dd></dd> + </dl> + </li> + <li>Menu Administrations + <dl> + <dt>Référentiel temporaires</dt> + <dd></dd> + </dl> + </li> + <li>Menu Aide + <dl> + <dt>Aide</dt> + <dd></dd> + <dt>Site</dt> + <dd></dd> + <dt>À propos</dt> + <dd></dd> + <dt>Langue</dt> + <dd></dd> + </dl> + </li> +</ul> +</body> +</html> \ No newline at end of file Property changes on: trunk/tutti-ui-swing/src/main/help/fr/index.html ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Deleted: trunk/tutti-ui-swing/src/main/help/fr/main.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/main.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/fr/main.html 2013-04-21 14:27:12 UTC (rev 841) @@ -1,48 +0,0 @@ - -<!DOCTYPE html> -<html lang="fr"> - -<head> - <meta charset="utf-8"/> - <title>Tutti - Écran principal</title> -</head> -<body> - -<h1>Écran principal</h1> - -<p>...</p> - -<strong>Documentation à rédiger</strong> - -<h2>Menu</h2> -Actions possibles depuis le menu : - -<ul> - <li>Configuration</li> - <li>Gérerles bases</li> - <li>Quitter l'application</li> -</ul> -</body> -</html> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/help/fr/manageTemporaryReferential.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/manageTemporaryReferential.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/fr/manageTemporaryReferential.html 2013-04-21 14:27:12 UTC (rev 841) @@ -36,18 +36,31 @@ <strong>Documentation à rédiger</strong> -<h2>Champs</h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> +<h2>Actions<a name="actions"></a></h2> +<dl> + <dt>Export un exemple de référentiel Espèce</dt> + <dd></dd> + <dt>Import des référentiels Espèce temporaires</dt> + <dd></dd> + <dt></dt> + <dt>Export un exemple de référentiel Navire</dt> + <dd></dd> + <dt>Import des référentiels Navire temporaires</dt> + <dd></dd> + <dt></dt> + <dt>Export un exemple de référentiel Engin</dt> + <dd></dd> + <dt>Import des référentiels Engin temporaires</dt> + <dd></dd> + <dt></dt> + <dt>Export un exemple de référentiel Personne</dt> + <dd></dd> + <dt>Import des référentiels Personne temporaires</dt> + <dd></dd> + <dt></dt> +</dl> -<h2>Actions</h2> -Actions possibles : - -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> +<hr> +<a href="index.html">Retour sur la table des matières</a> </body> </html> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/help/fr/selectCruise.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/selectCruise.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/fr/selectCruise.html 2013-04-21 14:27:12 UTC (rev 841) @@ -36,18 +36,52 @@ <strong>Documentation à rédiger</strong> -<h2>Champs</h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> +<h2>Champs<a name="fields"></a></h2> +<dl> + <dt>Série de campagne</dt> + <dd></dd> + <dt>Campagne</dt> + <dd></dd> + <dt>Protocole</dt> + <dd></dd> +</dl> -<h2>Actions</h2> -Actions possibles : +<h2>Actions<a name="actions"></a></h2> -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> +<dl> + <dt>Créer une série de campagne</dt> + <dd></dd> + <dt>Éditer une série de campagne</dt> + <dd></dd> + <dt>Créer une campagne</dt> + <dd></dd> + <dt>Éditer une campagne</dt> + <dd></dd> + <dt>Envoyer une campagne</dt> + <dd></dd> + <dt>Créer un protocole</dt> + <dd></dd> + <dt>Éditer un protocole</dt> + <dd></dd> + <dt>Cloner un protocole</dt> + <dd></dd> + <dt>Importer un protocole</dt> + <dd></dd> + <dt>Exporter un protocole</dt> + <dd></dd> + <dt>Supprimer un protocole</dt> + <dd></dd> + <dt>Saisir les captures</dt> + <dd></dd> + <dt>Valider les captures</dt> + <dd></dd> + <dt>Exporter les captures d'une série de campagne</dt> + <dd></dd> + <dt>Exporter les captures d'une campagne</dt> + <dd></dd> +</dl> + +<hr> +<a href="index.html">Retour sur la table des matières</a> </body> </html> \ No newline at end of file Added: trunk/tutti-ui-swing/src/main/help/fr/splitBenthosBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/splitBenthosBatch.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/fr/splitBenthosBatch.html 2013-04-21 14:27:12 UTC (rev 841) @@ -0,0 +1,39 @@ +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Catégoriser une capture de benthos</title> +</head> +<body> + +<h1>Catégoriser une capture de benthos</h1> + +<p>Sur cette écran on peut catégoriser une capture de benthos...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs<a name="fields"></a></h2> +<dl> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> + +<h2>Actions<a name="actions"></a></h2> +<dl> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> + +<hr> +<a href="index.html">Retour sur la table des matières</a> +</body> +</html> \ No newline at end of file Property changes on: trunk/tutti-ui-swing/src/main/help/fr/splitBenthosBatch.html ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/help/fr/splitSpeciesBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/splitSpeciesBatch.html 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/help/fr/splitSpeciesBatch.html 2013-04-21 14:27:12 UTC (rev 841) @@ -36,18 +36,27 @@ <strong>Documentation à rédiger</strong> -<h2>Champs</h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> +<h2>Champs<a name="fields"></a></h2> +<dl> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> -<h2>Actions</h2> -Actions possibles : +<h2>Actions<a name="actions"></a></h2> +<dl> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> + <dt></dt> + <dd></dd> +</dl> -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> +<hr> +<a href="index.html">Retour sur la table des matières</a> </body> </html> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiHelpBroker.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiHelpBroker.java 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiHelpBroker.java 2013-04-21 14:27:12 UTC (rev 841) @@ -104,6 +104,10 @@ result = super.findHelpId(comp); } + if (result==null) { + result = "tutti.index.help"; + } + return result; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css 2013-04-21 14:27:12 UTC (rev 841) @@ -82,7 +82,7 @@ text: "tutti.main.menu.changeLocale"; toolTipText: "tutti.main.action.changeLocale.tip"; i18nMnemonic: "tutti.main.action.changeLocale.mnemonic"; - _help: {"tutti.main.action.changeLocale.help"}; + _help: {"tutti.main.menu.action.changeLocale.help"}; } #menuChangeLocaleFR { @@ -92,7 +92,7 @@ i18nMnemonic: "tutti.main.action.changeLocaleFR.mnemonic"; enabled: {!handler.acceptLocale(model.getLocale(), "fr_FR")}; _tuttiAction: {ChangeToLocaleFRAction.class}; - _help: {"tutti.main.action.changeLocaleFR.help"}; + _help: {"tutti.main.menu.action.changeLocaleFR.help"}; } #menuChangeLocaleUK { @@ -102,7 +102,7 @@ i18nMnemonic: "tutti.main.action.changeLocaleUK.mnemonic"; enabled: {!handler.acceptLocale(model.getLocale(), "en_GB")}; _tuttiAction: {ChangeToLocaleUKAction.class}; - _help: {"tutti.main.action.changeLocaleUK.help"}; + _help: {"tutti.main.menu.action.changeLocaleUK.help"}; } #menuActions { @@ -200,7 +200,7 @@ text: "tutti.main.action.showHelp"; toolTipText: "tutti.main.action.showHelp.tip"; i18nMnemonic: "tutti.main.action.showHelp.mnemonic"; - _help: {"tutti.main.action.showHelp.help"}; + _help: {"tutti.index.help"}; } #menuHelpSite { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/SampleOrderIdsTableCell.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/SampleOrderIdsTableCell.java 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/SampleOrderIdsTableCell.java 2013-04-21 14:27:12 UTC (rev 841) @@ -30,6 +30,7 @@ import fr.ifremer.tutti.TuttiTechnicalException; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryEnum; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; +import fr.ifremer.tutti.persistence.entities.referential.CaracteristicBean; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.TuttiUIContext; @@ -56,7 +57,7 @@ */ public class SampleOrderIdsTableCell { - protected final Decorator<Caracteristic> decorator; + protected final Decorator<CaracteristicBean> decorator; protected final Map<Integer, SampleCategoryEnum> mapping; @@ -77,7 +78,7 @@ this.caracteristicMap.put(SampleCategoryEnum.age.getFieldValue(), persistenceService.getAgeCaracteristic()); this.decorator = context.getDecoratorService().getDecoratorByType( - Caracteristic.class, + CaracteristicBean.class, DecoratorService.CARACTERISTIC_PARAMETER_ONLY); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUI.css 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUI.css 2013-04-21 14:27:12 UTC (rev 841) @@ -23,5 +23,5 @@ */ #configTopPanel { - _help: {"tuttihelp.config.help"}; + _help: {"tutti.config.help"}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.css 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.css 2013-04-21 14:27:12 UTC (rev 841) @@ -30,7 +30,7 @@ } #editAccidentalBatchTopPanel { - _help: {"tuttihelp.editAccidentalBatch.help"}; + _help: {"tutti.editAccidentalBatch.help"}; } #tablePopup { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx 2013-04-21 14:27:12 UTC (rev 841) @@ -66,7 +66,7 @@ </BeanValidator> <TuttiHelpBroker id='broker' - constructorParams='"tuttihelp.editAccidentalBatch.help"'/> + constructorParams='"tutti.editAccidentalBatch.help"'/> <JPopupMenu id='tablePopup'> <JMenuItem id='removeAccidentalBatchMenu'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.css 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.css 2013-04-21 14:27:12 UTC (rev 841) @@ -23,7 +23,7 @@ */ #editIndividualObservationBatchTopPanel { - _help: {"tuttihelp.editIndividualObservationBatch.help"}; + _help: {"tutti.editIndividualObservationBatch.help"}; } #tablePopup { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx 2013-04-21 14:27:12 UTC (rev 841) @@ -65,7 +65,7 @@ </BeanValidator> <TuttiHelpBroker id='broker' - constructorParams='"tuttihelp.editIndividualObservationBatch.help"'/> + constructorParams='"tutti.editIndividualObservationBatch.help"'/> <JPopupMenu id='tablePopup'> <JMenuItem id='removeIndividualObservationBatchMenu'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.css 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.css 2013-04-21 14:27:12 UTC (rev 841) @@ -33,7 +33,7 @@ } #editMarineLitterBatchTopPanel { - _help: {"tuttihelp.editMarineLitterBatch.help"}; + _help: {"tutti.editMarineLitterBatch.help"}; } #marineLitterBatchTabToolBar { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.jaxx 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.jaxx 2013-04-21 14:27:12 UTC (rev 841) @@ -66,7 +66,7 @@ </BeanValidator> <TuttiHelpBroker id='broker' - constructorParams='"tuttihelp.editMarineLitterBatch.help"'/> + constructorParams='"tutti.editMarineLitterBatch.help"'/> <JToolBar id='marineLitterBatchTabToolBar'> <ButtonAttachment id='marineLitterBatchAttachmentsButton' Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchUI.css 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchUI.css 2013-04-21 14:27:12 UTC (rev 841) @@ -30,7 +30,7 @@ } #editPlanktonBatchTopPanel { - _help: {"tuttihelp.editPlanktonBatch.help"}; + _help: {"tutti.editPlanktonBatch.help"}; } #planktonTotalWeightLabel { text: "tutti.label.catches.planktonTotalWeight"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchUI.jaxx 2013-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchUI.jaxx 2013-04-21 14:27:12 UTC (rev 841) @@ -67,7 +67,7 @@ </BeanValidator> <TuttiHelpBroker id='broker' - constructorParams='"tuttihelp.editPlanktonBatch.help"'/> + constructorParams='"tutti.editPlanktonBatch.help"'/> <Table id='form' fill='both' constraints='BorderLayout.NORTH'> 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-04-21 11:47:39 UTC (rev 840) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-04-21 14:27:12 UTC (rev 841) @@ -5,14 +5,14 @@ swing.error.desktop.mail.not.supported=Le client mail n'a pas pu être ouvert. Vérifiez que vous avez défini un client mail par défaut dans votre système. swing.error.desktop.not.supported=Votre système ne permet pas d'ouvrir des liens ou fichiers en dehors de Tutti. tutti.about.bottomText=Copyright %s - %s - version %s -tutti.about.message=<h3>Tutti</h3><p><strong>Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques.</strong></p><br/><p>Ce logiciel permettra la saisie en mer des données d'opération de pêche (positions, environnement, engin, etc) et des captures associées (composition de la capture en espèces scientifiques avec poids, nombres, tailles etc) pour l'ensemble des campagnes halieutiques réalisées par l'Ifremer.</p><p>Ce projet a été initiée en 2012 par l'<a hreftutti.about.title\=À propos de Tutti -tutti.about.title= -tutti.about.translate.content=<h2>Comment traduire Tutti</h2>Vous pouvez nous aider à traduire Tutti.<hr/><br/><ul><li>Récupérer le fichier <a hreftutti.about.translate.title\=Traduire Tutti -tutti.about.translate.title= +tutti.about.message=<h3>Tutti</h3><p><strong>Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques.</strong></p><br/><p>Ce logiciel permettra la saisie en mer des données d'opération de pêche (positions, environnement, engin, etc) et des captures associées (composition de la capture en espèces scientifiques avec poids, nombres, tailles etc) pour l'ensemble des campagnes halieutiques réalisées par l'Ifremer.</p><p>Ce projet a été initiée en 2012 par l'<a href\="http\://www.ifremer.fr">Ifremer</a> et réalisé par la société <a href\="http\://codelutin.com">Codelutin</a>.</p><hr/><br/><p>Pour plus d'informations, vous pouvez visiter le <a href\="http\://maven-site.forge.codelutin.com/tutti">site du projet</a>.</p><p>Projet hébergé sur la forge <a href\="http\://forge.codelutin.com/projects/tutti">Forge.codelutin.com</a>.</p> +tutti.about.title=À propos de Tutti +tutti.about.translate.content=<h2>Comment traduire Tutti</h2>Vous pouvez nous aider à traduire Tutti.<hr/><br/><ul><li>Récupérer le fichier <a href\="%s">tutti-i18n.csv</a> dans le répertoire <strong>i18n</strong></li><li>ouvrez le avec un tableur (le caractère séprateur est une Tabultation)</li><li>Traduisez, Améliorer, ...</li><li>Enfin renvoyez-le nous</li></ul><br/>Nous intégrerons vos modifications avant la prochaine version. +tutti.about.translate.title=Traduire Tutti tutti.about.update.app.noup.detail=<tr><td>%1$s</td><td>%2$s</td><td>%2$s<td><td></td></tr> -tutti.about.update.app.up.detail=<tr><td>%1$s</td><td>%2$s</td><td><strong>%3$s</strong></td><td><a hreftutti.about.update.content\=<h2>Mise à jour de Tutti</h2><p>Fichier des mises à jour \: <a hreftutti.about.update.title\=Mise à jour Tutti -tutti.about.update.content= -tutti.about.update.title= +tutti.about.update.app.up.detail=<tr><td>%1$s</td><td>%2$s</td><td><strong>%3$s</strong></td><td><a href\="%4$s">Mettre à jour</a><td></tr> +tutti.about.update.content=<h2>Mise à jour de Tutti</h2><p>Fichier des mises à jour \: <a href\="%1$s">%1$s</a></p><br/><hr/><br/><table><CAPTION><EM>Mises à jour des modules</EM></CAPTION><tr><th>Module</th><th>Version installée</th><th>Dernière version</th><th></th></tr>%2$s</table> +tutti.about.update.title=Mise à jour Tutti tutti.attachmentEditor.action.add.mnemonic=A tutti.attachmentEditor.action.add.tip=Ajouter une pièce jointe tutti.attachmentEditor.action.closeAttachment.tip=Fermer la fenêtre des pièces-jointes @@ -125,11 +125,11 @@ tutti.createBenthosBatch.action.save.mnemonic=E tutti.createBenthosBatch.action.save.tip=Enregistrer la création du lot espèce tutti.createBenthosBatch.field.batchWeight=Poids du lot (kg) -tutti.createBenthosBatch.field.batchWeight.tip= +tutti.createBenthosBatch.field.batchWeight.tip=Poids du lot (kg) tutti.createBenthosBatch.field.sortedUnsortedCategory=V / HV -tutti.createBenthosBatch.field.sortedUnsortedCategory.tip= +tutti.createBenthosBatch.field.sortedUnsortedCategory.tip=Catégorie Vrac / Hors Vrac tutti.createBenthosBatch.field.species=Espèce du lot -tutti.createBenthosBatch.field.species.tip= +tutti.createBenthosBatch.field.species.tip=Espèce du lot tutti.createBenthosBatch.title=Créer un lot tutti.createBenthosMelag.error.message=Erreur à la ligne %s tutti.createBenthosMelag.error.title=Erreur @@ -441,7 +441,7 @@ tutti.editCruise.filterVesselType.scientific.tip=Uniquement les navires scientifiques tutti.editCruise.title.create.cruise=Créer une nouvelle campagne tutti.editCruise.title.edit.cruise=Éditer une campagne existante -tutti.editFishingOperation.action.attachments.tip= +tutti.editFishingOperation.action.attachments.tip=Pièces-jointes de l'opération tutti.editFishingOperation.action.cancelEditFishingOperation=Annuler tutti.editFishingOperation.action.cancelEditFishingOperation.mnemonic=A tutti.editFishingOperation.action.cancelEditFishingOperation.tip=Annuler la création du trait @@ -468,11 +468,11 @@ tutti.editFishingOperation.field.duration.tip=Durée du trait calculée tutti.editFishingOperation.field.fishingOperationInvalid=Trait invalide tutti.editFishingOperation.field.fishingOperationNumber=Numéro de Trait -tutti.editFishingOperation.field.fishingOperationNumber.tip= +tutti.editFishingOperation.field.fishingOperationNumber.tip=Numéro de Trait tutti.editFishingOperation.field.fishingOperationRectiligne=Trait rectiligne tutti.editFishingOperation.field.fishingOperationRectiligne.tip=Le trait est il rectiligne ? tutti.editFishingOperation.field.fishingOperationValid=Trait valide -tutti.editFishingOperation.field.fishingOperationValid.tip= +tutti.editFishingOperation.field.fishingOperationValid.tip=Trait valide tutti.editFishingOperation.field.fishingOperationValidity=Validité du trait tutti.editFishingOperation.field.gear=Engin tutti.editFishingOperation.field.gear.tip=Engin du trait @@ -585,19 +585,19 @@ tutti.editMarineLitterBatch.table.header.weight=Poids tutti.editMarineLitterBatch.table.header.weight.tip=Poids (kg) tutti.editPlanktonBatch.table.header.comment=Commentaire -tutti.editPlanktonBatch.table.header.comment.tip= +tutti.editPlanktonBatch.table.header.comment.tip=Commentaire tutti.editPlanktonBatch.table.header.file=Pièces jointes tutti.editPlanktonBatch.table.header.file.tip=Pièces jointes tutti.editPlanktonBatch.table.header.sampleWeight=Poids échantillonné -tutti.editPlanktonBatch.table.header.sampleWeight.tip= +tutti.editPlanktonBatch.table.header.sampleWeight.tip=Poids échantillonné tutti.editPlanktonBatch.table.header.speciesByCode=Espèce -tutti.editPlanktonBatch.table.header.speciesByCode.tip= +tutti.editPlanktonBatch.table.header.speciesByCode.tip=Espèce tutti.editPlanktonBatch.table.header.speciesByGenusCode=Espèce -tutti.editPlanktonBatch.table.header.speciesByGenusCode.tip= +tutti.editPlanktonBatch.table.header.speciesByGenusCode.tip=Espèce tutti.editPlanktonBatch.table.header.toConfirm=A Confirmer -tutti.editPlanktonBatch.table.header.toConfirm.tip= +tutti.editPlanktonBatch.table.header.toConfirm.tip=A Confirmer tutti.editPlanktonBatch.table.header.weight=Poids -tutti.editPlanktonBatch.table.header.weight.tip= +tutti.editPlanktonBatch.table.header.weight.tip=Poids tutti.editProgram.action.closeEditProgram=Fermer tutti.editProgram.action.closeEditProgram.mnemonic=r tutti.editProgram.action.closeEditProgram.tip=Annuler l'édition (ou la création) de la série de campagne, ou fermer l'éditeur suite à un enregistrement

1 0

r840 - in trunk: . tutti-persistence/src/main/resources/i18n tutti-service/src/main/resources/i18n tutti-ui-swing/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com 21 Apr '13

21 Apr '13

Author: tchemit Date: 2013-04-21 13:47:39 +0200 (Sun, 21 Apr 2013) New Revision: 840 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/840 Log: refs #2122: [TECH] Compl?\195?\170ter les traductions fran?\195?\167aises et anglaises Modified: trunk/pom.xml trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 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/pom.xml =================================================================== --- trunk/pom.xml 2013-04-21 11:29:20 UTC (rev 839) +++ trunk/pom.xml 2013-04-21 11:47:39 UTC (rev 840) @@ -168,7 +168,7 @@ <jreVersion>1.7.17</jreVersion>  -  +  </properties> Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2013-04-21 11:29:20 UTC (rev 839) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2013-04-21 11:47:39 UTC (rev 840) @@ -17,7 +17,6 @@ tutti.persistence.batch.validation.horsVracBenthosNotFound= tutti.persistence.batch.validation.horsVracMarineLitterNotFound= tutti.persistence.batch.validation.horsVracSpeciesNotFound= -tutti.persistence.batch.validation.onlySpeciesBatchStructure= tutti.persistence.batch.validation.unsortedNotFound= tutti.persistence.batch.validation.vracBenthosAliveItemizedNotFound= tutti.persistence.batch.validation.vracBenthosInertNotFound= Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2013-04-21 11:29:20 UTC (rev 839) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2013-04-21 11:47:39 UTC (rev 840) @@ -1,23 +1,22 @@ -tutti.config.option.persistence.db.attachment.directory.description=Répoertoire où sont stoquées les pièces-jointes -tutti.config.option.persistence.db.cache.directory.description=Répertoire où sont stoquées les caches de persistence +tutti.config.option.persistence.db.attachment.directory.description=Répertoire où sont stockées les pièces-jointes +tutti.config.option.persistence.db.cache.directory.description=Répertoire où sont stockées les caches de persistance tutti.config.option.persistence.db.configurationPath.description=Chemin du fichier de configuration d'Adagio tutti.config.option.persistence.db.directory.description=Répertoire où est la base de données tutti.config.option.persistence.db.enumerationPath.description=Chemin du fichier de correspondance des constantes tutti.config.option.persistence.db.name.description=Nom du fichier de la base de données tutti.config.option.persistence.db.protocol.directory.description=Répertoire où sont conservés les protocoles -tutti.config.option.persistence.hibernate.dialect.description=Le dialect hibernate utilisée pour communiquer avec la base de données -tutti.config.option.persistence.hibernate.formatSql.description=Option pour ajouter les commentaires dans les requètes sql générées. -tutti.config.option.persistence.hibernate.showSql.description=Option pour afficher ou non les requète sql dans les logs -tutti.config.option.persistence.hibernate.useSqlComment.description=Option pour ajouter les commentaires dans les requètes sql générées +tutti.config.option.persistence.hibernate.dialect.description=Le dialecte hibernate utilisée pour communiquer avec la base de données +tutti.config.option.persistence.hibernate.formatSql.description=Option pour ajouter les commentaires dans les requêtes sql générées. +tutti.config.option.persistence.hibernate.showSql.description=Option pour afficher ou non les requête sql dans les logs +tutti.config.option.persistence.hibernate.useSqlComment.description=Option pour ajouter les commentaires dans les requêtes sql générées tutti.config.option.persistence.jdbc.driver.description=Le pilote JDBC utilisé pour communiquer avec la base de données tutti.config.option.persistence.jdbc.password.description=Mot de passe de l'utilisateur pour se connecter à la base de données tutti.config.option.persistence.jdbc.url.description=URL de connexion à la base de données tutti.config.option.persistence.jdbc.username.description=Login de l'utilisateur pour se connecter à la base de données -tutti.config.persistence=Configuration de la persistence de Tutti +tutti.config.persistence=Configuration de la persistance de Tutti tutti.persistence.batch.validation.horsVracBenthosNotFound=Lot 'Hors Vrac > Benthos' non trouvé ou configuré avec d'autres critères de classement. tutti.persistence.batch.validation.horsVracMarineLitterNotFound= tutti.persistence.batch.validation.horsVracSpeciesNotFound=Lot 'Hors Vrac > Espèces' non trouvé ou configuré avec d'autres critères de classement. -tutti.persistence.batch.validation.onlySpeciesBatchStructure=Lot 'Espèces' (données historiques CGFS) détecté. tutti.persistence.batch.validation.unsortedNotFound=Lot 'Hors Vrac > Espèces' non trouvé ou configuré avec d'autres critères de classement. tutti.persistence.batch.validation.vracBenthosAliveItemizedNotFound= tutti.persistence.batch.validation.vracBenthosInertNotFound=Lot 'Vrac > Benthos > Inerte' non trouvé, ou configuré avec d'autres critères de classement. Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-04-21 11:29:20 UTC (rev 839) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-04-21 11:47:39 UTC (rev 840) @@ -8,10 +8,6 @@ tutti.config.option.tmp.directory.description= tutti.config.option.version.description= tutti.config.service= -tutti.editCatchBatch.action.computeWeights.error.incoherentCategoryWeight= -tutti.editCatchBatch.action.computeWeights.error.incoherentParentCategoryWeight= -tutti.editCatchBatch.action.computeWeights.error.incoherentRowWeightCategory= -tutti.editCatchBatch.action.computeWeights.error.incoherentRowWeightFrequency= tutti.property.attachment= tutti.property.caracteristic= tutti.property.country= @@ -49,15 +45,7 @@ tutti.propety.no.zone= tutti.propety.vessel.nation.registrationCode= tutti.service.catches.computeWeights.benthos.error.incoherentSampleWeight= -tutti.service.catches.computeWeights.error.incoherentBenthosTotalSorted= -tutti.service.catches.computeWeights.error.incoherentCategoryWeight= -tutti.service.catches.computeWeights.error.incoherentMarineLitterTotal= -tutti.service.catches.computeWeights.error.incoherentParentCategoryWeight= tutti.service.catches.computeWeights.error.incoherentRowWeightCategory= -tutti.service.catches.computeWeights.error.incoherentRowWeightFrequency= -tutti.service.catches.computeWeights.error.incoherentSampleWeight= -tutti.service.catches.computeWeights.error.incoherentSpeciesTotalSorted= -tutti.service.catches.computeWeights.error.incoherentTotal= tutti.service.catches.computeWeights.species.error.incoherentSampleWeight= tutti.service.export.invalid.cruise= tutti.service.export.invalid.fishingOperation= @@ -66,17 +54,10 @@ tutti.service.operations.computeWeights.benthos.error.incoherentRowWeightFrequency= tutti.service.operations.computeWeights.benthos.error.incoherentTotalSorted= tutti.service.operations.computeWeights.benthos.error.noWeight= -tutti.service.operations.computeWeights.error.incoherentBenthosTotalSorted= -tutti.service.operations.computeWeights.error.incoherentCategoryWeight= -tutti.service.operations.computeWeights.error.incoherentMarineLitterTotal= -tutti.service.operations.computeWeights.error.incoherentParentCategoryWeight= tutti.service.operations.computeWeights.error.incoherentRowWeightCategory= -tutti.service.operations.computeWeights.error.incoherentRowWeightFrequency= -tutti.service.operations.computeWeights.error.incoherentSpeciesTotalSorted= tutti.service.operations.computeWeights.error.incoherentTotal= tutti.service.operations.computeWeights.marineLitter.error.incoherentTotal= tutti.service.operations.computeWeights.marineLitter.error.noWeight= -tutti.service.operations.computeWeights.species.error.incoherentCategoryWeight= tutti.service.operations.computeWeights.species.error.incoherentParentCategoryWeight= tutti.service.operations.computeWeights.species.error.incoherentRowWeightFrequency= tutti.service.operations.computeWeights.species.error.incoherentTotalSorted= @@ -125,6 +106,5 @@ tutti.validator.error.program.zone.required= tutti.validator.error.protocol.name.alreadyUsed= tutti.validator.error.protocol.name.required= -tutti.validator.error.speciesBatch.species.required= tutti.validator.warning.latitude.outOfBounds= tutti.validator.warning.longitude.outOfBounds= Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-04-21 11:29:20 UTC (rev 839) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-04-21 11:47:39 UTC (rev 840) @@ -30,7 +30,7 @@ tutti.property.name=Nom tutti.property.parameterName=Paramètre tutti.property.program=Série de campagne -tutti.property.protocol=Protocol de saisie +tutti.property.protocol=Protocole de saisie tutti.property.refTaxCode=Code RefTax tutti.property.sortedUnsortedCategory=Vrac / Hors Vrac tutti.property.species=Espèce @@ -52,17 +52,14 @@ tutti.service.operations.computeWeights.benthos.error.incoherentCategoryWeight=Le poids total des mensurations d'un lot du benthos est supérieur au poids de la catégorie tutti.service.operations.computeWeights.benthos.error.incoherentParentCategoryWeight=Le poids de la catégorie d'un lot du benthos est différent de la somme des poids de ses sous-catégories tutti.service.operations.computeWeights.benthos.error.incoherentRowWeightFrequency=Le poids total des mensurations d'un lot du benthos est différent du poids du sous-échantillon -tutti.service.operations.computeWeights.benthos.error.incoherentSampleWeight=Le poids de sous-échantillonage d'un lot du benthos est supérieur au poids de la catégorie tutti.service.operations.computeWeights.benthos.error.incoherentTotalSorted=Le poids total Vrac du benthos est inférieur à la somme des poids Vrac triés, inerte trié et vivant non détaillé trié tutti.service.operations.computeWeights.benthos.error.noWeight=Un lot du benthos n'a pas de poids tutti.service.operations.computeWeights.error.incoherentRowWeightCategory= tutti.service.operations.computeWeights.error.incoherentTotal=Le poids total de la capture ne correspond pas à la somme des poids totaux Vrac, Hors Vrac et non triés tutti.service.operations.computeWeights.marineLitter.error.incoherentTotal=Le poids total des macro-déchets est inférieur à la somme des poids des macro-déchets saisis tutti.service.operations.computeWeights.marineLitter.error.noWeight=Un lot de macro-déchets n'a pas de poids -tutti.service.operations.computeWeights.species.error.incoherentCategoryWeight=Le poids total des mensurations d'un lot des espèces est supérieur au poids de la catégorie tutti.service.operations.computeWeights.species.error.incoherentParentCategoryWeight=Le poids de la catégorie d'un lot des espèces est différent de la somme des poids de ses sous-catégories tutti.service.operations.computeWeights.species.error.incoherentRowWeightFrequency=Le poids total des mensurations d'un lot des espèces est différent du poids du sous-échantillon -tutti.service.operations.computeWeights.species.error.incoherentSampleWeight=Le poids de sous-échantillonage d'un lot des espèces est supérieur au poids de la catégorie tutti.service.operations.computeWeights.species.error.incoherentTotalSorted=Le poids total Vrac des espèces est inférieur à la somme des poids Vrac triés, inerte trié et vivant non détaillé trié tutti.service.operations.computeWeights.species.error.noWeight=Un lot des espèces n'a pas de poids tutti.service.operations.exportCatchesReport.error=Erreur lors de la génération du rapport des captures @@ -80,7 +77,7 @@ tutti.validator.error.cruise.returnLocation.required=Le port de débarquement est obligatoire tutti.validator.error.cruise.vessel.required=Au moins un bateau doit être sélectionné tutti.validator.error.fishingOperation.catcher.required=Au moins un saisisseur est obligatoire -tutti.validator.error.fishingOperation.comment.required=Le commentaire est obligatoire si le traît est invalide +tutti.validator.error.fishingOperation.comment.required=Le commentaire est obligatoire si le trait est invalide tutti.validator.error.fishingOperation.date.end.required=La date de la fin du trait est obligatoire tutti.validator.error.fishingOperation.date.start.required=La date du début du trait est obligatoire tutti.validator.error.fishingOperation.dates.endBeforeStart=La date de fin doit être après la date de début @@ -89,7 +86,7 @@ tutti.validator.error.fishingOperation.dates.wrongTime=La durée du trait dépasse 45 minutes ou est inférieure à 20 minutes, merci de vérifier les dates/heures du trait tutti.validator.error.fishingOperation.existingKey=La clé code station/numéro de trait/date de début existe déjà tutti.validator.error.fishingOperation.fishingOperationNumber.required=Le numéro de trait est obligatoire -tutti.validator.error.fishingOperation.fishingOperationValid.required=La validité du traît est obligatoire +tutti.validator.error.fishingOperation.fishingOperationValid.required=La validité du trait est obligatoire tutti.validator.error.fishingOperation.gear.required=L'engin est obligatoire tutti.validator.error.fishingOperation.stationNumber.required=Le numéro de station est obligatoire tutti.validator.error.fishingOperation.stationNumber.too.long=Valeur trop longue (limitée à %s caractères) @@ -104,11 +101,10 @@ tutti.validator.error.longitude.start.required=La longitude de début de traîne est obligatoire tutti.validator.error.program.description.required=La description de la série est obligatoire tutti.validator.error.program.description.too.long=Taille de la description trop longue (limitée à %s caractères) -tutti.validator.error.program.existingKey=Le nom du programme est déjà utilisé +tutti.validator.error.program.existingKey=Le couple nom/zone existe déjà tutti.validator.error.program.name.required=Le nom de la série est obligatoire tutti.validator.error.program.zone.required=La zone de la série est obligatoire -tutti.validator.error.protocol.name.alreadyUsed=Le nom du protocol est déjà utilisé -tutti.validator.error.protocol.name.required=Le nom du protocol est obligatoire -tutti.validator.error.speciesBatch.species.required= +tutti.validator.error.protocol.name.alreadyUsed=Le nom du protocole est déjà utilisé +tutti.validator.error.protocol.name.required=Le nom du protocole est obligatoire tutti.validator.warning.latitude.outOfBounds=La Latitude doit être comprise entre -90.0 et 90.0 tutti.validator.warning.longitude.outOfBounds=La longitude doit être comprise entre -180.0 et 180.0 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-04-21 11:29:20 UTC (rev 839) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-04-21 11:47:39 UTC (rev 840) @@ -2,7 +2,6 @@ swing.error.cannot.open.file= swing.error.cannot.open.link= swing.error.desktop.browse.not.supported= -swing.error.desktop.extension.not.supported= swing.error.desktop.mail.not.supported= swing.error.desktop.not.supported= tutti.about.bottomText= @@ -14,9 +13,6 @@ tutti.about.update.app.up.detail= tutti.about.update.content= tutti.about.update.title= -tutti.action.cancel= -tutti.action.removeCaracteristic= -tutti.action.validate= tutti.attachmentEditor.action.add.mnemonic= tutti.attachmentEditor.action.add.tip= tutti.attachmentEditor.action.closeAttachment.tip= @@ -37,7 +33,6 @@ tutti.attachmentEditor.saveAttachment.fail.message= tutti.attachmentEditor.saveAttachment.fail.title= tutti.attachmentEditor.saveAttachment.success.message= -tutti.attachmentEditor.saveAttachment.success.title= tutti.attachmentEditor.saveAttachment.title= tutti.attachmentEditor.saveAttachment.warning.help= tutti.attachmentEditor.saveAttachment.warning.message= @@ -60,7 +55,6 @@ tutti.common.cancel= tutti.common.cancel.mnemonic= tutti.common.file.csv= -tutti.common.file.ibts= tutti.common.file.pdf= tutti.common.file.protocol= tutti.common.file.zip= @@ -73,10 +67,6 @@ tutti.config.application= tutti.config.category.applications= tutti.config.category.applications.description= -tutti.config.category.directories= -tutti.config.category.directories.description= -tutti.config.category.shortcuts= -tutti.config.category.shortcuts.description= tutti.config.category.technical= tutti.config.category.technical.description= tutti.config.category.ui= @@ -254,10 +244,6 @@ tutti.editAccidentalBatch.table.header.size.tip= tutti.editAccidentalBatch.table.header.species= tutti.editAccidentalBatch.table.header.species.tip= -tutti.editAccidentalBatch.table.header.speciesByCode= -tutti.editAccidentalBatch.table.header.speciesByCode.tip= -tutti.editAccidentalBatch.table.header.speciesByGenusCode= -tutti.editAccidentalBatch.table.header.speciesByGenusCode.tip= tutti.editAccidentalBatch.table.header.weight= tutti.editAccidentalBatch.table.header.weight.tip= tutti.editBenthosBatch.action.createBatch= @@ -308,8 +294,6 @@ tutti.editBenthosBatch.table.header.file.tip= tutti.editBenthosBatch.table.header.maturityCategory= tutti.editBenthosBatch.table.header.maturityCategory.tip= -tutti.editBenthosBatch.table.header.number= -tutti.editBenthosBatch.table.header.sampleWeight= tutti.editBenthosBatch.table.header.sexCategory= tutti.editBenthosBatch.table.header.sexCategory.tip= tutti.editBenthosBatch.table.header.sizeCategory= @@ -318,8 +302,6 @@ tutti.editBenthosBatch.table.header.sortedUnsortedCategory.tip= tutti.editBenthosBatch.table.header.species= tutti.editBenthosBatch.table.header.species.tip= -tutti.editBenthosBatch.table.header.speciesByCode= -tutti.editBenthosBatch.table.header.speciesByGenusCode= tutti.editBenthosBatch.table.header.toConfirm= tutti.editBenthosBatch.table.header.toConfirm.tip= tutti.editBenthosBatch.table.header.weight= @@ -361,13 +343,6 @@ tutti.editCatchBatch.action.cancelEditCatchBatch.mnemonic= tutti.editCatchBatch.action.cancelEditCatchBatch.tip= tutti.editCatchBatch.action.computeWeights= -tutti.editCatchBatch.action.computeWeights.error.incoherentCategoryWeight= -tutti.editCatchBatch.action.computeWeights.error.incoherentParentCategoryWeight= -tutti.editCatchBatch.action.computeWeights.error.incoherentRowWeightCategory= -tutti.editCatchBatch.action.computeWeights.error.incoherentRowWeightFrequency= -tutti.editCatchBatch.action.computeWeights.error.incoherentSpeciesTotalSorted= -tutti.editCatchBatch.action.computeWeights.error.incoherentTotal= -tutti.editCatchBatch.action.computeWeights.error.noWeight= tutti.editCatchBatch.action.computeWeights.mnemonic= tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.help= tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.message= @@ -378,8 +353,6 @@ tutti.editCatchBatch.action.importPupitri.existingData.message= tutti.editCatchBatch.action.importPupitri.existingData.title= tutti.editCatchBatch.action.importPupitri.mnemonic= -tutti.editCatchBatch.action.importPupitri.noProtocol.message= -tutti.editCatchBatch.action.importPupitri.noProtocol.title= tutti.editCatchBatch.action.importPupitri.success= tutti.editCatchBatch.action.importPupitri.tip= tutti.editCatchBatch.action.saveCatchBatch= @@ -436,8 +409,6 @@ tutti.editCruise.field.beginDate.tip= tutti.editCruise.field.comment= tutti.editCruise.field.comment.tip= -tutti.editCruise.field.country= -tutti.editCruise.field.country.tip= tutti.editCruise.field.departureLocation= tutti.editCruise.field.departureLocation.tip= tutti.editCruise.field.endDate= @@ -460,8 +431,6 @@ tutti.editCruise.field.surveyPart.tip= tutti.editCruise.field.vessel= tutti.editCruise.field.vessel.tip= -tutti.editCruise.field.year= -tutti.editCruise.field.year.tip= tutti.editCruise.filterVessel.tip= tutti.editCruise.filterVesselType= tutti.editCruise.filterVesselType.all= @@ -652,7 +621,6 @@ tutti.editProtocol.action.chooseProtocolBenthosFile= tutti.editProtocol.action.chooseProtocolCaracteristicFile= tutti.editProtocol.action.chooseProtocolSpeciesFile= -tutti.editProtocol.action.chooseProtocolbenthosFile= tutti.editProtocol.action.closeEditProtocol= tutti.editProtocol.action.closeEditProtocol.mnemonic= tutti.editProtocol.action.closeEditProtocol.tip= @@ -697,21 +665,18 @@ tutti.editProtocol.action.selectOtherSpecies.tip= tutti.editProtocol.askCancelEditBeforeLeaving.cancelSaveProtocol= tutti.editProtocol.askSaveBeforeLeaving.saveProtocol= -tutti.editProtocol.field..tip= tutti.editProtocol.field.benthos.tip= tutti.editProtocol.field.comment= tutti.editProtocol.field.comment.tip= tutti.editProtocol.field.protocol.name= tutti.editProtocol.field.protocol.name.tip= tutti.editProtocol.field.species.tip= -tutti.editProtocol.tab.accidental= tutti.editProtocol.tab.benthos= tutti.editProtocol.tab.caracteristic= tutti.editProtocol.tab.caracteristic.gearUseFeature= tutti.editProtocol.tab.caracteristic.lengthClasses= tutti.editProtocol.tab.caracteristic.vesselUseFeature= tutti.editProtocol.tab.info= -tutti.editProtocol.tab.plankton= tutti.editProtocol.tab.species= tutti.editProtocol.table.header.age= tutti.editProtocol.table.header.age.tip= @@ -840,7 +805,6 @@ tutti.fishingOperations.title.edit.operations= tutti.fishingOperations.title.validate.operations= tutti.fishingOperations.warn.invalid.batch.model= -tutti.flash.benthos.species.remove.from.protocol= tutti.flash.info.all.caractristic.exported= tutti.flash.info.benthos.add.to.protocol= tutti.flash.info.benthos.imported.in.protocol= @@ -856,7 +820,6 @@ tutti.flash.info.db.exported= tutti.flash.info.db.exported.and.clean= tutti.flash.info.db.imported= -tutti.flash.info.db.installed= tutti.flash.info.db.opened= tutti.flash.info.programCreated= tutti.flash.info.programSaved= @@ -881,29 +844,20 @@ tutti.importPupitri.error.fileMissing.message= tutti.importPupitri.error.fileMissing.title= tutti.importPupitri.field.carrouselFile= -tutti.importPupitri.field.speciesFile= tutti.importPupitri.field.trunkFile= -tutti.importPupitri.speciesFile.extension= -tutti.importPupitri.speciesFile.extension.description= tutti.importPupitri.title= tutti.importPupitri.trunkFile.extension= tutti.importPupitri.trunkFile.extension.description= tutti.label.catches.planktonTotalSampleWeight= tutti.label.catches.planktonTotalWeight= -tutti.label.tab.accidentel= -tutti.label.tab.benthos= tutti.label.tab.catches= tutti.label.tab.catchesCaracteristics= tutti.label.tab.fishingOperation= -tutti.label.tab.individualObservation= tutti.label.tab.marineLitter= -tutti.label.tab.observationIndividuel= tutti.label.tab.plancton= -tutti.label.tab.species= tutti.legend.frequencyConfiguration= tutti.legend.splitBenthosBatchConfiguration= tutti.legend.splitSpeciesBatchConfiguration= -tutti.main.action..mnemonic= tutti.main.action.about= tutti.main.action.about.mnemonic= tutti.main.action.about.tip= @@ -981,42 +935,30 @@ tutti.manageTemporaryReferential.action.chooseReferentialGearFile= tutti.manageTemporaryReferential.action.chooseReferentialGearFile.export.success= tutti.manageTemporaryReferential.action.chooseReferentialGearFile.import.success= -tutti.manageTemporaryReferential.action.chooseReferentialGearFile.success= tutti.manageTemporaryReferential.action.chooseReferentialPersonFile= tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.export.success= tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.import.success= -tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.success= tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile= tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.export.success= tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.import.success= -tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.success= tutti.manageTemporaryReferential.action.chooseReferentialVesselFile= tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.export.success= tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.import.success= -tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.success= tutti.manageTemporaryReferential.action.exportTemporaryGearExample= -tutti.manageTemporaryReferential.action.exportTemporaryGearExample.mnemonic= tutti.manageTemporaryReferential.action.exportTemporaryGearExample.tip= tutti.manageTemporaryReferential.action.exportTemporaryPersonExample= -tutti.manageTemporaryReferential.action.exportTemporaryPersonExample.mnemonic= tutti.manageTemporaryReferential.action.exportTemporaryPersonExample.tip= tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample= -tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample.mnemonic= tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample.tip= tutti.manageTemporaryReferential.action.exportTemporaryVesselExample= -tutti.manageTemporaryReferential.action.exportTemporaryVesselExample.mnemonic= tutti.manageTemporaryReferential.action.exportTemporaryVesselExample.tip= tutti.manageTemporaryReferential.action.importTemporaryGear= -tutti.manageTemporaryReferential.action.importTemporaryGear.mnemonic= tutti.manageTemporaryReferential.action.importTemporaryGear.tip= tutti.manageTemporaryReferential.action.importTemporaryPerson= -tutti.manageTemporaryReferential.action.importTemporaryPerson.mnemonic= tutti.manageTemporaryReferential.action.importTemporaryPerson.tip= tutti.manageTemporaryReferential.action.importTemporarySpecies= -tutti.manageTemporaryReferential.action.importTemporarySpecies.mnemonic= tutti.manageTemporaryReferential.action.importTemporarySpecies.tip= tutti.manageTemporaryReferential.action.importTemporaryVessel= -tutti.manageTemporaryReferential.action.importTemporaryVessel.mnemonic= tutti.manageTemporaryReferential.action.importTemporaryVessel.tip= tutti.manageTemporaryReferential.field.gear= tutti.manageTemporaryReferential.field.gear.tip= @@ -1040,57 +982,38 @@ tutti.manageTemporaryReferential.title.choose.importTemporarySpeciesFile= tutti.manageTemporaryReferential.title.choose.importTemporaryVesselFile= tutti.message.action.running= -tutti.sampleCategoryType.age= -tutti.sampleCategoryType.maturity= -tutti.sampleCategoryType.sex= -tutti.sampleCategoryType.size= -tutti.sampleCategoryType.sortedUnsorted= tutti.selectBenthos.title= tutti.selectCruise.action.chooseProtocolFile= tutti.selectCruise.action.cloneProtocol= -tutti.selectCruise.action.cloneProtocol.mnemonic= tutti.selectCruise.action.cloneProtocol.tip= tutti.selectCruise.action.deleteProtocol= tutti.selectCruise.action.deleteProtocol.message= -tutti.selectCruise.action.deleteProtocol.mnemonic= tutti.selectCruise.action.deleteProtocol.tip= tutti.selectCruise.action.deleteProtocol.title= tutti.selectCruise.action.editCatches= tutti.selectCruise.action.editCatches.mnemonic= tutti.selectCruise.action.editCatches.tip= tutti.selectCruise.action.editCruise= -tutti.selectCruise.action.editCruise.mnemonic= tutti.selectCruise.action.editCruise.tip= tutti.selectCruise.action.editProgram= -tutti.selectCruise.action.editProgram.mnemonic= tutti.selectCruise.action.editProgram.tip= tutti.selectCruise.action.editProtocol= -tutti.selectCruise.action.editProtocol.mnemonic= tutti.selectCruise.action.editProtocol.tip= tutti.selectCruise.action.exportProtocol= -tutti.selectCruise.action.exportProtocol.mnemonic= tutti.selectCruise.action.exportProtocol.tip= tutti.selectCruise.action.importProtocol= -tutti.selectCruise.action.importProtocol.mnemonic= tutti.selectCruise.action.importProtocol.tip= tutti.selectCruise.action.newCruise= -tutti.selectCruise.action.newCruise.mnemonic= tutti.selectCruise.action.newCruise.tip= tutti.selectCruise.action.newProgram= -tutti.selectCruise.action.newProgram.mnemonic= tutti.selectCruise.action.newProgram.tip= tutti.selectCruise.action.newProtocol= -tutti.selectCruise.action.newProtocol.mnemonic= tutti.selectCruise.action.newProtocol.tip= tutti.selectCruise.action.sendCruiseReport= -tutti.selectCruise.action.sendCruiseReport.mnemonic= tutti.selectCruise.action.sendCruiseReport.tip= tutti.selectCruise.action.validateCatches= tutti.selectCruise.action.validateCatches.mnemonic= tutti.selectCruise.action.validateCatches.tip= -tutti.selectCruise.action.validateCruise= -tutti.selectCruise.action.validateCruise.mnemonic= -tutti.selectCruise.action.validateCruise.tip= tutti.selectCruise.field.cruise= tutti.selectCruise.field.cruise.tip= tutti.selectCruise.field.program= @@ -1108,12 +1031,6 @@ tutti.selectSpecies.action.validate.mnemonic= tutti.selectSpecies.action.validate.tip= tutti.selectSpecies.title= -tutti.sendCatchesReport.action.chooseFile= -tutti.sendCatchesReport.action.chooseProtocolFile= -tutti.sendCatchesReport.action.success= -tutti.sendCatchesReport.mail.body= -tutti.sendCatchesReport.mail.subject= -tutti.sendCatchesReport.title.choose.exportFile= tutti.sendCruiseReport.action.chooseFile= tutti.sendCruiseReport.action.success= tutti.sendCruiseReport.mail.body= @@ -1156,7 +1073,6 @@ tutti.splitSpeciesBatch.table.header.weight= tutti.splitSpeciesBatch.title= tutti.timeeditor.H= -tutti.to.be.done= tutti.update.db= tutti.update.help= tutti.update.i18n= @@ -1165,9 +1081,7 @@ tutti.updateApplication.message.success= tutti.updateApplication.noUpdate= tutti.updateApplication.title.success= -tutti.validator.error.comment.too.long= tutti.validator.error.createAccidentalBatch.species.required= -tutti.validator.error.createIndividualObservationBatch.individualObservationSpecies.required= tutti.validator.error.createIndividualObservationBatch.lengthStepCaracteristic.required= tutti.validator.error.createIndividualObservationBatch.size.required= tutti.validator.error.createIndividualObservationBatch.species.required= @@ -1181,50 +1095,15 @@ tutti.validator.error.createSpeciesBatch.sortedUnsortedCategory.required= tutti.validator.error.createSpeciesBatch.species.required= tutti.validator.error.createSpeciesBatch.speciesAndCategory.notAvailable= -tutti.validator.error.cruise.beginDate.required= -tutti.validator.error.cruise.country.required= -tutti.validator.error.cruise.dates.endBeforeStart= -tutti.validator.error.cruise.departureLocation.required= -tutti.validator.error.cruise.endDate.required= -tutti.validator.error.cruise.gear.required= -tutti.validator.error.cruise.headOfMission.required= -tutti.validator.error.cruise.headOfSortRoom.required= -tutti.validator.error.cruise.multirigNumber.required= -tutti.validator.error.cruise.name.required= -tutti.validator.error.cruise.program.required= -tutti.validator.error.cruise.returnLocation.required= -tutti.validator.error.cruise.vessel.required= -tutti.validator.error.cruise.year.required= -tutti.validator.error.fishingOperation.catcher.required= -tutti.validator.error.fishingOperation.comment.required= tutti.validator.error.fishingOperation.date.end.required= -tutti.validator.error.fishingOperation.date.start.required= -tutti.validator.error.fishingOperation.dates.endBeforeStart= tutti.validator.error.fishingOperation.dates.endOutOfCruiseDates= tutti.validator.error.fishingOperation.dates.startOutOfCruiseDates= tutti.validator.error.fishingOperation.dates.wrongTime= -tutti.validator.error.fishingOperation.existingKey= -tutti.validator.error.fishingOperation.fishingOperationNumber.required= -tutti.validator.error.fishingOperation.fishingOperationValid.required= -tutti.validator.error.fishingOperation.gear.required= -tutti.validator.error.fishingOperation.stationNumber.required= -tutti.validator.error.fishingOperation.stationNumber.too.long= -tutti.validator.error.fishingOperation.strataLocation.required= -tutti.validator.error.fishingOperation.trawlDistance.required= -tutti.validator.error.fishingOperation.trawlDistance.tooLong= -tutti.validator.error.fishingOperation.trawlNetNumber.required= -tutti.validator.error.fishingOperation.vessel.required= tutti.validator.error.latitude.end.required= tutti.validator.error.latitude.start.required= tutti.validator.error.longitude.end.required= tutti.validator.error.longitude.start.required= -tutti.validator.error.program.description.required= -tutti.validator.error.program.description.too.long= -tutti.validator.error.program.existingKey= -tutti.validator.error.program.name.required= tutti.validator.error.program.zone.required= -tutti.validator.error.protocol.name.alreadyUsed= -tutti.validator.error.protocol.name.required= tutti.validator.error.speciesFrequency.lengthStepCaracteristic.required= tutti.validator.error.speciesFrequency.oneRowRequired= tutti.validator.error.splitSpeciesBatch.sampleWeight.invalidValue= @@ -1233,11 +1112,9 @@ tutti.validator.warning.cruise.name.format= tutti.validator.warning.latitude.degree.outOfBounds= tutti.validator.warning.latitude.minute.outOfBounds= -tutti.validator.warning.latitude.outOfBounds= tutti.validator.warning.latitude.second.outOfBounds= tutti.validator.warning.longitude.degree.outOfBounds= tutti.validator.warning.longitude.minute.outOfBounds= -tutti.validator.warning.longitude.outOfBounds= tutti.validator.warning.longitude.second.outOfBounds= tutti.vesselUseFeatureTable.action.removeCaracteristic= tutti.vesselUseFeatureTable.action.removeCaracteristic.mnemonic= 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-04-21 11:29:20 UTC (rev 839) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-04-21 11:47:39 UTC (rev 840) @@ -5,19 +5,17 @@ swing.error.desktop.mail.not.supported=Le client mail n'a pas pu être ouvert. Vérifiez que vous avez défini un client mail par défaut dans votre système. swing.error.desktop.not.supported=Votre système ne permet pas d'ouvrir des liens ou fichiers en dehors de Tutti. tutti.about.bottomText=Copyright %s - %s - version %s -tutti.about.message=<h3>Tutti</h3><p><strong>Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques.</strong></p><br/><p>Ce logiciel permettra la saisie en mer des données d'opération de pêche (positions, environnement, engin, etc) et des captures associées (composition de la capture en espèces scientifiques avec poids, nombres, tailles etc) pour l'ensemble des campagnes halieutiques réalisées par l'Ifremer.</p><p>Ce projet a été initiée en 2012 par l'<a href\="http\://www.ifremer.fr">Ifremer</a> et réalisé par la société <a href\="http\://codelutin.com">Codelutin</a>.</p><hr/><br/><p>Pour plus d'informations, vous pouvez visiter le <a href\="http\://maven-site.forge.codelutin.com/tutti">site du projet</a>.</p><p>Projet hébergé sur la forge <a href\="http\://forge.codelutin.com/projects/tutti">Forge.codelutin.com</a>.</p> -tutti.about.title=À propos de Tutti -tutti.about.translate.content=<h2>Comment traduire Tutti</h2>Vous pouvez nous aider à traduire Tutti.<hr/><br/><ul><li>Récupérer le fichier <a href\="%s">tutti-i18n.csv</a> dans le répertoire <strong>i18n</strong></li><li>ouvrez le avec un tableur (le caractère séprateur est une Tabultation)</li><li>Traduisez, Améliorer, ...</li><li>Enfin renvoyez-le nous</li></ul><br/>Nous intégrerons vos modifications avant la prochaine version. -tutti.about.translate.title=Traduire Tutti +tutti.about.message=<h3>Tutti</h3><p><strong>Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques.</strong></p><br/><p>Ce logiciel permettra la saisie en mer des données d'opération de pêche (positions, environnement, engin, etc) et des captures associées (composition de la capture en espèces scientifiques avec poids, nombres, tailles etc) pour l'ensemble des campagnes halieutiques réalisées par l'Ifremer.</p><p>Ce projet a été initiée en 2012 par l'<a hreftutti.about.title\=À propos de Tutti +tutti.about.title= +tutti.about.translate.content=<h2>Comment traduire Tutti</h2>Vous pouvez nous aider à traduire Tutti.<hr/><br/><ul><li>Récupérer le fichier <a hreftutti.about.translate.title\=Traduire Tutti +tutti.about.translate.title= tutti.about.update.app.noup.detail=<tr><td>%1$s</td><td>%2$s</td><td>%2$s<td><td></td></tr> -tutti.about.update.app.up.detail=<tr><td>%1$s</td><td>%2$s</td><td><strong>%3$s</strong></td><td><a href\="%4$s">Mettre à jour</a><td></tr> -tutti.about.update.content=<h2>Mise à jour de Tutti</h2><p>Fichier des mises à jour \: <a href\="%1$s">%1$s</a></p><br/><hr/><br/><table><CAPTION><EM>Mises à jour des modules</EM></CAPTION><tr><th>Module</th><th>Version installée</th><th>Dernière version</th><th></th></tr>%2$s</table> -tutti.about.update.title=Mise à jour Tutti +tutti.about.update.app.up.detail=<tr><td>%1$s</td><td>%2$s</td><td><strong>%3$s</strong></td><td><a hreftutti.about.update.content\=<h2>Mise à jour de Tutti</h2><p>Fichier des mises à jour \: <a hreftutti.about.update.title\=Mise à jour Tutti +tutti.about.update.content= +tutti.about.update.title= tutti.attachmentEditor.action.add.mnemonic=A tutti.attachmentEditor.action.add.tip=Ajouter une pièce jointe -tutti.attachmentEditor.action.close=Fermer tutti.attachmentEditor.action.closeAttachment.tip=Fermer la fenêtre des pièces-jointes -tutti.attachmentEditor.action.mnemonic.tip=E tutti.attachmentEditor.action.open.mnemonic=O tutti.attachmentEditor.action.open.tip=Ouvrir la pièce jointe tutti.attachmentEditor.action.remove.mnemonic=u @@ -35,7 +33,6 @@ tutti.attachmentEditor.saveAttachment.fail.message=Une erreur est survenue lors de la sauvegarde du fichier. tutti.attachmentEditor.saveAttachment.fail.title=Erreur de sauvegarde. tutti.attachmentEditor.saveAttachment.success.message=Le fichier %s a été sauvegardé sur votre machine. -tutti.attachmentEditor.saveAttachment.success.title=Sauvegarde réussie. tutti.attachmentEditor.saveAttachment.title=Sauver la pièce-jointe tutti.attachmentEditor.saveAttachment.warning.help=Que voulez-vous faire ?<ul><li><strong>Non</strong> pour annuler la sauvegarde</li><li><strong>Oui</strong> pour écraser le fichier existant</li></ul> tutti.attachmentEditor.saveAttachment.warning.message=Vous êtes sur le point d'écraser un fichier existant. @@ -82,7 +79,7 @@ tutti.config.option.programId.description=Identifiant de la dernière série de campagne utilisée tutti.config.option.protocolId.description=Identifiant du dernier protocole utilisé tutti.config.option.samplingCategoryOrderIds.description=Ordre des catégories d'échantillonnage -tutti.config.option.tremieCarousselVessel.description=Navire ayant un caroussel et un trémie (Thalassa) +tutti.config.option.tremieCarousselVessel.description=Navire ayant un carrousel et une trémie (ex. Thalassa) tutti.config.option.ui.autoPopupNumberEditor.description=Toujours afficher le pavé numérique lors de l'édition d'un nombre tutti.config.option.ui.color.blockingLayer.description=Couleur utilisée pour bloquer l'interface lors d'une action longue tutti.config.option.ui.color.cellWithValue.description=Couleur d'une cellule avec des données @@ -104,7 +101,7 @@ tutti.createAccidentalBatch.action.cancel.tip=Annuler la création de la capture accidentelle tutti.createAccidentalBatch.action.save=Enregistrer tutti.createAccidentalBatch.action.save.mnemonic=E -tutti.createAccidentalBatch.action.save.tip=Enregister la capture accidentelle +tutti.createAccidentalBatch.action.save.tip=Enregistrer la capture accidentelle tutti.createAccidentalBatch.field.accidentalDeadOrAlive=Mort ou vivant tutti.createAccidentalBatch.field.accidentalDeadOrAlive.tip=L'animal a-t-il été remis à l'eau mort ou vivant ? tutti.createAccidentalBatch.field.accidentalGender=Sexe @@ -126,7 +123,7 @@ tutti.createBenthosBatch.action.cancel.tip=Annuler la création du lot espèce tutti.createBenthosBatch.action.save=Enregistrer tutti.createBenthosBatch.action.save.mnemonic=E -tutti.createBenthosBatch.action.save.tip=Enregister la création du lot espèce +tutti.createBenthosBatch.action.save.tip=Enregistrer la création du lot espèce tutti.createBenthosBatch.field.batchWeight=Poids du lot (kg) tutti.createBenthosBatch.field.batchWeight.tip= tutti.createBenthosBatch.field.sortedUnsortedCategory=V / HV @@ -134,16 +131,8 @@ tutti.createBenthosBatch.field.species=Espèce du lot tutti.createBenthosBatch.field.species.tip= tutti.createBenthosBatch.title=Créer un lot -tutti.createBenthosMelag.action.cancel=Annuler -tutti.createBenthosMelag.action.cancel.mnemonic=A -tutti.createBenthosMelag.action.cancel.tip=Annuler la création du MELAG -tutti.createBenthosMelag.action.validate=Valider -tutti.createBenthosMelag.action.validate.mnemonic=V -tutti.createBenthosMelag.action.validate.tip=Valider la création du MELAG tutti.createBenthosMelag.error.message=Erreur à la ligne %s tutti.createBenthosMelag.error.title=Erreur -tutti.createBenthosMelag.message=Combien pesait le MELAG (kg) ? -tutti.createBenthosMelag.title=Poids du MELAG (kg) tutti.createIndividualObservationBatch.action.addSpecies=... tutti.createIndividualObservationBatch.action.addSpecies.mnemonic=. tutti.createIndividualObservationBatch.action.addSpecies.tip=Sélectionner une autre espèce @@ -169,11 +158,11 @@ tutti.createMarineLitterBatch.action.save.mnemonic=E tutti.createMarineLitterBatch.action.save.tip=Enregistrer la création du lot macro-déchet tutti.createMarineLitterBatch.field.marineLitterCategory=Catégorie de déchets -tutti.createMarineLitterBatch.field.marineLitterCategory.tip= +tutti.createMarineLitterBatch.field.marineLitterCategory.tip=Type de déchets observés tutti.createMarineLitterBatch.field.marineLitterSizeCategory=Catégorie de taille -tutti.createMarineLitterBatch.field.marineLitterSizeCategory.tip= +tutti.createMarineLitterBatch.field.marineLitterSizeCategory.tip=Classe de taille des déchets observés tutti.createMarineLitterBatch.field.number=Nombre -tutti.createMarineLitterBatch.field.number.tip= +tutti.createMarineLitterBatch.field.number.tip=Nombre d'objets dans la catégorie tutti.createMarineLitterBatch.title=Créer un lot tutti.createSpeciesBatch.action.addSpecies=... tutti.createSpeciesBatch.action.addSpecies.mnemonic=. @@ -183,13 +172,13 @@ tutti.createSpeciesBatch.action.cancel.tip=Annuler la création du lot espèce tutti.createSpeciesBatch.action.save=Enregistrer tutti.createSpeciesBatch.action.save.mnemonic=E -tutti.createSpeciesBatch.action.save.tip=Enregister la création du lot espèce +tutti.createSpeciesBatch.action.save.tip=Enregistrer la création du lot espèce tutti.createSpeciesBatch.field.batchWeight=Poids du lot (kg) -tutti.createSpeciesBatch.field.batchWeight.tip= +tutti.createSpeciesBatch.field.batchWeight.tip=Poids du lot (non obligatoire à ce stade) tutti.createSpeciesBatch.field.sortedUnsortedCategory=V / HV -tutti.createSpeciesBatch.field.sortedUnsortedCategory.tip= +tutti.createSpeciesBatch.field.sortedUnsortedCategory.tip=Vrac ou Hors Vrac tutti.createSpeciesBatch.field.species=Espèce du lot -tutti.createSpeciesBatch.field.species.tip= +tutti.createSpeciesBatch.field.species.tip=Code campagne ou Code Rubin – Nom scientifique du lot à créer tutti.createSpeciesBatch.title=Créer un lot tutti.createSpeciesMelag.action.cancel=Annuler tutti.createSpeciesMelag.action.cancel.mnemonic=A @@ -205,13 +194,13 @@ tutti.dbManager.action.chooseDbExportFile=Exporter la base de données tutti.dbManager.action.chooseDbFile=Choisir la base à importer tutti.dbManager.action.closeDb=Fermer -tutti.dbManager.action.closeDb.mnemonic=F +tutti.dbManager.action.closeDb.mnemonic=e tutti.dbManager.action.closeDb.tip=Fermer la base de données en cours d'utilisation tutti.dbManager.action.exportAndCleanDb=Exporter et supprimer tutti.dbManager.action.exportAndCleanDb.mnemonic=s tutti.dbManager.action.exportAndCleanDb.tip=Exporter la base de données au format zip puis supprimer les fichiers de Tutti tutti.dbManager.action.exportDb=Exporter -tutti.dbManager.action.exportDb.mnemonic=E +tutti.dbManager.action.exportDb.mnemonic=x tutti.dbManager.action.exportDb.tip=Exporter la base de données au format zip tutti.dbManager.action.importDb=Importer une base tutti.dbManager.action.importDb.mnemonic=i @@ -246,7 +235,7 @@ tutti.editAccidentalBatch.table.header.file=Pièces-jointes tutti.editAccidentalBatch.table.header.file.tip=Pièces-jointes tutti.editAccidentalBatch.table.header.gender=Sexe -tutti.editAccidentalBatch.table.header.gender.tip=Sexe (Male, femelle, autre...) +tutti.editAccidentalBatch.table.header.gender.tip=Sexe (mâle, femelle, autre...) tutti.editAccidentalBatch.table.header.lengthStepCaracteristic=Classe de taille tutti.editAccidentalBatch.table.header.lengthStepCaracteristic.tip=Classe de taille tutti.editAccidentalBatch.table.header.otherCaracteristics=Autres caractéristiques @@ -260,9 +249,6 @@ tutti.editBenthosBatch.action.createBatch=Créer un lot pour une espèce tutti.editBenthosBatch.action.createBatch.mnemonic=C tutti.editBenthosBatch.action.createBatch.tip=Créer un nouveau lot pour une espèce -tutti.editBenthosBatch.action.createMelag=Espèces d'un MELAG -tutti.editBenthosBatch.action.createMelag.mnemonic=C -tutti.editBenthosBatch.action.createMelag.tip=Calcul des poids des lots appartenant à un MELAG tutti.editBenthosBatch.action.removeBatch=Supprimer le lot tutti.editBenthosBatch.action.removeBatch.mnemonic=S tutti.editBenthosBatch.action.removeBatch.tip=Supprimer le lot courant (celui de la ligne sélectionnée) et tous ces fils @@ -276,17 +262,17 @@ tutti.editBenthosBatch.action.splitBatch.mnemonic=C tutti.editBenthosBatch.action.splitBatch.tip=Catégoriser le lot courant (celui de la ligne sélectionné) tutti.editBenthosBatch.field.benthosTotalInertWeight=Poids inerte trié (kg) -tutti.editBenthosBatch.field.benthosTotalInertWeight.tip= +tutti.editBenthosBatch.field.benthosTotalInertWeight.tip=Poids de la fraction inerte restante après le tri du benthos (cailloux, vase, débris coquilliers, etc.) tutti.editBenthosBatch.field.benthosTotalLivingNotItemizedWeight=Poids vivant non détaillé trié (kg) -tutti.editBenthosBatch.field.benthosTotalLivingNotItemizedWeight.tip= +tutti.editBenthosBatch.field.benthosTotalLivingNotItemizedWeight.tip=Poids de la fraction vivante restante après le tri du benthos (algues, matières vivantes non reconnaissable, etc.) tutti.editBenthosBatch.field.benthosTotalSampleSortedWeight=Poids VRAC trié (kg) -tutti.editBenthosBatch.field.benthosTotalSampleSortedWeight.tip= +tutti.editBenthosBatch.field.benthosTotalSampleSortedWeight.tip=Poids total du benthos trié tutti.editBenthosBatch.field.benthosTotalSortedWeight=Poids total VRAC (kg) -tutti.editBenthosBatch.field.benthosTotalSortedWeight.tip= +tutti.editBenthosBatch.field.benthosTotalSortedWeight.tip=Poids total VRAC des espèces de type benthos dans la capture tutti.editBenthosBatch.field.benthosTotalUnsortedWeight=Poids total HORS VRAC (kg) -tutti.editBenthosBatch.field.benthosTotalUnsortedWeight.tip= +tutti.editBenthosBatch.field.benthosTotalUnsortedWeight.tip=Poids total HORS VRAC des espèces de type benthos dans la capture tutti.editBenthosBatch.field.benthosTotalWeight=Poids TOTAL (kg) -tutti.editBenthosBatch.field.benthosTotalWeight.tip= +tutti.editBenthosBatch.field.benthosTotalWeight.tip=Poids total des espèces de type benthos dans la capture (Vrav + Hors Vrac) tutti.editBenthosBatch.filterBatch=Filtre tutti.editBenthosBatch.filterBatch.mode.all=Aucun tutti.editBenthosBatch.filterBatch.mode.all.tip=Pas de filtre (tous les lots sont visibles) @@ -299,43 +285,42 @@ 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.tip= +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= +tutti.editBenthosBatch.table.header.comment.tip=Commentaire sur la ligne tutti.editBenthosBatch.table.header.computedNumber=Nombre -tutti.editBenthosBatch.table.header.computedNumber.tip= +tutti.editBenthosBatch.table.header.computedNumber.tip=Nombre d'individus dans le lot tutti.editBenthosBatch.table.header.file=Pièces jointes -tutti.editBenthosBatch.table.header.file.tip= +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= +tutti.editBenthosBatch.table.header.maturityCategory.tip=Maturité des individus du lot tutti.editBenthosBatch.table.header.sexCategory=Sexe -tutti.editBenthosBatch.table.header.sexCategory.tip= +tutti.editBenthosBatch.table.header.sexCategory.tip=Sexe des individus du lot tutti.editBenthosBatch.table.header.sizeCategory=Class. Tri -tutti.editBenthosBatch.table.header.sizeCategory.tip= +tutti.editBenthosBatch.table.header.sizeCategory.tip=Classe de taille (petis, gros, …) des individus du lot tutti.editBenthosBatch.table.header.sortedUnsortedCategory=V/HV (kg) -tutti.editBenthosBatch.table.header.sortedUnsortedCategory.tip= +tutti.editBenthosBatch.table.header.sortedUnsortedCategory.tip=V \= Vrac ; HV \= Hors Vrac (espèces rares, de grande taille etc. sorties de la capture) tutti.editBenthosBatch.table.header.species=Espèce -tutti.editBenthosBatch.table.header.species.tip= +tutti.editBenthosBatch.table.header.species.tip=Code campagne ou code Rubin – Nom scientifique tutti.editBenthosBatch.table.header.toConfirm=A Confirmer -tutti.editBenthosBatch.table.header.toConfirm.tip= +tutti.editBenthosBatch.table.header.toConfirm.tip=Case à cocher si il y a un doute sur l'identification de l'espèce tutti.editBenthosBatch.table.header.weight=Poids sous-échantillonné (kg) -tutti.editBenthosBatch.table.header.weight.tip= -tutti.editBenthosBatch.title.batchActions=Actions +tutti.editBenthosBatch.table.header.weight.tip=Poids du lot mesuré ou dénombré tutti.editBenthosFrequencies.action.cancel=Annuler tutti.editBenthosFrequencies.action.cancel.mnemonic=A -tutti.editBenthosFrequencies.action.cancel.tip=Anuler l'édition des mensurations +tutti.editBenthosFrequencies.action.cancel.tip=Annuler l'édition des mensurations tutti.editBenthosFrequencies.action.generate=Générer tutti.editBenthosFrequencies.action.generate.mnemonic=G tutti.editBenthosFrequencies.action.generate.tip=Générer les mensurations tutti.editBenthosFrequencies.action.save=Enregistrer tutti.editBenthosFrequencies.action.save.mnemonic=E -tutti.editBenthosFrequencies.action.save.tip=Enreigstrer les mensurations +tutti.editBenthosFrequencies.action.save.tip=Enregistrer les mensurations tutti.editBenthosFrequencies.field.lengthStepCaracteristic=Type de mesure -tutti.editBenthosFrequencies.field.lengthStepCaracteristic.tip= +tutti.editBenthosFrequencies.field.lengthStepCaracteristic.tip=Méthode de mensuration des individus tutti.editBenthosFrequencies.field.maxStep=Classe max -tutti.editBenthosFrequencies.field.maxStep.tip= +tutti.editBenthosFrequencies.field.maxStep.tip=Taille maximale mesurée tutti.editBenthosFrequencies.field.minStep=Classe min -tutti.editBenthosFrequencies.field.minStep.tip= +tutti.editBenthosFrequencies.field.minStep.tip=Taille minimale mesurée tutti.editBenthosFrequencies.field.mode.autoGen=Génération des classes tutti.editBenthosFrequencies.field.mode.autoGen.tip=Mode où toutes les classes de taille sont générées tutti.editBenthosFrequencies.field.mode.rafale=Mode "rafale" @@ -345,41 +330,29 @@ tutti.editBenthosFrequencies.field.mode.simpleCounting=Mode simple dénombrement 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= +tutti.editBenthosFrequencies.field.rafaleStep.tip=Saisir à la suite les différentes tailles mesurées tutti.editBenthosFrequencies.field.simpleCounting=Nombre -tutti.editBenthosFrequencies.field.simpleCounting.tip= +tutti.editBenthosFrequencies.field.simpleCounting.tip=Saisir le nombre d'individus dans le lot tutti.editBenthosFrequencies.field.step=Pas de la classe de taille -tutti.editBenthosFrequencies.field.step.tip= +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.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.table.header.lengthStep=Classe de taille -tutti.editBenthosFrequencies.table.header.number=Nombre -tutti.editBenthosFrequencies.table.header.weight=Poids observé (kg) tutti.editBenthosFrequencies.title=Mensuration tutti.editCaracteristics.title=Autres caractéristiques tutti.editCatchBatch.action.cancelEditCatchBatch=Réinitialiser tutti.editCatchBatch.action.cancelEditCatchBatch.mnemonic=R tutti.editCatchBatch.action.cancelEditCatchBatch.tip=Réinitialiser l'édition de la capture tutti.editCatchBatch.action.computeWeights=Élever les poids -tutti.editCatchBatch.action.computeWeights.error.incoherentCategoryWeight=Le poids total des mensurations est supérieur au poids de la catégorie -tutti.editCatchBatch.action.computeWeights.error.incoherentParentCategoryWeight=Le poids de la catégorie est différent de la somme des poids de ses sous-catégories -tutti.editCatchBatch.action.computeWeights.error.incoherentRowWeightCategory=Le poids de la catégorie ne peut pas être nul si le poids de sous-échantillonage est renseigné -tutti.editCatchBatch.action.computeWeights.error.incoherentRowWeightFrequency=Le poids total des mensurations est différent du poids du sous-échantillon -tutti.editCatchBatch.action.computeWeights.error.incoherentSpeciesTotalSorted=Le poids total Vrac des espèces est inférieur à la somme des poids Vrac triés, inerte trié et vivant non détaillé trié -tutti.editCatchBatch.action.computeWeights.error.incoherentTotal=Le poids total de la capture ne correspond pas à la somme des poids totaux Vrac, Hors Vrac et non triés -tutti.editCatchBatch.action.computeWeights.error.noWeight=Un lot n'a pas de poids tutti.editCatchBatch.action.computeWeights.mnemonic=p tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.help=Est-ce bien une valeur observée ?<ul><li><strong>Non</strong> pour remplacer la valeur saisie par le poids calculé</li><li><strong>Oui</strong> pour garder la valeur saisie</li></ul>. tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.message=Le Poids total VRAC saisi est supérieur de moins de %s%% au Poids total Vrac trié. tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.title=Poids total VRAC peu différent du Poids total Vrac trié -tutti.editCatchBatch.action.computeWeights.tip=Elever les poids +tutti.editCatchBatch.action.computeWeights.tip=Élever les poids tutti.editCatchBatch.action.importPupitri=Import Pupitri tutti.editCatchBatch.action.importPupitri.existingData.help=Que voulez-vous faire ?<ul><li><strong>Annuler</strong> pour ne pas importer les données Pupitri et conserver les espèces saisies</li><li><strong>OK</strong> pour supprimer les espèces existantes et les remplacer par les données de Pupitri</li></ul> tutti.editCatchBatch.action.importPupitri.existingData.message=Des espèces ont déjà été saisies dans la capture. Si vous continuez, elles vont être écrasées. tutti.editCatchBatch.action.importPupitri.existingData.title=Données existantes tutti.editCatchBatch.action.importPupitri.mnemonic=I -tutti.editCatchBatch.action.importPupitri.noProtocol.message= -tutti.editCatchBatch.action.importPupitri.noProtocol.title= tutti.editCatchBatch.action.importPupitri.success= tutti.editCatchBatch.action.importPupitri.tip=Import Pupitri tutti.editCatchBatch.action.saveCatchBatch=Sauver @@ -388,39 +361,36 @@ 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= +tutti.editCatchBatch.field.benthosTotalSampleSortedWeight.tip=Poids du VRAC trié dans le benthos tutti.editCatchBatch.field.benthosTotalSortedWeight=Poids total VRAC (kg) -tutti.editCatchBatch.field.benthosTotalSortedWeight.tip= +tutti.editCatchBatch.field.benthosTotalSortedWeight.tip=Poids total du VRAC benthos tutti.editCatchBatch.field.benthosTotalUnsortedWeight=Poids total HORS VRAC (kg) -tutti.editCatchBatch.field.benthosTotalUnsortedWeight.tip= +tutti.editCatchBatch.field.benthosTotalUnsortedWeight.tip=Poids total du HORS VRAC benthos tutti.editCatchBatch.field.benthosTotalWeight=Poids TOTAL (kg) -tutti.editCatchBatch.field.benthosTotalWeight.tip= +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= +tutti.editCatchBatch.field.catchTotalRejectedWeight.tip=Poids de la fraction non triée à bord tutti.editCatchBatch.field.catchTotalSortedCarousselWeight=Caroussel observé -tutti.editCatchBatch.field.catchTotalSortedCarousselWeight.tip= -tutti.editCatchBatch.field.catchTotalSortedTremisWeight=Tremie -tutti.editCatchBatch.field.catchTotalSortedTremisWeight.tip= +tutti.editCatchBatch.field.catchTotalSortedCarousselWeight.tip=Sur Thalassa, poids total de la capture pesé sur la balance caroussel +tutti.editCatchBatch.field.catchTotalSortedTremisWeight=Trémie +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= +tutti.editCatchBatch.field.catchTotalSortedWeight.tip=Poids total VRAC des espèces dans la capture (sans les captures accidentelles) tutti.editCatchBatch.field.catchTotalUnsortedWeight=Poids total HORS VRAC (kg) -tutti.editCatchBatch.field.catchTotalUnsortedWeight.tip= +tutti.editCatchBatch.field.catchTotalUnsortedWeight.tip=Poids total HORS VRAC des espèces dans la capture (sans les captures accidentelles) tutti.editCatchBatch.field.catchTotalWeight=Poids TOTAL (kg) -tutti.editCatchBatch.field.catchTotalWeight.tip= +tutti.editCatchBatch.field.catchTotalWeight.tip=Poids total de la capture (sauf macro déchets et captures accidentelles) tutti.editCatchBatch.field.marineLitterTotalWeight=Poids TOTAL (kg) -tutti.editCatchBatch.field.marineLitterTotalWeight.tip= -tutti.editCatchBatch.field.speciesTotalInertWeight=Poids inerte trié (kg) -tutti.editCatchBatch.field.speciesTotalLivingNotItemizedWeight=Poids vivant non détaillé trié (kg) +tutti.editCatchBatch.field.marineLitterTotalWeight.tip=Poids total des macro déchets dans la capture tutti.editCatchBatch.field.speciesTotalSampleSortedWeight=Poids VRAC trié (kg) -tutti.editCatchBatch.field.speciesTotalSampleSortedWeight.tip= +tutti.editCatchBatch.field.speciesTotalSampleSortedWeight.tip=Poids total des espèces triées (poissons, crustacés etc.) tutti.editCatchBatch.field.speciesTotalSortedWeight=Poids total VRAC (kg) -tutti.editCatchBatch.field.speciesTotalSortedWeight.tip= +tutti.editCatchBatch.field.speciesTotalSortedWeight.tip=Poids total VRAC des espèces dans la capture (poissons, crustacés etc.) tutti.editCatchBatch.field.speciesTotalUnsortedWeight=Poids total HORS VRAC (kg) -tutti.editCatchBatch.field.speciesTotalUnsortedWeight.tip= +tutti.editCatchBatch.field.speciesTotalUnsortedWeight.tip=Poids total HORS VRAC des espèces dans la capture (poissons, crustacés etc.) tutti.editCatchBatch.field.speciesTotalWeight=Poids TOTAL (kg) -tutti.editCatchBatch.field.speciesTotalWeight.tip= +tutti.editCatchBatch.field.speciesTotalWeight.tip=Poids total des espèces dans la capture (poissons, crustacés etc.) tutti.editCatchBatch.legend.benthos=Benthos -tutti.editCatchBatch.legend.individualObservation=Observations individuelles tutti.editCatchBatch.legend.marineLitter=Macro déchets tutti.editCatchBatch.legend.species=Espèces tutti.editCatchBatch.legend.total=Capture @@ -432,42 +402,42 @@ tutti.editCruise.action.generateName.tip=Générer le nom normalisé de la campagne tutti.editCruise.action.saveCruise=Enregistrer tutti.editCruise.action.saveCruise.mnemonic=E -tutti.editCruise.action.saveCruise.tip=Enregister la campagne +tutti.editCruise.action.saveCruise.tip=Enregistrer la campagne tutti.editCruise.askCancelEditBeforeLeaving.cancelSaveCruise=La campagne n'est pas valide et ne peut pas être enregistrée. tutti.editCruise.askSaveBeforeLeaving.saveCruise=Des modifications sur la campagne n'ont pas été enregistrées. tutti.editCruise.field.beginDate=Date de début -tutti.editCruise.field.beginDate.tip= +tutti.editCruise.field.beginDate.tip=Date de début de la campagne tutti.editCruise.field.comment=Commentaire -tutti.editCruise.field.comment.tip= +tutti.editCruise.field.comment.tip=Commentaire général sur la campagne tutti.editCruise.field.departureLocation=Port de départ -tutti.editCruise.field.departureLocation.tip= +tutti.editCruise.field.departureLocation.tip=Nom du port de départ de la campagne tutti.editCruise.field.endDate=Date de fin -tutti.editCruise.field.endDate.tip= +tutti.editCruise.field.endDate.tip=Date de fin de la campagne tutti.editCruise.field.gear=Engin(s) -tutti.editCruise.field.gear.tip= +tutti.editCruise.field.gear.tip=Liste des engins présents à bord du navire au cours de la campagne et utilisés tutti.editCruise.field.headOfMission=Chef(s) de mission -tutti.editCruise.field.headOfMission.tip= -tutti.editCruise.field.headOfSortRoom=Reponsable(s) de salle de tri -tutti.editCruise.field.headOfSortRoom.tip= +tutti.editCruise.field.headOfMission.tip=Liste du(des) chef(s) de missions sur l'ensemble de la campagne +tutti.editCruise.field.headOfSortRoom=Responsable(s) de salle de tri +tutti.editCruise.field.headOfSortRoom.tip=Liste du(des) responsable(s) de la salle de tri sur l'ensemble de la campagne tutti.editCruise.field.multirigNumber=Nombre de poches -tutti.editCruise.field.multirigNumber.tip= +tutti.editCruise.field.multirigNumber.tip=Nombre de poche(s) associé à l'engin (le plus souvent \= 1) tutti.editCruise.field.name=Nom -tutti.editCruise.field.name.tip= +tutti.editCruise.field.name.tip=Nom normalisé de la campagne tutti.editCruise.field.program=Série -tutti.editCruise.field.program.tip= +tutti.editCruise.field.program.tip=Nom de la série de campagne tutti.editCruise.field.returnLocation=Port d'arrivée -tutti.editCruise.field.returnLocation.tip= +tutti.editCruise.field.returnLocation.tip=Nom du port d'arrivée de la campagne tutti.editCruise.field.surveyPart=Série partielle -tutti.editCruise.field.surveyPart.tip= +tutti.editCruise.field.surveyPart.tip=N° de la série partielle (mettre 1 si il y a une seule campagne dans l'année) tutti.editCruise.field.vessel=Navire -tutti.editCruise.field.vessel.tip= -tutti.editCruise.filterVessel.tip= +tutti.editCruise.field.vessel.tip=Navire de la campagne +tutti.editCruise.filterVessel.tip=Filtrer par type de navire tutti.editCruise.filterVesselType=Filtre \: tutti.editCruise.filterVesselType.all=Tout tutti.editCruise.filterVesselType.all.tip=Tout les navires -tutti.editCruise.filterVesselType.fishing=Pro -tutti.editCruise.filterVesselType.fishing.tip=Uniquement les navires pro -tutti.editCruise.filterVesselType.scientific=Scientifique +tutti.editCruise.filterVesselType.fishing=Professionnels +tutti.editCruise.filterVesselType.fishing.tip=Uniquement les navires professionnels +tutti.editCruise.filterVesselType.scientific=Scientifiques tutti.editCruise.filterVesselType.scientific.tip=Uniquement les navires scientifiques tutti.editCruise.title.create.cruise=Créer une nouvelle campagne tutti.editCruise.title.edit.cruise=Éditer une campagne existante @@ -480,7 +450,7 @@ tutti.editFishingOperation.action.importCasino.mnemonic=I tutti.editFishingOperation.action.importCasino.tip=Import Casino tutti.editFishingOperation.action.resetEditFishingOperation=Réinitialiser -tutti.editFishingOperation.action.resetEditFishingOperation.mnemonic=R +tutti.editFishingOperation.action.resetEditFishingOperation.mnemonic= tutti.editFishingOperation.action.resetEditFishingOperation.tip=Réinitialiser l'édition du trait tutti.editFishingOperation.action.resetFishingOperationValidState=Réinitialiser tutti.editFishingOperation.action.resetFishingOperationValidState.mnemonic=é @@ -493,70 +463,70 @@ tutti.editFishingOperation.askSaveBeforeLeaving.saveFishingOperation=Des modifications sur le trait n'ont pas été enregistrées. tutti.editFishingOperation.duration.format=dj Hh m'm' tutti.editFishingOperation.field.comment=Commentaire -tutti.editFishingOperation.field.comment.tip= +tutti.editFishingOperation.field.comment.tip=Commentaire sur le trait tutti.editFishingOperation.field.duration=Durée -tutti.editFishingOperation.field.duration.tip= +tutti.editFishingOperation.field.duration.tip=Durée du trait calculée tutti.editFishingOperation.field.fishingOperationInvalid=Trait invalide tutti.editFishingOperation.field.fishingOperationNumber=Numéro de Trait tutti.editFishingOperation.field.fishingOperationNumber.tip= tutti.editFishingOperation.field.fishingOperationRectiligne=Trait rectiligne -tutti.editFishingOperation.field.fishingOperationRectiligne.tip= +tutti.editFishingOperation.field.fishingOperationRectiligne.tip=Le trait est il rectiligne ? tutti.editFishingOperation.field.fishingOperationValid=Trait valide tutti.editFishingOperation.field.fishingOperationValid.tip= tutti.editFishingOperation.field.fishingOperationValidity=Validité du trait tutti.editFishingOperation.field.gear=Engin -tutti.editFishingOperation.field.gear.tip= +tutti.editFishingOperation.field.gear.tip=Engin du trait tutti.editFishingOperation.field.gearDate=Date -tutti.editFishingOperation.field.gearDate.tip= +tutti.editFishingOperation.field.gearDate.tip=Dates de début et fin de trait tutti.editFishingOperation.field.gearLatitude=Latitude (%s) -tutti.editFishingOperation.field.gearLatitude.tip= +tutti.editFishingOperation.field.gearLatitude.tip=Latitude tutti.editFishingOperation.field.gearLongitude=Longitude (%s) -tutti.editFishingOperation.field.gearLongitude.tip= -tutti.editFishingOperation.field.gearShootingEnd=Fin de traine -tutti.editFishingOperation.field.gearShootingEnd.tip= -tutti.editFishingOperation.field.gearShootingEndDate=Date de fin de traine -tutti.editFishingOperation.field.gearShootingEndLatitude=Latitude de fin de traine -tutti.editFishingOperation.field.gearShootingEndLatitude.tip= -tutti.editFishingOperation.field.gearShootingEndLatitudeDegree=Degré de latitude de fin de traine -tutti.editFishingOperation.field.gearShootingEndLatitudeMinute=Minute de latitude de fin de traine -tutti.editFishingOperation.field.gearShootingEndLatitudeSecond=Seconde de latitude de fin de traine -tutti.editFishingOperation.field.gearShootingEndLongitude=Longitude de fin de traine -tutti.editFishingOperation.field.gearShootingEndLongitude.tip= -tutti.editFishingOperation.field.gearShootingEndLongitudeDegree=Degré de longitude de fin de traine -tutti.editFishingOperation.field.gearShootingEndLongitudeMinute=Minute de longitude de fin de traine -tutti.editFishingOperation.field.gearShootingEndLongitudeSecond=Seconde de longitude de fin de traine -tutti.editFishingOperation.field.gearShootingStart=Début de traine -tutti.editFishingOperation.field.gearShootingStart.tip= -tutti.editFishingOperation.field.gearShootingStartDate=Date de début de traine -tutti.editFishingOperation.field.gearShootingStartLatitude=Latitude de début de traine -tutti.editFishingOperation.field.gearShootingStartLatitude.tip= -tutti.editFishingOperation.field.gearShootingStartLatitudeDegree=Degré de latitude de début de traine -tutti.editFishingOperation.field.gearShootingStartLatitudeMinute=Minute de latitude de début de traine -tutti.editFishingOperation.field.gearShootingStartLatitudeSecond=Seconde de latitude de début de traine -tutti.editFishingOperation.field.gearShootingStartLongitude=Longitude de début de traine -tutti.editFishingOperation.field.gearShootingStartLongitude.tip= -tutti.editFishingOperation.field.gearShootingStartLongitudeDegree=Degré de longitude de début de traine -tutti.editFishingOperation.field.gearShootingStartLongitudeMinute=Minute de longitude de début de traine -tutti.editFishingOperation.field.gearShootingStartLongitudeSecond=Seconde de longitude de début de traine +tutti.editFishingOperation.field.gearLongitude.tip=Longitude +tutti.editFishingOperation.field.gearShootingEnd=Fin de traîne +tutti.editFishingOperation.field.gearShootingEnd.tip=Informations sur la fin de pêche +tutti.editFishingOperation.field.gearShootingEndDate=Date de fin de traîne +tutti.editFishingOperation.field.gearShootingEndLatitude=Latitude de fin de traîne +tutti.editFishingOperation.field.gearShootingEndLatitude.tip=Latitude de fin de traîne +tutti.editFishingOperation.field.gearShootingEndLatitudeDegree=Degré de latitude de fin de traîne +tutti.editFishingOperation.field.gearShootingEndLatitudeMinute=Minute de latitude de fin de traîne +tutti.editFishingOperation.field.gearShootingEndLatitudeSecond=Seconde de latitude de fin de traîne +tutti.editFishingOperation.field.gearShootingEndLongitude=Longitude de fin de traîne +tutti.editFishingOperation.field.gearShootingEndLongitude.tip=Longitude de fin de traîne +tutti.editFishingOperation.field.gearShootingEndLongitudeDegree=Degré de longitude de fin de traîne +tutti.editFishingOperation.field.gearShootingEndLongitudeMinute=Minute de longitude de fin de traîne +tutti.editFishingOperation.field.gearShootingEndLongitudeSecond=Seconde de longitude de fin de traîne +tutti.editFishingOperation.field.gearShootingStart=Début de traîne +tutti.editFishingOperation.field.gearShootingStart.tip=Informations sur le début de pêche +tutti.editFishingOperation.field.gearShootingStartDate=Date de début de traîne +tutti.editFishingOperation.field.gearShootingStartLatitude=Latitude de début de traîne +tutti.editFishingOperation.field.gearShootingStartLatitude.tip=Latitude de début de traîne +tutti.editFishingOperation.field.gearShootingStartLatitudeDegree=Degré de latitude de début de traîne +tutti.editFishingOperation.field.gearShootingStartLatitudeMinute=Minute de latitude de début de traîne +tutti.editFishingOperation.field.gearShootingStartLatitudeSecond=Seconde de latitude de début de traîne +tutti.editFishingOperation.field.gearShootingStartLongitude=Longitude de début de traîne +tutti.editFishingOperation.field.gearShootingStartLongitude.tip=Longitude de début de traîne +tutti.editFishingOperation.field.gearShootingStartLongitudeDegree=Degré de longitude de début de traîne +tutti.editFishingOperation.field.gearShootingStartLongitudeMinute=Minute de longitude de début de traîne +tutti.editFishingOperation.field.gearShootingStartLongitudeSecond=Seconde de longitude de début de traîne tutti.editFishingOperation.field.gearTime=Heure -tutti.editFishingOperation.field.gearTime.tip= +tutti.editFishingOperation.field.gearTime.tip=Heures de début et fin de trait tutti.editFishingOperation.field.location=Localité -tutti.editFishingOperation.field.location.tip= +tutti.editFishingOperation.field.location.tip=Localité de la sous strate ou de la strate tutti.editFishingOperation.field.multirigAggregation=Numéro de poche -tutti.editFishingOperation.field.multirigAggregation.tip= +tutti.editFishingOperation.field.multirigAggregation.tip=N° de la poche au regard du nombre de poches précisé dans la campagne tutti.editFishingOperation.field.recorderPerson=Saisisseur(s) -tutti.editFishingOperation.field.recorderPerson.tip= +tutti.editFishingOperation.field.recorderPerson.tip=Nom(s) du (des) personnes qui ont saisi la données de ce trait tutti.editFishingOperation.field.stationNumber=Code Station -tutti.editFishingOperation.field.stationNumber.tip= +tutti.editFishingOperation.field.stationNumber.tip=Identifiant de la station tutti.editFishingOperation.field.strata=Strate -tutti.editFishingOperation.field.strata.tip= +tutti.editFishingOperation.field.strata.tip=Strate associée au trait tutti.editFishingOperation.field.subStrata=Sous strate -tutti.editFishingOperation.field.subStrata.tip= +tutti.editFishingOperation.field.subStrata.tip=Sous strate associée au trait tutti.editFishingOperation.field.trawlDistance=Distance chalutée (m) tutti.editFishingOperation.field.trawlDistance.inMilles.tip=%s milles marins -tutti.editFishingOperation.field.trawlDistance.tip= +tutti.editFishingOperation.field.trawlDistance.tip=Distance chalutée en mètres tutti.editFishingOperation.field.vessel=Navire -tutti.editFishingOperation.field.vessel.tip= +tutti.editFishingOperation.field.vessel.tip=Navire du trait tutti.editFishingOperation.label.traitReminder=Trait \: %s tutti.editFishingOperation.label.traitReminder.inCreation=en cours de création tutti.editFishingOperation.pane.other=Autres caractéristiques @@ -613,7 +583,7 @@ 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.tip=Poids (Kg) +tutti.editMarineLitterBatch.table.header.weight.tip=Poids (kg) tutti.editPlanktonBatch.table.header.comment=Commentaire tutti.editPlanktonBatch.table.header.comment.tip= tutti.editPlanktonBatch.table.header.file=Pièces jointes @@ -629,19 +599,19 @@ tutti.editPlanktonBatch.table.header.weight=Poids tutti.editPlanktonBatch.table.header.weight.tip= tutti.editProgram.action.closeEditProgram=Fermer -tutti.editProgram.action.closeEditProgram.mnemonic=F -tutti.editProgram.action.closeEditProgram.tip=Annuler l'édition (ou la création) de la série de campagne +tutti.editProgram.action.closeEditProgram.mnemonic=r +tutti.editProgram.action.closeEditProgram.tip=Annuler l'édition (ou la création) de la série de campagne, ou fermer l'éditeur suite à un enregistrement tutti.editProgram.action.saveProgram=Enregistrer tutti.editProgram.action.saveProgram.mnemonic=E -tutti.editProgram.action.saveProgram.tip=Enregistrer la série de campagne +tutti.editProgram.action.saveProgram.tip=Enregistrer les modifications tutti.editProgram.askCancelEditBeforeLeaving.cancelSaveProgram=La série de campagne n'est pas valide et ne peut pas être enregistrée. tutti.editProgram.askSaveBeforeLeaving.saveProgram=Des modifications sur la série de campagne n'ont pas été enregistrées. tutti.editProgram.field.description=Description -tutti.editProgram.field.description.tip= +tutti.editProgram.field.description.tip=Description de la série, champ obligatoire tutti.editProgram.field.name=Nom -tutti.editProgram.field.name.tip= +tutti.editProgram.field.name.tip=Nom de la série de campagne (exemple EVHOE) tutti.editProgram.field.zone=Zone -tutti.editProgram.field.zone.tip= +tutti.editProgram.field.zone.tip=Zone couverte par la série de campagne tutti.editProgram.title.create.program=Créer une nouvelle série de campagne tutti.editProgram.title.edit.program=Éditer une série de campagne existante tutti.editProtocol.action.addBenthosProtocol.mnemonic=j @@ -658,15 +628,15 @@ tutti.editProtocol.action.exportProtocolAllCaracteristic.mnemonic=t tutti.editProtocol.action.exportProtocolAllCaracteristic.tip=Exporter toutes les caractéristiques (sans les affecter à un écran) tutti.editProtocol.action.exportProtocolBenthos=Exporter les benthos -tutti.editProtocol.action.exportProtocolBenthos.mnemonic=x +tutti.editProtocol.action.exportProtocolBenthos.mnemonic=b tutti.editProtocol.action.exportProtocolBenthos.tip=Exporter les benthos du protocole tutti.editProtocol.action.exportProtocolCaracteristic=Exporter les caractéristiques -tutti.editProtocol.action.exportProtocolCaracteristic.mnemonic=x +tutti.editProtocol.action.exportProtocolCaracteristic.mnemonic=c tutti.editProtocol.action.exportProtocolCaracteristic.tip=Exporter les caractéristiques du protocole tutti.editProtocol.action.exportProtocolSpecies=Exporter les espèces -tutti.editProtocol.action.exportProtocolSpecies.mnemonic=x +tutti.editProtocol.action.exportProtocolSpecies.mnemonic=è tutti.editProtocol.action.exportProtocolSpecies.tip=Exporter les espèces du protocole -tutti.editProtocol.action.exportPupitri=Export pupitri +tutti.editProtocol.action.exportPupitri=Export Pupitri tutti.editProtocol.action.exportPupitri.mnemonic=p tutti.editProtocol.action.exportPupitri.tip=Exporter les espèces au format Pupitri tutti.editProtocol.action.importProtocolBenthos=Importer les benthos @@ -676,7 +646,7 @@ tutti.editProtocol.action.importProtocolCaracteristic.mnemonic=i tutti.editProtocol.action.importProtocolCaracteristic.tip=Importer les caractéristiques dans le protocole tutti.editProtocol.action.importProtocolSpecies=Importer les espèces -tutti.editProtocol.action.importProtocolSpecies.mnemonic=i +tutti.editProtocol.action.importProtocolSpecies.mnemonic=é tutti.editProtocol.action.importProtocolSpecies.tip=Importer les espèces dans le protocole tutti.editProtocol.action.removeBenthosProtocol=Supprimer le benthos tutti.editProtocol.action.removeBenthosProtocol.mnemonic=S @@ -686,13 +656,13 @@ tutti.editProtocol.action.removeSpeciesProtocol.tip=Supprimer l'espèce tutti.editProtocol.action.saveProtocol=Enregistrer tutti.editProtocol.action.saveProtocol.mnemonic=E -tutti.editProtocol.action.saveProtocol.tip=Enregistrer le protocol +tutti.editProtocol.action.saveProtocol.tip=Enregistrer le protocole tutti.editProtocol.action.selectOtherBenthos=... tutti.editProtocol.action.selectOtherBenthos.mnemonic=. -tutti.editProtocol.action.selectOtherBenthos.tip=Sélectionner une autre espèce +tutti.editProtocol.action.selectOtherBenthos.tip=Sélectionner une autre espèce (dans les synonymes) tutti.editProtocol.action.selectOtherSpecies=... tutti.editProtocol.action.selectOtherSpecies.mnemonic=. -tutti.editProtocol.action.selectOtherSpecies.tip=Sélectionner une autre espèce +tutti.editProtocol.action.selectOtherSpecies.tip=Sélectionner une autre espèce (dans les synonymes) tutti.editProtocol.askCancelEditBeforeLeaving.cancelSaveProtocol=Le protocole n'est pas valide et ne peut pas être enregistré. tutti.editProtocol.askSaveBeforeLeaving.saveProtocol=Des modifications sur le protocole n'ont pas été enregistrées. tutti.editProtocol.field.benthos.tip=Benthos @@ -701,43 +671,41 @@ tutti.editProtocol.field.protocol.name=Nom tutti.editProtocol.field.protocol.name.tip=Nom du protocole tutti.editProtocol.field.species.tip=Espèces -tutti.editProtocol.tab.accidental=Accidental tutti.editProtocol.tab.benthos=Benthos tutti.editProtocol.tab.caracteristic=Caractéristiques -tutti.editProtocol.tab.caracteristic.gearUseFeature=Mise en oeuvre de l'engin +tutti.editProtocol.tab.caracteristic.gearUseFeature=Mise en œuvre de l'engin tutti.editProtocol.tab.caracteristic.lengthClasses=Classes de taille -tutti.editProtocol.tab.caracteristic.vesselUseFeature=Mise en oeuvre du navire +tutti.editProtocol.tab.caracteristic.vesselUseFeature=Mise en œuvre du navire tutti.editProtocol.tab.info=Informations générales -tutti.editProtocol.tab.plankton=Plancton tutti.editProtocol.tab.species=Espèces tutti.editProtocol.table.header.age=Age -tutti.editProtocol.table.header.age.tip=Catégorisation sur l'age ? +tutti.editProtocol.table.header.age.tip=Catégorisation sur l'âge ? (usage pour les coquilles st jacques) tutti.editProtocol.table.header.calcifySample=Prélèvement de pièces calcifiées -tutti.editProtocol.table.header.calcifySample.tip=Prélèvement de pièces calcifiées +tutti.editProtocol.table.header.calcifySample.tip=Prélèvement de pièces calcifiées (pour les données individuelles) tutti.editProtocol.table.header.countIfNoFrequency=Dénombrement -tutti.editProtocol.table.header.countIfNoFrequency.tip=Dénombrement -tutti.editProtocol.table.header.lengthStep=Classe de Taille -tutti.editProtocol.table.header.lengthStep.tip=Comment mesurer les classes de taille (si vide alors pas de mesure) +tutti.editProtocol.table.header.countIfNoFrequency.tip=L'espèce doit elle être dénombrée ? +tutti.editProtocol.table.header.lengthStep=Mode de mensuration +tutti.editProtocol.table.header.lengthStep.tip=Comment mesurer les classes de taille ? (si vide alors pas de mesure) tutti.editProtocol.table.header.maturity=Maturité tutti.editProtocol.table.header.maturity.tip=Catégorisation sur la maturité ? tutti.editProtocol.table.header.sex=Sexe -tutti.editProtocol.table.header.sex.tip=Catégorisation sur le sexe ? +tutti.editProtocol.table.header.sex.tip=L'espèce doit elle être sexée ? tutti.editProtocol.table.header.size=Catégorie Tri -tutti.editProtocol.table.header.size.tip=Catégorisation sur la catégorie de tri ? +tutti.editProtocol.table.header.size.tip=Catégorisation en gros / petit etc. ? tutti.editProtocol.table.header.speciesReferenceTaxonId=Espèce -tutti.editProtocol.table.header.speciesReferenceTaxonId.tip=Espèce (code refTax - nom scientifique) -tutti.editProtocol.table.header.speciesSurveyCode=Code -tutti.editProtocol.table.header.speciesSurveyCode.tip=Code campagne (non synchronisable) +tutti.editProtocol.table.header.speciesReferenceTaxonId.tip=Code Rubin – Nom scientifique +tutti.editProtocol.table.header.speciesSurveyCode=Code campagne +tutti.editProtocol.table.header.speciesSurveyCode.tip=Code campagne (non synchronisable dans H2) tutti.editProtocol.table.header.weight=Pesée -tutti.editProtocol.table.header.weight.tip=Pesée +tutti.editProtocol.table.header.weight.tip=L'espèce doit elle être pesée ? tutti.editProtocol.title.choose.benthosExportFile=Exporter les benthos tutti.editProtocol.title.choose.benthosImportFile=Importer les benthos tutti.editProtocol.title.choose.caracteristicExportFile=Exporter les caractéristiques tutti.editProtocol.title.choose.caracteristicImportFile=Importer les caractéristiques tutti.editProtocol.title.choose.speciesExportFile=Exporter les espèces tutti.editProtocol.title.choose.speciesImportFile=Importer les espèces -tutti.editProtocol.title.create.protocol=Créer un nouveau protocol de saisie -tutti.editProtocol.title.edit.protocol=Éditer un protocol de saisie existant +tutti.editProtocol.title.create.protocol=Créer un nouveau protocole de saisie +tutti.editProtocol.title.edit.protocol=Éditer un protocole de saisie existant tutti.editProtocol.warn.clone=Le protocole que vous venez de cloner ne sera sauvegardé que lorsque vous cliquerez sur le bouton "Enregistrer". tutti.editProtocol.warn.import=Le protocole que vous venez d'importer ne sera sauvegardé que lorsque vous cliquerez sur le bouton "Enregistrer". tutti.editSpeciesBatch.action.createBatch=Créer un lot pour une espèce @@ -759,17 +727,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= +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.speciesTotalLivingNotItemizedWeight=Poids vivant non détaillé trié (kg) -tutti.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight.tip= +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.speciesTotalSampleSortedWeight=Poids VRAC trié (kg) -tutti.editSpeciesBatch.field.speciesTotalSampleSortedWeight.tip= +tutti.editSpeciesBatch.field.speciesTotalSampleSortedWeight.tip=Poids total des espèces triées (poissons, crustacés etc.) tutti.editSpeciesBatch.field.speciesTotalSortedWeight=Poids total VRAC (kg) -tutti.editSpeciesBatch.field.speciesTotalSortedWeight.tip= +tutti.editSpeciesBatch.field.speciesTotalSortedWeight.tip=Poids total VRAC des espèces dans la capture (poissons, crustacés etc.) tutti.editSpeciesBatch.field.speciesTotalUnsortedWeight=Poids total HORS VRAC (kg) -tutti.editSpeciesBatch.field.speciesTotalUnsortedWeight.tip= +tutti.editSpeciesBatch.field.speciesTotalUnsortedWeight.tip=Poids total HORS VRAC des espèces dans la capture (sans les captures accidentelles) tutti.editSpeciesBatch.field.speciesTotalWeight=Poids TOTAL (kg) -tutti.editSpeciesBatch.field.speciesTotalWeight.tip= +tutti.editSpeciesBatch.field.speciesTotalWeight.tip=Poids total des espèces dans la capture (poissons, crustacés etc.) tutti.editSpeciesBatch.filterBatch=Filtre tutti.editSpeciesBatch.filterBatch.mode.all=Aucun tutti.editSpeciesBatch.filterBatch.mode.all.tip=Pas de filtre (tous les lots sont visibles) @@ -792,22 +760,21 @@ tutti.editSpeciesBatch.table.header.species=Espèce tutti.editSpeciesBatch.table.header.toConfirm=A Confirmer tutti.editSpeciesBatch.table.header.weight=Poids sous-échantillonné (kg) -tutti.editSpeciesBatch.title.batchActions=Actions tutti.editSpeciesFrequencies.action.cancel=Annuler tutti.editSpeciesFrequencies.action.cancel.mnemonic=A -tutti.editSpeciesFrequencies.action.cancel.tip=Anuler l'édition des mensurations +tutti.editSpeciesFrequencies.action.cancel.tip=Annuler l'édition des mensurations tutti.editSpeciesFrequencies.action.generate=Générer tutti.editSpeciesFrequencies.action.generate.mnemonic=G tutti.editSpeciesFrequencies.action.generate.tip=Générer les mensurations tutti.editSpeciesFrequencies.action.save=Enregistrer tutti.editSpeciesFrequencies.action.save.mnemonic=E -tutti.editSpeciesFrequencies.action.save.tip=Enreigstrer les mensurations +tutti.editSpeciesFrequencies.action.save.tip=Enregistrer les mensurations tutti.editSpeciesFrequencies.field.lengthStepCaracteristic=Type de mesure -tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.tip= +tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.tip=Méthode de mensuration des individus tutti.editSpeciesFrequencies.field.maxStep=Classe max -tutti.editSpeciesFrequencies.field.maxStep.tip= +tutti.editSpeciesFrequencies.field.maxStep.tip=Taille maximale mesurée tutti.editSpeciesFrequencies.field.minStep=Classe min -tutti.editSpeciesFrequencies.field.minStep.tip= +tutti.editSpeciesFrequencies.field.minStep.tip=Taille minimale mesurée tutti.editSpeciesFrequencies.field.mode.autoGen=Génération des classes tutti.editSpeciesFrequencies.field.mode.autoGen.tip=Mode où toutes les classes de taille sont générées tutti.editSpeciesFrequencies.field.mode.rafale=Mode "rafale" @@ -817,11 +784,11 @@ tutti.editSpeciesFrequencies.field.mode.simpleCounting=Mode simple dénombrement 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= +tutti.editSpeciesFrequencies.field.rafaleStep.tip=Saisir à la suite les différentes tailles mesurées tutti.editSpeciesFrequencies.field.simpleCounting=Nombre -tutti.editSpeciesFrequencies.field.simpleCounting.tip= +tutti.editSpeciesFrequencies.field.simpleCounting.tip=Saisir le nombre d'individus dans le lot tutti.editSpeciesFrequencies.field.step=Pas de la classe de taille -tutti.editSpeciesFrequencies.field.step.tip= +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.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 @@ -837,10 +804,9 @@ tutti.fishingOperations.info.no.fishingOperation.selected=< Aucun trait sélectionné > tutti.fishingOperations.title.edit.operations=Saisie des opérations de pêches (%s) tutti.fishingOperations.title.validate.operations=Validation des opérations de pêches (%s) -tutti.fishingOperations.warn.invalid.batch.model=L'arbre d'échantillonage n'est pas compatible. Les captures ne seront pas visibles. +tutti.fishingOperations.warn.invalid.batch.model=L'arbre d’échantillonnage n'est pas compatible. Les captures ne seront pas visibles. tutti.flash.info.all.caractristic.exported=Toutes les caractéristiques exportées dans le fichier <strong>%s</strong>. tutti.flash.info.benthos.add.to.protocol=Le benthos <strong>%s</strong> a été ajoutée au protocole. -tutti.flash.info.benthos.exported.from.protocol=Benthos du protocole exportées dans le fichier <strong>%s</strong>. tutti.flash.info.benthos.imported.in.protocol=Benthos importés dans le protocole depuis le fichier <strong>%s</strong>. tutti.flash.info.benthos.imported.in.protocol.oneReplaced=Benthos importés dans le protocole depuis le fichier <strong>%s</strong>. 1 remplacée par son référent. tutti.flash.info.benthos.imported.in.protocol.severalReplaced=Benthos importés dans le protocole depuis le fichier <strong>%s</strong>. %s remplacées par leur référent. @@ -871,36 +837,29 @@ tutti.gearUseFeatureTable.action.removeCaracteristic.tip=Supprimer la caractéristique tutti.gearUseFeatureTable.table.header.key=Caractéristique tutti.gearUseFeatureTable.table.header.value=Valeur -tutti.gearUseFeatureTable.title=Mise en oeuvre de l'engin +tutti.gearUseFeatureTable.title=Mise en œuvre de l'engin tutti.importProtocol.action.success=Protocole [%s] lu depuis le fichier. tutti.importPupitri.carrouselFile.extension=car tutti.importPupitri.carrouselFile.extension.description=Fichier du carrousel (.car) tutti.importPupitri.error.fileMissing.message=Vous devez sélectionner un fichier pour le trémie et un fichier pour le carrousel pour pouvoir continuer l'import. tutti.importPupitri.error.fileMissing.title=Fichier non renseigné tutti.importPupitri.field.carrouselFile=Fichier du carrousel -tutti.importPupitri.field.speciesFile=Fichier des espèces tutti.importPupitri.field.trunkFile=Fichier du trémie -tutti.importPupitri.speciesFile.extension=ibts -tutti.importPupitri.speciesFile.extension.description=Fichier des espèces (.ibts) tutti.importPupitri.title=Import Pupitri tutti.importPupitri.trunkFile.extension=tnk tutti.importPupitri.trunkFile.extension.description=Fichier du trémie (.tnk) tutti.label.catches.planktonTotalSampleWeight=Poids total échantillonné tutti.label.catches.planktonTotalWeight=Poids total -tutti.label.tab.accidental=Captures accidentelles -tutti.label.tab.benthos=Benthos tutti.label.tab.catches=Captures tutti.label.tab.catchesCaracteristics=Résumé tutti.label.tab.fishingOperation=Trait -tutti.label.tab.individualObservations=Observations individuelles tutti.label.tab.marineLitter=Macro déchets tutti.label.tab.plancton=Plancton -tutti.label.tab.species=Espèces tutti.legend.frequencyConfiguration=Configuration tutti.legend.splitBenthosBatchConfiguration= tutti.legend.splitSpeciesBatchConfiguration=Configuration tutti.main.action.about=À propos -tutti.main.action.about.mnemonic=p +tutti.main.action.about.mnemonic=À tutti.main.action.about.tip=À Propos tutti.main.action.changeLocale.mnemonic=l tutti.main.action.changeLocale.tip=Changer de langue @@ -956,14 +915,14 @@ tutti.main.menu.actions.mnemonic=c tutti.main.menu.actions.tip=Actions tutti.main.menu.administration=Administration -tutti.main.menu.administration.mnemonic=m +tutti.main.menu.administration.mnemonic=d tutti.main.menu.administration.tip=Administrer Tutti tutti.main.menu.changeLocale=Langue tutti.main.menu.file=Fichier tutti.main.menu.file.mnemonic=h tutti.main.menu.file.tip=Fichier tutti.main.menu.help=Aide -tutti.main.menu.help.mnemonic=d +tutti.main.menu.help.mnemonic=A tutti.main.menu.help.tip=Aide tutti.main.title.applicationName=Tutti tutti.main.title.noSelectedCruise=Pas de campagne sélectionné @@ -1002,16 +961,16 @@ tutti.manageTemporaryReferential.action.importTemporaryVessel=Importer tutti.manageTemporaryReferential.action.importTemporaryVessel.tip=Importer un référentiel temporaire de navires tutti.manageTemporaryReferential.field.gear=Référentiel Engin -tutti.manageTemporaryReferential.field.gear.tip= +tutti.manageTemporaryReferential.field.gear.tip=Gestion du référentiel temporaire pour les engins tutti.manageTemporaryReferential.field.person=Référentiel Personne -tutti.manageTemporaryReferential.field.person.tip= +tutti.manageTemporaryReferential.field.person.tip=Gestion du référentiel temporaire pour les personnes tutti.manageTemporaryReferential.field.species=Référentiel Espèce -tutti.manageTemporaryReferential.field.species.tip= +tutti.manageTemporaryReferential.field.species.tip=Gestion du référentiel temporaire pour les espèces tutti.manageTemporaryReferential.field.vessel=Référentiel Navire -tutti.manageTemporaryReferential.field.vessel.tip= +tutti.manageTemporaryReferential.field.vessel.tip=Gestion du référentiel temporaire pour les navires tutti.manageTemporaryReferential.passwordDialog.error.message=Le mot de passe que vous avez entré est incorrect. tutti.manageTemporaryReferential.passwordDialog.error.title=Mot de passe incorrect -tutti.manageTemporaryReferential.passwordDialog.message=Vous souhaitez entrer dans une partie sensible de l'application.\nVous devez entrer le mot de passe pour entrer. +tutti.manageTemporaryReferential.passwordDialog.message=Vous souhaitez entrer dans une partie sensible de l'application.\nVous devez entrer le mot de passe pour continuer. tutti.manageTemporaryReferential.passwordDialog.title=Zone sensible tutti.manageTemporaryReferential.title=importer des référentiels temporaires tutti.manageTemporaryReferential.title.choose.exportTemporaryGearExampleFile=Exporter un exemple de référentiel Engin @@ -1023,28 +982,23 @@ tutti.manageTemporaryReferential.title.choose.importTemporarySpeciesFile=Importer un réferentiel Espèce tutti.manageTemporaryReferential.title.choose.importTemporaryVesselFile=Importer un réferentiel Navire tutti.message.action.running=<html>Action <strong>%s</strong> en cours d'execution...<hr/></html> -tutti.sampleCategoryType.age=Age -tutti.sampleCategoryType.maturity=Maturité -tutti.sampleCategoryType.sex=Sexe -tutti.sampleCategoryType.size=Class Tri. -tutti.sampleCategoryType.sortedUnsorted=V/HV tutti.selectBenthos.title=Choisissez un benthos tutti.selectCruise.action.chooseProtocolFile=Choisir le fichier de protocole tutti.selectCruise.action.cloneProtocol=Cloner tutti.selectCruise.action.cloneProtocol.tip=Dupliquer le protocole sélectionné tutti.selectCruise.action.deleteProtocol=Supprimer -tutti.selectCruise.action.deleteProtocol.message=Vous êtes sur le point de supprimer le protocol %s -tutti.selectCruise.action.deleteProtocol.tip=Supprimer le protocole sélectioné -tutti.selectCruise.action.deleteProtocol.title=Supprimer le protocole sélectioné +tutti.selectCruise.action.deleteProtocol.message=Vous êtes sur le point de supprimer le protocole %s +tutti.selectCruise.action.deleteProtocol.tip=Supprimer le protocole sélectionné +tutti.selectCruise.action.deleteProtocol.title=Supprimer le protocole sélectionné tutti.selectCruise.action.editCatches=Saisir les captures tutti.selectCruise.action.editCatches.mnemonic=S -tutti.selectCruise.action.editCatches.tip=Saisir des captures +tutti.selectCruise.action.editCatches.tip=Ouvrir les écrans de saisie des captures tutti.selectCruise.action.editCruise=Éditer tutti.selectCruise.action.editCruise.tip=Éditer la campagne sélectionnée tutti.selectCruise.action.editProgram=Éditer tutti.selectCruise.action.editProgram.tip=Éditer le programme sélectionné tutti.selectCruise.action.editProtocol=Éditer -tutti.selectCruise.action.editProtocol.tip=Éditer le protocol sélectionné +tutti.selectCruise.action.editProtocol.tip=Éditer le protocole sélectionné tutti.selectCruise.action.exportProtocol=Exporter tutti.selectCruise.action.exportProtocol.tip=Exporter le protocole sélectionné tutti.selectCruise.action.importProtocol=Importer @@ -1059,13 +1013,13 @@ tutti.selectCruise.action.sendCruiseReport.tip=Envoyer le rapport de la campagne tutti.selectCruise.action.validateCatches=Valider les captures tutti.selectCruise.action.validateCatches.mnemonic=V -tutti.selectCruise.action.validateCatches.tip=Valider les captures +tutti.selectCruise.action.validateCatches.tip=Lancer le processus de validation des données tutti.selectCruise.field.cruise=Campagne -tutti.selectCruise.field.cruise.tip= +tutti.selectCruise.field.cruise.tip=Nom de la campagne tutti.selectCruise.field.program=Série de campagne -tutti.selectCruise.field.program.tip= -tutti.selectCruise.field.protocol=Protocol de saisie -tutti.selectCruise.field.protocol.tip= +tutti.selectCruise.field.program.tip=Nom de la série de campagne +tutti.selectCruise.field.protocol=Protocole de saisie +tutti.selectCruise.field.protocol.tip=Nom du protocole de saisie tutti.selectCruise.title=Sélection de la campagne tutti.selectCruise.title.choose.exportFile=Exporter le protocole tutti.selectCruise.title.choose.importFile=Importer le protocole @@ -1079,7 +1033,7 @@ tutti.selectSpecies.title=Choisissez une espèce tutti.sendCruiseReport.action.chooseFile=Choisir le fichier de rapport tutti.sendCruiseReport.action.success=Les captures ont correctement été exporté dans le fichier %s -tutti.sendCruiseReport.mail.body=Bonjour,\n\nveuillez trouver ci-joint le rapport des captures de la campagne %1s.\n*Pensez à joindre le fichier %2s*\n\nCordialement,\n\n*Votre nom* +tutti.sendCruiseReport.mail.body=Bonjour,\n\nVeuillez trouver ci-joint le rapport des captures de la campagne %1s.\n*Pensez à joindre le fichier %2s*\n\nCordialement,\n\n*Votre nom* tutti.sendCruiseReport.mail.subject=Captures de la campagne %s tutti.sendCruiseReport.title.choose.exportFile=Exporter les captures de la campagne tutti.splitBenthosBatch.action.cancel=Annuler @@ -1089,13 +1043,13 @@ tutti.splitBenthosBatch.action.save.mnemonic=E tutti.splitBenthosBatch.action.save.tip=Sauver le sous-échantillonage tutti.splitBenthosBatch.field.batchWeight=Poids total à catégoriser -tutti.splitBenthosBatch.field.batchWeightField.tip= +tutti.splitBenthosBatch.field.batchWeightField.tip=Poids du lot père (si renseigné) tutti.splitBenthosBatch.field.category=Catégorie -tutti.splitBenthosBatch.field.categoryField.tip= +tutti.splitBenthosBatch.field.categoryField.tip=Choisir le mode de catégorisation tutti.splitBenthosBatch.field.sampleWeight=Poids total catégorisé -tutti.splitBenthosBatch.field.sampleWeightField.tip= +tutti.splitBenthosBatch.field.sampleWeightField.tip=Somme des poids saisis ci-dessous tutti.splitBenthosBatch.field.species=Espèce -tutti.splitBenthosBatch.field.speciesField.tip= +tutti.splitBenthosBatch.field.speciesField.tip=Espèce du lot père tutti.splitBenthosBatch.table.header.category=Catégorie tutti.splitBenthosBatch.table.header.selected=Sélection tutti.splitBenthosBatch.table.header.weight=Poids (kg) @@ -1107,28 +1061,26 @@ tutti.splitSpeciesBatch.action.save.mnemonic=E tutti.splitSpeciesBatch.action.save.tip=Sauver le sous-échantillonage tutti.splitSpeciesBatch.field.batchWeight=Poids total à catégoriser -tutti.splitSpeciesBatch.field.batchWeightField.tip= +tutti.splitSpeciesBatch.field.batchWeightField.tip=Poids du lot père (si renseigné) tutti.splitSpeciesBatch.field.category=Catégorie -tutti.splitSpeciesBatch.field.categoryField.tip= +tutti.splitSpeciesBatch.field.categoryField.tip=Choisir le mode de catégorisation tutti.splitSpeciesBatch.field.sampleWeight=Poids total catégorisé -tutti.splitSpeciesBatch.field.sampleWeightField.tip= +tutti.splitSpeciesBatch.field.sampleWeightField.tip=Somme des poids saisis ci-dessous tutti.splitSpeciesBatch.field.species=Espèce -tutti.splitSpeciesBatch.field.speciesField.tip= +tutti.splitSpeciesBatch.field.speciesField.tip=Espèce du lot père tutti.splitSpeciesBatch.table.header.category=Catégorie tutti.splitSpeciesBatch.table.header.selected=Sélection tutti.splitSpeciesBatch.table.header.weight=Poids (kg) tutti.splitSpeciesBatch.title=Catégorisation du lot tutti.timeeditor.H=H -tutti.to.be.done=< A FAIRE > tutti.update.db=Base de données tutti.update.help=Aide en ligne tutti.update.i18n=Traductions tutti.update.jre=Java tutti.update.tutti=Tutti -tutti.updateApplication.message.success=La mise à jour nécessite le rédémarrage du Tutti.\nL'application va se fermer puis se réouvrir automatiquement. +tutti.updateApplication.message.success=La mise à jour nécessite le redémarrage du Tutti.\nL'application va se fermer puis se ré-ouvrir automatiquement. tutti.updateApplication.noUpdate=Aucune mise à jour de l'application détectée. tutti.updateApplication.title.success=Redémarrage de Tutti nécessaire... -tutti.validator.error.comment.too.long=Taille de commentaire trop longue (limitée à %s caractères) 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 @@ -1143,50 +1095,15 @@ tutti.validator.error.createSpeciesBatch.sortedUnsortedCategory.required=La catégorie Vrac / Hors Vrac est obligatoire tutti.validator.error.createSpeciesBatch.species.required=L'espèce est obligatoire tutti.validator.error.createSpeciesBatch.speciesAndCategory.notAvailable=Couple (espèce - Vrac/Hors Vrac) déjà utilisée -tutti.validator.error.cruise.beginDate.required=La date de début est obligatoire -tutti.validator.error.cruise.country.required=Le pays est obligatoire -tutti.validator.error.cruise.dates.endBeforeStart=La date de fin doit être après la date de début -tutti.validator.error.cruise.departureLocation.required=Le port d'embarquement est obligatoire -tutti.validator.error.cruise.endDate.required=La date de fin est obligatoire -tutti.validator.error.cruise.gear.required=Au moins un engin doit être sélectionné -tutti.validator.error.cruise.headOfMission.required=Au moins un chef de mission doit être sélectionné -tutti.validator.error.cruise.headOfSortRoom.required=Au moins un responsable de salle de tri doit être sélectionné -tutti.validator.error.cruise.multirigNumber.required=Le nombre de poche est obligatoire -tutti.validator.error.cruise.name.required=Le nom de la campagne est obligatoire -tutti.validator.error.cruise.program.required=La série est obligatoire -tutti.validator.error.cruise.returnLocation.required=Le port de débarquement est obligatoire -tutti.validator.error.cruise.vessel.required=Au moins un bateau doit être sélectionné -tutti.validator.error.cruise.year.required=L'année est obligatoire -tutti.validator.error.fishingOperation.catcher.required=Au moins un saisisseur est obligatoire -tutti.validator.error.fishingOperation.comment.required=Le commentaire est obligatoire si le traît est invalide tutti.validator.error.fishingOperation.date.end.required=La date de la fin du trait est obligatoire -tutti.validator.error.fishingOperation.date.start.required=La date du début du trait est obligatoire -tutti.validator.error.fishingOperation.dates.endBeforeStart=La date de fin doit être après la date de début tutti.validator.error.fishingOperation.dates.endOutOfCruiseDates=La date de fin est en dehors des dates de la campagne tutti.validator.error.fishingOperation.dates.startOutOfCruiseDates=La date de début est en dehors des dates de la campagne tutti.validator.error.fishingOperation.dates.wrongTime=La durée du trait dépasse 45 minutes ou est inférieure à 20 minutes, merci de vérifier les dates/heures du trait -tutti.validator.error.fishingOperation.existingKey=La clé code station/numéro de trait/date de début existe déjà -tutti.validator.error.fishingOperation.fishingOperationNumber.required=Le numéro de trait est obligatoire -tutti.validator.error.fishingOperation.fishingOperationValid.required=La validité du traît est obligatoire -tutti.validator.error.fishingOperation.gear.required=L'engin est obligatoire -tutti.validator.error.fishingOperation.stationNumber.required=Le numéro de station est obligatoire -tutti.validator.error.fishingOperation.stationNumber.too.long=Valeur trop longue (limitée à %s caractères) -tutti.validator.error.fishingOperation.strataLocation.required=La strate, sous-strate ou localité doit être renseignée -tutti.validator.error.fishingOperation.trawlDistance.required=La distance est obligatoire -tutti.validator.error.fishingOperation.trawlDistance.tooLong=La distance du trait dépasse 3 milles marin (5556 m), merci de vérifier les coordonnées -tutti.validator.error.fishingOperation.trawlNetNumber.required=Le numéro de poche est obligatoire -tutti.validator.error.fishingOperation.vessel.required=Le navire est obligatoire tutti.validator.error.latitude.end.required=La latitude de fin de traîne est obligatoire tutti.validator.error.latitude.start.required=La latitude de début de traîne est obligatoire tutti.validator.error.longitude.end.required=La longitude de fin de traîne est obligatoire tutti.validator.error.longitude.start.required=La longitude de début de traîne est obligatoire -tutti.validator.error.program.description.required=La description de la série est obligatoire -tutti.validator.error.program.description.too.long=Taille de la description trop longue (limitée à %s caractères) -tutti.validator.error.program.existingKey=Le couple nom/zone existe déjà -tutti.validator.error.program.name.required=Le nom de la série est obligatoire tutti.validator.error.program.zone.required=La zone de la série est obligatoire -tutti.validator.error.protocol.name.alreadyUsed=Le nom du protocol est déjà utilisé -tutti.validator.error.protocol.name.required=Le nom du protocol 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.splitSpeciesBatch.sampleWeight.invalidValue=La somme des poids ventilés doit être strictement positive @@ -1195,11 +1112,9 @@ tutti.validator.warning.cruise.name.format=Le format n'est pas celui ... tutti.validator.warning.latitude.degree.outOfBounds=Le degré de la latitude doit être compris entre -90 et 90 tutti.validator.warning.latitude.minute.outOfBounds=La minute de la latitude doit être comprise entre 0 et 59 -tutti.validator.warning.latitude.outOfBounds=La Latitude doit être comprise entre -90.0 et 90.0 tutti.validator.warning.latitude.second.outOfBounds=La seconde de la latitude doit être comprise entre 0 et 59 tutti.validator.warning.longitude.degree.outOfBounds=Le degré de la longitude doit être compris entre -180 et 180 tutti.validator.warning.longitude.minute.outOfBounds=La minute de la longitude doit être comprise entre 0 et 59 -tutti.validator.warning.longitude.outOfBounds=La longitude doit être comprise entre -180.0 et 180.0 tutti.validator.warning.longitude.second.outOfBounds=La seconde de la longitude doit être comprise entre 0 et 59 tutti.vesselUseFeatureTable.action.removeCaracteristic=Supprimer tutti.vesselUseFeatureTable.action.removeCaracteristic.mnemonic=S

1 0

r839 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service tutti-persistence/src/main/resources tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service tutti-service/src/main/java/fr/ifremer/tutti/service/catches tutti-service/src/main/java/fr/ifremer/tutti/service/export tutti-service/src/main/resources/ftl tutti-ui-swing/src/main/filtered-resources tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise tutti-ui-swing/src/main/java/fr/i
by tchemit＠users.forge.codelutin.com 21 Apr '13

21 Apr '13

Author: tchemit Date: 2013-04-21 13:29:20 +0200 (Sun, 21 Apr 2013) New Revision: 839 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/839 Log: refs #1875: [IMP/EXP] - Export des donn?\195?\169es de campagne : format g?\195?\169n?\195?\169rique + add missing stuff Added: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportSampleCategory.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java trunk/tutti-persistence/src/main/resources/tutti-db-enumerations.properties trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceReadTest.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ExportCatchesReportService.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/CatchExportRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java trunk/tutti-service/src/main/resources/ftl/catchesReport_fr.ftl trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SendCruiseReportAction.java trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIModel-error-validation.xml trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/icons/action-email.png Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java 2013-04-20 14:33:56 UTC (rev 838) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java 2013-04-21 11:29:20 UTC (rev 839) @@ -272,7 +272,9 @@ Preconditions.checkNotNull(species); Preconditions.checkNotNull(species.getReferenceTaxonId()); - catchBatchDao.setSortingBatchReferenceTaxon(batchId, species.getReferenceTaxonId()); + catchBatchDao.setSortingBatchReferenceTaxon( + batchId, + species.getReferenceTaxonId()); } //------------------------------------------------------------------------// @@ -284,24 +286,11 @@ String speciesBatchId) { Preconditions.checkNotNull(speciesBatchId); -// List<SpeciesBatchFrequency> results = Lists.newArrayList(); -// -// Integer sortingBatchId = Integer.valueOf(speciesBatchId); -// Integer catchBatchId = catchBatchDao.getIdBySortingBatchId(sortingBatchId); -// Preconditions.checkNotNull( -// catchBatchId, -// "Could not find catchBatch for speciesBatch: " + speciesBatchId); -// -// CatchBatch catchBatch = catchBatchDao.loadFullTree(catchBatchId); -// -// SortingBatch sortingBatch = catchBatchDao.getSortingBatchById( -// catchBatch, sortingBatchId); -// -// List<SortingBatch> frequencyChilds = batchHelper.getFrequencyChilds(sortingBatch); List<SortingBatch> frequencyChilds = batchHelper.getFrequencies(speciesBatchId); List<SpeciesBatchFrequency> results = Lists.newArrayList(); for (SortingBatch child : frequencyChilds) { - SpeciesBatchFrequency target = TuttiBeanFactory.newSpeciesBatchFrequency(); + SpeciesBatchFrequency target = + TuttiBeanFactory.newSpeciesBatchFrequency(); entityToSpeciesBatchFrequency(child, target); results.add(target); @@ -352,10 +341,6 @@ for (SortingBatch child : frequencyChilds) { notUpdatedChildIds.add(child.getId()); } -// for (Batch batch : parentBatch.getChildBatchs()) { -// SortingBatch sortingBatch = (SortingBatch) batch; -// notUpdatedChildIds.add(sortingBatch.getId()); -// } short rankOrder = 0; List<SortingBatch> batchsToUpdate = Lists.newArrayList(); @@ -489,13 +474,7 @@ SpeciesBatch targetChild = TuttiBeanFactory.newSpeciesBatch(); entityToSpeciesBatch(sourceChild, targetChild); if (log.isInfoEnabled()) { - String species; - if (target.getSpecies() != null) { - species = String.valueOf(target.getSpecies().getReferenceTaxonId()); - } else { - species = "no species"; - } - log.info("Loaded CatchBatch Hors Vrac > (Species|Benthos) > " + species + " : " + target.getId()); + log.info("Loaded CatchBatch Hors Vrac > (Species|Benthos) > " + target.getSpecies().getReferenceTaxonId() + " : " + target.getId()); } if (targetChild.getSampleCategoryValue() != null) { targetChilds.add(targetChild); Modified: trunk/tutti-persistence/src/main/resources/tutti-db-enumerations.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/tutti-db-enumerations.properties 2013-04-20 14:33:56 UTC (rev 838) +++ trunk/tutti-persistence/src/main/resources/tutti-db-enumerations.properties 2013-04-21 11:29:20 UTC (rev 839) @@ -385,14 +385,11 @@ #PSFM "Remis à l'eau mort ou vivant" PmfmId.DEAD_OR_ALIVE=1393 -#TODO A creer (type alphanumeric) # PSFM "Pour référencer un autre id de pmfm" PmfmId.ID_PSFM=1433 -#TODO A creer (type alphanumeric) PmfmId.SAMPLE_ID=1435 -#TODO A creer (type alphanumeric) PmfmId.OTOLITHE_ID=1436 # (20=observateur volant, 95=Administrateur SIH) -> L'avantage du 20 est qu'il est inactif (=20), donc plus facilement detectable @@ -413,7 +410,7 @@ VesselPersonRoleId.SORT_ROOM_MANAGER=3 VesselPersonRoleId.RECORDER_PERSON=4 -TranscribingTypeId.TAXINOMIE_REFTAX_MNEMONIQUE=101 -TranscribingTypeId.TAXINOMIE_COMMUN_NOM_VERNACULAIRE=102 +TranscribingTypeId.TAXINOMIE_REFTAX_MNEMONIQUE=55 +TranscribingTypeId.TAXINOMIE_COMMUN_NOM_VERNACULAIRE=56 MatrixId.PRODUCT_BATCH=1 \ No newline at end of file Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceReadTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceReadTest.java 2013-04-20 14:33:56 UTC (rev 838) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceReadTest.java 2013-04-21 11:29:20 UTC (rev 839) @@ -288,7 +288,7 @@ @Test public void getMacroWasteCategoryCaracteristic() { Caracteristic result = service.getMarineLitterCategoryCaracteristic(); - assertCaracteristicQualitative(result, 21); + assertCaracteristicQualitative(result, 34); } @Test Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ExportCatchesReportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ExportCatchesReportService.java 2013-04-20 14:33:56 UTC (rev 838) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ExportCatchesReportService.java 2013-04-21 11:29:20 UTC (rev 839) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.catches; +/* + * #%L + * Tutti :: Service + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.itextpdf.text.DocumentException; Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ExportCatchesReportService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native 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-04-20 14:33:56 UTC (rev 838) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java 2013-04-21 11:29:20 UTC (rev 839) @@ -30,9 +30,15 @@ import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; +import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency; +import fr.ifremer.tutti.persistence.entities.referential.Gear; +import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.Vessel; +import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.TuttiCsvUtil; +import org.apache.commons.collections.CollectionUtils; +import java.io.Serializable; import java.util.List; /** @@ -49,32 +55,150 @@ newColumnForExport("Annee", Cruise.PROPERTY_BEGIN_DATE, TuttiCsvUtil.YEAR); newColumnForExport("Serie", Cruise.PROPERTY_PROGRAM, Program.PROPERTY_NAME); newColumnForExport("Serie_Partielle", Cruise.PROPERTY_SURVEY_PART); + newColumnForExport("Engin", FishingOperation.PROPERTY_GEAR, Gear.PROPERTY_NAME); + newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); newColumnForExport("Id_Operation", FishingOperation.PROPERTY_STATION_NUMBER); newColumnForExport("NumOrdre_Station", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); newColumnForExport("Navire", Cruise.PROPERTY_VESSEL, Vessel.PROPERTY_NAME); - newColumnForExport("Zone_Etude", "programeZoneName"); - newColumnForExport("Id_Sismer", Cruise.PROPERTY_NAME); - newColumnForExport("Date_Deb_Campagne", Cruise.PROPERTY_BEGIN_DATE, TuttiCsvUtil.DAY_TIME_SECOND); - newColumnForExport("Port_Deb_Campagne", Cruise.PROPERTY_DEPARTURE_LOCATION); - newColumnForExport("Date_Fin_Campagne", Cruise.PROPERTY_END_DATE, TuttiCsvUtil.DAY_TIME_SECOND); - newColumnForExport("Port_Fin_Campagne", Cruise.PROPERTY_RETURN_LOCATION); - newColumnForExport("Chef_Mission", Cruise.PROPERTY_HEAD_OF_MISSION); - newColumnForExport("Resp_Salle_Tri", Cruise.PROPERTY_HEAD_OF_SORT_ROOM); - newColumnForExport("Commentaire", Cruise.PROPERTY_COMMENT); + newColumnForExport("Taxon", CatchExportRow.SPECIES_SAMPLE_CATEGORY); + newColumnForExport("NumOrdre_Taxon_H2", CatchExportRow.SPECIES_SAMPLE_CATEGORY); + newColumnForExport("Tot_Taxon", CatchExportRow.SPECIES_SAMPLE_CATEGORY); + newColumnForExport("Ech_Taxon", CatchExportRow.SPECIES_SAMPLE_CATEGORY); + newColumnForExport("Type_Volume_Poids_Taxon", CatchExportRow.SPECIES_SAMPLE_CATEGORY); + newColumnForExport("Unite_Volume_Poids_Taxon", CatchExportRow.SPECIES_SAMPLE_CATEGORY); + + newColumnForExport("Vrac/Hors_Vrac", CatchExportRow.SORTED_UNSORTED_SAMPLE_CATEGORY); + newColumnForExport("NumOrdre_Vrac_H2", CatchExportRow.SORTED_UNSORTED_SAMPLE_CATEGORY); + newColumnForExport("Tot_Vrac", CatchExportRow.SORTED_UNSORTED_SAMPLE_CATEGORY); + newColumnForExport("Ech_Vrac", CatchExportRow.SORTED_UNSORTED_SAMPLE_CATEGORY); + newColumnForExport("Type_Volume_Poids_Vrac", CatchExportRow.SORTED_UNSORTED_SAMPLE_CATEGORY); + newColumnForExport("Unite_Volume_Poids_Vrac", CatchExportRow.SORTED_UNSORTED_SAMPLE_CATEGORY); + + newColumnForExport("Categorie", CatchExportRow.SIZE_SAMPLE_CATEGORY); + newColumnForExport("NumOrdre_Cat_H2", CatchExportRow.SIZE_SAMPLE_CATEGORY); + newColumnForExport("Tot_Cat", CatchExportRow.SIZE_SAMPLE_CATEGORY); + newColumnForExport("Ech_Cat", CatchExportRow.SIZE_SAMPLE_CATEGORY); + newColumnForExport("Type_Volume_Poids_Cat", CatchExportRow.SIZE_SAMPLE_CATEGORY); + newColumnForExport("Unite_Volume_Poids_Cat", CatchExportRow.SIZE_SAMPLE_CATEGORY); + + newColumnForExport("Sexe", CatchExportRow.SEX_SAMPLE_CATEGORY); + newColumnForExport("NumOrdre_Sexe_H2", CatchExportRow.SEX_SAMPLE_CATEGORY); + newColumnForExport("Tot_Sexe", CatchExportRow.SEX_SAMPLE_CATEGORY); + newColumnForExport("Ech_Sexe", CatchExportRow.SEX_SAMPLE_CATEGORY); + newColumnForExport("Type_Volume_Poids_Sexe", CatchExportRow.SEX_SAMPLE_CATEGORY); + newColumnForExport("Unite_Volume_Poids_Sexe", CatchExportRow.SEX_SAMPLE_CATEGORY); + + newColumnForExport("Maturite", CatchExportRow.MATURITY_SAMPLE_CATEGORY); + newColumnForExport("NumOrdre_Maturite_H2", CatchExportRow.MATURITY_SAMPLE_CATEGORY); + newColumnForExport("Tot_Maturite", CatchExportRow.MATURITY_SAMPLE_CATEGORY); + newColumnForExport("Ech_Maturite", CatchExportRow.MATURITY_SAMPLE_CATEGORY); + newColumnForExport("Type_Volume_Poids_Maturite", CatchExportRow.MATURITY_SAMPLE_CATEGORY); + newColumnForExport("Unite_Volume_Poids_Maturite", CatchExportRow.MATURITY_SAMPLE_CATEGORY); + + newColumnForExport("Age", CatchExportRow.AGE_SAMPLE_CATEGORY); + newColumnForExport("Num_Ordre_Age_H2", CatchExportRow.AGE_SAMPLE_CATEGORY); + + newColumnForExport("Code_Longueur", CatchExportRow.FREQUENCY_LENGTH_STEP_CARACTERISTIC); + newColumnForExport("Taille", CatchExportRow.FREQUENCY_LENGTH_STEP); + newColumnForExport("NumOrdre_Taille_H2", Cruise.PROPERTY_HEAD_OF_MISSION); + newColumnForExport("Poids_Classe_Taille", CatchExportRow.FREQUENCY_WEIGHT); + newColumnForExport("Unite_Taille", CatchExportRow.FREQUENCY_LENGTH_STEP_CARACTERISTIC); + newColumnForExport("Precision_Mesure", CatchExportRow.FREQUENCY_LENGTH_STEP_CARACTERISTIC); + newColumnForExport("Nbr", CatchExportRow.FREQUENCY_NUMBER); + + newColumnForExport("Poids_Reference", Cruise.PROPERTY_HEAD_OF_SORT_ROOM); + newColumnForExport("Coef_Final_Elevation", Cruise.PROPERTY_COMMENT); } - public void prepareRows(List<CatchExportRow> rows, + public void prepareRows(PersistenceService persistenceService, + List<CatchExportRow> rows, Cruise cruise, FishingOperation operation, BatchContainer<SpeciesBatch> rootSpeciesBatch, BatchContainer<BenthosBatch> rootBenthosBatch) { - CatchExportRow row = new CatchExportRow(); - row.setCruise(cruise); - row.setFishingOperation(operation); -// row.setRootSpeciesBatch(rootSpeciesBatch); -// row.setRootBenthosBatch(rootBenthosBatch); - rows.add(row); + + + for (SpeciesBatch speciesBatch : rootSpeciesBatch.getChildren()) { + CatchExportRow row = new CatchExportRow(); + row.setCruise(cruise); + row.setFishingOperation(operation); + ExportSampleCategory<Species> speciesCategory = new ExportSampleCategory<Species>(); + speciesCategory.setCategoryValue(speciesBatch.getSpecies()); + speciesCategory.setCategoryWeight(speciesBatch.getWeight()); + speciesCategory.setComputedWeight(speciesBatch.getComputedWeight()); + speciesCategory.setNumber(speciesBatch.getNumber()); + speciesCategory.setComputedNumber(speciesBatch.getComputedNumber()); + + row.setSpeciesCategory(speciesCategory); + prepareRows(persistenceService, row, rows, speciesBatch); + } + for (BenthosBatch benthosBatch : rootBenthosBatch.getChildren()) { + CatchExportRow row = new CatchExportRow(); + row.setCruise(cruise); + row.setFishingOperation(operation); + ExportSampleCategory<Species> speciesCategory = new ExportSampleCategory<Species>(); + speciesCategory.setCategoryValue(benthosBatch.getSpecies()); + speciesCategory.setCategoryWeight(benthosBatch.getWeight()); + speciesCategory.setComputedWeight(benthosBatch.getComputedWeight()); + speciesCategory.setNumber(benthosBatch.getNumber()); + speciesCategory.setComputedNumber(benthosBatch.getComputedNumber()); + + row.setSpeciesCategory(speciesCategory); + prepareRows(persistenceService, row, rows, benthosBatch); + } } + public void prepareRows(PersistenceService persistenceService, + CatchExportRow currentRow, + List<CatchExportRow> rows, + SpeciesBatch speciesBatch) { + + ExportSampleCategory<Serializable> sampleCategory = + new ExportSampleCategory<Serializable>(); + sampleCategory.setCategoryType(speciesBatch.getSampleCategoryType()); + sampleCategory.setCategoryValue(speciesBatch.getSampleCategoryValue()); + sampleCategory.setCategoryWeight(speciesBatch.getSampleCategoryWeight()); + sampleCategory.setComputedWeight(speciesBatch.getSampleCategoryComputedWeight()); + sampleCategory.setNumber(speciesBatch.getNumber()); + sampleCategory.setComputedNumber(speciesBatch.getComputedNumber()); + + currentRow.addCategory(sampleCategory); + + if (speciesBatch.isChildBatchsEmpty()) { + + // on a leaf, get frequencies + + List<SpeciesBatchFrequency> speciesBatchFrequency = + persistenceService.getAllSpeciesBatchFrequency(speciesBatch.getId()); + + if (CollectionUtils.isEmpty(speciesBatchFrequency)) { + + // no frequency + // simple denombrement + rows.add(currentRow.copy()); + } else { + for (SpeciesBatchFrequency batchFrequency : speciesBatchFrequency) { + CatchExportRow row = currentRow.copy(); + row.setSpeciesFrequency(batchFrequency); + rows.add(row); + } + } + + } else { + + for (SpeciesBatch childBatch : speciesBatch.getChildBatchs()) { + prepareRows(persistenceService, currentRow, rows, childBatch); + } + } + + } + + public void prepareRows(PersistenceService persistenceService, + CatchExportRow currentRow, + List<CatchExportRow> rows, + BenthosBatch benthosBatch) { + + + } } \ No newline at end of file Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportRow.java 2013-04-20 14:33:56 UTC (rev 838) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportRow.java 2013-04-21 11:29:20 UTC (rev 839) @@ -24,13 +24,20 @@ * #L% */ +import com.google.common.collect.Maps; +import fr.ifremer.tutti.persistence.entities.data.BenthosBatchFrequency; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.Program; +import fr.ifremer.tutti.persistence.entities.data.SampleCategoryEnum; +import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency; +import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; +import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import java.io.Serializable; import java.util.Date; +import java.util.Map; /** * A row in a catch export. @@ -42,10 +49,38 @@ private static final long serialVersionUID = 1L; + public static final String FREQUENCY_LENGTH_STEP_CARACTERISTIC = "frequencyLengthStepCaracteristic"; + + public static final String FREQUENCY_LENGTH_STEP = "frequencyLengthStep"; + + public static final String FREQUENCY_WEIGHT = "frequencyWeight"; + + public static final String FREQUENCY_NUMBER = "frequencyNumber"; + + public static final String SPECIES_SAMPLE_CATEGORY = "speciesSampleCategory"; + + public static final String SORTED_UNSORTED_SAMPLE_CATEGORY = "sortedUnsortedSampleCategory"; + + public static final String SIZE_SAMPLE_CATEGORY = "sizeSampleCategory"; + + public static final String SEX_SAMPLE_CATEGORY = "SexSampleCategory"; + + public static final String MATURITY_SAMPLE_CATEGORY = "maturitySampleCategory"; + + public static final String AGE_SAMPLE_CATEGORY = "ageSampleCategory"; + protected Cruise cruise; protected FishingOperation fishingOperation; + protected ExportSampleCategory speciesCategory; + + protected final Map<SampleCategoryEnum, ExportSampleCategory> categories = Maps.newEnumMap(SampleCategoryEnum.class); + + protected SpeciesBatchFrequency speciesFrequency; + + protected BenthosBatchFrequency benthosFrequency; + public void setCruise(Cruise cruise) { this.cruise = cruise; } @@ -54,6 +89,22 @@ this.fishingOperation = fishingOperation; } + public void setSpeciesCategory(ExportSampleCategory sampleCategory) { + this.speciesCategory = sampleCategory; + } + + public void addCategory(ExportSampleCategory sampleCategory) { + categories.put(sampleCategory.getCategoryType(), sampleCategory); + } + + public void setSpeciesFrequency(SpeciesBatchFrequency speciesFrequency) { + this.speciesFrequency = speciesFrequency; + } + + public void setBenthosFrequency(BenthosBatchFrequency benthosFrequency) { + this.benthosFrequency = benthosFrequency; + } + public Date getBeginDate() { return cruise.getBeginDate(); } @@ -66,6 +117,10 @@ return cruise.getSurveyPart(); } + public Vessel getVessel() { + return cruise.getVessel(); + } + public String getStationNumber() { return fishingOperation.getStationNumber(); } @@ -74,7 +129,87 @@ return fishingOperation.getFishingOperationNumber(); } - public Vessel getVessel() { - return cruise.getVessel(); + public Gear getGear() { + return fishingOperation.getGear(); } + + public String getMultirigAggregation() { + return fishingOperation.getMultirigAggregation(); + } + + public Caracteristic getFrequencyLengthStepCaracteristic() { + Caracteristic result; + if (speciesFrequency == null) { + result = benthosFrequency.getLengthStepCaracteristic(); + } else { + result = speciesFrequency.getLengthStepCaracteristic(); + } + return result; + } + + public Float getFrequencyLengthStep() { + Float result; + if (speciesFrequency == null) { + result = benthosFrequency.getLengthStep(); + } else { + result = speciesFrequency.getLengthStep(); + } + return result; + } + + public Float getFrequencyWeight() { + Float result; + if (speciesFrequency == null) { + result = benthosFrequency.getWeight(); + } else { + result = speciesFrequency.getWeight(); + } + return result; + } + + public Integer getFrequencyNumber() { + Integer result; + if (speciesFrequency == null) { + result = benthosFrequency.getNumber(); + } else { + result = speciesFrequency.getNumber(); + } + return result; + } + + public ExportSampleCategory getSpeciesSampleCategory() { + return speciesCategory; + } + + public ExportSampleCategory getSortedUnsortedSampleCategory() { + return categories.get(SampleCategoryEnum.sortedUnsorted); + } + + public ExportSampleCategory getSizeSampleCategory() { + return categories.get(SampleCategoryEnum.size); + } + + public ExportSampleCategory getSexSampleCategory() { + return categories.get(SampleCategoryEnum.sex); + } + + public ExportSampleCategory getMaturitySampleCategory() { + return categories.get(SampleCategoryEnum.maturity); + } + + public ExportSampleCategory getAgeSampleCategory() { + return categories.get(SampleCategoryEnum.age); + } + + public CatchExportRow copy() { + CatchExportRow result = new CatchExportRow(); + result.setCruise(cruise); + result.setFishingOperation(fishingOperation); + result.setSpeciesCategory(speciesCategory); + result.categories.putAll(categories); + result.setSpeciesFrequency(speciesFrequency); + result.setBenthosFrequency(benthosFrequency); + + return result; + } } \ No newline at end of file Added: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportSampleCategory.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportSampleCategory.java (rev 0) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportSampleCategory.java 2013-04-21 11:29:20 UTC (rev 839) @@ -0,0 +1,61 @@ +package fr.ifremer.tutti.service.export; + +/* + * #%L + * Tutti :: Service + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ifremer.tutti.persistence.entities.data.SampleCategory; + +import java.io.Serializable; + +/** + * Export sample category (extends {@link SampleCategory} to some computed + * stuff. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class ExportSampleCategory<S extends Serializable> extends SampleCategory<S> { + + private static final long serialVersionUID = 1L; + + private Integer number; + + private Integer computedNumber; + + public Integer getNumber() { + return number; + } + + public void setNumber(Integer number) { + this.number = number; + } + + public Integer getComputedNumber() { + return computedNumber; + } + + public void setComputedNumber(Integer computedNumber) { + this.computedNumber = computedNumber; + } +} Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportSampleCategory.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native 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-04-20 14:33:56 UTC (rev 838) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 2013-04-21 11:29:20 UTC (rev 839) @@ -34,8 +34,10 @@ import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; +import fr.ifremer.tutti.persistence.entities.data.CatchBatch; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; +import fr.ifremer.tutti.persistence.entities.data.MarineLitterBatch; import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; @@ -219,7 +221,7 @@ exportParameters(exportContext, cruise, operations); - exportCatches(exportContext, cruise, operations); +// exportCatches(exportContext, cruise, operations); } protected void exportSurvey(ExportContext exportContext, @@ -271,24 +273,40 @@ protected void exportCatches(ExportContext exportContext, Cruise cruise, List<FishingOperation> operations) { - try { for (FishingOperation operation : operations) { + String operationId = operation.getId(); + + CatchBatch catchBatch = + persistenceService.getCatchBatchFromFishingOperation( + operationId); + BatchContainer<SpeciesBatch> rootSpeciesBatch = - persistenceService.getRootSpeciesBatch(operation.getId()); + persistenceService.getRootSpeciesBatch(operationId); BatchContainer<BenthosBatch> rootBenthosBatch = - persistenceService.getRootBenthosBatch(operation.getId()); + persistenceService.getRootBenthosBatch(operationId); + BatchContainer<MarineLitterBatch> rootMarineLitterBatch = + persistenceService.getRootMarineLitterBatch(operationId); + + tuttiWeightComputingService.computeCatchBatchWeights( + catchBatch, + rootSpeciesBatch, + rootBenthosBatch, + rootMarineLitterBatch); + List<CatchExportRow> rows = Lists.newArrayList(); - exportContext.catchModel.prepareRows(rows, + exportContext.catchModel.prepareRows(persistenceService, + rows, cruise, operation, rootSpeciesBatch, rootBenthosBatch); -// exportContext.catchExport.write(rows, exportContext.catchWriter); + + exportContext.catchExport.write(rows, exportContext.catchWriter); } } catch (Exception e) { Modified: trunk/tutti-service/src/main/resources/ftl/catchesReport_fr.ftl =================================================================== --- trunk/tutti-service/src/main/resources/ftl/catchesReport_fr.ftl 2013-04-20 14:33:56 UTC (rev 838) +++ trunk/tutti-service/src/main/resources/ftl/catchesReport_fr.ftl 2013-04-21 11:29:20 UTC (rev 839) @@ -1,3 +1,26 @@ +<#-- + #%L + Tutti :: Service + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% +--> <html> <head> <style type="text/css"> Property changes on: trunk/tutti-service/src/main/resources/ftl/catchesReport_fr.ftl ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-04-20 14:33:56 UTC (rev 838) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-04-21 11:29:20 UTC (rev 839) @@ -1,5 +1,28 @@ +### +# #%L +# Tutti :: UI +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2012 - 2013 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Thu Apr 18 16:32:55 CEST 2013 +#Sun Apr 21 13:23:05 CEST 2013 tutti.createAccidentalBatch.action.cancel.help= tutti.createAccidentalBatch.action.save.help= tutti.createAccidentalBatch.field.accidentalDeadOrAlive.help= @@ -48,6 +71,7 @@ tutti.editAccidentalBatch.action.removeBatch.help= tutti.editBenthosBatch.action.createBatch.help=editBenthosBatch.html\#fields tutti.editBenthosBatch.action.removeBatch.help=editBenthosBatch.html\#fields +tutti.editBenthosBatch.action.removeSubBatch.help= tutti.editBenthosBatch.action.renameBatch.help=editBenthosBatch.html\#fields tutti.editBenthosBatch.action.splitBatch.help=editBenthosBatch.html\#fields tutti.editBenthosBatch.field.benthosTotalInertWeight.help=editBenthosBatch.html\#fields Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-04-20 14:33:56 UTC (rev 838) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-04-21 11:29:20 UTC (rev 839) @@ -1,3 +1,26 @@ +### +# #%L +# Tutti :: UI +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2012 - 2013 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo #Thu Apr 18 16:32:55 CEST 2013 tutti.createAccidentalBatch.action.cancel.help= Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUI.css 2013-04-20 14:33:56 UTC (rev 838) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUI.css 2013-04-21 11:29:20 UTC (rev 839) @@ -1,3 +1,26 @@ +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ #navigation { rootVisible: false; } \ No newline at end of file Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUI.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SendCruiseReportAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SendCruiseReportAction.java 2013-04-20 14:33:56 UTC (rev 838) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SendCruiseReportAction.java 2013-04-21 11:29:20 UTC (rev 839) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.home; +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.base.Preconditions; import fr.ifremer.tutti.TuttiIOUtil; import fr.ifremer.tutti.persistence.entities.data.Cruise; Modified: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIModel-error-validation.xml =================================================================== --- trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIModel-error-validation.xml 2013-04-20 14:33:56 UTC (rev 838) +++ trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIModel-error-validation.xml 2013-04-21 11:29:20 UTC (rev 839) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> Property changes on: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIModel-error-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native 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-04-20 14:33:56 UTC (rev 838) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-04-21 11:29:20 UTC (rev 839) @@ -266,6 +266,9 @@ tutti.editBenthosBatch.action.removeBatch= tutti.editBenthosBatch.action.removeBatch.mnemonic= tutti.editBenthosBatch.action.removeBatch.tip= +tutti.editBenthosBatch.action.removeSubBatch= +tutti.editBenthosBatch.action.removeSubBatch.mnemonic= +tutti.editBenthosBatch.action.removeSubBatch.tip= tutti.editBenthosBatch.action.renameBatch= tutti.editBenthosBatch.action.renameBatch.mnemonic= tutti.editBenthosBatch.action.renameBatch.tip= Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/action-email.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r838 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro tutti-persistence/src/main/resources tutti-persistence/src/test tutti-persistence/src/test/java/fr/ifremer/tutti/persistence tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service tut
by tchemit＠users.forge.codelutin.com 20 Apr '13

20 Apr '13

Author: tchemit Date: 2013-04-20 16:33:56 +0200 (Sat, 20 Apr 2013) New Revision: 838 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/838 Log: fixes #2334: Avoir une nouvelle base avec les pmfm cr?\195?\169es par Vincent fixes #2340: [TECH] Possibilit?\195?\169 d'avoir des collisions sur les pi?\195?\168ces jointes fixes #2281: [TECH] - R?\195?\169percution des nouveaut?\195?\169s du mod?\195?\168le adagio Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/AttachementObjectTypeEnum.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/PlanktonBatchPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFile.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/TuttiTable.java trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml trunk/tutti-persistence/src/main/resources/tutti-db-enumerations.properties trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/DatabaseFixtures.java trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceWriteTest.java trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceWriteTest.java trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceReadTest.java trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/synchro/DatabaseSynchroFixtures.java trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/synchro/ReferentialSynchronizeHelperTest.java trunk/tutti-persistence/src/test/server.properties trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentModelAware.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-04-20 14:33:56 UTC (rev 838) @@ -25,6 +25,7 @@ */ import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; +import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; @@ -298,12 +299,14 @@ //------------------------------------------------------------------------// /** - * Get all attachments for the given object {@code objectId}. + * Get all attachments for the given object {@code objectId} of type. * - * @param objectId id of the object + * @param objectType type of attachment + * @param objectId id of the object * @return list of all attachments for the given {@code objectId}. */ - List<Attachment> getAllAttachments(Integer objectId); + List<Attachment> getAllAttachments(AttachementObjectTypeEnum objectType, + Integer objectId); /** * Get the file of the given {@code attachmentId}. Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-04-20 14:33:56 UTC (rev 838) @@ -28,6 +28,7 @@ import fr.ifremer.adagio.core.dao.data.batch.validator.CatchBatchValidationException; import fr.ifremer.adagio.core.service.technical.CacheService; import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; +import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; @@ -408,8 +409,9 @@ //------------------------------------------------------------------------// @Override - public List<Attachment> getAllAttachments(Integer objectId) { - return attachmentService.getAllAttachments(objectId); + public List<Attachment> getAllAttachments(AttachementObjectTypeEnum objectType, + Integer objectId) { + return attachmentService.getAllAttachments(objectType, objectId); } @Override Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java 2013-04-20 14:33:56 UTC (rev 838) @@ -25,6 +25,7 @@ */ import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; +import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; @@ -510,7 +511,8 @@ } @Override - public List<Attachment> getAllAttachments(Integer objectId) { + public List<Attachment> getAllAttachments(AttachementObjectTypeEnum objectType, + Integer objectId) { throw new RuntimeException("method not implemented"); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/AttachementObjectTypeEnum.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/AttachementObjectTypeEnum.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/AttachementObjectTypeEnum.java 2013-04-20 14:33:56 UTC (rev 838) @@ -44,6 +44,7 @@ SCIENTIFIC_CRUISE("OBJECT_TYPE_SCIENTIFIC_CRUISE"), OPERATION("OBJECT_TYPE_OPERATION"), CATCH_BATCH("OBJECT_TYPE_CATCH_BATCH"), + BATCH("OBJECT_TYPE_BATCH"), SAMPLE("OBJECT_TYPE_SAMPLE"); private final String fieldName; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java 2013-04-20 14:33:56 UTC (rev 838) @@ -42,6 +42,7 @@ import fr.ifremer.tutti.persistence.entities.TuttiBeanFactory; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; +import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; @@ -167,7 +168,9 @@ log.info("Will delete accidental batch: " + batchId); } sampleDao.remove(batchId); - attachmentPersistenceService.deleteAllAttachment(batchId); + attachmentPersistenceService.deleteAllAttachment( + AttachementObjectTypeEnum.SAMPLE, + batchId); } // ------------------------------------------------------------------------// Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceService.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceService.java 2013-04-20 14:33:56 UTC (rev 838) @@ -25,6 +25,7 @@ */ import fr.ifremer.tutti.persistence.TuttiPersistenceServiceImplementor; +import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; import fr.ifremer.tutti.persistence.entities.data.Attachment; import org.springframework.transaction.annotation.Transactional; @@ -46,7 +47,8 @@ * @param objectId id of the object * @return list of all attachments for the given {@code objectId}. */ - List<Attachment> getAllAttachments(Integer objectId); + List<Attachment> getAllAttachments(AttachementObjectTypeEnum objectType, + Integer objectId); /** * Get the file of the given {@code attachmentId}. @@ -88,9 +90,11 @@ /** * Deletes all attachments of the given object id. * - * @param objectId id of the object + * @param objectType type of attachment + * @param objectId id of the object */ @Transactional(readOnly = false) - void deleteAllAttachment(Integer objectId); + void deleteAllAttachment(AttachementObjectTypeEnum objectType, + Integer objectId); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java 2013-04-20 14:33:56 UTC (rev 838) @@ -38,6 +38,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.type.IntegerType; +import org.hibernate.type.StringType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataRetrievalFailureException; import org.springframework.dao.InvalidDataAccessResourceUsageException; @@ -88,10 +89,13 @@ //------------------------------------------------------------------------// @Override - public List<Attachment> getAllAttachments(Integer objectId) { + public List<Attachment> getAllAttachments(AttachementObjectTypeEnum objectType, + Integer objectId) { Iterator<Object[]> list = queryList( "allAttachment", - "objectId", IntegerType.INSTANCE, objectId); + "objectId", IntegerType.INSTANCE, objectId, + "objectTypeCode", StringType.INSTANCE, objectType.getFieldValue() + ); List<Attachment> result = Lists.newArrayList(); while (list.hasNext()) { @@ -239,8 +243,9 @@ } @Override - public void deleteAllAttachment(Integer objectId) { - List<Attachment> attachments = getAllAttachments(objectId); + public void deleteAllAttachment(AttachementObjectTypeEnum objectType, + Integer objectId) { + List<Attachment> attachments = getAllAttachments(objectType, objectId); for (Attachment attachment : attachments) { delete(attachment); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java 2013-04-20 14:33:56 UTC (rev 838) @@ -38,6 +38,7 @@ import fr.ifremer.adagio.core.dao.referential.taxon.ReferenceTaxon; import fr.ifremer.adagio.core.dao.referential.taxon.ReferenceTaxonImpl; import fr.ifremer.tutti.persistence.entities.TuttiBeanFactory; +import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; import fr.ifremer.tutti.persistence.entities.data.BenthosBatchFrequency; @@ -45,6 +46,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.service.batch.BatchPersistenceHelper; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.FlushMode; @@ -212,7 +214,9 @@ Integer batchId = Integer.valueOf(id); catchBatchDao.removeWithChildren(batchId); - attachmentPersistenceService.deleteAllAttachment(batchId); + attachmentPersistenceService.deleteAllAttachment( + AttachementObjectTypeEnum.BATCH, + batchId); getCurrentSession().flush(); } @@ -220,7 +224,47 @@ @Override public void deleteBenthosSubBatch(String id) { Preconditions.checkNotNull(id); - deleteBenthosBatch(id); + getCurrentSession().setFlushMode(FlushMode.COMMIT); + + Integer benthosBatchId = Integer.valueOf(id); + + // get catch batch + Integer catchBatchId = catchBatchDao.getIdBySortingBatchId(benthosBatchId); + + Preconditions.checkNotNull( + catchBatchId, + "Could not find catchBatch for benthosBatch: " + benthosBatchId); + + CatchBatch catchBatch = + catchBatchDao.loadFullTree(catchBatchId); + + // get species batch + SortingBatch sortingBatch = catchBatchDao.getSortingBatchById( + catchBatch, benthosBatchId); + + // get his children + Collection<Batch> childBatchs = sortingBatch.getChildBatchs(); + + if (CollectionUtils.isNotEmpty(childBatchs)) { + + for (Batch childBatch : childBatchs) { + + // delete this child and all his children + Integer childBatchId = childBatch.getId(); + + if (log.isInfoEnabled()) { + log.info("Delete child [" + childBatchId + "] of species batch: " + id); + } + catchBatchDao.removeWithChildren(childBatchId); + + // delete his attachment (if any) + attachmentPersistenceService.deleteAllAttachment( + AttachementObjectTypeEnum.BATCH, + childBatchId); + } + } + + getCurrentSession().flush(); } @Override Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2013-04-20 14:33:56 UTC (rev 838) @@ -63,6 +63,7 @@ import fr.ifremer.adagio.core.service.referential.location.LocationService; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.TuttiBeanFactory; +import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; @@ -399,7 +400,9 @@ public void deleteFishingOperation(String id) { Preconditions.checkNotNull(id); - attachmentPersistenceService.deleteAllAttachment(Integer.valueOf(id)); + attachmentPersistenceService.deleteAllAttachment( + AttachementObjectTypeEnum.OPERATION, + Integer.valueOf(id)); } //------------------------------------------------------------------------// Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java 2013-04-20 14:33:56 UTC (rev 838) @@ -44,6 +44,7 @@ import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.TuttiBeanFactory; import fr.ifremer.tutti.persistence.entities.TuttiEntities; +import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.IndividualObservationBatch; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; @@ -202,7 +203,8 @@ if (sample != null) { sample.getSampleMeasurements().clear(); sampleDao.remove(sample); - attachmentPersistenceService.deleteAllAttachment(batchId); + attachmentPersistenceService.deleteAllAttachment(AttachementObjectTypeEnum.SAMPLE, + batchId); } } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java 2013-04-20 14:33:56 UTC (rev 838) @@ -37,6 +37,7 @@ import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueImpl; import fr.ifremer.tutti.persistence.entities.TuttiBeanFactory; import fr.ifremer.tutti.persistence.entities.TuttiEntities; +import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.MarineLitterBatch; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; @@ -193,7 +194,9 @@ Integer batchId = Integer.valueOf(id); catchBatchDao.removeWithChildren(batchId); - attachmentPersistenceService.deleteAllAttachment(batchId); + attachmentPersistenceService.deleteAllAttachment( + AttachementObjectTypeEnum.BATCH, + batchId); getCurrentSession().flush(); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/PlanktonBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/PlanktonBatchPersistenceServiceImpl.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/PlanktonBatchPersistenceServiceImpl.java 2013-04-20 14:33:56 UTC (rev 838) @@ -26,6 +26,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; +import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; import fr.ifremer.tutti.persistence.entities.data.PlanktonBatch; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -70,6 +71,8 @@ @Override public void deletePlanktonBatch(String id) { Preconditions.checkNotNull(id); - attachmentPersistenceService.deleteAllAttachment(Integer.valueOf(id)); + attachmentPersistenceService.deleteAllAttachment( + AttachementObjectTypeEnum.BATCH, + Integer.valueOf(id)); } } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java 2013-04-20 14:33:56 UTC (rev 838) @@ -38,6 +38,7 @@ import fr.ifremer.adagio.core.dao.referential.taxon.ReferenceTaxon; import fr.ifremer.adagio.core.dao.referential.taxon.ReferenceTaxonImpl; import fr.ifremer.tutti.persistence.entities.TuttiBeanFactory; +import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryEnum; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; @@ -209,7 +210,9 @@ Integer batchId = Integer.valueOf(id); catchBatchDao.removeWithChildren(batchId); - attachmentPersistenceService.deleteAllAttachment(batchId); + attachmentPersistenceService.deleteAllAttachment( + AttachementObjectTypeEnum.BATCH, + batchId); getCurrentSession().flush(); } @@ -252,7 +255,9 @@ catchBatchDao.removeWithChildren(childBatchId); // delete his attachment (if any) - attachmentPersistenceService.deleteAllAttachment(childBatchId); + attachmentPersistenceService.deleteAllAttachment( + AttachementObjectTypeEnum.BATCH, + childBatchId); } } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFile.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFile.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFile.java 2013-04-20 14:33:56 UTC (rev 838) @@ -257,6 +257,9 @@ @Value("${ObjectTypeCode.CATCH_BATCH}") public final String OBJECT_TYPE_CATCH_BATCH = null; + @Value("${ObjectTypeCode.BATCH}") + public final String OBJECT_TYPE_BATCH = null; + @Value("${ObjectTypeCode.OPERATION}") public final String OBJECT_TYPE_OPERATION = null; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/TuttiTable.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/TuttiTable.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/TuttiTable.java 2013-04-20 14:33:56 UTC (rev 838) @@ -100,6 +100,10 @@ PERSON, PERSON2USER_PROFIL(true), + // VESSEL_PERSON_ROLE + VESSEL_PERSON_ROLE, + VESSEL_PERSON, + //ORDER ORDER_ITEM, Modified: trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml =================================================================== --- trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml 2013-04-20 14:33:56 UTC (rev 838) @@ -440,9 +440,11 @@ MeasurementFileImpl m WHERE m.objectId = :objectId + AND m.objectType.code = :objectTypeCode ORDER BY m.id ]]> <query-param name="objectId" type="java.lang.Integer"/> + <query-param name="objectTypeCode" type="java.lang.Integer"/> </query> <query cacheable="true" name="attachment"> Modified: trunk/tutti-persistence/src/main/resources/tutti-db-enumerations.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/tutti-db-enumerations.properties 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-persistence/src/main/resources/tutti-db-enumerations.properties 2013-04-20 14:33:56 UTC (rev 838) @@ -385,15 +385,15 @@ #PSFM "Remis à l'eau mort ou vivant" PmfmId.DEAD_OR_ALIVE=1393 -#TODO A creer (type alphanumeric) FIXME Change Id when in next db +#TODO A creer (type alphanumeric) # PSFM "Pour référencer un autre id de pmfm" -PmfmId.ID_PSFM=1243 +PmfmId.ID_PSFM=1433 -#TODO A creer (type alphanumeric) FIXME Change Id when in next db -PmfmId.SAMPLE_ID=1424 +#TODO A creer (type alphanumeric) +PmfmId.SAMPLE_ID=1435 -#TODO A creer (type alphanumeric) FIXME Change Id when in next db -PmfmId.OTOLITHE_ID=1432 +#TODO A creer (type alphanumeric) +PmfmId.OTOLITHE_ID=1436 # (20=observateur volant, 95=Administrateur SIH) -> L'avantage du 20 est qu'il est inactif (=20), donc plus facilement detectable PersonId.UNKNOWN_RECORDER_PERSON=20 @@ -406,6 +406,7 @@ ObjectTypeCode.SCIENTIFIC_CRUISE=SCIENTIFIC_CRUISE ObjectTypeCode.OPERATION=OPERATION ObjectTypeCode.CATCH_BATCH=CATCH_BATCH +ObjectTypeCode.BATCH=BATCH ObjectTypeCode.SAMPLE=SAMPLE VesselPersonRoleId.SCIENTIFIC_CRUISE_MANAGER=2 Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/DatabaseFixtures.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/DatabaseFixtures.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/DatabaseFixtures.java 2013-04-20 14:33:56 UTC (rev 838) @@ -97,7 +97,7 @@ } public int refNbCaracteristic() { - return 478; + return 481; } public int refNbSpecies() { @@ -145,7 +145,7 @@ } public int refNbScientificVessel() { - return 2; + return 3; } public int refNbPerson() { Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceWriteTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceWriteTest.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceWriteTest.java 2013-04-20 14:33:56 UTC (rev 838) @@ -61,7 +61,8 @@ Integer cruiseId = Integer.valueOf(dbResource.getFixtures().cruiseId()); - allAttachments = service.getAllAttachments(cruiseId); + allAttachments = service.getAllAttachments( + AttachementObjectTypeEnum.SCIENTIFIC_CRUISE, cruiseId); Assert.assertTrue(allAttachments.isEmpty()); // @@ -91,7 +92,8 @@ // reload it // - allAttachments = service.getAllAttachments(cruiseId); + allAttachments = service.getAllAttachments( + AttachementObjectTypeEnum.SCIENTIFIC_CRUISE, cruiseId); Assert.assertFalse(allAttachments.isEmpty()); Assert.assertEquals(1, allAttachments.size()); @@ -112,7 +114,8 @@ // reload it // - allAttachments = service.getAllAttachments(cruiseId); + allAttachments = service.getAllAttachments( + AttachementObjectTypeEnum.SCIENTIFIC_CRUISE, cruiseId); Assert.assertFalse(allAttachments.isEmpty()); Assert.assertEquals(1, allAttachments.size()); @@ -124,7 +127,8 @@ // service.deleteAttachment(attachment.getId()); - allAttachments = service.getAllAttachments(cruiseId); + allAttachments = service.getAllAttachments( + AttachementObjectTypeEnum.SCIENTIFIC_CRUISE, cruiseId); Assert.assertTrue(allAttachments.isEmpty()); Assert.assertFalse(attachmentFile.exists()); } Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceWriteTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceWriteTest.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceWriteTest.java 2013-04-20 14:33:56 UTC (rev 838) @@ -105,9 +105,8 @@ caracteristicMap.put(ageCaracteristic, 10.f); // add a string caracteristic - //FIXME Can't add it until we have correct pmfm id (with no collision here) -// Caracteristic stringCaracteristic = referentialService.getCaracteristic(dbResource.getFixtures().refAlphanumericPmfmId()); -// caracteristicMap.put(stringCaracteristic, "Un texte!"); + Caracteristic stringCaracteristic = referentialService.getCaracteristic(dbResource.getFixtures().refAlphanumericPmfmId()); + caracteristicMap.put(stringCaracteristic, "Un texte!"); fullIndividualObservationBatch.setComment("IndividualObservationBatch-full"); fullIndividualObservationBatch.setSamplingCode("SamplingCode"); Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceReadTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceReadTest.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceReadTest.java 2013-04-20 14:33:56 UTC (rev 838) @@ -294,7 +294,7 @@ @Test public void getMacroWasteSizeCategoryCaracteristic() { Caracteristic result = service.getMarineLitterSizeCategoryCaracteristic(); - assertCaracteristicQualitative(result, 6); + assertCaracteristicQualitative(result, 7); } @Test(expected = UnsupportedOperationException.class) Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/synchro/DatabaseSynchroFixtures.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/synchro/DatabaseSynchroFixtures.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/synchro/DatabaseSynchroFixtures.java 2013-04-20 14:33:56 UTC (rev 838) @@ -129,6 +129,14 @@ return count(TuttiTable.PERSON); } + public int nbVesselPerson() { + return count(TuttiTable.VESSEL_PERSON); + } + + public int nbVesselPersonRole() { + return count(TuttiTable.VESSEL_PERSON_ROLE); + } + public int nbQualitativeValue() { return count(TuttiTable.QUALITATIVE_VALUE); } Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/synchro/ReferentialSynchronizeHelperTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/synchro/ReferentialSynchronizeHelperTest.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/synchro/ReferentialSynchronizeHelperTest.java 2013-04-20 14:33:56 UTC (rev 838) @@ -82,7 +82,7 @@ protected Properties localConnectionProperties; - protected boolean checkDate = true; + protected boolean checkDate = false; @Before public void setUp() throws Exception { @@ -180,34 +180,34 @@ getLastUpdateDate(TuttiTable.UNIT, internalDb, getSqlDate(2012, 8, 17)); getLastUpdateDate(TuttiTable.AGGREGATION_LEVEL, internalDb, getSqlDate(2011, 6, 9)); - getLastUpdateDate(TuttiTable.PARAMETER_GROUP, internalDb, getSqlDate(2013, 4, 2)); - getLastUpdateDate(TuttiTable.PARAMETER, internalDb, getSqlDate(2013, 4, 2)); + getLastUpdateDate(TuttiTable.PARAMETER_GROUP, internalDb, getSqlDate(2013, 4, 18)); + getLastUpdateDate(TuttiTable.PARAMETER, internalDb, getSqlDate(2013, 4, 19)); getLastUpdateDate(TuttiTable.MATRIX, internalDb, getSqlDate(2013, 1, 24)); getLastUpdateDate(TuttiTable.FRACTION, internalDb, getSqlDate(2013, 1, 24)); getLastUpdateDate(TuttiTable.METHOD, internalDb, getSqlDate(2013, 1, 29)); - getLastUpdateDate(TuttiTable.PMFM, internalDb, getSqlDate(2013, 4, 2)); + getLastUpdateDate(TuttiTable.PMFM, internalDb, getSqlDate(2013, 4, 18)); getLastUpdateDate(TuttiTable.GEAR_CLASSIFICATION, internalDb, getSqlDate(2012, 12, 18)); getLastUpdateDate(TuttiTable.GEAR, internalDb, getSqlDate(2012, 12, 18)); getLastUpdateDate(TuttiTable.LOCATION_CLASSIFICATION, internalDb, getSqlDate(2010, 10, 26)); getLastUpdateDate(TuttiTable.LOCATION_LEVEL, internalDb, getSqlDate(2013, 1, 28)); - getLastUpdateDate(TuttiTable.LOCATION, internalDb, getSqlDate(2013, 3, 28)); + getLastUpdateDate(TuttiTable.LOCATION, internalDb, getSqlDate(2013, 4, 16)); getLastUpdateDate(TuttiTable.TAXONOMIC_LEVEL, internalDb, getSqlDate(2013, 2, 21)); - getLastUpdateDate(TuttiTable.REFERENCE_TAXON, internalDb, getSqlDate(2013, 3, 26)); - getLastUpdateDate(TuttiTable.TAXON_NAME, internalDb, getSqlDate(2013, 3, 28)); + getLastUpdateDate(TuttiTable.REFERENCE_TAXON, internalDb, getSqlDate(2013, 4, 12)); + getLastUpdateDate(TuttiTable.TAXON_NAME, internalDb, getSqlDate(2013, 4, 19)); getLastUpdateDate(TuttiTable.TAXON_GROUP_TYPE, internalDb, getSqlDate(2012, 5, 24)); getLastUpdateDate(TuttiTable.TAXON_GROUP, internalDb, getSqlDate(2013, 2, 20)); - getLastUpdateDate(TuttiTable.ROUND_WEIGHT_CONVERSION, internalDb, getSqlDate(2013, 3, 28)); + getLastUpdateDate(TuttiTable.ROUND_WEIGHT_CONVERSION, internalDb, getSqlDate(2013, 4, 5)); getLastUpdateDate(TuttiTable.WEIGHT_LENGTH_CONVERSION, internalDb, getSqlDate(2013, 2, 18)); getLastUpdateDate(TuttiTable.VESSEL_TYPE, internalDb, getSqlDate(2012, 4, 25)); - getLastUpdateDate(TuttiTable.VESSEL, internalDb, getSqlDate(2013, 3, 29)); + getLastUpdateDate(TuttiTable.VESSEL, internalDb, getSqlDate(2013, 4, 12)); getLastUpdateDate(TuttiTable.USER_PROFIL, internalDb, getSqlDate(2009, 6, 18)); getLastUpdateDate(TuttiTable.DEPARTMENT, internalDb, getSqlDate(2013, 2, 14)); - getLastUpdateDate(TuttiTable.PERSON, internalDb, getSqlDate(2013, 4, 2)); + getLastUpdateDate(TuttiTable.PERSON, internalDb, getSqlDate(2013, 4, 19)); getLastUpdateDate(TuttiTable.FRACTION2MATRIX, internalDb, null); getLastUpdateDate(TuttiTable.PMFM2QUALITATIVE_VALUE, internalDb, null); getLastUpdateDate(TuttiTable.GEAR_CLASSIFICATION_ASSOCIATIO, internalDb, getSqlDate(2012, 12, 18)); getLastUpdateDate(TuttiTable.GEAR_ASSOCIATION, internalDb, getSqlDate(2012, 12, 18)); - getLastUpdateDate(TuttiTable.LOCATION_ASSOCIATION, internalDb, getSqlDate(2013, 3, 27)); + getLastUpdateDate(TuttiTable.LOCATION_ASSOCIATION, internalDb, getSqlDate(2013, 4, 11)); getLastUpdateDate(TuttiTable.LOCATION_HIERARCHY, internalDb, null); getLastUpdateDate(TuttiTable.LOCATION_HIERARCHY_EXCEPTION, internalDb, null); getLastUpdateDate(TuttiTable.TAXON_INFORMATION, internalDb, getSqlDate(2012, 2, 13)); @@ -217,10 +217,10 @@ getLastUpdateDate(TuttiTable.UNIT_CONVERSION, internalDb, getSqlDate(2011, 11, 21)); getLastUpdateDate(TuttiTable.VESSEL_REGISTRATION_PERIOD, internalDb, null); getLastUpdateDate(TuttiTable.PERSON2USER_PROFIL, internalDb, null); - getLastUpdateDate(TuttiTable.TAXON_NAME_HISTORY, internalDb, getSqlDate(2013, 3, 28)); + getLastUpdateDate(TuttiTable.TAXON_NAME_HISTORY, internalDb, getSqlDate(2013, 4, 19)); getLastUpdateDate(TuttiTable.REFERENCE_DOCUMENT, internalDb, getSqlDate(2011, 11, 4)); getLastUpdateDate(TuttiTable.AUTHOR, internalDb, null); - getLastUpdateDate(TuttiTable.CITATION, internalDb, getSqlDate(2013, 3, 28)); + getLastUpdateDate(TuttiTable.CITATION, internalDb, getSqlDate(2013, 4, 19)); getLastUpdateDate(TuttiTable.TAXON_GROUP_HISTORICAL_RECORD, internalDb, getSqlDate(2013, 2, 20)); getLastUpdateDate(TuttiTable.ORDER_ITEM, internalDb, getSqlDate(2010, 5, 5)); getLastUpdateDate(TuttiTable.PRECISION_TYPE, internalDb, null); @@ -228,6 +228,8 @@ getLastUpdateDate(TuttiTable.PHOTO_TYPE, internalDb, getSqlDate(2010, 5, 26)); getLastUpdateDate(TuttiTable.OBJECT_TYPE, internalDb, getSqlDate(2013, 2, 14)); getLastUpdateDate(TuttiTable.ORDER_TYPE, internalDb, getSqlDate(2009, 10, 16)); + getLastUpdateDate(TuttiTable.VESSEL_PERSON, internalDb, null); + getLastUpdateDate(TuttiTable.VESSEL_PERSON_ROLE, internalDb, getSqlDate(2009, 10, 16)); getLastUpdateDate(TuttiTable.ANALYSIS_INSTRUMENT, internalDb, null); // try it on a empty db (all values are to null) @@ -283,6 +285,8 @@ getExistingPrimaryKeys(TuttiTable.USER_PROFIL, fixtures.nbUserProfil()); getExistingPrimaryKeys(TuttiTable.DEPARTMENT, fixtures.nbDepartment()); getExistingPrimaryKeys(TuttiTable.PERSON, fixtures.nbPerson()); + getExistingPrimaryKeys(TuttiTable.VESSEL_PERSON, fixtures.nbVesselPerson()); + getExistingPrimaryKeys(TuttiTable.VESSEL_PERSON_ROLE, fixtures.nbVesselPersonRole()); getExistingPrimaryKeys(TuttiTable.TAXON_NAME_HISTORY, fixtures.nbTaxonNameHistory()); getExistingPrimaryKeys(TuttiTable.REFERENCE_DOCUMENT, fixtures.nbReferenceDocument()); @@ -393,6 +397,9 @@ getDataToUpdate(TuttiTable.ORDER_TYPE, internalDb, internalConnection, fromDate, fixtures.nbOrderType()); getDataToUpdate(TuttiTable.ANALYSIS_INSTRUMENT, internalDb, internalConnection, fromDate, fixtures.nbAnalysisInstrument()); + getDataToUpdate(TuttiTable.VESSEL_PERSON, internalDb, internalConnection, fromDate, fixtures.nbVesselPerson()); + getDataToUpdate(TuttiTable.VESSEL_PERSON_ROLE, internalDb, internalConnection, fromDate, fixtures.nbVesselPersonRole()); + // try it on a empty db (nothing to synch) // create a external empty db @@ -485,6 +492,8 @@ updateTable(TuttiTable.OBJECT_TYPE, internalDb, internalConnection, externalConnection, fromDate, fixtures.nbObjectType(), 0); updateTable(TuttiTable.ORDER_TYPE, internalDb, internalConnection, externalConnection, fromDate, fixtures.nbOrderType(), 0); updateTable(TuttiTable.ANALYSIS_INSTRUMENT, internalDb, internalConnection, externalConnection, fromDate, fixtures.nbAnalysisInstrument(), 0); + updateTable(TuttiTable.VESSEL_PERSON, internalDb, internalConnection, externalConnection, fromDate, fixtures.nbVesselPerson(), 0); + updateTable(TuttiTable.VESSEL_PERSON_ROLE, internalDb, internalConnection, externalConnection, fromDate, fixtures.nbVesselPersonRole(), 0); externalConnection.commit(); // externalConnection.rollback(); @@ -552,6 +561,8 @@ updateTable(TuttiTable.OBJECT_TYPE, internalDb, internalConnection, externalConnection, fromDate, 0, fixtures.nbObjectType()); updateTable(TuttiTable.ORDER_TYPE, internalDb, internalConnection, externalConnection, fromDate, 0, fixtures.nbOrderType()); updateTable(TuttiTable.ANALYSIS_INSTRUMENT, internalDb, internalConnection, externalConnection, fromDate, 0, fixtures.nbAnalysisInstrument()); + updateTable(TuttiTable.VESSEL_PERSON, internalDb, internalConnection, externalConnection, fromDate, fixtures.nbVesselPerson(), 0); + updateTable(TuttiTable.VESSEL_PERSON_ROLE, internalDb, internalConnection, externalConnection, fromDate, fixtures.nbVesselPersonRole(), 0); externalConnection.commit(); @@ -624,6 +635,8 @@ updateTable(TuttiTable.OBJECT_TYPE, internalDb, internalConnection, externalConnection, fromDate, 0, 0); updateTable(TuttiTable.ORDER_TYPE, internalDb, internalConnection, externalConnection, fromDate, 0, 0); updateTable(TuttiTable.ANALYSIS_INSTRUMENT, internalDb, internalConnection, externalConnection, fromDate, 0, 0); + updateTable(TuttiTable.VESSEL_PERSON, internalDb, internalConnection, externalConnection, fromDate, fixtures.nbVesselPerson(), 0); + updateTable(TuttiTable.VESSEL_PERSON_ROLE, internalDb, internalConnection, externalConnection, fromDate, fixtures.nbVesselPersonRole(), 0); // add a aggregation level then synch String query = "INSERT INTO AGGREGATION_LEVEL (ID, NAME, RANK_ORDER, UPDATE_DATE) VALUES (-1000, 'NAME', -1000, NULL)"; Modified: trunk/tutti-persistence/src/test/server.properties =================================================================== --- trunk/tutti-persistence/src/test/server.properties 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-persistence/src/test/server.properties 2013-04-20 14:33:56 UTC (rev 838) @@ -23,5 +23,5 @@ ### server.database.0=file:db/allegro server.dbname.0=allegro -server.database.1=file:dbEmpty/allegro -server.dbname.1=allegroEmpty \ No newline at end of file +#server.database.1=file:dbEmpty/allegro +#server.dbname.1=allegroEmpty \ No newline at end of file Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-04-20 14:33:56 UTC (rev 838) @@ -32,6 +32,7 @@ import fr.ifremer.tutti.persistence.TuttiPersistenceNoDbImpl; import fr.ifremer.tutti.persistence.config.TuttiPersistenceConfig; import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; +import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; @@ -485,8 +486,9 @@ //------------------------------------------------------------------------// @Override - public List<Attachment> getAllAttachments(Integer objectId) { - return driver.getAllAttachments(objectId); + public List<Attachment> getAllAttachments(AttachementObjectTypeEnum objectType, + Integer objectId) { + return driver.getAllAttachments(objectType, objectId); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-04-20 14:33:56 UTC (rev 838) @@ -98,7 +98,8 @@ model.fromBean(cruise); // load attachments - List<Attachment> attachments = persistenceService.getAllAttachments(Integer.valueOf(model.getObjectId())); + List<Attachment> attachments = persistenceService.getAllAttachments( + model.getObjectType(), model.getObjectId()); model.addAllAttachment(attachments); if (log.isDebugEnabled()) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIModel.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIModel.java 2013-04-20 14:33:56 UTC (rev 838) @@ -152,8 +152,8 @@ } @Override - public String getObjectId() { - return getId(); + public Integer getObjectId() { + return getIdAsInt(); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIModel.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIModel.java 2013-04-20 14:33:56 UTC (rev 838) @@ -77,7 +77,7 @@ } @Override - public String getObjectId() { + public Integer getObjectId() { return null; //To change body of implemented methods use File | Settings | File Templates. } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-04-20 14:33:56 UTC (rev 838) @@ -445,12 +445,13 @@ VesselUseFeatureTabUI vesselUseFeatureTabContent = ui.getVesselUseFeatureTabContent(); vesselUseFeatureTabContent.getHandler().reset(bean); - String id = editFishingOperationUIModel.getObjectId(); - if (id != null) { - Integer objectId = Integer.valueOf(id); + Integer objectId = editFishingOperationUIModel.getObjectId(); + if (objectId != null) { List<Attachment> attachments = - getContext().getPersistenceService().getAllAttachments(objectId); + getContext().getPersistenceService().getAllAttachments( + editFishingOperationUIModel.getObjectType(), + objectId); editFishingOperationUIModel.addAllAttachment(attachments); } @@ -532,7 +533,7 @@ batch = persistenceService.getCatchBatchFromFishingOperation(operationId); batch.setFishingOperation(bean); Integer objectId = Integer.valueOf(batch.getId()); - attachments = persistenceService.getAllAttachments(objectId); + attachments = persistenceService.getAllAttachments(catchesUIModel.getObjectType(), objectId); getModel().setCatchEnabled(true); } catch (InvalidBatchModelException e) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-04-20 14:33:56 UTC (rev 838) @@ -639,10 +639,10 @@ public void reset(FishingOperation bean) { - Integer objectId = Integer.valueOf(bean.getId()); - List<Attachment> attachments = - getContext().getPersistenceService().getAllAttachments(objectId); + getContext().getPersistenceService().getAllAttachments( + getModel().getObjectType(), + bean.getIdAsInt()); getModel().removeAllAttachment(getModel().getAttachment()); getModel().addAllAttachment(attachments); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2013-04-20 14:33:56 UTC (rev 838) @@ -560,8 +560,8 @@ } @Override - public String getObjectId() { - return getId(); + public Integer getObjectId() { + return getIdAsInt(); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java 2013-04-20 14:33:56 UTC (rev 838) @@ -90,8 +90,6 @@ protected TuttiComputedOrNotData<Float> marineLitterTotalComputedOrNotWeight = new TuttiComputedOrNotData<Float>(); - ; - protected TuttiComputedOrNotData<Float> catchTotalComputedOrNotWeight = new TuttiComputedOrNotData<Float>(); @@ -633,8 +631,8 @@ } @Override - public String getObjectId() { - return catchBatch == null ? null : catchBatch.getId(); + public Integer getObjectId() { + return catchBatch == null ? null : catchBatch.getIdAsInt(); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchRowModel.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchRowModel.java 2013-04-20 14:33:56 UTC (rev 838) @@ -81,11 +81,9 @@ super(AccidentalBatch.class, fromBeanBinder, toBeanBinder); } - public AccidentalBatchRowModel(AccidentalBatch aBatch, - List<Attachment> attachments) { + public AccidentalBatchRowModel(AccidentalBatch aBatch) { this(); fromBean(aBatch); - this.attachment.addAll(attachments); } @Override @@ -213,8 +211,8 @@ } @Override - public String getObjectId() { - return getId(); + public Integer getObjectId() { + return getIdAsInt(); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2013-04-20 14:33:56 UTC (rev 838) @@ -38,7 +38,6 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.accidental.create.CreateAccidentalBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.accidental.create.CreateAccidentalBatchUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.IndividualObservationBatchTableModel; -import fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.MarineLitterBatchRowModel; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; @@ -135,13 +134,14 @@ protected AccidentalBatchRowModel loadBatch(AccidentalBatch aBatch) { - Integer id = aBatch.getIdAsInt(); + AccidentalBatchRowModel newRow = + new AccidentalBatchRowModel(aBatch); List<Attachment> attachments = - persistenceService.getAllAttachments(id); + persistenceService.getAllAttachments(newRow.getObjectType(), + newRow.getObjectId()); - AccidentalBatchRowModel newRow = - new AccidentalBatchRowModel(aBatch, attachments); + newRow.addAllAttachment(attachments); return newRow; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java 2013-04-20 14:33:56 UTC (rev 838) @@ -259,14 +259,12 @@ } public BenthosBatchRowModel(BenthosBatch aBatch, - List<BenthosBatchFrequency> frequencies, - List<Attachment> attachments) { + List<BenthosBatchFrequency> frequencies) { this(); fromBean(aBatch); List<BenthosFrequencyRowModel> frequencyRows = BenthosFrequencyRowModel.fromBeans(frequencies); frequency.addAll(frequencyRows); - this.attachment.addAll(attachments); Collections.sort(frequency); } @@ -628,8 +626,8 @@ } @Override - public String getObjectId() { - return getId(); + public Integer getObjectId() { + return getIdAsInt(); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-04-20 14:33:56 UTC (rev 838) @@ -222,11 +222,12 @@ BatchContainer<BenthosBatch> rootBenthosBatch = persistenceService.getRootBenthosBatch(bean.getId()); - model.setRootBatchId(rootBenthosBatch.getId()); + model.setRootBatchId(rootBenthosBatch.getIdAsInt()); List<Attachment> attachments = persistenceService.getAllAttachments( - Integer.valueOf(model.getObjectId())); + model.getObjectType(), + model.getObjectId()); model.addAllAttachment(attachments); if (log.isInfoEnabled()) { @@ -1055,16 +1056,20 @@ BenthosBatchRowModel parentRow, List<BenthosBatchRowModel> rows) { - String id = aBatch.getId(); - List<BenthosBatchFrequency> frequencies = - persistenceService.getAllBenthosBatchFrequency(id); + persistenceService.getAllBenthosBatchFrequency(aBatch.getId()); + + + BenthosBatchRowModel newRow = + new BenthosBatchRowModel(aBatch, frequencies); + List<Attachment> attachments = - persistenceService.getAllAttachments(Integer.valueOf(id)); + persistenceService.getAllAttachments(newRow.getObjectType(), + newRow.getObjectId()); - BenthosBatchRowModel newRow = - new BenthosBatchRowModel(aBatch, frequencies, attachments); + newRow.addAllAttachment(attachments); + // set the surveycode, do it only on the parent, // the species of the parent is set to the children in loadBatchRow if (parentRow == null && context.isProtocolFilled()) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java 2013-04-20 14:33:56 UTC (rev 838) @@ -131,7 +131,7 @@ protected final List<Attachment> attachment = Lists.newArrayList(); - private String rootBatchId; + private Integer rootBatchId; public BenthosBatchUIModel(EditCatchesUIModel catchesUIModel) { super(catchesUIModel, @@ -355,13 +355,13 @@ firePropertyChange(PROPERTY_CREATE_MELAG_ENABLED, oldValue, createMelagEnabled); } - public void setRootBatchId(String rootBatchId) { - String oldValue = getObjectId(); + public void setRootBatchId(Integer rootBatchId) { + Integer oldValue = getObjectId(); this.rootBatchId = rootBatchId; firePropertyChange(PROPERTY_OBJECT_ID, oldValue, getObjectId()); } - public String getRootBatchId() { + public Integer getRootBatchId() { return rootBatchId; } @@ -371,11 +371,11 @@ @Override public AttachementObjectTypeEnum getObjectType() { - return AttachementObjectTypeEnum.CATCH_BATCH; + return AttachementObjectTypeEnum.BATCH; } @Override - public String getObjectId() { + public Integer getObjectId() { return rootBatchId; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java 2013-04-20 14:33:56 UTC (rev 838) @@ -76,11 +76,9 @@ super(IndividualObservationBatch.class, fromBeanBinder, toBeanBinder); } - public IndividualObservationBatchRowModel(IndividualObservationBatch aBatch, - List<Attachment> attachments) { + public IndividualObservationBatchRowModel(IndividualObservationBatch aBatch) { this(); fromBean(aBatch); - this.attachment.addAll(attachments); } @Override @@ -208,8 +206,8 @@ } @Override - public String getObjectId() { - return getId(); + public Integer getObjectId() { + return getIdAsInt(); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2013-04-20 14:33:56 UTC (rev 838) @@ -25,7 +25,6 @@ import com.google.common.collect.Lists; import fr.ifremer.tutti.PropagatePropertyChangeListener; import fr.ifremer.tutti.persistence.entities.TuttiEntities; -import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.IndividualObservationBatch; @@ -36,7 +35,6 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; -import fr.ifremer.tutti.ui.swing.content.operation.catches.accidental.AccidentalBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.create.CreateIndividualObservationBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.create.CreateIndividualObservationBatchUIModel; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; @@ -132,13 +130,14 @@ protected IndividualObservationBatchRowModel loadBatch(IndividualObservationBatch aBatch) { - Integer id = aBatch.getIdAsInt(); + IndividualObservationBatchRowModel newRow = + new IndividualObservationBatchRowModel(aBatch); List<Attachment> attachments = - persistenceService.getAllAttachments(id); + persistenceService.getAllAttachments(newRow.getObjectType(), + newRow.getObjectId()); - IndividualObservationBatchRowModel newRow = - new IndividualObservationBatchRowModel(aBatch, attachments); + newRow.addAllAttachment(attachments); return newRow; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchRowModel.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchRowModel.java 2013-04-20 14:33:56 UTC (rev 838) @@ -76,11 +76,9 @@ super(MarineLitterBatch.class, fromBeanBinder, toBeanBinder); } - public MarineLitterBatchRowModel(MarineLitterBatch aBatch, - List<Attachment> attachments) { + public MarineLitterBatchRowModel(MarineLitterBatch aBatch) { this(); fromBean(aBatch); - this.attachment.addAll(attachments); } @Override @@ -172,8 +170,8 @@ } @Override - public String getObjectId() { - return getId(); + public Integer getObjectId() { + return getIdAsInt(); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java 2013-04-20 14:33:56 UTC (rev 838) @@ -33,7 +33,6 @@ import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.MarineLitterBatch; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; -import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.ui.swing.content.operation.AbstractTuttiBatchTableUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; @@ -59,7 +58,6 @@ import org.jdesktop.swingx.decorator.HighlightPredicate; import org.jdesktop.swingx.decorator.Highlighter; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; -import org.nuiton.util.decorator.Decorator; import javax.swing.JComponent; import java.awt.Color; @@ -115,10 +113,12 @@ BatchContainer<MarineLitterBatch> batchContainer = persistenceService.getRootMarineLitterBatch(bean.getId()); - model.setRootBatchId(batchContainer.getId()); + model.setRootBatchId(batchContainer.getIdAsInt()); List<Attachment> attachments = - persistenceService.getAllAttachments(Integer.valueOf(model.getObjectId())); + persistenceService.getAllAttachments( + model.getObjectType(), + model.getObjectId()); model.addAllAttachment(attachments); if (log.isInfoEnabled()) { @@ -137,14 +137,13 @@ protected MarineLitterBatchRowModel loadBatch(MarineLitterBatch aBatch) { - Integer id = aBatch.getIdAsInt(); + MarineLitterBatchRowModel newRow = new MarineLitterBatchRowModel(aBatch); List<Attachment> attachments = - persistenceService.getAllAttachments(id); + persistenceService.getAllAttachments(newRow.getObjectType(), + newRow.getObjectId()); - MarineLitterBatchRowModel newRow = - new MarineLitterBatchRowModel(aBatch, attachments); - + newRow.addAllAttachment(attachments); return newRow; } @@ -322,18 +321,18 @@ // MarineLitter Category column addColumnToModel(columnModel, - null, - newTableCellRender(CaracteristicQualitativeValue.class, null), - MarineLitterBatchTableModel.MACRO_WASTE_CATEGORY); + null, + newTableCellRender(CaracteristicQualitativeValue.class, null), + MarineLitterBatchTableModel.MACRO_WASTE_CATEGORY); } { // MarineLitter Size Category column addColumnToModel(columnModel, - null, - newTableCellRender(CaracteristicQualitativeValue.class, null), - MarineLitterBatchTableModel.MACRO_WASTE_SIZE_CATEGORY); + null, + newTableCellRender(CaracteristicQualitativeValue.class, null), + MarineLitterBatchTableModel.MACRO_WASTE_SIZE_CATEGORY); } { // Number column Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIModel.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIModel.java 2013-04-20 14:33:56 UTC (rev 838) @@ -59,7 +59,7 @@ */ protected boolean removeBatchEnabled; - private String rootBatchId; + private Integer rootBatchId; public MarineLitterBatchUIModel(EditCatchesUIModel catchesUIModel) { super(catchesUIModel, @@ -96,13 +96,13 @@ firePropertyChange(PROPERTY_REMOVE_BATCH_ENABLED, oldValue, removeBatchEnabled); } - public void setRootBatchId(String rootBatchId) { - String oldValue = getObjectId(); + public void setRootBatchId(Integer rootBatchId) { + Integer oldValue = getObjectId(); this.rootBatchId = rootBatchId; firePropertyChange(PROPERTY_OBJECT_ID, oldValue, getObjectId()); } - public String getRootBatchId() { + public Integer getRootBatchId() { return rootBatchId; } @@ -116,11 +116,11 @@ @Override public AttachementObjectTypeEnum getObjectType() { - return AttachementObjectTypeEnum.CATCH_BATCH; + return AttachementObjectTypeEnum.BATCH; } @Override - public String getObjectId() { + public Integer getObjectId() { return rootBatchId; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchRowModel.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchRowModel.java 2013-04-20 14:33:56 UTC (rev 838) @@ -183,8 +183,8 @@ } @Override - public String getObjectId() { - return getId(); + public Integer getObjectId() { + return getIdAsInt(); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java 2013-04-20 14:33:56 UTC (rev 838) @@ -227,14 +227,12 @@ } public SpeciesBatchRowModel(SpeciesBatch aBatch, - List<SpeciesBatchFrequency> frequencies, - List<Attachment> attachments) { + List<SpeciesBatchFrequency> frequencies) { this(); fromBean(aBatch); List<SpeciesFrequencyRowModel> frequencyRows = SpeciesFrequencyRowModel.fromBeans(frequencies); frequency.addAll(frequencyRows); - this.attachment.addAll(attachments); Collections.sort(frequency); } @@ -720,8 +718,8 @@ } @Override - public String getObjectId() { - return getId(); + public Integer getObjectId() { + return getIdAsInt(); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-04-20 14:33:56 UTC (rev 838) @@ -221,10 +221,11 @@ BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(bean.getId()); - model.setRootBatchId(rootSpeciesBatch.getId()); + model.setRootBatchId(rootSpeciesBatch.getIdAsInt()); List<Attachment> attachments = - persistenceService.getAllAttachments(Integer.valueOf(model.getObjectId())); + persistenceService.getAllAttachments(model.getObjectType(), + model.getObjectId()); model.addAllAttachment(attachments); if (log.isInfoEnabled()) { @@ -1083,11 +1084,15 @@ List<SpeciesBatchFrequency> frequencies = persistenceService.getAllSpeciesBatchFrequency(id); + SpeciesBatchRowModel newRow = + new SpeciesBatchRowModel(aBatch, frequencies); + List<Attachment> attachments = - persistenceService.getAllAttachments(Integer.valueOf(id)); + persistenceService.getAllAttachments(newRow.getObjectType(), + newRow.getObjectId()); + newRow.addAllAttachment(attachments); - SpeciesBatchRowModel newRow = - new SpeciesBatchRowModel(aBatch, frequencies, attachments); + // set the surveycode, do it only on the parent, // the species of the parent is set to the children in loadBatchRow if (parentRow == null && context.isProtocolFilled()) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java 2013-04-20 14:33:56 UTC (rev 838) @@ -131,7 +131,7 @@ protected final List<Attachment> attachment = Lists.newArrayList(); - private String rootBatchId; + private Integer rootBatchId; public SpeciesBatchUIModel(EditCatchesUIModel catchesUIModel) { super(catchesUIModel, @@ -336,13 +336,13 @@ firePropertyChange(PROPERTY_CREATE_MELAG_ENABLED, oldValue, createMelagEnabled); } - public void setRootBatchId(String rootBatchId) { - String oldValue = getObjectId(); + public void setRootBatchId(Integer rootBatchId) { + Integer oldValue = getObjectId(); this.rootBatchId = rootBatchId; firePropertyChange(PROPERTY_OBJECT_ID, oldValue, getObjectId()); } - public String getRootBatchId() { + public Integer getRootBatchId() { return rootBatchId; } @@ -352,11 +352,11 @@ @Override public AttachementObjectTypeEnum getObjectType() { - return AttachementObjectTypeEnum.CATCH_BATCH; + return AttachementObjectTypeEnum.BATCH; } @Override - public String getObjectId() { + public Integer getObjectId() { return rootBatchId; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java 2013-04-20 14:33:56 UTC (rev 838) @@ -37,8 +37,6 @@ import jaxx.runtime.swing.ComponentResizer; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import javax.swing.AbstractAction; import javax.swing.Action; @@ -66,10 +64,6 @@ */ public class AttachmentEditorUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, AttachmentEditorUI> { - /** Logger. */ - private static final Log log = - LogFactory.getLog(AttachmentEditorUIHandler.class); - public static final String CLOSE_DIALOG_ACTION = "closeDialog"; public static final String SHOW_DIALOG_ACTION = "showDialog"; @@ -233,7 +227,7 @@ name = file.getName(); } attachment.setObjectType(bean.getObjectType()); - attachment.setObjectId(Integer.valueOf(bean.getObjectId())); + attachment.setObjectId(bean.getObjectId()); attachment.setName(name); attachment.setComment(ui.getFileComment().getText()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentModelAware.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentModelAware.java 2013-04-20 12:52:37 UTC (rev 837) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentModelAware.java 2013-04-20 14:33:56 UTC (rev 838) @@ -45,7 +45,7 @@ AttachementObjectTypeEnum getObjectType(); - String getObjectId(); + Integer getObjectId(); List<Attachment> getAttachment();

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
21
Older →

Jump to page: