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

[Git][ultreiaio/ird-observe][feature/features/search_or_create_trip] 2 commits: Client - Mise en place de l'action de recherche/création de marée (Closes #2223)
by Tony CHEMIT (＠tchemit) 11 Sep '22

11 Sep '22

Tony CHEMIT pushed to branch feature/features/search_or_create_trip at ultreiaio / ird-observe Commits: 8bcffb77 by Tony Chemit at 2022-09-11T14:44:05+02:00 Client - Mise en place de l'action de recherche/création de marée (Closes #2223) - - - - - 53eab20f by Tony Chemit at 2022-09-11T14:44:05+02:00 missing I18n declaration - - - - - 30 changed files: - + client/core/src/main/resources/icons/navigation/default/actions/search.png - client/core/src/main/resources/observe-ui.properties - client/datasource/actions/src/main/i18n/getters/java.getter - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/actions/ExportToClipboard.java - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/i18n/getters/jaxx.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/ObserveKeyStrokesEditorApi.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/actions/ApplyNavigationConfiguration.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationUIHandler.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/SearchOrCreate.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/SearchUI.jaxx - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/SearchUI.jcss - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/SearchUIHandler.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/SearchUIModel.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/actions/AddSearchCriteria.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/actions/CreateNewData.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/actions/GotoSelectedData.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/actions/SearchActionSupport.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/criteria/SearchCriteriaUI.jaxx - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/criteria/SearchCriteriaUI.jcss - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/criteria/SearchCriteriaUIHandler.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/criteria/SearchCriteriaUIModel.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/criteria/actions/ChangePropertyAction.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/criteria/actions/DeleteCriteria.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/criteria/actions/SearchCriteriaUIActionSupport.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/criteria/actions/UseGroupByFlavorAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationCapability.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationInitializer.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/03cb1d6ca0125ef88582ce45… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/03cb1d6ca0125ef88582ce45… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch feature/features/search_or_create_trip
by Tony CHEMIT (＠tchemit) 07 Sep '22

07 Sep '22

Tony CHEMIT pushed new branch feature/features/search_or_create_trip at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/feature/features/search_or_… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] La taille de la fenêtre de configuration de l'arbre de navigation tronque les...
by Tony CHEMIT (＠tchemit) 03 Sep '22

03 Sep '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b73d1ded by Tony Chemit at 2022-09-03T08:02:13+02:00 La taille de la fenêtre de configuration de l'arbre de navigation tronque les boutons du bas si on passe du module PS vers LL - Closes #2340 - - - - - 2 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/TreeConfigUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/TreeConfigUIModel.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/TreeConfigUIHandler.java ===================================== @@ -49,12 +49,14 @@ import org.nuiton.jaxx.runtime.JAXXObject; import org.nuiton.jaxx.runtime.spi.UIHandler; import javax.swing.AbstractButton; +import javax.swing.Box; import javax.swing.Icon; import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.JPopupMenu; import javax.swing.KeyStroke; import javax.swing.SwingUtilities; +import javax.swing.UIManager; import javax.swing.event.PopupMenuEvent; import javax.swing.event.PopupMenuListener; import java.awt.Component; @@ -85,6 +87,11 @@ public class TreeConfigUIHandler implements UIHandler<TreeConfigUI>, PropertyCha private final Map<String, AbstractButton> allOptions; private final Multimap<String, AbstractButton> groupByOptions; private final Map<String, AbstractButton> temporalOptions; + /** + * Keep the default height (to add some extra components for missing groupBy count in a module and always have + * the same groupByChoose height at any cost). + */ + private final int defaultGroupByComponentHeight; private TreeConfigUI ui; public static void updateStatistics(ToolkitTreeFlatModelRootRequest request, @@ -178,6 +185,7 @@ public class TreeConfigUIHandler implements UIHandler<TreeConfigUI>, PropertyCha groupByOptions = ArrayListMultimap.create(); allOptions = new TreeMap<>(); temporalOptions = new TreeMap<>(); + defaultGroupByComponentHeight = UIManager.getDefaults().getIcon("RadioButton.icon").getIconHeight(); } @Override @@ -226,7 +234,7 @@ public class TreeConfigUIHandler implements UIHandler<TreeConfigUI>, PropertyCha reset(bean); } - public void updateOptions(){ + public void updateOptions() { for (Map.Entry<String, Collection<AbstractButton>> entry : groupByOptions.asMap().entrySet()) { entry.getValue().forEach(c -> { if (Objects.equals(true, c.getClientProperty(DISABLED))) { @@ -279,6 +287,7 @@ public class TreeConfigUIHandler implements UIHandler<TreeConfigUI>, PropertyCha } } } + public void reset(TreeConfig bean) { String moduleName = bean.getModuleName(); String groupByName = bean.getGroupByName(); @@ -309,6 +318,15 @@ public class TreeConfigUIHandler implements UIHandler<TreeConfigUI>, PropertyCha UseGroupByAction action = (UseGroupByAction) editor.getAction(); action.install(); } + int definitionMaxCount = ui.getModel().getDefinitionMaxCount(); + if (definitionMaxCount > editors.size()) { + // Fill with extra component to always have the same number of component in the groupByChoose + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2340 + for (int i = editors.size(); i < definitionMaxCount; i++) { + log.info("Add extra dummy component to fix size {} with height {}", i, defaultGroupByComponentHeight); + groupByChoose.add(Box.createVerticalStrut(defaultGroupByComponentHeight)); + } + } changeGroupByName(newGroupByName); SwingUtilities.invokeLater(ui::revalidate); SwingUtilities.invokeLater(ui::repaint); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/TreeConfigUIModel.java ===================================== @@ -22,8 +22,11 @@ package fr.ird.observe.client.datasource.editor.api.config; * #L% */ +import fr.ird.observe.dto.data.DataGroupByDtoDefinition; import fr.ird.observe.navigation.tree.GroupByHelper; import fr.ird.observe.navigation.tree.TreeConfig; +import fr.ird.observe.spi.module.BusinessModule; +import fr.ird.observe.spi.module.ObserveBusinessProject; import io.ultreia.java4all.bean.AbstractJavaBean; import io.ultreia.java4all.bean.monitor.BeanMonitor; import io.ultreia.java4all.bean.monitor.PropertyDiff; @@ -78,12 +81,23 @@ public class TreeConfigUIModel extends AbstractJavaBean implements PropertyChang * GroupBy helper. */ private final GroupByHelper groupByHelper; + /** + * To keep to max count of definitions for a module to fix a minimum size in the ui. + * <p> + * See <a href="https://gitlab.com/ultreiaio/ird-observe/-/issues/2340">issue 2340</a> + */ + private final int definitionMaxCount; protected TreeConfigUIModel(GroupByHelper groupByHelper, TreeConfig originalBean) { this.groupByHelper = groupByHelper; this.originalBean = originalBean; this.bean = new TreeConfig(); this.monitor = new BeanMonitor(MONITORED_PROPERTIES.toArray(new String[0])); + this.definitionMaxCount = computeDefinitionMaxCount(ObserveBusinessProject.get().getModules()); + } + + public int getDefinitionMaxCount() { + return definitionMaxCount; } public TreeConfig getOriginalBean() { @@ -133,15 +147,15 @@ public class TreeConfigUIModel extends AbstractJavaBean implements PropertyChang */ public boolean isStructureChanged() { List<String> modifiedProperties = List.of(monitor.getModifiedProperties()); - if( modifiedProperties.contains(TreeConfig.LOAD_DATA)) { + if (modifiedProperties.contains(TreeConfig.LOAD_DATA)) { // loadData is now off return !bean.isLoadData(); } - if( modifiedProperties.contains(TreeConfig.LOAD_REFERENTIAL)) { + if (modifiedProperties.contains(TreeConfig.LOAD_REFERENTIAL)) { // loadReferential is now off return !bean.isLoadReferential(); } - if( modifiedProperties.contains(TreeConfig.MODULE_NAME)) { + if (modifiedProperties.contains(TreeConfig.MODULE_NAME)) { // previous module name is off return true; } @@ -170,4 +184,15 @@ public class TreeConfigUIModel extends AbstractJavaBean implements PropertyChang private void fireEmpty() { firePropertyChange(EMPTY, isEmpty()); } + + + private int computeDefinitionMaxCount(List<BusinessModule> modules) { + int definitionMaxCount = 0; + for (BusinessModule module : modules) { + List<DataGroupByDtoDefinition<?, ?>> definitions = module.getDataGroupByDtoDefinitions(); + definitionMaxCount = Math.max(definitionMaxCount, definitions.size()); + } + return definitionMaxCount; + } + } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b73d1dedea0675802ad6fa4eb… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b73d1dedea0675802ad6fa4eb… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Update changelog for v.9.0.7 [skip CI]
by Tony CHEMIT (＠tchemit) 02 Sep '22

02 Sep '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 60fe612d by Tony Chemit at 2022-09-02T19:21:27+02:00 Update changelog for v.9.0.7 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,7 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2022-08-28 14:43. + * Last generated at 2022-09-02 19:20. ## Version [9.0.7](https://gitlab.com/ultreiaio/ird-observe/-/milestones/232) @@ -21,6 +21,7 @@ * [[Type::Anomalie 2419]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2419) **Erreur de migration de l'espèce AVDTH 8 de CAPT_ELEM vers ps_logbook.catch** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2420]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2420) **Statut de la doc de mapping des espèces AVDTH/ObServe** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2423]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2423) **Erreur calcul des données sur V9** (Thanks to Tony CHEMIT) (Reported by Philippe Sabarros) + * [[Type::Anomalie 2427]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2427) **Erreur de type de mesure sur les échantillons AVDTH migrés** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 1751]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1751) **Mettre un sablier lors de l'ouverture si le nœud a beaucoup de données à charger.** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Type::Evolution 2104]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2104) **On pourrait avoir un service de génération de topiaid** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 2232]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2232) **Dans l'UI des profils de connexion, trimmer les espaces** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) @@ -28,6 +29,8 @@ * [[Type::Evolution 2293]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2293) **Il serait intéressant de permettre l'absence de base déclarée par défaut** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 2343]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2343) **Sur les données LL port et associées, rajouter 2 nouveaux champs data entry operators** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 2345]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2345) **Ajouter un champ position sur le formulaire Landing LL** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2366]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2366) **UI de gestion des associations espèce/océan pas disponible sur Océan** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2370]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2370) **Il faudrait un type d'accès en écriture mais qui empêche la modification des références** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 2378]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2378) **Convertisseur de longueur m/km/nm/ftm** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 2395]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2395) **Titre de l'appli** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 2409]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2409) **Aucune barre de progression** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/60fe612d541c4607ea3a21e9d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/60fe612d541c4607ea3a21e9d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] UI de gestion des associations espèce/océan pas disponible sur Océan - Closes #2366
by Tony CHEMIT (＠tchemit) 02 Sep '22

02 Sep '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0b1099f7 by Tony Chemit at 2022-09-02T19:18:56+02:00 UI de gestion des associations espèce/océan pas disponible sur Océan - Closes #2366 - - - - - 1 changed file: - core/persistence/java/src/main/java/fr/ird/observe/entities/referential/common/OceanSpi.java Changes: ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/referential/common/OceanSpi.java ===================================== @@ -59,7 +59,8 @@ public class OceanSpi extends GeneratedOceanSpi { Set<String> newSpeciesWithThisOceanIds = dto.getSpecies().stream().map(SpeciesReference::getId).collect(Collectors.toSet()); if (dto.isPersisted()) { // In that case, we could have some species to update by removing some ocean associations - try (Stream<Species> speciesStream = Species.loadEntities(context, s -> s.getOceanTopiaIds().contains(entity.getId()))) { + String thisOceanId = dto.getId(); + try (Stream<Species> speciesStream = Species.loadEntities(context, s -> s.getOceanTopiaIds().contains(thisOceanId))) { speciesStream.forEach(oldSpeciesWithThisOcean -> { String oldSpeciesWithThisOceanId = oldSpeciesWithThisOcean.getTopiaId(); if (!newSpeciesWithThisOceanIds.contains(oldSpeciesWithThisOceanId)) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0b1099f75db01a2aab143b8c3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0b1099f75db01a2aab143b8c3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: UI de gestion des associations espèce/océan pas disponible sur Océan - Closes #2366
by Tony CHEMIT (＠tchemit) 02 Sep '22

02 Sep '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d39cba11 by Tony Chemit at 2022-09-02T19:04:58+02:00 UI de gestion des associations espèce/océan pas disponible sur Océan - Closes #2366 - - - - - 048de6cf by Tony Chemit at 2022-09-02T19:04:58+02:00 Persistence - Close streams that are coming from database to release as soon as possible underlying resources - - - - - 7bdf5cac by Tony Chemit at 2022-09-02T19:07:12+02:00 Merge branch 'feature/features/ocean_and_species' into develop - - - - - 19 changed files: - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/OceanUI.jaxx - + client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/OceanUI.jcss - core/api/dto/src/main/resources/META-INF/dto/Observe/DifferentialMetaModel.json - core/api/services/src/main/resources/META-INF/i18n/Observe-labels.properties - core/api/validation/src/main/i18n/getters/eugene.getter - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripBatchSpi.java - + core/persistence/java/src/main/java/fr/ird/observe/entities/referential/common/OceanSpi.java - core/persistence/resources/src/main/resources/fr/ird/observe/entities/referential/common/Ocean/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/referential/common/Ocean/validation-update.json - core/persistence/test/src/test/java/fr/ird/observe/persistence/test/DecoratorServiceTest.java - core/services/i18n/src/main/i18n/translations/services_en_GB.properties - core/services/i18n/src/main/i18n/translations/services_es_ES.properties - core/services/i18n/src/main/i18n/translations/services_fr_FR.properties - model/src/main/models/Observe/dto/01-referential-common.model - model/src/main/models/Observe/dto/attribute/ordered.properties - model/src/main/models/Observe/dto/class/i18nLabels.properties - toolkit/persistence/src/main/java/fr/ird/observe/spi/context/DtoEntityContext.java - toolkit/persistence/src/main/java/fr/ird/observe/spi/context/DtoEntityContextSupport.java - toolkit/persistence/src/main/java/fr/ird/observe/spi/context/ReferentialDtoEntityContext.java Changes: ===================================== client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/OceanUI.jaxx ===================================== @@ -24,24 +24,61 @@ <import> fr.ird.observe.dto.referential.common.OceanDto fr.ird.observe.dto.referential.common.OceanReference + fr.ird.observe.dto.referential.common.SpeciesReference io.ultreia.java4all.jaxx.widgets.choice.BeanCheckBox + io.ultreia.java4all.jaxx.widgets.list.DoubleList </import> <BeanValidator id='validator' autoField='true' beanClass='fr.ird.observe.dto.referential.common.OceanDto' context='create' errorTableModel='{getErrorTableModel()}'/> <OceanUIModel id='model' constructorParams='@override:getNavigationSource(this)'/> <OceanDto id='bean'/> - <Table id='editTable' forceOverride="3"> + <Table id="editView" insets="0" fill="both"> <row> - <cell anchor='west'> - <JLabel id='atLeastOneSelectedLabel'/> - </cell> - <cell weightx="1" fill="both"> - <JPanel id="atLeastOneSelected" layout="{new GridLayout(2, 2)}" border='{BorderFactory.createLoweredBevelBorder()}'> - <BeanCheckBox id='northWestAllowed'/> - <BeanCheckBox id='northEastAllowed' /> - <BeanCheckBox id='southWestAllowed'/> - <BeanCheckBox id='southEastAllowed'/> - </JPanel> + <cell anchor="north" weightx="1" weighty="1"> + <JTabbedPane id='mainTabbedPane'> + <tab id='generalTab' i18nProperty=""> + <Table fill="both" weightx="1"> + <row> + <cell> + <Table id='editTable' styleClass="caracteristic" addToContainer="true" forceOverride="3"> + <row> + <cell anchor='west'> + <JLabel id='atLeastOneSelectedLabel'/> + </cell> + <cell weightx="1" fill="both"> + <JPanel id="atLeastOneSelected" layout="{new GridLayout(2, 2)}" border='{BorderFactory.createLoweredBevelBorder()}'> + <BeanCheckBox id='northWestAllowed'/> + <BeanCheckBox id='northEastAllowed' /> + <BeanCheckBox id='southWestAllowed'/> + <BeanCheckBox id='southEastAllowed'/> + </JPanel> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell> + <Table id='editI18nTable' addToContainer="true"/> + </cell> + </row> + <row> + <cell weighty="1"> + <JLabel styleClass="skipI18n"/> + </cell> + </row> + </Table> + </tab> + <tab id='speciesTab' i18nProperty="species"> + <Table fill="both"> + <row> + <cell weightx="1" weighty="1"> + <DoubleList id='species' genericType='SpeciesReference'/> + </cell> + </row> + </Table> + </tab> + </JTabbedPane> </cell> </row> </Table> ===================================== client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/OceanUI.jcss ===================================== @@ -0,0 +1,29 @@ +/*- + * #%L + * ObServe Client :: DataSource :: Editor :: Common + * %% + * Copyright (C) 2008 - 2022 IRD, Ultreia.io + * %% + * 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% + */ + +#mainTabbedPane { + _focusComponent:{newComponentArray(uri,species)}; +} + +/*#species { + border:{new TitledBorder(t("observe.referential.common.SpeciesList.speciesTab") + " ")}; +}*/ ===================================== core/api/dto/src/main/resources/META-INF/dto/Observe/DifferentialMetaModel.json ===================================== @@ -96,6 +96,7 @@ "northWestAllowed", "southEastAllowed", "southWestAllowed", + "species", "uri" ], "fr.ird.observe.dto.referential.common.SexDto": [ ===================================== core/api/services/src/main/resources/META-INF/i18n/Observe-labels.properties ===================================== @@ -20,7 +20,7 @@ # #L% ### #Generated by org.nuiton.i18n.plugin.GenerateI18nLabelsMojo -#Wed Jul 27 12:29:59 CEST 2022 +#Fri Sep 02 18:35:55 CEST 2022 observe.Business.createDate=observe.Common.createDate observe.Business.homeId=observe.Common.homeId observe.Business.id=observe.Common.id @@ -1826,6 +1826,7 @@ observe.referential.common.Ocean.code=observe.referential.Referential.code observe.referential.common.Ocean.codeAndHomeId=observe.referential.Referential.codeAndHomeId observe.referential.common.Ocean.createDate=observe.Common.createDate observe.referential.common.Ocean.enabled=observe.Common.enabled +observe.referential.common.Ocean.generalTab=observe.Common.generalTab observe.referential.common.Ocean.homeId=observe.Common.homeId observe.referential.common.Ocean.id=observe.Common.id observe.referential.common.Ocean.label=observe.Common.label @@ -1839,6 +1840,9 @@ observe.referential.common.Ocean.label7=observe.Common.label7 observe.referential.common.Ocean.label8=observe.Common.label8 observe.referential.common.Ocean.lastUpdateDate=observe.Common.lastUpdateDate observe.referential.common.Ocean.needComment=observe.Common.needComment +observe.referential.common.Ocean.species=observe.Common.species +observe.referential.common.Ocean.species.available=observe.Common.species.available +observe.referential.common.Ocean.species.selected=observe.Common.species.selected observe.referential.common.Ocean.status=observe.Common.status observe.referential.common.Ocean.uri=observe.Common.uri observe.referential.common.Ocean.version=observe.Common.version ===================================== core/api/validation/src/main/i18n/getters/eugene.getter ===================================== @@ -355,6 +355,7 @@ observe.referential.common.Ocean.northEastAllowed observe.referential.common.Ocean.northWestAllowed observe.referential.common.Ocean.southEastAllowed observe.referential.common.Ocean.southWestAllowed +observe.referential.common.Ocean.species observe.referential.common.Person.atLeastOneSelected observe.referential.common.Person.dataEntryOperator observe.referential.common.Person.dataSource ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripBatchSpi.java ===================================== @@ -32,6 +32,7 @@ import fr.ird.observe.spi.service.ServiceContext; import java.util.Date; import java.util.LinkedHashSet; import java.util.stream.Collectors; +import java.util.stream.Stream; public class TripBatchSpi extends GeneratedTripBatchSpi { @@ -44,9 +45,12 @@ public class TripBatchSpi extends GeneratedTripBatchSpi { protected LinkedHashSet<PackagingReference> getPackaging(ServiceContext context, Trip trip) { Harbour landingHarbour = trip.getLandingHarbour(); Date date = trip.getEndDate(); - return Packaging.toReferenceSet(context.getReferentialLocale(), Packaging.getDao(context) - .streamAll() - .filter(p -> p.acceptHarbour(landingHarbour) && p.acceptDate(date)), null, null).stream().collect(Collectors.toCollection(LinkedHashSet::new)); + try (Stream<Packaging> stream = Packaging.getDao(context).streamAll()) { + return Packaging.toReferenceSet(context.getReferentialLocale(), + stream.filter(p -> p.acceptHarbour(landingHarbour) && p.acceptDate(date)), + null, + null).stream().collect(Collectors.toCollection(LinkedHashSet::new)); + } } } ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/referential/common/OceanSpi.java ===================================== @@ -0,0 +1,91 @@ +package fr.ird.observe.entities.referential.common; + +/*- + * #%L + * ObServe Core :: Persistence :: Java + * %% + * Copyright (C) 2008 - 2022 IRD, Ultreia.io + * %% + * 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.ird.observe.dto.form.Form; +import fr.ird.observe.dto.referential.common.OceanDto; +import fr.ird.observe.dto.referential.common.SpeciesReference; +import fr.ird.observe.dto.result.SaveResultDto; +import fr.ird.observe.spi.result.AddEntityToUpdateStep; +import fr.ird.observe.spi.service.ServiceContext; + +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +/** + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.0.7 + */ +public class OceanSpi extends GeneratedOceanSpi { + + @Override + public Form<OceanDto> loadForm(ServiceContext context, String id) { + Form<OceanDto> form = super.loadForm(context, id); + // add species that use this ocean, to be able to edit species list from Ocean form + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2366 + try (Stream<Species> speciesStream = Species.loadEntities(context, s -> s.getOceanTopiaIds().contains(id))) { + List<SpeciesReference> speciesReferences = Species.toReferenceSet(context.getReferentialLocale(), speciesStream, null, null, null).toList(); + form.getObject().setSpecies(speciesReferences); + } + return form; + } + + @Override + public SaveResultDto saveEntity(ServiceContext context, Ocean entity, OceanDto dto) { + Set<Species> speciesToUpdate = new LinkedHashSet<>(); + Set<String> newSpeciesWithThisOceanIds = dto.getSpecies().stream().map(SpeciesReference::getId).collect(Collectors.toSet()); + if (dto.isPersisted()) { + // In that case, we could have some species to update by removing some ocean associations + try (Stream<Species> speciesStream = Species.loadEntities(context, s -> s.getOceanTopiaIds().contains(entity.getId()))) { + speciesStream.forEach(oldSpeciesWithThisOcean -> { + String oldSpeciesWithThisOceanId = oldSpeciesWithThisOcean.getTopiaId(); + if (!newSpeciesWithThisOceanIds.contains(oldSpeciesWithThisOceanId)) { + // this species was removed from the ocean + oldSpeciesWithThisOcean.removeOcean(entity); + speciesToUpdate.add(oldSpeciesWithThisOcean); + } else { + // this species still have this ocean, no need to keep it + newSpeciesWithThisOceanIds.remove(oldSpeciesWithThisOceanId); + } + }); + } + } + if (!newSpeciesWithThisOceanIds.isEmpty()) { + // need to add this ocean to those species + try (Stream<Species> speciesStream = Species.loadEntities(context, s -> newSpeciesWithThisOceanIds.contains(s.getTopiaId()))) { + speciesStream.forEach(s -> { + s.addOcean(entity); + speciesToUpdate.add(s); + }); + } + } + AddEntityToUpdateStep update = newSaveHelper(context).update(this, entity); + for (Species species : speciesToUpdate) { + update.update(Species.SPI, species); + } + return update.build(entity); + } +} //OceanSpi ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/referential/common/Ocean/validation-create.json ===================================== @@ -54,6 +54,14 @@ "southWestAllowed is mandatory" ] }, + "species": { + "errors": [ + "check if referential species is disabled (only if validation is strong)" + ], + "warnings": [ + "check if referential species is disabled (only if validation is not strong)" + ] + }, "status": { "warnings": [ "referential is enabled" ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/referential/common/Ocean/validation-update.json ===================================== @@ -54,6 +54,14 @@ "southWestAllowed is mandatory" ] }, + "species": { + "errors": [ + "check if referential species is disabled (only if validation is strong)" + ], + "warnings": [ + "check if referential species is disabled (only if validation is not strong)" + ] + }, "status": { "warnings": [ "referential is enabled" ===================================== core/persistence/test/src/test/java/fr/ird/observe/persistence/test/DecoratorServiceTest.java ===================================== @@ -52,6 +52,7 @@ import org.junit.Test; import java.util.NoSuchElementException; import java.util.Objects; +import java.util.stream.Stream; /** * Created by tchemit on 31/08/17. @@ -120,22 +121,24 @@ public class DecoratorServiceTest extends PersistenceTestSupportRead { R reference1 = spi.toReference(ReferentialLocale.FR, newDto); decoratorService.installDecorator(reference1); decorate(referenceDecorator, reference1); - spi.getDao(persistenceContext).streamAll().limit(ObservePersistenceFixtures.ENTITIES_LIMIT_SIZE).forEach(entity -> { - D dto = spi.toDto(ReferentialLocale.FR, entity); - entity.registerDecorator(entityDecorator); - String entityToString = entityDecorator.decorate(entity); - Assert.assertNotNull(entityToString); - decoratorService.installDecorator(dto); - String dtoToString = decorate(decorator, dto); - if (!(dto instanceof LayoutAware)) { - Assert.assertEquals(entityToString, dtoToString); - } - - R reference = spi.toReference(ReferentialLocale.FR, dto); - decoratorService.installDecorator(reference); - String referenceToString = decorate(referenceDecorator, reference); - Assert.assertEquals(referenceToString, dtoToString); - }); + try (Stream<E> stream = spi.getDao(persistenceContext).streamAll().limit(ObservePersistenceFixtures.ENTITIES_LIMIT_SIZE)) { + stream.forEach(entity -> { + D dto = spi.toDto(ReferentialLocale.FR, entity); + entity.registerDecorator(entityDecorator); + String entityToString = entityDecorator.decorate(entity); + Assert.assertNotNull(entityToString); + decoratorService.installDecorator(dto); + String dtoToString = decorate(decorator, dto); + if (!(dto instanceof LayoutAware)) { + Assert.assertEquals(entityToString, dtoToString); + } + + R reference = spi.toReference(ReferentialLocale.FR, dto); + decoratorService.installDecorator(reference); + String referenceToString = decorate(referenceDecorator, reference); + Assert.assertEquals(referenceToString, dtoToString); + }); + } } } ===================================== core/services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -1478,6 +1478,7 @@ observe.referential.common.Ocean.northEastAllowed=Quadrant 1 (NE) observe.referential.common.Ocean.northWestAllowed=Quadrant 4 (NW) observe.referential.common.Ocean.southEastAllowed=Quadrant 2 (SE) observe.referential.common.Ocean.southWestAllowed=Quadrant 3 (SW) +observe.referential.common.Ocean.species=Species observe.referential.common.Ocean.type=Ocean observe.referential.common.Ocean.validation.atLeastOneSelected=At least one quadrant must be selected. observe.referential.common.Organism.type=Organism ===================================== core/services/i18n/src/main/i18n/translations/services_es_ES.properties ===================================== @@ -1478,6 +1478,7 @@ observe.referential.common.Ocean.northEastAllowed=Quadrant 1 (NE) observe.referential.common.Ocean.northWestAllowed=Quadrant 4 (NW) observe.referential.common.Ocean.southEastAllowed=Quadrant 2 (SE) observe.referential.common.Ocean.southWestAllowed=Quadrant 3 (SW) +observe.referential.common.Ocean.species=Especies observe.referential.common.Ocean.type=Océano observe.referential.common.Ocean.validation.atLeastOneSelected=At least one quadrant must be selected. observe.referential.common.Organism.type=Organismo ===================================== core/services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -1478,6 +1478,7 @@ observe.referential.common.Ocean.northEastAllowed=Quadrant 1 (NE) observe.referential.common.Ocean.northWestAllowed=Quadrant 4 (NW) observe.referential.common.Ocean.southEastAllowed=Quadrant 2 (SE) observe.referential.common.Ocean.southWestAllowed=Quadrant 3 (SW) +observe.referential.common.Ocean.species=Espèces observe.referential.common.Ocean.type=Océan observe.referential.common.Ocean.validation.atLeastOneSelected=Veuillez sélectionner au moins un quadrant. observe.referential.common.Organism.type=Organisme ===================================== model/src/main/models/Observe/dto/01-referential-common.model ===================================== @@ -81,6 +81,7 @@ northEastAllowed boolean southEastAllowed boolean southWestAllowed boolean northWestAllowed boolean +species {*:*} referential.common.SpeciesReference referential.common.LengthMeasureMethod > referential.I18nReferential ===================================== model/src/main/models/Observe/dto/attribute/ordered.properties ===================================== @@ -57,6 +57,7 @@ data.ps.observation.Sample.attribute.sampleMeasure=true data.ps.observation.SetCatch.attribute.catches=true data.ps.observation.SetNonTargetCatchRelease.attribute.nonTargetCatchRelease=true referential.common.Gear.attribute.gearCharacteristic=true +referential.common.Ocean.attribute.species=true referential.common.Species.attribute.ocean=true referential.common.SpeciesGroup.attribute.speciesGroupReleaseMode=true referential.common.SpeciesList.attribute.species=true ===================================== model/src/main/models/Observe/dto/class/i18nLabels.properties ===================================== @@ -103,7 +103,7 @@ referential.common.Harbour=coordinate,country,latitude,locode,longitude,quadrant referential.common.LengthFormulaSupport=ocean,species,sex,coefficients,source,coefficientsInformation,generalTab,otherTab referential.common.LengthLengthParameter=inputOutputFormula,inputSizeMeasureType,outputInputFormula,outputSizeMeasureType,inputOutputFormulaInformation,outputInputFormulaInformation referential.common.LengthWeightParameter=lengthWeightFormula,meanLength,meanWeight,sizeMeasureType,weightLengthFormula,lengthWeightFormulaInformation,meanValues,weightLengthFormulaInformation -referential.common.Ocean=northEastAllowed,southEastAllowed,southWestAllowed,northWestAllowed,atLeastOneSelected,validation.atLeastOneSelected +referential.common.Ocean=northEastAllowed,southEastAllowed,southWestAllowed,northWestAllowed,atLeastOneSelected,validation.atLeastOneSelected,generalTab,species,species.available,species.selected referential.common.Organism=country,description referential.common.Person=captain,country,dataEntryOperator,dataSource,firstName,lastName,observer,psSampler,atLeastOneSelected,validation.atLeastOneSelected referential.common.ShipOwner=country,endDate,label,startDate ===================================== toolkit/persistence/src/main/java/fr/ird/observe/spi/context/DtoEntityContext.java ===================================== @@ -308,7 +308,9 @@ public interface DtoEntityContext< } default Set<D> loadEntitiesToDto(ServiceContext context) { - return toDtoSet(context.getReferentialLocale(), getDao(context).streamAll()); + try (Stream<E> stream = getDao(context).streamAll()) { + return toDtoSet(context.getReferentialLocale(), stream); + } } default Stream<E> loadEntities(ServiceContext context, Predicate<E> predicate) { ===================================== toolkit/persistence/src/main/java/fr/ird/observe/spi/context/DtoEntityContextSupport.java ===================================== @@ -131,10 +131,12 @@ public abstract class DtoEntityContextSupport< public DtoReferenceCollection<R> toReferenceSet(ServiceContext context, Date now) { ReferentialLocale referentialLocale = context.getReferentialLocale(); Set<R> references = new LinkedHashSet<>(); - getDao(context).streamAll().forEach(entity -> { - R reference = toReference(referentialLocale, entity); - references.add(reference); - }); + try (Stream<E> stream = getDao(context).streamAll()) { + stream.forEach(entity -> { + R reference = toReference(referentialLocale, entity); + references.add(reference); + }); + } return createReferenceSet(referentialLocale, references, now); } @@ -230,10 +232,12 @@ public abstract class DtoEntityContextSupport< public final Map<String, R> uniqueIndex(ServiceContext context) { Map<String, R> references = new LinkedHashMap<>(); ReferentialLocale referentialLocale = context.getReferentialLocale(); - getDao(context).streamAll().forEach(entity -> { - R reference = toReference(referentialLocale, entity); - references.put(reference.getId(), reference); - }); + try (Stream<E> stream = getDao(context).streamAll()) { + stream.forEach(entity -> { + R reference = toReference(referentialLocale, entity); + references.put(reference.getId(), reference); + }); + } return references; } ===================================== toolkit/persistence/src/main/java/fr/ird/observe/spi/context/ReferentialDtoEntityContext.java ===================================== @@ -89,6 +89,16 @@ public abstract class ReferentialDtoEntityContext< this.extraScripts = SingletonSupplier.of(this::loadExtraScripts); } + @Override + public Form<D> loadForm(ServiceContext context, String id) { + E entity = loadEntity(context, id); + return referentialEntityToForm(context.getReferentialLocale(), entity); + } + + public SaveResultDto saveEntity(ServiceContext context, E entity, D dto) { + return saveEntity(context, entity); + } + public Optional<ReplaceReferentialScript> getReplaceScript() { return getSqlScript().getReplaceReferentialScript(); } @@ -182,12 +192,6 @@ public abstract class ReferentialDtoEntityContext< return ReferentialDtoReferenceSet.of(toReferenceType(), references, now); } - @Override - public final Form<D> loadForm(ServiceContext context, String id) { - E entity = loadEntity(context, id); - return referentialEntityToForm(context.getReferentialLocale(), entity); - } - public final LinkedHashSet<E> toReferentialEntitySet(Collection<R> references) { LinkedHashSet<E> entityList = null; if (references != null && !references.isEmpty()) { @@ -274,7 +278,7 @@ public abstract class ReferentialDtoEntityContext< E entity = loadOrCreateEntityFromReferentialDto(context, dto); checkLastUpdateDate(context, entity, dto); fromDto(context.getReferentialLocale(), entity, dto); - return saveEntity(context, entity); + return saveEntity(context, entity, dto); } private SqlScript generateDuplicateScript(ServiceContext context, String id, String newId) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0d5a7baa5292d12395407f22… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0d5a7baa5292d12395407f22… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Erreur de type de mesure sur les échantillons AVDTH migrés - Closes #2427
by Tony CHEMIT (＠tchemit) 01 Sep '22

