[tutti] branch develop updated (ac95a90 -> edacaf3)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from ac95a90 fixes #5187: [AIDE] mises à jour new edacaf3 fixes #5127: [BIGFIN] si mesure au mm, les mesures du big fin sont importées en cm sur le tableau Tutti The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit edacaf32f5b692c9e24876d5c51bf3c0365b1a59 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 25 11:38:50 2014 +0200 fixes #5127: [BIGFIN] si mesure au mm, les mesures du big fin sont importées en cm sur le tableau Tutti Summary of changes: .../species/frequency/SpeciesFrequencyUIHandler.java | 14 ++++---------- .../main/resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../main/resources/i18n/tutti-ui-swing_fr_FR.properties | 4 ++-- 3 files changed, 7 insertions(+), 12 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit edacaf32f5b692c9e24876d5c51bf3c0365b1a59 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 25 11:38:50 2014 +0200 fixes #5127: [BIGFIN] si mesure au mm, les mesures du big fin sont importées en cm sur le tableau Tutti --- .../species/frequency/SpeciesFrequencyUIHandler.java | 14 ++++---------- .../main/resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../main/resources/i18n/tutti-ui-swing_fr_FR.properties | 4 ++-- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java index f57585b..b77c295 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java @@ -567,7 +567,8 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci getTable().scrollRowToVisible(rowIndex); if (fromIchtyometer) { - showInformationMessage(t("tutti.editSpeciesFrequencies.addMeasure", step, aroundLengthStep)); + String unit = model.getLengthStepCaracteristicUnit(); + showInformationMessage(t("tutti.editSpeciesFrequencies.addMeasure", step, aroundLengthStep, unit)); } } @@ -779,21 +780,14 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci if ("mm".equals(unit)) { - // measurement on mm asked + // measurement in mm asked length = record.getLength(); } else { - // measurement on cm asked + // measurement in cm asked length = record.getLength() / 10; - Float precision = getModel().getLengthStepCaracteristicPrecision(); - - if (precision != null) { - - //FIXME Should we consider the precision ? - - } } applyRafaleStep(length, true); diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties index e8f61bd..f1f3134 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties @@ -1165,6 +1165,7 @@ tutti.exportFishingOperationCsv.action.chooseFile= tutti.exportFishingOperationCsv.action.success= tutti.exportFishingOperationCsv.message.badBenthos= tutti.exportFishingOperationCsv.message.badSpecies= +tutti.exportFishingOperationCsv.message.missing.protocol= tutti.exportFishingOperationCsv.message.model.modified=Catch was modified, please save it before launching an export. tutti.exportFishingOperationCsv.message.required.protocol= tutti.exportFishingOperationCsv.title.badBenthos= diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index 71eb87c..682b43f 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -1079,7 +1079,7 @@ tutti.editSpeciesFrequencies.action.saveAndClose.tip=Enregistrer les mensuration tutti.editSpeciesFrequencies.action.saveAndContinue=Enregistrer et Continuer tutti.editSpeciesFrequencies.action.saveAndContinue.mnemonic=C tutti.editSpeciesFrequencies.action.saveAndContinue.tip=Enregistrer les mensurations et saisir les mensurations pour le lot suivant -tutti.editSpeciesFrequencies.addMeasure=Ajout d'un individu de taille <strong>%s</strong>cm (classe de taille <strong>%s</strong>cm) +tutti.editSpeciesFrequencies.addMeasure=Ajout d'un individu de taille <strong>%1$s</strong>%3$s (classe de taille <strong>%2$s</strong>%3$s) tutti.editSpeciesFrequencies.askBeforeSave.help=Que voulez-vous faire?<ul><li><strong>Non</strong> pour rester sur cet écran</li><li><strong>Oui</strong> pour enregisrer les mensurations avec poids</li></ul> tutti.editSpeciesFrequencies.askBeforeSave.message=La saisie comporte des classes de taille avec et sans poids associés.<br/><strong>Seules les classes de taille avec poids seront dans ce cas sauvegardées.</strong> tutti.editSpeciesFrequencies.askBeforeSave.title=Confirmer l'enregistrement des mensurations @@ -1133,6 +1133,7 @@ tutti.exportCruiseCsv.title.badBenthos=Espèces non présentes dans le protocole tutti.exportCruiseCsv.title.badSpecies=Espèces non présentes dans le protocole (onglet Espèce) tutti.exportCruiseCsv.title.choose.exportFile=Exporter la campagne tutti.exportCruiseCsv.title.missing.protocol=Pas de protocole renseigné +tutti.exportCruiseCsv.title.required.protocol=Protocole requis pour export csv tutti.exportDb.step.closeDb=Fermeture de la base courante tutti.exportDb.step.createArchive=Création de l'archive %s tutti.exportDb.step.openDb=Réouverture de la base courante @@ -1148,7 +1149,6 @@ tutti.exportFishingOperationCsv.title.badSpecies=Espèces non présentes dans le tutti.exportFishingOperationCsv.title.choose.exportFile=Exporter le trait de la campagne tutti.exportFishingOperationCsv.title.missing.protocol=Protocole requis pour export csv tutti.exportFishingOperationCsv.title.model.modified=Impossible d'exporter, capture modifiée -tutti.exportCruiseCsv.title.required.protocol=Protocole requis pour export csv tutti.exportFishingOperationReport.action.chooseFile=Choisir le fichier de rapport tutti.exportFishingOperationReport.action.success=Le trait a été exporté dans le fichier <strong>%s</strong> tutti.exportFishingOperationReport.message.model.modified=La capture a été modifiée, veuillez l'enregistrer avant de lancer un export. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm