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

[Git][ultreiaio/ird-observe][develop] Introduce DtoMetaTransformer to augments dto model (this is a first step, we...
by Tony CHEMIT 24 Jan '21

24 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8d709c05 by Tony Chemit at 2021-01-24T18:44:30+01:00 Introduce DtoMetaTransformer to augments dto model (this is a first step, we will later improve it to minimize as much as possible stuff to write in models) Rename FloatingObect sub dto to respect convention over configuration on ContainerDto. - - - - - 30 changed files: - client/datasource/editor/ps/src/main/capabilities/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUI.capabilities - client/datasource/editor/ps/src/main/i18n/getters/navigation.getter - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectObjectObservedSpeciesUI.jaxx - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectObjectSchoolEstimateUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectSchoolEstimateUIModelStates.java → client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectObjectSchoolEstimateUIModelStates.java - − client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectObservedSpeciesUI.jaxx - − client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectSchoolEstimateUI.jaxx - client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectObservedSpeciesUINavigationNode.scope → client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectObjectObservedSpeciesUINavigationNode.scope - client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectSchoolEstimateUINavigationNode.scope → client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectObjectSchoolEstimateUINavigationNode.scope - client/datasource/editor/ps/src/main/resources/icons/navigation/default/ps/data/observation/FloatingObjectObservedSpecies_16x16.png → client/datasource/editor/ps/src/main/resources/icons/navigation/default/ps/data/observation/FloatingObjectObjectObservedSpecies_16x16.png - client/datasource/editor/ps/src/main/resources/icons/navigation/default/ps/data/observation/FloatingObjectObservedSpecies_24x24.png → client/datasource/editor/ps/src/main/resources/icons/navigation/default/ps/data/observation/FloatingObjectObjectObservedSpecies_24x24.png - client/datasource/editor/ps/src/main/resources/icons/navigation/default/ps/data/observation/FloatingObjectSchoolEstimate_16x16.png → client/datasource/editor/ps/src/main/resources/icons/navigation/default/ps/data/observation/FloatingObjectObjectSchoolEstimate_16x16.png - client/datasource/editor/ps/src/main/resources/icons/navigation/default/ps/data/observation/FloatingObjectSchoolEstimate_24x24.png → client/datasource/editor/ps/src/main/resources/icons/navigation/default/ps/data/observation/FloatingObjectObjectSchoolEstimate_24x24.png - client/datasource/editor/ps/src/main/resources/observe-ui-navigation-ps.properties - client/datasource/editor/ps/src/test/java/fr/ird/observe/client/datasource/editor/ps/PsNavigationTreeNodeTest.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/dto-definition/src/main/models/Observe-20-data-ps-observation.model - models/dto-definition/src/main/models/Observe-25-data-ps.model - models/dto-definition/src/main/models/Observe-30-data-ll-observation.model - models/dto-definition/src/main/models/Observe-31-data-ll-logbook.model - models/dto-definition/src/main/models/Observe-35-data-ll.model - models/dto/src/main/java/fr/ird/observe/dto/decoration/init/DataPsObservationModelDecoratorInitializer.java - + models/dto/src/test/java/fr/ird/observe/spi/mapping/ObserveDtoToFormDtoMappingTest.java - + models/dto/src/test/java/fr/ird/observe/spi/mapping/ObserveDtoToMainDtoDtoMappingTest.java - server/core/src/main/filtered-resources/mapping - + toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/DtoMetaTransformer.java - toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/GenerateDto.java - toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/GenerateServiceApi.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8d709c05a48605073337d70fd… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8d709c05a48605073337d70fd… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: * Sanitize service API and Local API
by Tony CHEMIT 23 Jan '21

23 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 77caeba3 by Tony Chemit at 2021-01-23T16:44:16+01:00 * Sanitize service API and Local API * Align it to DataDto type * Make neutral ObserveServiceLocal - - - - - 20c9f26c by Tony Chemit at 2021-01-23T16:44:16+01:00 * Align UI to DataDto type * Simplify UI code (add more method final) - - - - - 71d00f50 by Tony Chemit at 2021-01-23T16:44:16+01:00 Put config color in UIManager - - - - - 1e6f7ff2 by Tony Chemit at 2021-01-23T16:44:16+01:00 Use now config color in navigation tree - - - - - 30 changed files: - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/create/CreateNewEditable.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripUI.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripUIHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUINavigationHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIOpenExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/actions/ContentEditUIActionSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/actions/DeleteEdit.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/actions/MoveEdit.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/actions/SaveContentEditUIAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUINavigationHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUINavigationHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIOpenExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/actions/ContentOpenableUIActionSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/actions/DeleteOpenable.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/actions/MoveOpenable.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/actions/SaveContentOpenableUIAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/sample/SampleContentTableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0236db7eccb7fd0421bd5530… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0236db7eccb7fd0421bd5530… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Fix SampleDataServiceLocalSupport (call twice binder to entity)
by Tony CHEMIT 23 Jan '21

23 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 51347b1d by Tony Chemit at 2021-01-23T15:34:32+01:00 Fix SampleDataServiceLocalSupport (call twice binder to entity) - - - - - 4067895f by Tony Chemit at 2021-01-23T15:34:47+01:00 Put config color in UIManager - - - - - 479c83f0 by Tony Chemit at 2021-01-23T15:34:59+01:00 Use now config color in bavigation tree - - - - - 0236db7e by Tony Chemit at 2021-01-23T15:36:20+01:00 remove unused code - - - - - 5 changed files: - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUINavigationHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUINavigationInitializer.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ContainerDataServiceLocalSupport.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/SampleDataServiceLocalSupport.java Changes: ===================================== client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java ===================================== @@ -814,8 +814,17 @@ public class ClientConfig extends GeneratedClientConfig implements TripMapConfig loadUIConfigFile(ObserveClientResourceManager.Resource.ui_navigation_common, dir); loadUIConfigFile(ObserveClientResourceManager.Resource.ui_navigation_ps, dir); loadUIConfigFile(ObserveClientResourceManager.Resource.ui_navigation_ll, dir); - UIManager.getDefaults().put("BlockingLayerUI.busyColor", getBusyStateColor()); - UIManager.getDefaults().put("BlockingLayerUI.blockColor", getBlockStateColor()); + UIDefaults defaults = UIManager.getDefaults(); + defaults.put("BlockingLayerUI.busyColor", getBusyStateColor()); + defaults.put("BlockingLayerUI.blockColor", getBlockStateColor()); + for (ClientConfigOption option : ClientConfigOption.values()) { + if (option.getType()==Color.class) { + String key = option.getKey(); + Color color = get().getOptionAsColor(key); + log.info(String.format("Register color: %s → %s", key,color)); + defaults.put(key, color); + } + } } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUINavigationHandler.java ===================================== @@ -25,6 +25,7 @@ package fr.ird.observe.client.datasource.editor.api.content.data.table; import fr.ird.observe.client.datasource.editor.api.content.ContentMode; import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationHandler; +import javax.swing.UIManager; import java.awt.Color; import java.util.Objects; @@ -38,6 +39,8 @@ public abstract class ContentTableUINavigationHandler<N extends ContentTableUINa private final N node; + private Color disabledColor; + private Color emptyColor; public ContentTableUINavigationHandler(N node) { this.node = Objects.requireNonNull(node); } @@ -48,7 +51,10 @@ public abstract class ContentTableUINavigationHandler<N extends ContentTableUINa @Override public Color getColor() { if (!getNode().getInitializer().isShowData()) { - return Color.GRAY; + return getDisabledColor(); + } + if (getNode().getInitializer().isEmpty()) { + return getEmptyColor(); } return super.getColor(); } @@ -75,4 +81,18 @@ public abstract class ContentTableUINavigationHandler<N extends ContentTableUINa } return node.getParent().getHandler().getContentMode(); } + + public Color getDisabledColor() { + if (disabledColor==null) { + disabledColor = UIManager.getColor("ui.tree.node.disabled.color"); + } + return disabledColor; + } + + public Color getEmptyColor() { + if (emptyColor==null) { + emptyColor = UIManager.getColor("ui.tree.node.empty.color"); + } + return emptyColor; + } } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUINavigationInitializer.java ===================================== @@ -44,6 +44,7 @@ public class ContentTableUINavigationInitializer extends NavigationInitializer<C private DtoReference parentReference; private SingletonSupplier<Boolean> showData; + private SingletonSupplier<Boolean> empty; public static <D extends IdDto> boolean isEnabled(D bean, Class<? extends IdDto> dtoType) { Stream<JavaBeanPropertyDefinition<?, ?>> properties = bean.javaBeanDefinition().readProperties(); @@ -56,6 +57,17 @@ public class ContentTableUINavigationInitializer extends NavigationInitializer<C return true; } + public static <D extends IdDto> boolean isEmpty(D bean, Class<? extends IdDto> dtoType) { + Stream<JavaBeanPropertyDefinition<?, ?>> properties = bean.javaBeanDefinition().readProperties(); + String propertyNameCandidate = Introspector.decapitalize(dtoType.getSimpleName()) + .replace("Dto", "Empty") + .replace("Reference", "Empty"); + if (properties.anyMatch(p -> propertyNameCandidate.equals(p.propertyName()))) { + return bean.get(propertyNameCandidate); + } + return false; + } + public ContentTableUINavigationInitializer(NavigationScope scope, DtoReference parentReference) { super(scope); this.parentReference = Objects.requireNonNull(parentReference); @@ -65,6 +77,7 @@ public class ContentTableUINavigationInitializer extends NavigationInitializer<C protected Object init(NavigationContext<ContentTableUINavigationContext> context) { context.initReference(parentReference); this.showData = SingletonSupplier.of(this::computeShowSata); + this.empty = SingletonSupplier.of(this::computeEmpty); return getScope().getMainType(); } @@ -72,6 +85,10 @@ public class ContentTableUINavigationInitializer extends NavigationInitializer<C return isEnabled(parentReference, getScope().getMainType()); } + protected boolean computeEmpty() { + return isEmpty(parentReference, getScope().getMainType()); + } + @Override protected void open(NavigationContext<ContentTableUINavigationContext> context) { showData.clear(); @@ -94,6 +111,10 @@ public class ContentTableUINavigationInitializer extends NavigationInitializer<C return showData.get(); } + public boolean isEmpty() { + return empty.get(); + } + @Override public String toString() { ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ContainerDataServiceLocalSupport.java ===================================== @@ -76,10 +76,6 @@ public class ContainerDataServiceLocalSupport<PE extends DataEntity<?, ?>, D ext return saveEntity(parentSpi, spi, entity, saveCallback); } - protected E newEntity() { - return spi.newEntity(now()); - } - protected PE loadOrCreateEntityFromDto(M dto) { return mainSpi.loadOrCreateEntityFromDto(getApplicationLocale(), getTopiaPersistenceContext(), dto); } @@ -92,10 +88,6 @@ public class ContainerDataServiceLocalSupport<PE extends DataEntity<?, ?>, D ext return parentSpi.loadEntity(getApplicationLocale(), getTopiaPersistenceContext(), parenId); } -// protected E loadSimpleEntity(String id) { -// return spi.loadEntity(getApplicationLocale(), getTopiaPersistenceContext(), id); -// } - } ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/SampleDataServiceLocalSupport.java ===================================== @@ -61,8 +61,6 @@ public abstract class SampleDataServiceLocalSupport<C extends ContainerChildDto, public SaveResultDto save(M dto) { Set parent = getParent(dto); E entity = loadOrCreateEntityFromDto(parent, dto); - checkLastUpdateDate(entity, dto); - entity.fromDto(getReferentialLocale(), dto); return onSave(parent, entity, dto); } @@ -82,6 +80,7 @@ public abstract class SampleDataServiceLocalSupport<C extends ContainerChildDto, protected final E loadOrCreateEntityFromDto(Set parent, M dto) { dto.setId(null); E entity = loadFormEntity(parent); + checkLastUpdateDate(entity, dto); entity.fromDto(getReferentialLocale(), dto); dto.setId(entity.getTopiaId()); return entity; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5f427e5b57f6ba0f3e15da24… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5f427e5b57f6ba0f3e15da24… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Use now containerDto (make us remove a lots of code we now generate)
by Tony CHEMIT 23 Jan '21

23 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 54ba847a by Tony Chemit at 2021-01-23T09:46:55+01:00 Use now containerDto (make us remove a lots of code we now generate) - - - - - 710dbd23 by Tony Chemit at 2021-01-23T13:16:38+01:00 * Sanitize service API and Local API * Align it to DataDto type * Make neutral ObserveServiceLocal - - - - - 5f427e5b by Tony Chemit at 2021-01-23T14:43:14+01:00 * Align UI to DataDto type * Simplify UI code (add more method final) - - - - - 30 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/create/CreateNewEditable.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripUI.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripUIHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIOpenExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/actions/ContentEditUIActionSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/actions/DeleteEdit.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/actions/MoveEdit.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/actions/SaveContentEditUIAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIOpenExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/actions/ContentOpenableUIActionSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/actions/DeleteOpenable.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/actions/MoveOpenable.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/actions/SaveContentOpenableUIAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/sample/SampleContentTableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModelStates.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModelStatesSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModelSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIOpenExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/actions/SaveContentSimpleUIAdapter.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/cf3e58bbff28dbc729c34fa7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/cf3e58bbff28dbc729c34fa7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Problème de sauvegarde libération espèce sensible - Closes #1771
by Tony CHEMIT 22 Jan '21

22 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: cf3e58bb by Tony Chemit at 2021-01-22T15:02:47+01:00 Problème de sauvegarde libération espèce sensible - Closes #1771 - - - - - 15 changed files: - services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/SimpleDataServiceLocalSupport.java → services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ContainerDataServiceLocalSupport.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/common/TripGearUseFeaturesServiceLocalSupport.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/SetCatchServiceLocalSupport.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/ActivityEncounterServiceLocalSupport.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/ActivitySensorUsedServiceLocalSupport.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/SetCatchServiceLocalSupport.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/SetTdrServiceLocalSupport.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/common/TripGearUseFeaturesServiceLocalSupport.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/FloatingObjectObservedSpeciesServiceLocalSupport.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/FloatingObjectSchoolEstimateServiceLocalSupport.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/SetDiscardedTargetCatchServiceLocalSupport.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/SetKeptTargetCatchServiceLocalSupport.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/SetNonTargetCatchReleaseServiceLocalSupport.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/SetNonTargetCatchServiceLocalSupport.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/SetSchoolEstimateServiceLocalSupport.java Changes: ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/SimpleDataServiceLocalSupport.java → services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ContainerDataServiceLocalSupport.java ===================================== @@ -40,18 +40,18 @@ import java.util.function.BiConsumer; * @author Tony Chemit - dev(a)tchemit.fr * @since 8.0.1 */ -public class SimpleDataServiceLocalSupport<PE extends DataEntity<?, ?>, M extends DataDto, D extends DataDto, E extends DataEntity<?, ?>> extends ObserveServiceLocal implements SimpleDataService<M> { +public class ContainerDataServiceLocalSupport<PE extends DataEntity<?, ?>, M extends DataDto, D extends DataDto, E extends DataEntity<?, ?>> extends ObserveServiceLocal implements SimpleDataService<M> { protected final DataDtoEntityContext<?, ?, PE, ?> parentSpi; protected final DataDtoEntityContext<M, ?, PE, ?> mainSpi; protected final DataDtoEntityContext<D, ?, E, ?> spi; protected final BiConsumer<PE, Date> saveCallback; - protected SimpleDataServiceLocalSupport(DataDtoEntityContext<?, ?, PE, ?> parentSpi, DataDtoEntityContext<M, ?, PE, ?> mainSpi, DataDtoEntityContext<D, ?, E, ?> spi) { + protected ContainerDataServiceLocalSupport(DataDtoEntityContext<?, ?, PE, ?> parentSpi, DataDtoEntityContext<M, ?, PE, ?> mainSpi, DataDtoEntityContext<D, ?, E, ?> spi) { this(parentSpi, mainSpi, spi, null); } - protected SimpleDataServiceLocalSupport(DataDtoEntityContext<?, ?, PE, ?> parentSpi, DataDtoEntityContext<M, ?, PE, ?> mainSpi, DataDtoEntityContext<D, ?, E, ?> spi, BiConsumer<PE, Date> saveCallback) { + protected ContainerDataServiceLocalSupport(DataDtoEntityContext<?, ?, PE, ?> parentSpi, DataDtoEntityContext<M, ?, PE, ?> mainSpi, DataDtoEntityContext<D, ?, E, ?> spi, BiConsumer<PE, Date> saveCallback) { this.parentSpi = Objects.requireNonNull(parentSpi); this.mainSpi = Objects.requireNonNull(mainSpi); this.spi = Objects.requireNonNull(spi); ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/common/TripGearUseFeaturesServiceLocalSupport.java ===================================== @@ -26,13 +26,13 @@ import fr.ird.observe.dto.data.ll.common.GearUseFeaturesDto; import fr.ird.observe.dto.data.ll.common.TripGearUseFeaturesDto; import fr.ird.observe.entities.data.ll.common.GearUseFeatures; import fr.ird.observe.entities.data.ll.common.Trip; -import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport; +import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport; import fr.ird.observe.services.service.data.ll.common.TripGearUseFeaturesService; /** * @author Tony Chemit - dev(a)tchemit.fr */ -class TripGearUseFeaturesServiceLocalSupport extends SimpleDataServiceLocalSupport<Trip, TripGearUseFeaturesDto, GearUseFeaturesDto, GearUseFeatures> implements TripGearUseFeaturesService { +class TripGearUseFeaturesServiceLocalSupport extends ContainerDataServiceLocalSupport<Trip, TripGearUseFeaturesDto, GearUseFeaturesDto, GearUseFeatures> implements TripGearUseFeaturesService { public TripGearUseFeaturesServiceLocalSupport() { super(Trip.SPI, Trip.TRIP_GEAR_USE_FEATURES_SPI, GearUseFeatures.SPI, ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/SetCatchServiceLocalSupport.java ===================================== @@ -26,13 +26,13 @@ import fr.ird.observe.dto.data.ll.logbook.CatchDto; import fr.ird.observe.dto.data.ll.logbook.SetCatchDto; import fr.ird.observe.entities.data.ll.logbook.Catch; import fr.ird.observe.entities.data.ll.logbook.Set; -import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport; +import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport; import fr.ird.observe.services.service.data.ll.logbook.SetCatchService; /** * @author Tony Chemit - dev(a)tchemit.fr */ -class SetCatchServiceLocalSupport extends SimpleDataServiceLocalSupport<Set, SetCatchDto, CatchDto, Catch> implements SetCatchService { +class SetCatchServiceLocalSupport extends ContainerDataServiceLocalSupport<Set, SetCatchDto, CatchDto, Catch> implements SetCatchService { public SetCatchServiceLocalSupport() { super(Set.SPI, Set.SET_CATCH_SPI, Catch.SPI); ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/ActivityEncounterServiceLocalSupport.java ===================================== @@ -26,7 +26,7 @@ import fr.ird.observe.dto.data.ll.observation.ActivityEncounterDto; import fr.ird.observe.dto.data.ll.observation.EncounterDto; import fr.ird.observe.entities.data.ll.observation.Activity; import fr.ird.observe.entities.data.ll.observation.Encounter; -import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport; +import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport; import fr.ird.observe.services.service.data.ll.observation.ActivityEncounterService; /** @@ -34,7 +34,7 @@ import fr.ird.observe.services.service.data.ll.observation.ActivityEncounterServ * * @author Tony Chemit - dev(a)tchemit.fr */ -class ActivityEncounterServiceLocalSupport extends SimpleDataServiceLocalSupport<Activity, ActivityEncounterDto, EncounterDto, Encounter> implements ActivityEncounterService { +class ActivityEncounterServiceLocalSupport extends ContainerDataServiceLocalSupport<Activity, ActivityEncounterDto, EncounterDto, Encounter> implements ActivityEncounterService { public ActivityEncounterServiceLocalSupport() { super(Activity.SPI, Activity.ACTIVITY_ENCOUNTER_SPI, Encounter.SPI); ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/ActivitySensorUsedServiceLocalSupport.java ===================================== @@ -26,7 +26,7 @@ import fr.ird.observe.dto.data.ll.observation.ActivitySensorUsedDto; import fr.ird.observe.dto.data.ll.observation.SensorUsedDto; import fr.ird.observe.entities.data.ll.observation.Activity; import fr.ird.observe.entities.data.ll.observation.SensorUsed; -import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport; +import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport; import fr.ird.observe.services.service.data.ll.observation.ActivitySensorUsedService; /** @@ -34,7 +34,7 @@ import fr.ird.observe.services.service.data.ll.observation.ActivitySensorUsedSer * * @author Tony Chemit - dev(a)tchemit.fr */ -class ActivitySensorUsedServiceLocalSupport extends SimpleDataServiceLocalSupport<Activity, ActivitySensorUsedDto, SensorUsedDto, SensorUsed> implements ActivitySensorUsedService { +class ActivitySensorUsedServiceLocalSupport extends ContainerDataServiceLocalSupport<Activity, ActivitySensorUsedDto, SensorUsedDto, SensorUsed> implements ActivitySensorUsedService { public ActivitySensorUsedServiceLocalSupport() { super(Activity.SPI, Activity.ACTIVITY_SENSOR_USED_SPI, SensorUsed.SPI); ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/SetCatchServiceLocalSupport.java ===================================== @@ -26,7 +26,7 @@ import fr.ird.observe.dto.data.ll.observation.CatchDto; import fr.ird.observe.dto.data.ll.observation.SetCatchDto; import fr.ird.observe.entities.data.ll.observation.Catch; import fr.ird.observe.entities.data.ll.observation.Set; -import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport; +import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport; import fr.ird.observe.services.service.data.ll.observation.SetCatchService; /** @@ -34,7 +34,7 @@ import fr.ird.observe.services.service.data.ll.observation.SetCatchService; * * @author Tony Chemit - dev(a)tchemit.fr */ -class SetCatchServiceLocalSupport extends SimpleDataServiceLocalSupport<Set, SetCatchDto, CatchDto, Catch> implements SetCatchService { +class SetCatchServiceLocalSupport extends ContainerDataServiceLocalSupport<Set, SetCatchDto, CatchDto, Catch> implements SetCatchService { public SetCatchServiceLocalSupport() { super(Set.SPI, Set.SET_CATCH_SPI, Catch.SPI); ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/SetTdrServiceLocalSupport.java ===================================== @@ -26,7 +26,7 @@ import fr.ird.observe.dto.data.ll.observation.SetTdrDto; import fr.ird.observe.dto.data.ll.observation.TdrDto; import fr.ird.observe.entities.data.ll.observation.Set; import fr.ird.observe.entities.data.ll.observation.Tdr; -import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport; +import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport; import fr.ird.observe.services.service.data.ll.observation.SetTdrService; /** @@ -34,7 +34,7 @@ import fr.ird.observe.services.service.data.ll.observation.SetTdrService; * * @author Tony Chemit - dev(a)tchemit.fr */ -class SetTdrServiceLocalSupport extends SimpleDataServiceLocalSupport<Set, SetTdrDto, TdrDto, Tdr> implements SetTdrService { +class SetTdrServiceLocalSupport extends ContainerDataServiceLocalSupport<Set, SetTdrDto, TdrDto, Tdr> implements SetTdrService { public SetTdrServiceLocalSupport() { super(Set.SPI, Set.SET_TDR_SPI, Tdr.SPI); ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/common/TripGearUseFeaturesServiceLocalSupport.java ===================================== @@ -26,13 +26,13 @@ import fr.ird.observe.dto.data.ps.common.GearUseFeaturesDto; import fr.ird.observe.dto.data.ps.common.TripGearUseFeaturesDto; import fr.ird.observe.entities.data.ps.common.GearUseFeatures; import fr.ird.observe.entities.data.ps.common.Trip; -import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport; +import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport; import fr.ird.observe.services.service.data.ps.common.TripGearUseFeaturesService; /** * @author Tony Chemit - dev(a)tchemit.fr */ -class TripGearUseFeaturesServiceLocalSupport extends SimpleDataServiceLocalSupport<Trip, TripGearUseFeaturesDto, GearUseFeaturesDto, GearUseFeatures> implements TripGearUseFeaturesService { +class TripGearUseFeaturesServiceLocalSupport extends ContainerDataServiceLocalSupport<Trip, TripGearUseFeaturesDto, GearUseFeaturesDto, GearUseFeatures> implements TripGearUseFeaturesService { public TripGearUseFeaturesServiceLocalSupport() { super(Trip.SPI, Trip.TRIP_GEAR_USE_FEATURES_SPI, GearUseFeatures.SPI, ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/FloatingObjectObservedSpeciesServiceLocalSupport.java ===================================== @@ -26,7 +26,7 @@ import fr.ird.observe.dto.data.ps.observation.FloatingObjectObservedSpeciesDto; import fr.ird.observe.dto.data.ps.observation.ObjectObservedSpeciesDto; import fr.ird.observe.entities.data.ps.observation.FloatingObject; import fr.ird.observe.entities.data.ps.observation.ObjectObservedSpecies; -import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport; +import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport; import fr.ird.observe.services.service.data.ps.observation.FloatingObjectObservedSpeciesService; /** @@ -34,7 +34,7 @@ import fr.ird.observe.services.service.data.ps.observation.FloatingObjectObserve * * @author Tony Chemit - dev(a)tchemit.fr */ -class FloatingObjectObservedSpeciesServiceLocalSupport extends SimpleDataServiceLocalSupport<FloatingObject, FloatingObjectObservedSpeciesDto, ObjectObservedSpeciesDto, ObjectObservedSpecies> implements FloatingObjectObservedSpeciesService { +class FloatingObjectObservedSpeciesServiceLocalSupport extends ContainerDataServiceLocalSupport<FloatingObject, FloatingObjectObservedSpeciesDto, ObjectObservedSpeciesDto, ObjectObservedSpecies> implements FloatingObjectObservedSpeciesService { public FloatingObjectObservedSpeciesServiceLocalSupport() { super(FloatingObject.SPI, FloatingObject.FLOATING_OBJECT_OBSERVED_SPECIES_SPI, ObjectObservedSpecies.SPI); ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/FloatingObjectSchoolEstimateServiceLocalSupport.java ===================================== @@ -26,7 +26,7 @@ import fr.ird.observe.dto.data.ps.observation.FloatingObjectSchoolEstimateDto; import fr.ird.observe.dto.data.ps.observation.ObjectSchoolEstimateDto; import fr.ird.observe.entities.data.ps.observation.FloatingObject; import fr.ird.observe.entities.data.ps.observation.ObjectSchoolEstimate; -import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport; +import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport; import fr.ird.observe.services.service.data.ps.observation.FloatingObjectSchoolEstimateService; /** @@ -34,7 +34,7 @@ import fr.ird.observe.services.service.data.ps.observation.FloatingObjectSchoolE * * @author Tony Chemit - dev(a)tchemit.fr */ -class FloatingObjectSchoolEstimateServiceLocalSupport extends SimpleDataServiceLocalSupport<FloatingObject, FloatingObjectSchoolEstimateDto, ObjectSchoolEstimateDto, ObjectSchoolEstimate> implements FloatingObjectSchoolEstimateService { +class FloatingObjectSchoolEstimateServiceLocalSupport extends ContainerDataServiceLocalSupport<FloatingObject, FloatingObjectSchoolEstimateDto, ObjectSchoolEstimateDto, ObjectSchoolEstimate> implements FloatingObjectSchoolEstimateService { public FloatingObjectSchoolEstimateServiceLocalSupport() { super(FloatingObject.SPI, FloatingObject.FLOATING_OBJECT_SCHOOL_ESTIMATE_SPI, ObjectSchoolEstimate.SPI); ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/SetDiscardedTargetCatchServiceLocalSupport.java ===================================== @@ -26,7 +26,7 @@ import fr.ird.observe.dto.data.ps.observation.DiscardedTargetCatchDto; import fr.ird.observe.dto.data.ps.observation.SetDiscardedTargetCatchDto; import fr.ird.observe.entities.data.ps.observation.Set; import fr.ird.observe.entities.data.ps.observation.TargetCatch; -import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport; +import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport; import fr.ird.observe.services.service.data.ps.observation.SetDiscardedTargetCatchService; /** @@ -36,7 +36,7 @@ import fr.ird.observe.services.service.data.ps.observation.SetDiscardedTargetCat * @author Tony Chemit - dev(a)tchemit.fr * @since 8.0.1 */ -class SetDiscardedTargetCatchServiceLocalSupport extends SimpleDataServiceLocalSupport<Set, SetDiscardedTargetCatchDto, DiscardedTargetCatchDto, TargetCatch> implements SetDiscardedTargetCatchService { +class SetDiscardedTargetCatchServiceLocalSupport extends ContainerDataServiceLocalSupport<Set, SetDiscardedTargetCatchDto, DiscardedTargetCatchDto, TargetCatch> implements SetDiscardedTargetCatchService { public SetDiscardedTargetCatchServiceLocalSupport() { super(Set.SPI, Set.SET_DISCARDED_TARGET_CATCH_SPI, TargetCatch.DISCARDED_TARGET_CATCH_SPI); ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/SetKeptTargetCatchServiceLocalSupport.java ===================================== @@ -26,7 +26,7 @@ import fr.ird.observe.dto.data.ps.observation.KeptTargetCatchDto; import fr.ird.observe.dto.data.ps.observation.SetKeptTargetCatchDto; import fr.ird.observe.entities.data.ps.observation.Set; import fr.ird.observe.entities.data.ps.observation.TargetCatch; -import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport; +import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport; import fr.ird.observe.services.service.data.ps.observation.SetKeptTargetCatchService; /** @@ -36,7 +36,7 @@ import fr.ird.observe.services.service.data.ps.observation.SetKeptTargetCatchSer * @author Tony Chemit - dev(a)tchemit.fr * @since 8.0.1 */ -class SetKeptTargetCatchServiceLocalSupport extends SimpleDataServiceLocalSupport<Set, SetKeptTargetCatchDto, KeptTargetCatchDto, TargetCatch> implements SetKeptTargetCatchService { +class SetKeptTargetCatchServiceLocalSupport extends ContainerDataServiceLocalSupport<Set, SetKeptTargetCatchDto, KeptTargetCatchDto, TargetCatch> implements SetKeptTargetCatchService { public SetKeptTargetCatchServiceLocalSupport() { super(Set.SPI, Set.SET_KEPT_TARGET_CATCH_SPI, TargetCatch.KEPT_TARGET_CATCH_SPI); ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/SetNonTargetCatchReleaseServiceLocalSupport.java ===================================== @@ -22,22 +22,19 @@ package fr.ird.observe.services.local.service.data.ps.observation; * #L% */ +import fr.ird.observe.dto.data.ps.observation.NonTargetCatchReleaseDto; import fr.ird.observe.dto.data.ps.observation.SetNonTargetCatchReleaseDto; +import fr.ird.observe.entities.data.ps.observation.NonTargetCatchRelease; import fr.ird.observe.entities.data.ps.observation.Set; -import fr.ird.observe.services.local.service.data.Simple4DataServiceLocalSupport; +import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport; import fr.ird.observe.services.service.data.ps.observation.SetNonTargetCatchReleaseService; /** * @author Tony Chemit - dev(a)tchemit.fr */ -class SetNonTargetCatchReleaseServiceLocalSupport extends Simple4DataServiceLocalSupport<Set, SetNonTargetCatchReleaseDto, Set> implements SetNonTargetCatchReleaseService { +class SetNonTargetCatchReleaseServiceLocalSupport extends ContainerDataServiceLocalSupport<Set, SetNonTargetCatchReleaseDto, NonTargetCatchReleaseDto, NonTargetCatchRelease> implements SetNonTargetCatchReleaseService { public SetNonTargetCatchReleaseServiceLocalSupport() { - super(Set.SPI, Set.SET_NON_TARGET_CATCH_RELEASE_SPI); - } - - @Override - protected Set loadFormEntity(Set parent) { - return parent; + super(Set.SPI, Set.SET_NON_TARGET_CATCH_RELEASE_SPI, NonTargetCatchRelease.SPI); } } ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/SetNonTargetCatchServiceLocalSupport.java ===================================== @@ -26,7 +26,7 @@ import fr.ird.observe.dto.data.ps.observation.NonTargetCatchDto; import fr.ird.observe.dto.data.ps.observation.SetNonTargetCatchDto; import fr.ird.observe.entities.data.ps.observation.NonTargetCatch; import fr.ird.observe.entities.data.ps.observation.Set; -import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport; +import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport; import fr.ird.observe.services.service.data.ps.observation.SetNonTargetCatchService; /** @@ -34,7 +34,7 @@ import fr.ird.observe.services.service.data.ps.observation.SetNonTargetCatchServ * * @author Tony Chemit - dev(a)tchemit.fr */ -class SetNonTargetCatchServiceLocalSupport extends SimpleDataServiceLocalSupport<Set, SetNonTargetCatchDto, NonTargetCatchDto, NonTargetCatch> implements SetNonTargetCatchService { +class SetNonTargetCatchServiceLocalSupport extends ContainerDataServiceLocalSupport<Set, SetNonTargetCatchDto, NonTargetCatchDto, NonTargetCatch> implements SetNonTargetCatchService { public SetNonTargetCatchServiceLocalSupport() { super(Set.SPI, Set.SET_NON_TARGET_CATCH_SPI, NonTargetCatch.SPI); ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/SetSchoolEstimateServiceLocalSupport.java ===================================== @@ -26,7 +26,7 @@ import fr.ird.observe.dto.data.ps.observation.SchoolEstimateDto; import fr.ird.observe.dto.data.ps.observation.SetSchoolEstimateDto; import fr.ird.observe.entities.data.ps.observation.SchoolEstimate; import fr.ird.observe.entities.data.ps.observation.Set; -import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport; +import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport; import fr.ird.observe.services.service.data.ps.observation.SetSchoolEstimateService; /** @@ -34,7 +34,7 @@ import fr.ird.observe.services.service.data.ps.observation.SetSchoolEstimateServ * * @author Tony Chemit - dev(a)tchemit.fr */ -class SetSchoolEstimateServiceLocalSupport extends SimpleDataServiceLocalSupport<Set, SetSchoolEstimateDto, SchoolEstimateDto, SchoolEstimate> implements SetSchoolEstimateService { +class SetSchoolEstimateServiceLocalSupport extends ContainerDataServiceLocalSupport<Set, SetSchoolEstimateDto, SchoolEstimateDto, SchoolEstimate> implements SetSchoolEstimateService { public SetSchoolEstimateServiceLocalSupport() { super(Set.SPI, Set.SET_SCHOOL_ESTIMATE_SPI, SchoolEstimate.SPI); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/cf3e58bbff28dbc729c34fa71… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/cf3e58bbff28dbc729c34fa71… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/1254] 12 commits: Suppression en cade des libérations de capture accessoire - Closes #1768
by Tony CHEMIT 22 Jan '21

22 Jan '21

Tony CHEMIT pushed to branch feature/1254 at ultreiaio / ird-observe Commits: e8ee529f by Tony Chemit at 2021-01-21T18:19:47+01:00 Suppression en cade des libérations de capture accessoire - Closes #1768 - - - - - 69257b76 by Tony Chemit at 2021-01-22T09:38:55+01:00 Micro bizarrerie sur le modèle 8.0 - Closes #1764 - - - - - e473bd86 by Tony Chemit at 2021-01-22T10:35:05+01:00 Disponibilité du sélecteur DMS / DMD / DD - Closes #1717 - - - - - f3977cee by Tony Chemit at 2021-01-22T10:54:34+01:00 Petit défaut d'affichage d'une liste à choix multiple - Closes #1770 - - - - - 65848f2e by Tony Chemit at 2021-01-22T10:54:54+01:00 Tailles d'icônes différentes sur le même niveau de hiérarchie - Closes #1769 - - - - - 1f897757 by Tony Chemit at 2021-01-22T12:15:30+01:00 Suppression en cade des libérations de capture accessoire - See #1768 - - - - - fb4a04a9 by Tony Chemit at 2021-01-22T12:15:30+01:00 Suppression en cade des libérations de capture accessoire - See #1768 Pour le moment, aucun message sur le sujet et aucun traitement. - - - - - 02158bdf by Tony Chemit at 2021-01-22T12:15:30+01:00 Move to version 9.0.0-RC-1 - - - - - 89112369 by Tony Chemit at 2021-01-22T12:16:06+01:00 Suppression en cade des libérations de capture accessoire - See #1768 - - - - - 26b199bd by Tony Chemit at 2021-01-22T12:16:32+01:00 Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - Closes #1254 - - - - - 5ef42b5e by Tony Chemit at 2021-01-22T12:16:32+01:00 Clean i18n and consolidate code - - - - - 643a9b56 by Tony Chemit at 2021-01-22T13:15:53+01:00 stash me over git me!!! - - - - - 30 changed files: - .mvn/pom.gitflow.develop - .mvn/pom.gitflow.master - client/.mvn/pom.gitflow.develop - client/.mvn/pom.gitflow.master - client/configuration/.mvn/pom.gitflow.develop - client/configuration/.mvn/pom.gitflow.master - client/configuration/pom.xml - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/core/.mvn/pom.gitflow.develop - client/core/.mvn/pom.gitflow.master - client/core/pom.xml - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/core/src/main/java/fr/ird/observe/client/main/focus/MainUIFocusModel.java - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializer.java - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializerContext.java - client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java - client/core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss - + client/datasource/.mvn/pom.gitflow.develop - + client/datasource/.mvn/pom.gitflow.master - + client/datasource/.mvn/pom.organizationId - + client/datasource/.mvn/pom.projectId - + client/datasource/.mvn/pom.stageId - client/datasource/actions/.mvn/pom.gitflow.develop - client/datasource/actions/.mvn/pom.gitflow.master - client/datasource/actions/pom.xml - + client/datasource/editor/.mvn/pom.gitflow.develop - + client/datasource/editor/.mvn/pom.gitflow.master - + client/datasource/editor/.mvn/pom.organizationId - + client/datasource/editor/.mvn/pom.projectId The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1daea5622c55ee0f396c168c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1daea5622c55ee0f396c168c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Petit défaut d'affichage d'une liste à choix multiple - Closes #1770
by Tony CHEMIT 22 Jan '21

