Observe-commits

Download

observe-commits@list.forge.codelutin.com

August 2020

1 participants
52 discussions

[Git][ultreiaio/ird-observe][develop-7.x] 4 commits: [PS] Contrôle de la saisie des espèces dans faune accessoire par systèmes...
by Tony CHEMIT 05 Aug '20

05 Aug '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: dab9fdc8 by Tony Chemit at 2020-08-05T13:26:18+02:00 [PS] Contrôle de la saisie des espèces dans faune accessoire par systèmes observés (cas requin baleine) - See #1583 - - - - - 4f50f240 by Tony Chemit at 2020-08-05T13:26:19+02:00 update pom - - - - - e154abdc by Tony Chemit at 2020-08-05T13:26:19+02:00 Listes à choix multiples et mode permissif sur référentiels désactivés - Closes #1585 - - - - - ca258626 by Tony Chemit at 2020-08-05T13:31:08+02:00 Revert "update pom" This reverts commit 4f50f240 - - - - - 3 changed files: - client-configuration/src/main/config/Client.ini - client-configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java Changes: ===================================== client-configuration/src/main/config/Client.ini ===================================== @@ -597,7 +597,7 @@ defaultValue = true description = observe.config.ui.seineBycatchObservedSystem.description key = ui.seineBycatchObservedSystem type = fr.ird.observe.validation.SeineBycatchObservedSystemConfig -defaultValue = {\"fr.ird.observe.entities.referentiel.Species#1239832684290#0.04680507324710936\": [\"fr.ird.observe.entities.referentiel.seine.ObservedSystem#0#1.0\",\"fr.ird.observe.entities.referentiel.seine.ObservedSystem#0#1.1\"]} +defaultValue = {\"fr.ird.observe.entities.referentiel.Species#1239832684290#0.04680507324710936\": [\"fr.ird.observe.entities.referentiel.seine.ObservedSystem#0#1.0\",\"fr.ird.observe.entities.referentiel.seine.ObservedSystem#0#1.1\",\"fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9217864901728908\"]} [option temporaryFilesTimeout] description = observe.config.temporaryFilesTimeout.description ===================================== client-configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java ===================================== @@ -47,10 +47,11 @@ public class ClientConfigTest { { Collection<String> requiredObservedSystemBySpeciesId = seineBycatchObservedSystem.getRequiredObservedSystemBySpeciesId("fr.ird.observe.entities.referentiel.Species#1239832684290#0.04680507324710936"); Assert.assertNotNull(requiredObservedSystemBySpeciesId); - Assert.assertEquals(2, requiredObservedSystemBySpeciesId.size()); + Assert.assertEquals(3, requiredObservedSystemBySpeciesId.size()); Iterator<String> iterator = requiredObservedSystemBySpeciesId.iterator(); Assert.assertEquals("fr.ird.observe.entities.referentiel.seine.ObservedSystem#0#1.0", iterator.next()); Assert.assertEquals("fr.ird.observe.entities.referentiel.seine.ObservedSystem#0#1.1", iterator.next()); + Assert.assertEquals("fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9217864901728908", iterator.next()); } { Collection<String> requiredObservedSystemBySpeciesId = seineBycatchObservedSystem.getRequiredObservedSystemBySpeciesId("fr.ird.observe.entities.referentiel.Species#1239832684290#0.04680507324710936_fake"); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java ===================================== @@ -721,8 +721,9 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U log.debug(String.format("Filter referential references (type %s - property %s), original size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); // by default always remove obsolete references - List<R> referentialReferences = DtoReferenceCollection.filterEnabled(incomingReferences); - log.debug(String.format("Filter referential references (type %s - property %s), without diabled size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); + boolean validationDisabledReferential = ui.getConfig().isValidationDisabledReferential(); + List<R> referentialReferences = validationDisabledReferential ? new LinkedList<>(incomingReferences) : DtoReferenceCollection.filterEnabled(incomingReferences); + log.debug(String.format("Filter referential references (type %s - property %s), without disabled size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); //noinspection unchecked ReferentialReferencesFilter<D, R> referentialReferencesFilter = referentialsFilters.get(propertyName); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/11f90bbddfdada0212095cef… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/11f90bbddfdada0212095cef… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Amélioration du design dans editor-api :
by Tony CHEMIT 03 Aug '20

03 Aug '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 01d0ac4d by Tony Chemit at 2020-07-28T14:40:54+02:00 Amélioration du design dans editor-api : * un seul listener sur l'arbre pour gérer la sélection * déplacement du code de la navigation dans son paquetage * ajout d'une méthode ClientUIContext.addSimpleAction (il faudrait l'utiliser partout, à finir) * nettoyage code et commentaire - - - - - 409b6da5 by Tony Chemit at 2020-07-28T17:24:29+02:00 Ajout méthode pour avoir les informations sur une source de données à partir de sa configuration - - - - - 1973bdfe by Tony Chemit at 2020-07-28T17:24:56+02:00 Nettoyage code - - - - - 1b179ca3 by Tony Chemit at 2020-07-30T14:35:22+02:00 Improve again editor API - - - - - 30 changed files: - client-core/src/main/i18n/templates/dataSourceInformation_en_GB.ftl - client-core/src/main/i18n/templates/dataSourceInformation_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceInformation_fr_FR.ftl - client-core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveDataSourcesManager.java - client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/util/ObserveKeyStrokesSupport.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIBodyContent.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/ConfigModel.java - client-datasource-editor-api/src/main/i18n/templates/dataSourceConnectionReport_en_GB.ftl - client-datasource-editor-api/src/main/i18n/templates/dataSourceConnectionReport_es_ES.ftl - client-datasource-editor-api/src/main/i18n/templates/dataSourceConnectionReport_fr_FR.ftl - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditor.jaxx - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditorBodyContent.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditorHandler.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditorHelper.java - − client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/ObServeNavigationTreeSelectionListener.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/loading/close/CloseDataSourceAction.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/loading/open/OpenDataSourceAction.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/loading/open/OpenDataSourceActionStep.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/menu/actions/ReloadStorageAction.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/NavigationTree.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/NavigationTreeCellRenderer.java - + client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/NavigationTreeSelectionListenerImpl.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/ObserveNavigationTreeShowPopupAction.java → client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/NavigationTreeShowPopupHandler.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/NavigationUI.jaxx - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/NavigationUIHandler.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/ObstunaAdminAction.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageUIModel.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/connexion/DataSourceSelectorModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/22ea111dd2e2456eb41edd23… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/22ea111dd2e2456eb41edd23… You're receiving this email because of your account on gitlab.com.

1 0