01 Sep '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0d5a7baa by Tony Chemit at 2022-09-01T11:55:46+02:00 Erreur de type de mesure sur les échantillons AVDTH migrés - Closes #2427 - - - - - 1 changed file: - core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java Changes: ===================================== core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java ===================================== @@ -149,13 +149,13 @@ public class ImportReferentialContext { speciesCache = referential.getSpeciesCache(); speciesCache.init(Maps.uniqueIndex(referential.getSpecies(), Species::getFaoCode)); - Map<String, SizeMeasureType> sizeMeasureType = Maps.uniqueIndex(referential.getSizeMeasureType(), SizeMeasureType::getCode); - sizeMeasureTypeFL = sizeMeasureType.get("FL"); - sizeMeasureTypeDL = sizeMeasureType.get("DL"); + Map<String, SizeMeasureType> sizeMeasureType = Maps.uniqueIndex(referential.getSizeMeasureType(), SizeMeasureType::getId); + sizeMeasureTypeFL = sizeMeasureType.get("fr.ird.referential.common.SizeMeasureType#1433499465700#0.0902433863375336"); // FL + sizeMeasureTypeDL = sizeMeasureType.get("fr.ird.referential.common.SizeMeasureType#1433499466774#0.529249255312607"); // PD1 - Map<String, DataQuality> dataQuality = Maps.uniqueIndex(referential.getDataQuality(), DataQuality::getCode); - dataQualityA = dataQuality.get("A"); - dataQualityE = dataQuality.get("E"); + Map<String, DataQuality> dataQuality = Maps.uniqueIndex(referential.getDataQuality(), DataQuality::getId); + dataQualityA = dataQuality.get("fr.ird.referential.common.DataQuality#0#1"); // A + dataQualityE = dataQuality.get("fr.ird.referential.common.DataQuality#0#5"); // E // trip Map<String, Ocean> ocean = Maps.uniqueIndex(referential.getOcean(), Ocean::getId); @@ -172,9 +172,9 @@ public class ImportReferentialContext { vessel = Maps.uniqueIndex(referential.getVessel(), Vessel::getCode); wellContentStatus = Maps.uniqueIndex(referential.getWellContentStatus(), WellContentStatus::getCode); - Map<String, AcquisitionStatus> acquisitionStatus = Maps.uniqueIndex(referential.getAcquisitionStatus(), AcquisitionStatus::getCode); - acquisitionStatus1 = acquisitionStatus.get("1"); - acquisitionStatus99 = acquisitionStatus.get("99"); + Map<String, AcquisitionStatus> acquisitionStatus = Maps.uniqueIndex(referential.getAcquisitionStatus(), AcquisitionStatus::getId); + acquisitionStatus1 = acquisitionStatus.get("fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#001"); // 1 + acquisitionStatus99 = acquisitionStatus.get("fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#999"); //99 // landing landingCategories = Maps.uniqueIndex(referential.getWeightCategory(), WeightCategory::getCode); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0d5a7baa5292d12395407f228… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0d5a7baa5292d12395407f228… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Update changelog for v.9.0.7 [skip CI]
by Tony CHEMIT (＠tchemit) 28 Aug '22

