- Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][release/9.0.0-RC-14] 2 commits: [jgitflow-maven-plugin]updating poms for branch'release/9.0.0-RC-14' with...
by Tony CHEMIT (＠tchemit) 23 Sep '21

23 Sep '21

Tony CHEMIT pushed to branch release/9.0.0-RC-14 at ultreiaio / ird-observe Commits: d7cfd38e by Tony Chemit at 2021-09-23T18:32:27+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.0-RC-14' with non-snapshot versions[skip ci] - - - - - 91c61cbe by Tony Chemit at 2021-09-23T18:50:22+02:00 fix i18n - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/api/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/i18n/pom.xml - client/pom.xml - client/runner/pom.xml - models/definition/pom.xml - models/dto/i18n/pom.xml - models/dto/java/pom.xml - models/dto/pom.xml - models/navigation/descriptor/pom.xml - models/navigation/id/pom.xml - models/navigation/pom.xml - models/navigation/tree/pom.xml - models/persistence/avdth/pom.xml - models/persistence/java/pom.xml - models/persistence/migration/pom.xml - models/persistence/pom.xml - models/persistence/test-api/pom.xml - models/persistence/test-impl/pom.xml - models/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/14a9fc709348eea96fbb67b2… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/14a9fc709348eea96fbb67b2… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 9.0.0-RC-15-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 23 Sep '21

23 Sep '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d3787c81 by Tony Chemit at 2021-09-23T18:31:51+02:00 [jgitflow-maven-plugin]updating poms for 9.0.0-RC-15-SNAPSHOT development[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/api/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/i18n/pom.xml - client/pom.xml - client/runner/pom.xml - models/definition/pom.xml - models/dto/i18n/pom.xml - models/dto/java/pom.xml - models/dto/pom.xml - models/navigation/descriptor/pom.xml - models/navigation/id/pom.xml - models/navigation/pom.xml - models/navigation/tree/pom.xml - models/persistence/avdth/pom.xml - models/persistence/java/pom.xml - models/persistence/migration/pom.xml - models/persistence/pom.xml - models/persistence/test-api/pom.xml - models/persistence/test-impl/pom.xml - models/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d3787c812240945e27e824ec4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d3787c812240945e27e824ec4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/9.0.0-RC-14
by Tony CHEMIT (＠tchemit) 23 Sep '21

23 Sep '21

Tony CHEMIT pushed new branch release/9.0.0-RC-14 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/release/9.0.0-RC-14 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update CHANGELOG [skip ci]
by Tony CHEMIT (＠tchemit) 23 Sep '21

23 Sep '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 14a9fc70 by Tony Chemit at 2021-09-23T18:31:26+02:00 update CHANGELOG [skip ci] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,24 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2021-09-20 17:43. + * Last generated at 2021-09-23 18:30. + +## Version [9.0.0-RC-14](https://gitlab.com/ultreiaio/ird-observe/-/milestones/201) + +**Closed at 2021-09-23.** + +### Download +* [Application (observe-9.0.0-RC-14.zip)](https://repo1.maven.org/maven2/fr/ird/observe/obs…) +* [Serveur (observe-9.0.0-RC-14.war)](https://repo1.maven.org/maven2/fr/ird/observe/obs…) + +### Issues + * [[Type::Anomalie 1995]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1995) **Il n'est toujours pas possible de synchroniser simple un référentiel local avec un login distant de type référentiel** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 1996]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1996) **La synchronisation simple de référentiel ne synchronise pas** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 1998]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1998) **La synchro avancée de référentiel montre des différences qui ne devraient pas être là** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 1991]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1991) **Algorithme d'estimation du poids des batch de localmarket** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 1994]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1994) **Origine de ces libellés ?** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 1997]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1997) **Problème de données AVDTH / OA / Marché local sondage** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Tâche 1993]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1993) **Migration 7 vers 9 RC13 bloque** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) ## Version [9.0.0-RC-13](https://gitlab.com/ultreiaio/ird-observe/-/milestones/200) @@ -11,7 +28,6 @@ * [Application (observe-9.0.0-RC-13.zip)](https://repo1.maven.org/maven2/fr/ird/observe/obs…) * [Serveur (observe-9.0.0-RC-13.war)](https://repo1.maven.org/maven2/fr/ird/observe/obs…) - ### Issues * [[Type::Evolution 1986]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1986) **affichage des actions sur les tableaux inlines dans son titre à droite dans une toolbar et suppression alors des menus contextuels** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Type::Evolution 1987]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1987) **Stabilisation des éditeurs inlines** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/14a9fc709348eea96fbb67b26… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/14a9fc709348eea96fbb67b26… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 10 commits: fix menu action fires when editing a text field
by Tony CHEMIT (＠tchemit) 23 Sep '21