22 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f3977cee by Tony Chemit at 2021-01-22T10:54:34+01:00 Petit défaut d'affichage d'une liste à choix multiple - Closes #1770 - - - - - 65848f2e by Tony Chemit at 2021-01-22T10:54:54+01:00 Tailles d'icônes différentes sur le même niveau de hiérarchie - Closes #1769 - - - - - 6 changed files: - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUI.jcss - client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetGlobalCompositionUINavigationNode.scope - client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUINavigationNode.scope - client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/data/observation/SetGlobalCompositionUINavigationNode.scope - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/simple/GenerateContentSimpleUINavigationScope.java Changes: ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUI.jaxx ===================================== @@ -231,9 +231,7 @@  <row> <cell columns="2" fill="both" weighty="0.7"> - <JScrollPane id='predatorPane'> - <DoubleList id='predator' genericType='SpeciesReference'/> - </JScrollPane> + <DoubleList id='predator' genericType='SpeciesReference'/> </cell> </row> ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUI.jcss ===================================== @@ -63,12 +63,9 @@ title:"observe.data.ll.logbook.Catch.comment"; } -#predatorPane { - minimumSize:{new Dimension(10,150)}; -} - #predator { - showListLabel: true; + minimumSize:{new Dimension(10,150)}; + showListLabel: false; universeLabel:{t("observe.data.ll.logbook.Catch.availablePredator")}; selectedLabel:{t("observe.data.ll.logbook.Catch.selectedPredator")}; } ===================================== client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetGlobalCompositionUINavigationNode.scope ===================================== @@ -1,7 +1,8 @@ { "properties": { "model.permission": "WRITE_DATA", - "ui.iconPath": "navigation.ll.data.logbook.SetGlobalComposition" + "ui.iconPath": "navigation.ll.data.logbook.SetGlobalComposition", + "ui.subNode": "true" }, "i18nMapping": { "type": "observe.data.ll.logbook.SetGlobalComposition.type" ===================================== client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUINavigationNode.scope ===================================== @@ -1,7 +1,8 @@ { "properties": { "model.permission": "WRITE_DATA", - "ui.iconPath": "navigation.ll.data.observation.SetDetailComposition" + "ui.iconPath": "navigation.ll.data.observation.SetDetailComposition", + "ui.subNode": "true" }, "i18nMapping": { "type": "observe.data.ll.observation.SetDetailComposition.type" ===================================== client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/data/observation/SetGlobalCompositionUINavigationNode.scope ===================================== @@ -1,7 +1,8 @@ { "properties": { "model.permission": "WRITE_DATA", - "ui.iconPath": "navigation.ll.data.observation.SetGlobalComposition" + "ui.iconPath": "navigation.ll.data.observation.SetGlobalComposition", + "ui.subNode": "true" }, "i18nMapping": { "type": "observe.data.ll.observation.SetGlobalComposition.type" ===================================== client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/simple/GenerateContentSimpleUINavigationScope.java ===================================== @@ -51,6 +51,7 @@ public class GenerateContentSimpleUINavigationScope extends GenerateContentSimpl String selectTypeName = generator.detectCapabilities.parentRelations.get(generator.packageName + "." + nodeType).replace(generator.packageName, generator.dtoPackage).replace("UINavigationNode", "Dto"); return newBuilder(contentUiType, nodeType) .setModule() + .setSubNode() .setDtoTypeFromNodeType() .setMainDtoTypeFromDtoType() .setDtoReferenceTypeFromMainDtoType() View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e473bd86fa64ad8cd31e53c2… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e473bd86fa64ad8cd31e53c2… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Disponibilité du sélecteur DMS / DMD / DD - Closes #1717
by Tony CHEMIT 22 Jan '21