28 Aug '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4e48eb46 by Tony Chemit at 2022-08-28T15:01:12+02:00 Update changelog for v.9.0.7 [skip CI] - - - - - 61bdeb5c by Tony Chemit at 2022-08-28T15:01:12+02:00 Il serait intéressant de permettre l'absence de base déclarée par défaut - See #2293 (update doc) - - - - - 3 changed files: - CHANGELOG.md - src/site/markdown/server-configuration-db.md - src/site/markdown/server-configuration-security.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,7 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2022-08-23 22:38. + * Last generated at 2022-08-28 14:43. ## Version [9.0.7](https://gitlab.com/ultreiaio/ird-observe/-/milestones/232) @@ -14,8 +14,10 @@ ### Issues * [[Type::Anomalie 2324]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2324) **Ouverture de base impossible selon configuration précédente de l'arbre** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2327]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2327) **Clé de libellé non traduite en anglais sur la page de synchrod e la synchro avancée** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2411]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2411) **HResponseErrorException / InvalidAuthenticationTokenException en 9.0.6 en quittant l'application** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2412]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2412) **Certains services sont encore en GET alors qu'ils devraient être en POST** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2416]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2416) **La boîte 'A propos' ne fontionne pas** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2419]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2419) **Erreur de migration de l'espèce AVDTH 8 de CAPT_ELEM vers ps_logbook.catch** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2420]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2420) **Statut de la doc de mapping des espèces AVDTH/ObServe** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2423]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2423) **Erreur calcul des données sur V9** (Thanks to Tony CHEMIT) (Reported by Philippe Sabarros) @@ -23,6 +25,7 @@ * [[Type::Evolution 2104]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2104) **On pourrait avoir un service de génération de topiaid** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 2232]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2232) **Dans l'UI des profils de connexion, trimmer les espaces** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 2259]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2259) **Dans l'assistant rapport, ajouter un export CSV** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2293]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2293) **Il serait intéressant de permettre l'absence de base déclarée par défaut** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 2343]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2343) **Sur les données LL port et associées, rajouter 2 nouveaux champs data entry operators** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 2345]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2345) **Ajouter un champ position sur le formulaire Landing LL** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 2378]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2378) **Convertisseur de longueur m/km/nm/ftm** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) @@ -32,6 +35,9 @@ * [[Type::Evolution 2417]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2417) **Improve statistics API** (Thanks to ) (Reported by Tony CHEMIT) * [[Type::Evolution 2418]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2418) **Contournements des soucis mémoire de l'importeru AVDTH** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 2421]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2421) **Traitement de RAV** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2422]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2422) **Il faudrait mettre à jour le script qui crée les colonnes postgis pour chaque champ lat/lon** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2425]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2425) **RAV*, quelques détails** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2426]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2426) **Avoir des retours d'expérience possibles sur les actions de maintenance de bases distantes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [9.0.6](https://gitlab.com/ultreiaio/ird-observe/-/milestones/231) ===================================== src/site/markdown/server-configuration-db.md ===================================== @@ -21,111 +21,25 @@ ## Création d'une base obstuna -La mise en place d'une nouvelle base obstuna se fait en 3 étapes : +La mise en place d'une nouvelle base obstuna se fait en 2 étapes : - création de la base vierge et des rôles sur le serveur postgres -- configuration de la base sur le serveur postgres - création du contenu de la base via ObServe Note - **Il faut de plus avoir à disposition une autre base obstuna qui contient le + **Il faut de plus avoir à disposition une autre base qui contient le référentiel à importer dans la nouvelle base.** -###Phase 1 +### Phase 1 Pour créer une nouvelle instance d'obstuna, il faut au préalable avoir une base vierge (sans schéma) et les utilisateurs sur le serveur postgres. -Il existe une script qui permet de faire ça en tant qu'utilisateur *postgres*. - -``` - sudo su postgres - (cd scripts/postgresl/createdb ; ./create-ird_obstuna.sh) -``` - -Ce script va créer : - -- le propriétaire de la base (**admin**) -- les rôles de technicien **adamiano**, **lfloch**, **pcauquil** -- les rôles de simple utilisateur **utilisateur** -- les rôles d'utilisateur de référentiel **referentiel** -- la base vierge (nommée **obstuna**) - -Ce script a été conçu pour la configuration de l'ird, il ne fait qu'appeler -un autre script bash avec les bons paramètres. - -``` - scripts/postgresl/createdb/create-empty.sh -``` - -Il est donc très facile d'écrire un nouveau script de configuration avec le -bon nom de la base, du propriétaire et des utilisateurs. - -Par exemple pour créer une base avec la configuration suivante - -- nom *obstuna-test* -- propriétaire *admin-test* -- utilisateurs *technicien-test*, *utilisateur-test*, *referentiel-test* - -on lance la commande : - -``` - ( cd scripts/postgresl/createdb ; ./create-empty.sh obstuna-test admin-test "technicien-test utilisateur-test referentiel-test") -``` - -### Phase 1 (base de test) - -Pour créer la base de test utilisée pour tous les tests d'intégration, on lance -un autre script : - -``` - sudo su postgres - (cd scripts/postgresl/createdb ; ./create-test_obstuna.sh) -``` - -Cela crée une base avec la configuration suivante : - -- nom *obstuna-test* -- propriétaire *admin* -- techniciens *technicien1*, *technicien2*, *technicien3* -- utilisateurs *utilisateur* -- utilisateurs de référentiel *referentiel* +Utilisation de commandes classiques **pg**, rien à décrire de plus ici. ### Phase 2 -Ajouter une ligne dans le fichier de configuration pg_hba.conf - -``` - host obstuna all 0.0.0.0/0 md5 -``` - -Pour la base de test ajouter en plus une ligne -``` - host obstuna-test all 0.0.0.0/0 md5 -``` - -Selon la configuration du serveur, il est possible de devoir aussi modifier -le fichier de configuration postgresql.conf (pour renseigner la propriété -listen_addresses='*' pour autoriser le tcp depuis l'extérieur). - -Redémarrer le serveur postgres : -``` - sudo /etc/init.d/postgresql-8.3 restart -``` -ou -``` - sudo service postgresql-8.3 restart -``` - -tester la connexion - -``` - psql -h localhost obstuna admin -``` - -### Phase 3 - Il suffit enfin de lancer l'application en mode *création de base obstuna* via le raccourci suivant : ===================================== src/site/markdown/server-configuration-security.md ===================================== @@ -69,13 +69,15 @@ Sa définition est * un nom * une url - * (optionel) est-ce la base par défaut de l'application ? + * (optionel) est-ce la base par défaut de l'application ? *(1)* * des roles associés à cette base Le nom est représenté comme une *ancre* dans le format *yaml*. Par convention, on préfixe toujours celui-ci par **db-**. +**Note *(1)*** à partir de version **9.0.7** il n'est plus obligatoire d'avoir une base par défaut. + #### Exemple Pour définir une dabase de donnée **production**, on écrit View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4e361ec2081b8b28c8ac5797… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4e361ec2081b8b28c8ac5797… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 37 commits: Remove unused class
by Tony CHEMIT (＠tchemit) 28 Aug '22