23 Sep '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e7470af2 by Tony Chemit at 2021-09-23T15:19:51+02:00 fix menu action fires when editing a text field - - - - - 6c519609 by Tony Chemit at 2021-09-23T16:39:18+02:00 fix number renderer (if <1 won't display it) - - - - - 91895f04 by Tony Chemit at 2021-09-23T16:46:03+02:00 fix enumeration decoration - - - - - b932e830 by Tony Chemit at 2021-09-23T16:46:15+02:00 fix i18n - - - - - bfe74226 by Tony Chemit at 2021-09-23T16:46:36+02:00 remove batch validation since now with the computed value we can have both - - - - - cfe587d0 by Tony Chemit at 2021-09-23T16:47:03+02:00 fix reset computed value and remove for the moment auto-consolidation - - - - - 8c23e69a by Tony Chemit at 2021-09-23T16:47:20+02:00 move origin field to a normal text editor - - - - - 5e81b40b by Tony Chemit at 2021-09-23T17:10:58+02:00 fix typo - - - - - 1f076526 by Tony Chemit at 2021-09-23T18:10:54+02:00 ps logbook Activity.time may be not null - - - - - 1e6cb46c by Tony Chemit at 2021-09-23T18:27:08+02:00 Problème de reset sur l'éditeur de temps (ps logbook activity) - Closes #2000 - - - - - 18 changed files: - client/core/src/main/java/fr/ird/observe/client/main/ObserveMainUIHandler.java - client/core/src/main/java/fr/ird/observe/client/util/JMenuWithAccelerator.java - client/core/src/main/java/fr/ird/observe/client/util/table/JXTableUtil.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/DataSourceEditorNavigationMenuHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/DataSourceEditorNavigationModuleContext.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/TripBatchUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/TripBatchUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIHandler.java - models/definition/src/main/models/Observe/dto/attribute/mayNotNull.properties - models/dto/java/src/main/java/fr/ird/observe/dto/data/ps/localmarket/BatchWeightComputedValueSource.java - models/dto/java/src/main/resources/observe-reports.properties - pom.xml - services/api-test/src/main/resources/fixtures/fr/ird/observe/services/service/actions/report/ReportService.properties - services/i18n/src/main/i18n/translations/services_en_GB.properties - services/i18n/src/main/i18n/translations/services_fr_FR.properties - services/validation/src/main/validation/fr/ird/observe/dto/data/ps/localmarket/BatchDto-create-warning-validation.xml - services/validation/src/main/validation/fr/ird/observe/dto/data/ps/localmarket/BatchDto-update-warning-validation.xml Changes: ===================================== client/core/src/main/java/fr/ird/observe/client/main/ObserveMainUIHandler.java ===================================== @@ -38,6 +38,8 @@ import org.nuiton.jaxx.runtime.swing.action.JAXXObjectActionSupport; import org.nuiton.jaxx.widgets.error.ErrorDialogUI; import javax.swing.JComponent; +import javax.swing.event.MenuEvent; +import javax.swing.event.MenuListener; import java.util.Locale; import static io.ultreia.java4all.i18n.I18n.t; @@ -103,6 +105,23 @@ public class ObserveMainUIHandler implements UIHandler<ObserveMainUI>, WithClien busyModel.addPropertyChangeListener(BusyModel.BUSY_PROPERTY_NAME, evt -> reload(model, config, busyModel)); + ui.getMenuLanguage().disabled(); + ui.getMenuHelp().addMenuListener(new MenuListener() { + @Override + public void menuSelected(MenuEvent e) { + ui.getMenuLanguage().enabled(); + } + + @Override + public void menuDeselected(MenuEvent e) { + ui.getMenuLanguage().disabled(); + } + + @Override + public void menuCanceled(MenuEvent e) { + ui.getMenuLanguage().disabled(); + } + }); } public void destroy() { ===================================== client/core/src/main/java/fr/ird/observe/client/util/JMenuWithAccelerator.java ===================================== @@ -39,10 +39,25 @@ public class JMenuWithAccelerator extends JMenu { private static final Logger log = LogManager.getLogger(JMenuWithAccelerator.class); private KeyStroke accelerator; + private boolean accessible; @Override public KeyStroke getAccelerator() { - return accelerator; + return accessible ? accelerator : null; + } + + public void enabled() { + KeyStroke oldValue = getAccelerator(); + accessible = true; + repaint(); + revalidate(); + firePropertyChange("accelerator", oldValue, getAccelerator()); + } + + public void disabled() { + KeyStroke oldValue = getAccelerator(); + accessible = false; + firePropertyChange("accelerator", oldValue, getAccelerator()); } @Override ===================================== client/core/src/main/java/fr/ird/observe/client/util/table/JXTableUtil.java ===================================== @@ -116,7 +116,7 @@ public class JXTableUtil { return null; } Number reference = (Number) value; - if (reference.intValue() == 0) { + if (reference.doubleValue() == 0) { return null; } return reference.toString(); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIModelStates.java ===================================== @@ -61,7 +61,7 @@ public class ContentTableUIModelStates<D extends DataDto, C extends ContainerChi */ private boolean canResetRow; /** - * Pour savoir si on peut voir les données du l'écran. + * Pour savoir si on peut voir les données de l'écran. * <p> * Cela diffère du mode de l'écran, à utiliser par exemple pour les écrans * d'échantillons lorsque aucune discarded n'est effectuée. on se retrouve en ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/DataSourceEditorNavigationMenuHandler.java ===================================== @@ -31,6 +31,8 @@ import io.ultreia.java4all.i18n.I18n; import org.nuiton.jaxx.runtime.spi.UIHandler; import javax.swing.JMenuItem; +import javax.swing.event.MenuEvent; +import javax.swing.event.MenuListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -65,6 +67,26 @@ public class DataSourceEditorNavigationMenuHandler implements UIHandler<DataSour psContext = new DataSourceEditorNavigationModuleContext(ui, editModel.getPs()); llContext = new DataSourceEditorNavigationModuleContext(ui, editModel.getLl()); + ui.addMenuListener(new MenuListener() { + @Override + public void menuSelected(MenuEvent e) { + psContext.rootMenu.enabled(); + llContext.rootMenu.enabled(); + } + + @Override + public void menuDeselected(MenuEvent e) { + psContext.rootMenu.disabled(); + llContext.rootMenu.disabled(); + } + + @Override + public void menuCanceled(MenuEvent e) { + psContext.rootMenu.disabled(); + llContext.rootMenu.disabled(); + } + }); + selectCommonReferential = new JMenuItem(); ObserveBusinessProject project = ObserveBusinessProject.get(); SelectReferentialAction.install(ui, ui.getPopupMenu(), selectCommonReferential, project.getCommonBusinessModule(), project.getCommonBusinessModule().getCommonBusinessSubModule()); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/DataSourceEditorNavigationModuleContext.java ===================================== @@ -64,8 +64,9 @@ public class DataSourceEditorNavigationModuleContext implements PropertyChangeLi JMenuWithAccelerator rootMenu = new JMenuWithAccelerator(); KeyStroke keyStroke = MenuAction.getMenuKeyStroke(ui.getPopupMenu()); rootMenu.setAccelerator(keyStroke); - rootMenu.setMnemonic(keyStroke.getKeyChar()); + rootMenu.setMnemonic((char) keyStroke.getKeyCode()); this.rootMenu = rootMenu; + this.rootMenu.disabled(); rootMenu.setText(I18n.t("observe.ui.menu.navigation." + editModel.getModel().toLowerCase())); ui.add(rootMenu); NavigationModelNode<?> node = editModel.getNode(1); @@ -75,7 +76,7 @@ public class DataSourceEditorNavigationModuleContext implements PropertyChangeLi for (BusinessSubModule subModule : module.getSubModules()) { for (EditNode<?> editNode : nodes) { //FIXME We need to get a better order from persistence model - if (editNode.getSubModule().equals(subModule)) { + if (editNode.getSubModule().equals(subModule) && editNode.getLevel() > 0) { JMenuItem item = new JMenuItem(); dataItems.add(item); SelectEditDataAction.install(ui, rootMenu.getPopupMenu(), item, editNode); ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/TripBatchUI.jaxx ===================================== @@ -111,8 +111,11 @@ </row>  <row> - <cell columns='2'> - <BigTextEditor id="origin"/> + <cell> + <JLabel id='originLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <NormalTextEditor id="origin"/> </cell> </row> </Table> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/TripBatchUIModelStates.java ===================================== @@ -53,10 +53,11 @@ import java.util.Set; @GenerateJavaBeanDefinition public class TripBatchUIModelStates extends GeneratedTripBatchUIModelStates { - public static final Set<String> COMPUTE_PROPERTIES = Set.of(BatchDto.PROPERTY_WEIGHT, BatchDto.PROPERTY_PACKAGING); + public static final Set<String> COMPUTE_PROPERTIES = Set.of(BatchDto.PROPERTY_COUNT, BatchDto.PROPERTY_WEIGHT, BatchDto.PROPERTY_PACKAGING); private static final Logger log = LogManager.getLogger(TripBatchUIModelStates.class); private final ConsolidateDataService psConsolidateDataService; private TripDto trip; + private boolean computing; public TripBatchUIModelStates(GeneratedTripBatchUIModel model) { super(model); @@ -70,11 +71,19 @@ public class TripBatchUIModelStates extends GeneratedTripBatchUIModelStates { if (context.getSelectModel().getPs().getCommonTrip().isEnabled()) { trip = context.getCurrentPsCommonTrip(); } - getTableEditBean().addPropertyChangeListener(this::recomputeComputedValues); + getTableEditBean().addPropertyChangeListener(BatchDto.PROPERTY_WEIGHT, this::resetComputedValues); + //TODO Do not compute it for the moment +// getTableEditBean().addPropertyChangeListener(this::recomputeComputedValues); //FIXME Should come from node context not from here... // setShowData(getBean().isNotAvailablePackagingsEmpty()); } + public void resetComputedValues(PropertyChangeEvent event) { + if (event.getNewValue() == null && getTableModel().isCanConsolidate()) { + getTableEditBean().setWeightComputedSource(null); + } + } + public void recomputeComputedValues(PropertyChangeEvent event) { String propertyName = event.getPropertyName(); if (!COMPUTE_PROPERTIES.contains(propertyName) || !getTableModel().isCanConsolidate()) { @@ -84,15 +93,29 @@ public class TripBatchUIModelStates extends GeneratedTripBatchUIModelStates { } public void recomputeComputedValues() { - BatchConsolidateRequest request = new BatchConsolidateRequest(); - request.setBatch(getTableEditBean()); - request.setOceanId(trip.getOcean().getId()); - request.setDate(trip.getEndDate()); - request.setFailIfLengthWeightParameterNotFound(getClientConfig().isValidationLengthWeightEnable()); - BatchConsolidateResult result = psConsolidateDataService.consolidateLocalmarketBatch(request); - if (result != null) { - log.info("Flush consolidate batch changes..."); - result.flushToDto(getTableEditBean()); + if (computing) { + return; + } + computing = true; + + try { + log.info("Will recompute some values..."); + BatchConsolidateRequest request = new BatchConsolidateRequest(); + request.setBatch(getTableEditBean()); + request.setOceanId(trip.getOcean().getId()); + request.setDate(trip.getEndDate()); + request.setFailIfLengthWeightParameterNotFound(false); + BatchConsolidateResult result = psConsolidateDataService.consolidateLocalmarketBatch(request); + if (result != null) { + log.info("Flush consolidate batch changes..."); + result.flushToDto(getTableEditBean()); + String lengthWeightParameterNotFound = result.getLengthWeightParameterNotFound(); + if (lengthWeightParameterNotFound != null) { + log.warn(lengthWeightParameterNotFound); + } + } + } finally { + computing = false; } } ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIHandler.java ===================================== @@ -43,8 +43,6 @@ class ActivityUIHandler extends GeneratedActivityUIHandler { String text = t("observe.Common.vesselActivity.comment", label); ui.vesselActivityInformation.setText(text); ui.vesselActivityInformation.setToolTipText(text); - //FIXME if dto.time is null, then we have the current time :( - ui.getTime().reset(); } @Override ===================================== models/definition/src/main/models/Observe/dto/attribute/mayNotNull.properties ===================================== @@ -56,6 +56,7 @@ data.ps.localmarket.SampleSampleSpecies.attribute.sampleSpecies=true data.ps.logbook.Activity.attribute.currentDirection=true data.ps.logbook.Activity.attribute.relatedObservedActivity=true data.ps.logbook.Activity.attribute.seaSurfaceTemperature=true +data.ps.logbook.Activity.attribute.time=true data.ps.logbook.Activity.attribute.wind=true data.ps.logbook.Catch.attribute.weightCategory=true data.ps.logbook.Route.attribute.comment=true ===================================== models/dto/java/src/main/java/fr/ird/observe/dto/data/ps/localmarket/BatchWeightComputedValueSource.java ===================================== @@ -49,6 +49,6 @@ public enum BatchWeightComputedValueSource { } @Override public String toString() { - return super.toString(); + return getLabel(); } } ===================================== models/dto/java/src/main/resources/observe-reports.properties ===================================== @@ -1298,7 +1298,7 @@ Date départ,\ Date arrivée,\ Date de l'échantillon,\ Cuves,\ -Composition du l'échantillon (tuple espèce - type de mesure - classe de taille - effectif),\ +Composition de l'échantillon (tuple espèce - type de mesure - classe de taille - effectif),\ Commentaire report.psLocalmarketSample.operations.1=ComputeLocalmarketSampleWellAndSpeciesMeasure report.psLocalmarketSample.repeatVariable.sampleId=java.lang.String|\ ===================================== pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2021.95</version> + <version>2021.96</version> </parent> <groupId>fr.ird.observe</groupId> ===================================== services/api-test/src/main/resources/fixtures/fr/ird/observe/services/service/actions/report/ReportService.properties ===================================== @@ -355,7 +355,7 @@ psLocalmarketSample.result.1=483^CAP BOJADOR^30/3/2019^8/4/2019^27/3/2021^3B, 3T psLocalmarketSample.result.columns=8 psLocalmarketSample.result.rows=2 psLocalmarketSample.syntax.columns=8 -psLocalmarketSample.syntax.columnsHeader=Code bateau^Nom bateau^Date départ^Date arrivée^Date de l'échantillon^Cuves^Composition du l'échantillon (tuple espèce - type de mesure - classe de taille - effectif)^Commentaire +psLocalmarketSample.syntax.columnsHeader=Code bateau^Nom bateau^Date départ^Date arrivée^Date de l'échantillon^Cuves^Composition de l'échantillon (tuple espèce - type de mesure - classe de taille - effectif)^Commentaire psLocalmarketSample.syntax.description=Marché local - Échantillons psLocalmarketSample.syntax.name=Marché local - Échantillons psLocalmarketSample.syntax.nbRequests=1 ===================================== services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -408,7 +408,7 @@ observe.common.exist.on.remote=%1$s (already exist) observe.constant.AcquisitionMode.individual=By individu observe.constant.AcquisitionMode.number=By effectif observe.constant.BatchWeightComputedValueSource.fromPackagingMeanWeight=Computed from packaging mean weight -observe.constant.BatchWeightComputedValueSource.fromSpeciesMeanWeight=Computed from species mean weight +<F extends DataDto&FloatingObjectAware, P extends DataDto&FloatingObjectPartAware>Computed from species mean weight observe.constant.CatchAcquisitionMode.GROUPED=Batch observe.constant.CatchAcquisitionMode.INDIVIDUAL=Individual observe.constant.CatchComputedValueSource.fromData=Computed from data ===================================== services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -408,7 +408,7 @@ observe.common.exist.on.remote=%1$s (déjà existante) observe.constant.AcquisitionMode.individual=Saisie par individu observe.constant.AcquisitionMode.number=Saisie par nombre observe.constant.BatchWeightComputedValueSource.fromPackagingMeanWeight=Calculé depuis le poids moyen du conditionnement -observe.constant.BatchWeightComputedValueSource.fromSpeciesMeanWeight=Calculé depuis le poids moyen de l'espèceobserve.constant.BatchWeightComputedValueSource.fromPackagingMeanWeight\= +observe.constant.BatchWeightComputedValueSource.fromSpeciesMeanWeight=Calculé depuis le poids moyen de l'espèce observe.constant.CatchAcquisitionMode.GROUPED=Groupé observe.constant.CatchAcquisitionMode.INDIVIDUAL=Par individu observe.constant.CatchComputedValueSource.fromData=calculé à partir des autres données ===================================== services/validation/src/main/validation/fr/ird/observe/dto/data/ps/localmarket/BatchDto-create-warning-validation.xml ===================================== @@ -23,15 +23,6 @@ "-//Apache Struts//XWork Validator 1.0.3//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> - <field name="count"> -  - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ countOrWeightValid ]]> - </param> - <message>observe.data.ps.localmarket.Batch.count.validation.required</message> - </field-validator> - </field> <field name="date">  <field-validator type="dayAfter" short-circuit="true"> @@ -41,14 +32,5 @@ <message>observe.data.ps.localmarket.Batch.validation.date.after.currentTrip.endDate##${startDate}##${endDate}</message> </field-validator> </field> - <field name="weight"> -  - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ countOrWeightValid ]]> - </param> - <message>observe.data.ps.localmarket.Batch.count.validation.required</message> - </field-validator> - </field> </validators> ===================================== services/validation/src/main/validation/fr/ird/observe/dto/data/ps/localmarket/BatchDto-update-warning-validation.xml ===================================== @@ -23,15 +23,6 @@ "-//Apache Struts//XWork Validator 1.0.3//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> - <field name="count"> -  - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ countOrWeightValid ]]> - </param> - <message>observe.data.ps.localmarket.Batch.count.validation.required</message> - </field-validator> - </field> <field name="date">  <field-validator type="dayAfter" short-circuit="true"> @@ -41,14 +32,5 @@ <message>observe.data.ps.localmarket.Batch.validation.date.after.currentTrip.endDate##${startDate}##${endDate}</message> </field-validator> </field> - <field name="weight"> -  - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ countOrWeightValid ]]> - </param> - <message>observe.data.ps.localmarket.Batch.count.validation.required</message> - </field-validator> - </field> </validators> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/196f745c2e0eaaf30e076966… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/196f745c2e0eaaf30e076966… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 18 commits: Définition des reports PS logbooks tabulaires [localmarket] - See #1969
by Tony CHEMIT (＠tchemit) 23 Sep '21

23 Sep '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 691f7c3b by Tony Chemit at 2021-09-22T21:54:22+02:00 Définition des reports PS logbooks tabulaires [localmarket] - See #1969 - - - - - fb49c7fb by Tony Chemit at 2021-09-22T21:54:22+02:00 Amélioration du code pour les reports sur les équipements - - - - - 00985781 by Tony Chemit at 2021-09-22T21:54:22+02:00 Mode de saisie par défaut - Closes #1992 - - - - - 3d2042a2 by Tony Chemit at 2021-09-22T21:54:22+02:00 Origine de ces libellés ? - Closes #1994 - - - - - afd1b49e by Tony Chemit at 2021-09-23T13:37:29+02:00 Problème de données AVDTH / OA / Marché local sondage - Closes #1997 - - - - - e8872bd8 by Tony Chemit at 2021-09-23T13:37:29+02:00 Affichage d'un **Date non définie** plutot que aucun sur les données avec un champs **date** - - - - - 98f79e22 by Tony Chemit at 2021-09-23T13:37:29+02:00 Improve Report API, now we can have operations with parameters and no more enumeration to describe operations, use ReportOperationConsumer. More over introduce also ReportRequestExecutor with common code inside it, the service local is one of it. (service code goes from 517 lines to 142 :)) - - - - - 1d80b2ab by Tony Chemit at 2021-09-23T13:37:29+02:00 update fixtures (migration timestamp changed...) - - - - - c52ecaf9 by Tony Chemit at 2021-09-23T13:37:29+02:00 Revue de l'API de consolidation (un peu de clean) Intégration dans la consolidation des sondages (localMarket) Algorithme d'estimation du poids des batch de localmarket - See #1991 - - - - - 5cccd9b3 by Tony Chemit at 2021-09-23T13:37:29+02:00 fix NPE when exiting application - - - - - 96d64eac by Tony Chemit at 2021-09-23T13:37:29+02:00 Correction label Packaging.meanWeight - - - - - e42a1c7a by Tony Chemit at 2021-09-23T13:37:29+02:00 Mise à jour pendant l'import avdth des bons statut d'acquisition - - - - - 4e1626a2 by Tony Chemit at 2021-09-23T13:37:29+02:00 amélioration code récupération id de cuve pendant l'import avdth meilleure gestion des arrondis pendant l'import avdth - - - - - 3d7cb417 by Tony Chemit at 2021-09-23T13:37:29+02:00 update public api doc - - - - - 9b0d624c by Tony Chemit at 2021-09-23T13:37:29+02:00 Il n'est toujours pas possible de synchroniser simple un référentiel local avec un login distant de type référentiel - Closes #1995 - - - - - 569183f9 by Tony Chemit at 2021-09-23T13:37:29+02:00 La synchro avancée de référentiel montre des différences qui ne devraient pas être là - Closes ultreiaio/ird-observe#1998 Il manque des décorateurs sur la synchro avancée de référentiel - - - - - 0f92c7bc by Tony Chemit at 2021-09-23T13:37:29+02:00 fix bug if program is not in tree while saving a such referential - - - - - 196f745c by Tony Chemit at 2021-09-23T14:09:23+02:00 update pom and toolkit - - - - - 30 changed files: - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/core/src/main/java/fr/ird/observe/client/ErrorHandler.java - client/datasource/actions/src/main/i18n/getters/java.getter - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/node/ReferentialSynchroNodeSupport.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/actions/ResetComputedValue.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/ResetComputedValue.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/actions/SaveContentReferentialUIAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/connexion/DataSourceSelectorModel.java - client/datasource/editor/ps/src/main/i18n/getters/java.getter - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SurveyUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/TripBatchUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/TripBatchUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/TripBatchUITableModel.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/actions/TripBatchUIWeightComputedInformation.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/FloatingObjectUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/actions/SetCatchUICatchWeightComputedInformation.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/actions/SetCatchUIMeanLengthComputedInformation.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/actions/SetCatchUIMeanWeightComputedInformation.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/actions/SetCatchUITotalCountComputedInformation.java - client/i18n/src/main/i18n/translations/observe_en_GB.properties - client/i18n/src/main/i18n/translations/observe_es_ES.properties - client/i18n/src/main/i18n/translations/observe_fr_FR.properties - models/definition/src/main/models/Observe/dto/23-data-ps-localmarket.model - models/definition/src/main/models/Observe/dto/attribute/notNull.properties - models/definition/src/main/models/Observe/dto/attribute/positiveNumber.properties - models/definition/src/main/models/Observe/dto/attribute/strictlyPositiveNumber.properties The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/89d96fa4a19e9b30fc46db11… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/89d96fa4a19e9b30fc46db11… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 11 commits: clean memory when report changed
by Tony CHEMIT (＠tchemit) 22 Sep '21

22 Sep '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f8c4064a by Tony Chemit at 2021-09-21T13:35:06+02:00 clean memory when report changed - - - - - e97118d2 by Tony Chemit at 2021-09-22T11:37:06+02:00 Définition des reports PS logbooks tabulaires [localmarket] - See #1969 - - - - - b1789f55 by Tony Chemit at 2021-09-22T11:37:06+02:00 Amélioration du code pour les reports sur les équipements - - - - - bea00139 by Tony Chemit at 2021-09-22T11:37:06+02:00 Mode de saisie par défaut - Closes #1992 - - - - - f1949b34 by Tony Chemit at 2021-09-22T11:37:06+02:00 Origine de ces libellés ? - Closes #1994 - - - - - 1c3494d9 by Tony Chemit at 2021-09-22T12:08:19+02:00 Problème de données AVDTH / OA / Marché local sondage - Closes #1997 - - - - - 30cd7127 by Tony Chemit at 2021-09-22T12:08:19+02:00 Affichage d'un **Date non définie** plutot que aucun sur les données avec un champs **date** - - - - - 72a77819 by Tony Chemit at 2021-09-22T12:08:19+02:00 Improve Report API, now we can have operations with parameters and no more enumeration to describe operations, use ReportOperationConsumer. More over introduce also ReportRequestExecutor with common code inside it, the service local is one of it. (service code goes from 517 lines to 142 :)) - - - - - 753ae7dc by Tony Chemit at 2021-09-22T12:08:19+02:00 update fixtures (migration timestamp changed...) - - - - - 40c9df8a by Tony Chemit at 2021-09-22T16:09:07+02:00 Revue de l'API de consolidation (un peu de clean) Intégration dans la consolidation des sondages (localMarket) Algorithme d'estimation du poids des batch de localmarket - See #1991 - - - - - 89d96fa4 by Tony Chemit at 2021-09-22T16:09:07+02:00 fix NPE when exiting application - - - - - 30 changed files: - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/core/src/main/java/fr/ird/observe/client/ErrorHandler.java - client/datasource/actions/src/main/i18n/getters/java.getter - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUIHandler.java - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SurveyUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/TripBatchUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/FloatingObjectUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUIModelStates.java - client/i18n/src/main/i18n/translations/observe_en_GB.properties - client/i18n/src/main/i18n/translations/observe_es_ES.properties - client/i18n/src/main/i18n/translations/observe_fr_FR.properties - models/definition/src/main/models/Observe/dto/23-data-ps-localmarket.model - models/definition/src/main/models/Observe/dto/attribute/notNull.properties - models/definition/src/main/models/Observe/dto/attribute/strictlyPositiveNumber.properties - models/definition/src/main/models/Observe/dto/class/decorator.properties - models/definition/src/main/models/Observe/dto/class/i18nLabels.properties - models/definition/src/main/models/Observe/dto/class/references.properties - models/definition/src/main/models/Observe/persistence/23-data-ps-localmarket.model - models/definition/src/main/models/Observe/persistence/attribute/notNull.properties - models/definition/src/main/models/Observe/persistence/attribute/orderBy.properties - models/dto/i18n/src/main/i18n/getters/labels.getter - models/dto/java/src/main/java/fr/ird/observe/dto/ProtectedIdsPs.java - models/dto/java/src/main/java/fr/ird/observe/dto/data/ps/common/TripDto.java - models/dto/java/src/main/java/fr/ird/observe/dto/data/ps/consolidate/ConsolidateTripDataRequest.java → models/dto/java/src/main/java/fr/ird/observe/dto/data/ps/common/consolidate/TripConsolidateRequest.java - models/dto/java/src/main/java/fr/ird/observe/dto/data/ps/consolidate/ConsolidateTripDataResult.java → models/dto/java/src/main/java/fr/ird/observe/dto/data/ps/common/consolidate/TripConsolidateResult.java - models/dto/java/src/main/java/fr/ird/observe/dto/data/ps/consolidate/dcp/SimplifiedObjectTypeManager.java → models/dto/java/src/main/java/fr/ird/observe/dto/data/ps/dcp/SimplifiedObjectTypeManager.java - models/dto/java/src/main/java/fr/ird/observe/dto/data/ps/consolidate/dcp/SimplifiedObjectTypeNode.java → models/dto/java/src/main/java/fr/ird/observe/dto/data/ps/dcp/SimplifiedObjectTypeNode.java - models/dto/java/src/main/java/fr/ird/observe/dto/data/ps/consolidate/dcp/SimplifiedObjectTypeSpecializedRules.java → models/dto/java/src/main/java/fr/ird/observe/dto/data/ps/dcp/SimplifiedObjectTypeSpecializedRules.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/157f891f7038f637db92063a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/157f891f7038f637db92063a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe (version 9.0.0-RC-13)
by Tony CHEMIT (＠tchemit) 20 Sep '21