22 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e473bd86 by Tony Chemit at 2021-01-22T10:35:05+01:00 Disponibilité du sélecteur DMS / DMD / DD - Closes #1717 - - - - - 9 changed files: - client/core/src/main/java/fr/ird/observe/client/main/focus/MainUIFocusModel.java - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializer.java - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializerContext.java - client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java - client/core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.jcss Changes: ===================================== client/core/src/main/java/fr/ird/observe/client/main/focus/MainUIFocusModel.java ===================================== @@ -69,7 +69,7 @@ public class MainUIFocusModel extends UIFocusModel implements PropertyChangeList this.keyboardFocusManager = Objects.requireNonNull(keyboardFocusManager); this.acceptedClassesInBlockingLayer = new LinkedHashSet<>(); this.acceptedClassesInBlockingLayer.add(JTable.class); - this.acceptedClassesInBlockingLayer.add(JList.class); +// this.acceptedClassesInBlockingLayer.add(JList.class); this.acceptedClassesInBlockingLayer.add(JScrollBar.class); this.acceptedClassesInBlockingLayer.add(JTabbedPane.class); ===================================== client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializer.java ===================================== @@ -49,11 +49,9 @@ public class DefaultUIInitializer<UI extends JComponent & JAXXObject> extends UI public static final String CLIENT_PROPERTY_FORCE_LOAD = "forceLoad"; public static final String CLIENT_PROPERTY_LIST_NO_LOAD = "listNoLoad"; - // public static final String DELEGATE_CONTENT_UI = "delegateContentUI"; public static final String MAIN_TABBED_PANE = "mainTabbedPane"; public static final String SUB_TABBED_PANE = "subTabbedPane"; - public static final String CLIENT_PROPERTY_NOT_BLOCKING = "notBlocking"; public static final Class<?>[] MANAGED_TYPES = new Class<?>[]{ JComponent.class, BeanCheckBox.class, @@ -192,10 +190,6 @@ public class DefaultUIInitializer<UI extends JComponent & JAXXObject> extends UI protected void init(JComponent editor) { initializerContext.checkFirstPass(); - final Boolean propertyName = (Boolean) editor.getClientProperty(CLIENT_PROPERTY_NOT_BLOCKING); - if (propertyName != null) { - initializerContext.addDoNotBlockComponentId(editor.getName()); - } } } ===================================== client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializerContext.java ===================================== @@ -74,4 +74,30 @@ public class DefaultUIInitializerContext<U extends JAXXObject> extends UIInitial public void setSubTabbedPaneValidator(JTabbedPane tabbedPane) { this.subTabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) getUi(), tabbedPane.getName()).addScope(NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING).build(); } + + @Override + public UIInitializerContext<U> startFirstPass() { + super.startFirstPass(); + // Url + addDoNotBlockComponentId("openLink"); + // JaxxComboBox, DoubleList, ListHeader + addDoNotBlockComponentId("displayDecorator"); + // TripMap + addDoNotBlockComponentId("observeMapPane"); + addDoNotBlockComponentId("zoomIt"); + addDoNotBlockComponentId("zoomPlus"); + addDoNotBlockComponentId("zoomMinus"); + addDoNotBlockComponentId("exportPng"); + addDoNotBlockComponentId("toggleLegend"); + addDoNotBlockComponentId("addObservations"); + addDoNotBlockComponentId("addLogbook"); + // TemperatureEditor + addDoNotBlockComponentId("cFormat"); + addDoNotBlockComponentId("fFormat"); + // CoordinateEditor + addDoNotBlockComponentId("ddFormat"); + addDoNotBlockComponentId("dmdFormat"); + addDoNotBlockComponentId("dmsFormat"); + return this; + } } ===================================== client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java ===================================== @@ -185,7 +185,11 @@ public class UIInitHelper { Objects.requireNonNull(label, "can't find label for temperature editor " + editor); editor.setConfig(new TemperatureEditorConfig(TemperatureFormat.C, label.getText(), propertyName)); editor.init(label); - editor.getModel().addPropertyChangeListener("format", e -> validator.doValidate()); + editor.getModel().addPropertyChangeListener("format", e -> { + if (validator.getBean() != null) { + validator.doValidate(); + } + }); } public static void init(NumberEditor editor, boolean autoPopupNumberEditor, boolean showPopupButton) { ===================================== client/core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss ===================================== @@ -118,10 +118,6 @@ JToolBar { opaque:false; } -JTabbedPane { - _notBlocking: true; -} - JXDatePicker { formats:{"dd/MM/yyyy"}; } @@ -144,7 +140,6 @@ DoubleList { showSelectPopupEnabled: false; filterable:false; autoSortSelectedList:true; - _notBlocking: true; } JaxxComboBox { ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java ===================================== @@ -368,17 +368,6 @@ public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSup protected void init(JComponent editor) { initializerContext.checkFirstPass(); - if (editor instanceof UrlEditor) { - initializerContext.addDoNotBlockComponentId("openLink"); - } else if (editor.getClientProperty(DefaultUIInitializer.CLIENT_PROPERTY_NOT_BLOCKING) != null) { - initializerContext.addDoNotBlockComponentId(editor.getName()); - ActionMap actionMap = editor.getActionMap(); - if (actionMap.keys() != null) { - for (Object key : actionMap.keys()) { - initializerContext.addDoNotBlockComponentId(key.toString()); - } - } - } Object property = editor.getClientProperty(CLIENT_PROPERTY_FOCUS_COMPONENT); if (property == null) { return; ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripUI.jcss ===================================== @@ -94,8 +94,4 @@ #mapTab { enabled:{!states.isCreatingMode()}; -} - -#tripMap { - _notBlocking:true; -} +} \ No newline at end of file ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jcss ===================================== @@ -79,7 +79,6 @@ #sectionsTable { model: {sectionsTableModel}; editable: {states.isEnabled()}; - _notBlocking: true; } #basketsPane { @@ -94,7 +93,6 @@ #basketsTable { model: {basketsTableModel}; editable: {states.isEnabled()}; - _notBlocking: true; } #branchlinesPane { @@ -109,7 +107,6 @@ #branchlinesTable { model: {branchlinesTableModel}; editable: {states.isEnabled()}; - _notBlocking: true; } /* ***************************************************************************** */ ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.jcss ===================================== @@ -34,8 +34,4 @@ #mapTab { enabled:{!states.isCreatingMode()}; -} - -#tripMap { - _notBlocking:true; -} +} \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/e473bd86fa64ad8cd31e53c2c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/e473bd86fa64ad8cd31e53c2c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Micro bizarrerie sur le modèle 8.0 - Closes #1764
by Tony CHEMIT 22 Jan '21