28 Aug '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a32703eb by Tony Chemit at 2022-08-24T16:48:34+02:00 Remove unused class - - - - - 5c0f55bf by Tony Chemit at 2022-08-24T17:13:22+02:00 Persistence - remove TopiaMetadataEntity from API (just use it in templates) Persistence - move DifferentialMetaModel to Dto layer (in BusinessProject) Persistence - update license headers - - - - - c9ae667b by Tony Chemit at 2022-08-24T17:13:22+02:00 Dto - remove from ReferentialDto version and create properties (never used) - - - - - 007c9646 by Tony Chemit at 2022-08-24T17:13:22+02:00 Dto - remove from ToolkitId some unused constants - - - - - 31fff682 by Tony Chemit at 2022-08-24T17:13:22+02:00 Replace ObserveDto by IdDto in ContentTableUITableModel - - - - - 78f10ae4 by Tony Chemit at 2022-08-24T17:13:22+02:00 Persistence - move DifferentialMetaModel to Dto layer (in BusinessProject) - - - - - 341cf5a2 by Tony Chemit at 2022-08-24T17:34:46+02:00 Persistence - Improve Migration service (move it to his dedicated package) - - - - - 095a367f by Tony Chemit at 2022-08-25T16:32:57+02:00 Persistence - Make ObserveDataSourceConfigurationTopiaH2.createTemporaryConfiguration method use System.nanoTime instead of UUID (then can understand when db was created) - - - - - e3c8b718 by Tony Chemit at 2022-08-25T16:34:19+02:00 Persistence - Fix migrateOneToOneComposition for ll_logbook sample - - - - - d19b1bf8 by Tony Chemit at 2022-08-25T16:40:54+02:00 Persistence - Remove a lot of code from ToPIA Persistence - Never use hibernate to generate schema at runtime Persistence - Review ToPIA initSchema (in fact do nothing at all now) - - - - - 2e703b25 by Tony Chemit at 2022-08-25T16:40:54+02:00 Tck - Test more stuff (adding persistence layer in services tck) - - - - - b00c282e by Tony Chemit at 2022-08-25T19:10:00+02:00 add a way to inject tck credentials inside tests (for pg new tests) - - - - - 36de6070 by Tony Chemit at 2022-08-25T20:41:36+02:00 update pom - - - - - f3679ae1 by Tony Chemit at 2022-08-26T01:00:53+02:00 Persistence - Improve Create schema consumer to be able to create schema only if not exists (luckily it works on h2 and on pg \o/) - - - - - bdb42995 by Tony Chemit at 2022-08-26T18:04:16+02:00 Persistence - Use SqlSupplier from java-util - - - - - 7eec3f3d by Tony Chemit at 2022-08-26T18:04:16+02:00 Persistence - add TopiaTransaction.flush method to be able to flush from TopiaPersistenceContext - - - - - 5facf930 by Tony Chemit at 2022-08-26T18:04:16+02:00 Persistence - add JdbcHelper.applyDatabaseNameCase to get neutral search algorithm and use it in SecurityScriptBuilderContext Persistence - add JdbcHelper.isTableExist and JdbcHelper.isSchemaExist Persistence - add JdbcHelper tests - - - - - 46d0fee9 by Tony Chemit at 2022-08-26T18:04:16+02:00 Persistence - Deprecates HibernateUtil.isSchemaExist and HibernateUtil.isSchemaEmpty - - - - - f9dc03de by Tony Chemit at 2022-08-26T18:04:16+02:00 Service local - Review AnonymousServiceLocalSupport , now code is pretty clean and easy to understand. Persistence - Review how to create new database. Now code is pretty clean Service local - Improve AnonymousServiceLocalSupport code Persistence - Review JdbcSecurityHelper.getDataSourceInformation - - - - - 5a1538b4 by Tony Chemit at 2022-08-27T04:27:14+02:00 Persistence - Review TopiaApplicationContextFactory, now we are talking of something nice and smooth, no cast, no mystery, no back ended instance in framework. The ObserveTopiaApplicationContextFactory is now pretty easy to use :) Persistence - Clean Sql service init according to topia configuration Persistence - clean ObserveDataSourceConfiguration, ObserveTopiaConfigurationFactory, BeanTopiaConfiguration and TopiaConfiguration - - - - - 91202ee5 by Tony Chemit at 2022-08-27T04:27:14+02:00 Code - Fix typo and import - - - - - 58de8538 by Tony Chemit at 2022-08-27T04:27:14+02:00 Persistence - improve SecurityScriptHelper code - - - - - 5aa320d0 by Tony Chemit at 2022-08-27T04:27:14+02:00 Persistence - tms_version va-t-elle rester dans le schéma public ? - See #2218 - - - - - 3e210f5a by Tony Chemit at 2022-08-27T04:27:14+02:00 RAV*, quelques détails - Closes ultreiaio/ird-observe#2425 - - - - - 80a00fbf by Tony Chemit at 2022-08-27T04:27:14+02:00 Try to fix validation file order (some validation fields changes from time to time...) - - - - - 5b7f7598 by Tony Chemit at 2022-08-27T04:27:14+02:00 Clé de libellé non traduite en anglais sur la page de synchrod e la synchro avancée - Closes #2327 - - - - - 0d0aa3a7 by Tony Chemit at 2022-08-27T04:27:14+02:00 tidy poms and at last update slf4j and try to fix log4j memory leaks in tomcat (can't find how to remove the thread local usage...) - - - - - 7345b7b1 by Tony Chemit at 2022-08-27T04:27:14+02:00 add TopiaApplicationContextFactory in log to see topia application context usages. - - - - - 145dde05 by Tony Chemit at 2022-08-27T04:27:14+02:00 low down log level - - - - - 11268c6a by Tony Chemit at 2022-08-27T04:27:14+02:00 Il serait intéressant de permettre l'absence de base déclarée par défaut - See #2293 - - - - - 4e7c59a1 by Tony Chemit at 2022-08-28T13:46:26+02:00 Avoir des retours d'expérience possibles sur les actions de maintenance de bases distantes - Closes #2426 - - - - - f144e1f1 by Tony Chemit at 2022-08-28T13:46:26+02:00 Add colors in logs :) - - - - - 32b8de06 by Tony Chemit at 2022-08-28T13:46:26+02:00 Clean topia application context factory when a test is done! - - - - - e131d2c0 by Tony Chemit at 2022-08-28T13:46:26+02:00 update pom - - - - - 81b0e126 by Tony Chemit at 2022-08-28T13:46:26+02:00 Persistence - remove some topiaException when not really needed - - - - - 9900905e by Tony Chemit at 2022-08-28T13:46:26+02:00 Persistence - Remove log.error in migration service - - - - - 4e361ec2 by Tony Chemit at 2022-08-28T14:23:32+02:00 Feedback - be able to select text inside error pane :) - - - - - 30 changed files: - client/configuration/pom.xml - client/configuration/src/main/filtered-resources/log4j2.xml - client/configuration/src/main/filtered-resources/observe-log4j2.xml - client/core/src/main/java/fr/ird/observe/client/ErrorHandler.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/action/FeedBackBuilder.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/action/FeedBackBuilderModel.java - client/datasource/actions/pom.xml - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminActionModel.java - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUITableModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/loading/open/OpenDataSourceActionStep.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/launchers/RemoteUILauncher.java - client/datasource/editor/ll/pom.xml - client/datasource/editor/spi/pom.xml - client/runner/pom.xml - client/runner/src/main/i18n/translations/client-runner_en_GB.properties - core/api/dto/pom.xml - − core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/logbook/consolidate/ActivityConsolidateResult.java - core/persistence/java/src/main/resources/META-INF/persistence/Observe/DifferentialMetaModel.json → core/api/dto/src/main/resources/META-INF/dto/Observe/DifferentialMetaModel.json - core/api/dto/src/test/resources/log4j2.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/java/pom.xml - core/persistence/java/src/main/java/fr/ird/observe/entities/DataSourceCreateHelper.java - core/persistence/java/src/main/java/fr/ird/observe/entities/ObserveTopiaApplicationContext.java - core/persistence/java/src/main/java/fr/ird/observe/entities/ObserveTopiaApplicationContextFactory.java - core/persistence/java/src/main/java/fr/ird/observe/entities/ObserveTopiaPersistenceContext.java - − core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaMetadataModel.json - − core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaMetadataModelPaths.json The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0b928f3f38f9a4399a74a461… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0b928f3f38f9a4399a74a461… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Update changelog for v.9.0.7 [skip CI]
by Tony CHEMIT (＠tchemit) 23 Aug '22

