Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 81376acd by tchemit at 2019-02-07T14:49:45Z Perte des tooltips sur les données calculées - Closes #1218 - - - - - 37246ad7 by tchemit at 2019-02-07T14:49:47Z update pom - - - - - 7e31647e by tchemit at 2019-02-07T14:49:47Z [UI] Le slider pourrait défiler de façon automatique - Closes #1214 - - - - - 12 changed files: - client-core/src/main/i18n/getters/java.getter - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/AbstractSampleUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/StorageTabUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/StorageTabUIHandler.java - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - pom.xml Changes: ===================================== client-core/src/main/i18n/getters/java.getter ===================================== @@ -502,6 +502,10 @@ observe.common.RouteDto.message.no.active.found observe.common.RouteDto.message.no.active.found.for.other.trip observe.common.RouteDto.message.not.open observe.common.RouteDto.message.updating +observe.common.Sample.length.computed.tip +observe.common.Sample.length.observed.tip +observe.common.Sample.weight.computed.tip +observe.common.Sample.weight.observed.tip observe.common.SchoolEstimateDto.table.meanWeight observe.common.SchoolEstimateDto.table.meanWeight.tip observe.common.SchoolEstimateDto.table.speciesThon ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUIHandler.java ===================================== @@ -55,6 +55,7 @@ import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState; import org.nuiton.util.StringUtil; import javax.swing.JOptionPane; +import javax.swing.JTextArea; import java.io.PrintWriter; import java.io.StringWriter; import java.util.Collection; @@ -192,7 +193,9 @@ public class AdminTabUIHandler<U extends AdminTabUI> { } public void addMessage(AdminStep step, String text) { - ui.getProgression().append(text + "\n"); + JTextArea progression = ui.getProgression(); + progression.append(text + "\n"); + progression.setCaretPosition(progression.getDocument().getLength()); } protected void logExportResult(String i18nKey, ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/AbstractSampleUIHandler.java ===================================== @@ -32,13 +32,15 @@ import fr.ird.observe.dto.data.seine.NonTargetLengthDto; import fr.ird.observe.dto.data.seine.TargetLengthDto; import fr.ird.observe.dto.referential.SizeMeasureTypeReference; import fr.ird.observe.dto.referential.SpeciesReference; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.beans.PropertyChangeListener; import java.util.List; import java.util.Optional; +import static io.ultreia.java4all.i18n.I18n.n; + /** * Created on 31/10/16. * @@ -47,6 +49,11 @@ import java.util.Optional; */ public abstract class AbstractSampleUIHandler<E extends IdDto, D extends IdDto, U extends ContentTableUI<E, D, U>> extends ContentTableUIHandler<E, D, U> { + public static final String POIDS_COMPUTED_TIP = n("observe.common.Sample.weight.computed.tip"); + public static final String POIDS_OBSERVED_TIP = n("observe.common.Sample.weight.observed.tip"); + public static final String LONGUEUR_COMPUTED_TIP = n("observe.common.Sample.length.computed.tip"); + public static final String LONGUEUR_OBSERVED_TIP = n("observe.common.Sample.length.observed.tip"); + protected final Logger log = LogManager.getLogger(getClass()); /** * Ecoute les modifications de la propriété {@link TargetLengthDto#getWeight()}, ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUI.jaxx ===================================== @@ -83,22 +83,14 @@ <script><![CDATA[ -public static final String POIDS_COMPUTED_TIP = n("observe.common.Sample.weight.computed.tip"); -public static final String POIDS_OBSERVED_TIP = n("observe.common.Sample.weight.observed.tip"); -public static final String LONGUEUR_COMPUTED_TIP = n("observe.common.Sample.length.computed.tip"); -public static final String LONGUEUR_OBSERVED_TIP = n("observe.common.Sample.length.observed.tip"); - public String getWeightDataTip(boolean computed) { - return computed ? t(POIDS_COMPUTED_TIP) : t(POIDS_OBSERVED_TIP); + return computed ? t(NonTargetSampleUIHandler.POIDS_COMPUTED_TIP) : t(NonTargetSampleUIHandler.POIDS_OBSERVED_TIP); } public String getLengthDataTip(boolean computed) { - return computed ? t(LONGUEUR_COMPUTED_TIP) : t(LONGUEUR_OBSERVED_TIP); + return computed ? t(NonTargetSampleUIHandler.LONGUEUR_COMPUTED_TIP) : t(NonTargetSampleUIHandler.LONGUEUR_OBSERVED_TIP); } -public String getSpeciesFauneTypeTaille(SpeciesReference species) { - return species == null ? t("observe.message.no.species.selected") : species.getSizeMeasureTypeId(); -} ]]> </script> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUI.jcss ===================================== @@ -40,16 +40,6 @@ _resetTablePropertyName:{NonTargetLengthDto.PROPERTY_PICTURES_REFERENCES}; } -#speciesTypeTailleLabel { - actionIcon:"information"; - text:"observe.common.lengthMeasureType"; -} - -#speciesTypeTaille { - font-weight:"bold"; - text:{getSpeciesFauneTypeTaille(tableEditBean.getSpecies())}; -} - #comment { model:{getBean()}; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUI.jaxx ===================================== @@ -79,20 +79,15 @@ <script><![CDATA[ -public static final String POIDS_COMPUTED_TIP = n("observe.common.Sample.weight.computed.tip"); -public static final String POIDS_OBSERVED_TIP = n("observe.common.Sample.weight.observed.tip"); -public static final String LONGUEUR_COMPUTED_TIP = n("observe.common.Sample.length.computed.tip"); -public static final String LONGUEUR_OBSERVED_TIP = n("observe.common.Sample.length.observed.tip"); - @Override public abstract TargetSampleUIHandler getHandler(); public String getWeightDataTip(boolean computed) { - return computed ? t(POIDS_COMPUTED_TIP) : t(POIDS_OBSERVED_TIP); + return computed ? t(TargetSampleUIHandler.POIDS_COMPUTED_TIP) : t(TargetSampleUIHandler.POIDS_OBSERVED_TIP); } public String getLengthDataTip(boolean computed) { - return computed ? t(LONGUEUR_COMPUTED_TIP) : t(LONGUEUR_OBSERVED_TIP); + return computed ? t(TargetSampleUIHandler.LONGUEUR_COMPUTED_TIP) : t(TargetSampleUIHandler.LONGUEUR_OBSERVED_TIP); } ]]> </script> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/StorageTabUI.jaxx ===================================== @@ -64,13 +64,7 @@ protected void setDescriptionText(String text) { } protected String getProgressString(int currentStep, int nbStep) { - StorageStep step = getStep(); - String txt = ""; - if (step != null) { - txt = n("observe.storage.step.label"); - txt = t(txt, currentStep + 1, nbStep, I18nEnumHelper.getLabel(step)); - } - return txt; + return StorageTabUIHandler.getProgressString(currentStep, nbStep, getStep()); } ]]> </script> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/StorageTabUIHandler.java ===================================== @@ -23,12 +23,15 @@ package fr.ird.observe.client.ui.storage.tabs; import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.ObserveTextGenerator; +import fr.ird.observe.client.ui.storage.StorageStep; import fr.ird.observe.client.ui.storage.StorageUIModel; +import fr.ird.observe.dto.I18nEnumHelper; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import org.nuiton.jaxx.runtime.JAXXObject; import javax.swing.JLabel; +import static io.ultreia.java4all.i18n.I18n.n; import static io.ultreia.java4all.i18n.I18n.t; /** @@ -80,4 +83,12 @@ public class StorageTabUIHandler<U extends JAXXObject> { this.ui = ui; } + protected static String getProgressString(int currentStep, int nbStep,StorageStep step) { + String txt = ""; + if (step != null) { + txt = n("observe.storage.step.label"); + txt = t(txt, currentStep + 1, nbStep, I18nEnumHelper.getLabel(step)); + } + return txt; + } } ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1072,7 +1072,11 @@ observe.common.RouteDto.titles=Routes observe.common.RouteDto.type=Route observe.common.RouteDto.types=Routes observe.common.Sample.action.resetDefaultSizeMeasureType.tip=Use default size measure type +observe.common.Sample.length.computed.tip=Length was computed +observe.common.Sample.length.observed.tip=Length was observed observe.common.Sample.weight=Individual weight (kg) +observe.common.Sample.weight.computed.tip=Weight was computed (%s) +observe.common.Sample.weight.observed.tip=Weight was observed observe.common.SchoolEstimateDto.action.create=Insert this estimate observe.common.SchoolEstimateDto.action.create.tip=Insert this estimate observe.common.SchoolEstimateDto.meanWeight=Mean weight ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1072,7 +1072,11 @@ observe.common.RouteDto.titles=Rutas observe.common.RouteDto.type=Ruta observe.common.RouteDto.types=Rutas observe.common.Sample.action.resetDefaultSizeMeasureType.tip=Utilizar el tipo de medida por defecto +observe.common.Sample.length.computed.tip=Longitud calculada +observe.common.Sample.length.observed.tip=Longitud observada observe.common.Sample.weight=Peso del ejemplar (en Kg) +observe.common.Sample.weight.computed.tip=Peso calculado +observe.common.Sample.weight.observed.tip=Peso observado observe.common.SchoolEstimateDto.action.create=Insertar la estimación observe.common.SchoolEstimateDto.action.create.tip=Insertar la nueva estimación en la tabla observe.common.SchoolEstimateDto.meanWeight=Peso medio (en Kg) ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -1072,7 +1072,11 @@ observe.common.RouteDto.titles=Routes observe.common.RouteDto.type=Route observe.common.RouteDto.types=Routes observe.common.Sample.action.resetDefaultSizeMeasureType.tip=Utiliser le type de mensuration par défaut +observe.common.Sample.length.computed.tip=La longueur a été calculée +observe.common.Sample.length.observed.tip=La longueur a été observée observe.common.Sample.weight=Poids ind. (en Kg) +observe.common.Sample.weight.computed.tip=Le poids a été calculé +observe.common.Sample.weight.observed.tip=Le poids a été observé observe.common.SchoolEstimateDto.action.create=Insérer cette estimation observe.common.SchoolEstimateDto.action.create.tip=Insérer la nouvelle estimation dans la table observe.common.SchoolEstimateDto.meanWeight=Poids moyen (en Kg) ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.7</version> + <version>2019.8.8</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/6bc4e3f71de42c02909090004d0... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/6bc4e3f71de42c02909090004d0... You're receiving this email because of your account on gitlab.com.