20 Sep '21

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 18c8f8f5 by Tony Chemit at 2021-09-20T18:39:18+02:00 Site checkin for project ObServe (version 9.0.0-RC-13) - - - - - 17 changed files: - 9.0.0-RC-13/CHANGELOG.html - 9.0.0-RC-13/ClientConfig.html - 9.0.0-RC-13/ClientConfig.properties - 9.0.0-RC-13/ServerConfig.html - 9.0.0-RC-13/administration-web.html - 9.0.0-RC-13/architecture-logicielle.html - 9.0.0-RC-13/avdth/common.html - 9.0.0-RC-13/avdth/index.html - 9.0.0-RC-13/avdth/landing.html - 9.0.0-RC-13/avdth/local_market.html - 9.0.0-RC-13/avdth/logbook.html - 9.0.0-RC-13/avdth/referential.html - + 9.0.0-RC-13/changelog.html - + 9.0.0-RC-13/changes-report.html - + 9.0.0-RC-13/ci-management.html - + 9.0.0-RC-13/dependency-convergence.html - + 9.0.0-RC-13/dependency-info.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/18c8f8f51799855f98c4eb94f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/18c8f8f51799855f98c4eb94f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe (version 9.0.0-RC-13)
by Tony CHEMIT (＠tchemit) 20 Sep '21