23 Aug '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f2ada326 by Tony Chemit at 2022-08-23T22:54:18+02:00 Update changelog for v.9.0.7 [skip CI] - - - - - 0b928f3f by Tony Chemit at 2022-08-23T22:54:18+02:00 Titre de l'appli - Closes #2395 - - - - - 2 changed files: - CHANGELOG.md - client/core/src/main/java/fr/ird/observe/client/main/ObserveMainUIHandler.java Changes: ===================================== CHANGELOG.md ===================================== @@ -1,12 +1,11 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2022-07-13 14:08. + * Last generated at 2022-08-23 22:38. ## Version [9.0.7](https://gitlab.com/ultreiaio/ird-observe/-/milestones/232) -**Closed at 2022-07-13.** - +**Closed at 2022-08-23.** ### Download * [Client (observe-9.0.7-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) @@ -14,12 +13,21 @@ * [Serveur (observe-9.0.7-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) ### Issues + * [[Type::Anomalie 2324]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2324) **Ouverture de base impossible selon configuration précédente de l'arbre** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2411]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2411) **HResponseErrorException / InvalidAuthenticationTokenException en 9.0.6 en quittant l'application** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2412]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2412) **Certains services sont encore en GET alors qu'ils devraient être en POST** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Type::Anomalie 2419]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2419) **Erreur de migration de l'espèce AVDTH 8 de CAPT_ELEM vers ps_logbook.catch** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2420]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2420) **Statut de la doc de mapping des espèces AVDTH/ObServe** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2423]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2423) **Erreur calcul des données sur V9** (Thanks to Tony CHEMIT) (Reported by Philippe Sabarros) + * [[Type::Evolution 1751]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1751) **Mettre un sablier lors de l'ouverture si le nœud a beaucoup de données à charger.** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Type::Evolution 2104]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2104) **On pourrait avoir un service de génération de topiaid** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2232]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2232) **Dans l'UI des profils de connexion, trimmer les espaces** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2259]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2259) **Dans l'assistant rapport, ajouter un export CSV** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2343]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2343) **Sur les données LL port et associées, rajouter 2 nouveaux champs data entry operators** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2345]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2345) **Ajouter un champ position sur le formulaire Landing LL** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 2378]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2378) **Convertisseur de longueur m/km/nm/ftm** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2395]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2395) **Titre de l'appli** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2409]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2409) **Aucune barre de progression** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 2410]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2410) **Ordonancement par défaut des 3 combos section, basket, avançon sur les observations** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 2417]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2417) **Improve statistics API** (Thanks to ) (Reported by Tony CHEMIT) * [[Type::Evolution 2418]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2418) **Contournements des soucis mémoire de l'importeru AVDTH** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) ===================================== client/core/src/main/java/fr/ird/observe/client/main/ObserveMainUIHandler.java ===================================== @@ -90,7 +90,7 @@ public class ObserveMainUIHandler implements UIHandler<ObserveMainUI>, WithClien ClientConfig config = getClientConfig(); - String title = t("observe.ui.title.welcome.admin") + (" v " + config.getVersion()); + String title = t("observe.ui.title.welcome.admin") + (" " + config.getVersion()); ui.setTitle(title); ErrorDialogUI.init(ui); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ea69fc49deca7f7cd0790834… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ea69fc49deca7f7cd0790834… You're receiving this email because of your account on gitlab.com.

1 0