22 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 69257b76 by Tony Chemit at 2021-01-22T09:38:55+01:00 Micro bizarrerie sur le modèle 8.0 - Closes #1764 - - - - - 25 changed files: - client/datasource/editor/ll/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ll/src/main/i18n/getters/navigation.getter - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIModelStates.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/dto-definition/src/main/models/Observe-30-data-ll-observation.model - models/dto-definition/src/main/models/Observe-31-data-ll-logbook.model - models/persistence/src/main/java/fr/ird/observe/entities/data/ll/logbook/ActivityImpl.java - models/persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_8_0.java - models/persistence/src/main/models/Observe-01-referential-common.model - models/persistence/src/main/models/Observe-30-data-ll-observation.model - models/persistence/src/main/models/Observe-31-data-ll-logbook.model - models/persistence/src/main/models/Observe-35-data-ll-common.model - models/persistence/src/main/resources/db/migration/8.0/30_common_fill-common.sql - models/persistence/src/main/resources/db/migration/8.0/70_ll_observation_fill-common.sql - models/persistence/src/main/resources/db/migration/8.0/observe_create-schema-H2.sql - models/persistence/src/main/resources/db/migration/8.0/observe_create-schema-PG.sql - models/persistence/src/main/resources/db/migration/8.0/observe_finalize-schema-H2.sql - models/persistence/src/main/resources/db/migration/8.0/observe_finalize-schema-PG.sql The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/69257b7644f35c15b85d4bce7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/69257b7644f35c15b85d4bce7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/1254] 23 commits: Problème de digit TargetLength.weight à 1 au lieu de 3 - Closes #1762
by Tony CHEMIT 21 Jan '21