20 Sep '21

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 9021cafd by Tony Chemit at 2021-09-20T18:22:17+02:00 Site checkin for project ObServe (version 9.0.0-RC-13) - - - - - 17 changed files: - − 9.0.0-RC-13-SNAPSHOT/changelog.html - − 9.0.0-RC-13-SNAPSHOT/changes-report.html - − 9.0.0-RC-13-SNAPSHOT/ci-management.html - − 9.0.0-RC-13-SNAPSHOT/dependency-convergence.html - − 9.0.0-RC-13-SNAPSHOT/dependency-info.html - − 9.0.0-RC-13-SNAPSHOT/dependency-management.html - − 9.0.0-RC-13-SNAPSHOT/dependency-updates-report.html - − 9.0.0-RC-13-SNAPSHOT/dev-activity.html - − 9.0.0-RC-13-SNAPSHOT/distribution-management.html - − 9.0.0-RC-13-SNAPSHOT/file-activity.html - − 9.0.0-RC-13-SNAPSHOT/images/add.gif - − 9.0.0-RC-13-SNAPSHOT/images/fix.gif - − 9.0.0-RC-13-SNAPSHOT/images/icon_help_sml.gif - − 9.0.0-RC-13-SNAPSHOT/images/remove.gif - − 9.0.0-RC-13-SNAPSHOT/images/rss.png - − 9.0.0-RC-13-SNAPSHOT/images/update.gif - − 9.0.0-RC-13-SNAPSHOT/issue-management.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9021cafdbef815b7ddc58e7ad… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9021cafdbef815b7ddc58e7ad… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/9.0.0-RC-13
by Tony CHEMIT (＠tchemit) 20 Sep '21

20 Sep '21

Tony CHEMIT deleted branch release/9.0.0-RC-13 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0