21 Jan '21

Tony CHEMIT pushed to branch feature/1254 at ultreiaio / ird-observe Commits: c0297045 by Tony Chemit at 2021-01-19T10:44:24+01:00 Problème de digit TargetLength.weight à 1 au lieu de 3 - Closes #1762 - - - - - 25332936 by Tony Chemit at 2021-01-19T11:20:38+01:00 [jgitflow-maven-plugin]updating poms for 8.0.5-SNAPSHOT development[skip ci] - - - - - 1c9cd2dd by Tony Chemit at 2021-01-19T11:21:15+01:00 [jgitflow-maven-plugin]updating poms for branch'release/8.0.4' with non-snapshot versions[skip ci] - - - - - 7123ab14 by Tony Chemit at 2021-01-19T11:32:01+01:00 [jgitflow-maven-plugin]merging 'release/8.0.4' into 'master' - - - - - cb6473d6 by Tony Chemit at 2021-01-19T11:32:04+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 0c465330 by Tony Chemit at 2021-01-19T11:32:05+01:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 332a6e99 by Tony Chemit at 2021-01-19T11:32:05+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 72e4976e by Tony Chemit at 2021-01-20T15:51:02+01:00 update CHANGELOG [skip ci] - - - - - 9135411f by Tony Chemit at 2021-01-20T20:23:08+01:00 Dysfonctionnement de l'arbre - Closes #1763 - - - - - 064d69ff by Tony Chemit at 2021-01-20T21:13:20+01:00 Introduce a way to extract schema or table from generated schema (help to create new safe migration for v9) - - - - - 5fc94916 by Tony Chemit at 2021-01-20T22:45:21+01:00 Improve ExtraTable and ExtractSchema - - - - - 429a3949 by Tony Chemit at 2021-01-21T13:09:18+01:00 Fix NPE if no species on NonTargetReleaseUI - - - - - a27ecc60 by Tony Chemit at 2021-01-21T13:09:57+01:00 Fix ReferentialCache to be able to use the incoming form object to filter - - - - - f09a98fb by Tony Chemit at 2021-01-21T13:10:47+01:00 Review ContentTableUI delete extra message (this should be always specialized, and no using a default message for all the form). - - - - - 605b4b11 by Tony Chemit at 2021-01-21T16:44:52+01:00 Suppression en cascade des captures conservées - Closes #1765 - - - - - bced957e by Tony Chemit at 2021-01-21T16:44:52+01:00 Suppression en cascade des captures rejetées - Closes #1766 - - - - - 4c1ca99d by Tony Chemit at 2021-01-21T16:44:52+01:00 Suppression en cascade de la faune accessoire - Closes #1767 - - - - - b4583d98 by Tony Chemit at 2021-01-21T17:01:28+01:00 Suppression en cade des libérations de capture accessoire - See #1768 - - - - - 604da9db by Tony Chemit at 2021-01-21T17:28:11+01:00 Suppression en cade des libérations de capture accessoire - See #1768 Pour le moment, aucun message sur le sujet et aucun traitement. - - - - - d7cdec41 by Tony Chemit at 2021-01-21T17:29:54+01:00 Move to version 9.0.0-RC-1 - - - - - 87001c93 by Tony Chemit at 2021-01-21T17:30:16+01:00 Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - Closes #1254 - - - - - 45598329 by Tony Chemit at 2021-01-21T17:30:16+01:00 Clean i18n and consolidate code - - - - - 1daea562 by Tony Chemit at 2021-01-21T18:52:31+01:00 stash me over git me!!! - - - - - 30 changed files: - .mvn/pom.gitflow.develop - .mvn/pom.gitflow.master - CHANGELOG.md - client/.mvn/pom.gitflow.develop - client/.mvn/pom.gitflow.master - client/configuration/.mvn/pom.gitflow.develop - client/configuration/.mvn/pom.gitflow.master - client/configuration/pom.xml - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/core/.mvn/pom.gitflow.develop - client/core/.mvn/pom.gitflow.master - client/core/pom.xml - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesCache.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesFilter.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesFilterHelper.java - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - + client/datasource/.mvn/pom.gitflow.develop - + client/datasource/.mvn/pom.gitflow.master - + client/datasource/.mvn/pom.organizationId - + client/datasource/.mvn/pom.projectId - + client/datasource/.mvn/pom.stageId - client/datasource/actions/.mvn/pom.gitflow.develop - client/datasource/actions/.mvn/pom.gitflow.master - client/datasource/actions/pom.xml - + client/datasource/editor/.mvn/pom.gitflow.develop - + client/datasource/editor/.mvn/pom.gitflow.master - + client/datasource/editor/.mvn/pom.organizationId - + client/datasource/editor/.mvn/pom.projectId - + client/datasource/editor/.mvn/pom.stageId The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3b4331ab9783e11ce686cf38… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3b4331ab9783e11ce686cf38… You're receiving this email because of your account on gitlab.com.

1 0