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

[Git][ultreiaio/ird-observe][develop] Lors d'exports massifs de données, le token expire rapidement et fait échouer...
by Tony CHEMIT (＠tchemit) 26 Feb '24

26 Feb '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 69061c0d by Tony Chemit at 2024-02-26T08:44:43+01:00 Lors d'exports massifs de données, le token expire rapidement et fait échouer la suite du processus - Closes #2839 - - - - - 6 changed files: - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/export/actions/Prepare.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/save/actions/Start.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/actions/Start.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/actions/Start.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/actions/Start.java Changes: ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataModel.java ===================================== @@ -141,55 +141,57 @@ public class SelectDataModel extends AdminActionModel { loadReferential = false; selectAllData = false; } - ObserveSwingDataSource dataSource = uiModel.getConfigModel().getLeftSourceModel().getSafeSource(true); - SelectionTreeModel selectionDataModel = getSelectionDataModel(); - SelectionTreeConfig config = getTreeConfig(); - if (init) { - SelectionTreeConfig newConfig = dataSource.newSelectionTreeConfig(); - newConfig.setLoadData(loadData); - newConfig.setLoadReferential(loadReferential); - newConfig.setUseOpenData(useOpenData); - // do not show empty group by - newConfig.setLoadEmptyGroupBy(false); - // need to see all data - newConfig.setLoadNullGroupBy(true); - // need to see all data - newConfig.setLoadDisabledGroupBy(true); - - config.init(newConfig); - Project navigationEditModel = getClientConfig().getNavigationEditModel(); - if (navigationEditModel!=null) { - List<String> openIds = navigationEditModel.getIds(); - selectionDataModel.setEditIds(openIds); + try (ObserveSwingDataSource dataSource = uiModel.getConfigModel().getLeftSourceModel().getSafeSource(true)) { + SelectionTreeModel selectionDataModel = getSelectionDataModel(); + SelectionTreeConfig config = getTreeConfig(); + if (init) { + SelectionTreeConfig newConfig = dataSource.newSelectionTreeConfig(); + newConfig.setLoadData(loadData); + newConfig.setLoadReferential(loadReferential); + newConfig.setUseOpenData(useOpenData); + // do not show empty group by + newConfig.setLoadEmptyGroupBy(false); + // need to see all data + newConfig.setLoadNullGroupBy(true); + // need to see all data + newConfig.setLoadDisabledGroupBy(true); + + config.init(newConfig); + Project navigationEditModel = getClientConfig().getNavigationEditModel(); + if (navigationEditModel != null) { + List<String> openIds = navigationEditModel.getIds(); + selectionDataModel.setEditIds(openIds); + } + } else { + config.setLoadData(loadData); + config.setLoadReferential(loadReferential); + config.setUseOpenData(useOpenData); } - } else { - config.setLoadData(loadData); - config.setLoadReferential(loadReferential); - config.setUseOpenData(useOpenData); - } - SelectionTreePaneHandler.initDataSource(selectTreePane, dataSource); - selectionDataModel.populate(dataSource.getNavigationService()::loadSelectionRoot); - if (uiModel.containsOperation(AdminStep.EXPORT_DATA)) { - ObserveSwingDataSource safeCentralSource = uiModel.getConfigModel().getRightSourceModel().getSafeSource(true); - List<String> existingTrip; - String modelType = config.getModuleName(); - switch (modelType) { - case "ps": - existingTrip = new ArrayList<>(safeCentralSource.getPsCommonTripService().getAllTripIds()); - break; - case "ll": - existingTrip = new ArrayList<>(safeCentralSource.getLlCommonTripService().getAllTripIds()); - break; - default: - throw new IllegalStateException(String.format("ModelType %s not managed", modelType)); + SelectionTreePaneHandler.initDataSource(selectTreePane, dataSource); + selectionDataModel.populate(dataSource.getNavigationService()::loadSelectionRoot); + if (uiModel.containsOperation(AdminStep.EXPORT_DATA)) { + try (ObserveSwingDataSource safeCentralSource = uiModel.getConfigModel().getRightSourceModel().getSafeSource(true)) { + String modelType = config.getModuleName(); + List<String> existingTrip; + switch (modelType) { + case "ps": + existingTrip = new ArrayList<>(safeCentralSource.getPsCommonTripService().getAllTripIds()); + break; + case "ll": + existingTrip = new ArrayList<>(safeCentralSource.getLlCommonTripService().getAllTripIds()); + break; + default: + throw new IllegalStateException(String.format("ModelType %s not managed", modelType)); + } + selectionDataModel.augmentsExistIds(existingTrip); + } } - selectionDataModel.augmentsExistIds(existingTrip); - } - boolean local = dataSource.isLocal(); - if (local && selectAllData) { - selectionDataModel.selectAll(); + boolean local = dataSource.isLocal(); + if (local && selectAllData) { + selectionDataModel.selectAll(); + } + return local; } - return local; } } ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/export/actions/Prepare.java ===================================== @@ -79,13 +79,7 @@ public class Prepare extends ExportUIActionSupport { stepModel.setData(data); stepModel.setCentralSource(targetSource); stepModel.setSource(incomingSource); - - openSource(targetSource); - - openSource(incomingSource); - sendMessage(t("observe.ui.datasource.editor.actions.exportData.message.prepare.data")); - sendMessage(t("observe.ui.datasource.editor.actions.exportData.message.operation.needFix", new Date())); ui.getModel().setWasDone(true); // user can now select real data to export ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/save/actions/Start.java ===================================== @@ -70,8 +70,6 @@ public class Start extends SaveLocalUIActionSupport { public WizardState doAction() throws Exception { log.debug(this); - ObserveSwingDataSource source = ui.getModel().getConfigModel().getLeftSourceModel().getSafeSource(false); - SaveLocalModel stepModel = ui.getModel().getSaveLocalModel(); if (!stepModel.isLocalSourceNeedSave()) { sendMessage("Aucune modification sur la base locale, opération non requise."); @@ -79,28 +77,27 @@ public class Start extends SaveLocalUIActionSupport { return WizardState.SUCCESSED; } - openSource(source); - long t00 = TimeLog.getTime(); - if (stepModel.isDoBackup() && source.isLocal()) { - - sendMessage("Sauvegarde de la base locale vers " + stepModel.getBackupFile()); + try (ObserveSwingDataSource source = ui.getModel().getConfigModel().getLeftSourceModel().getSafeSource(true)) { + long t00 = TimeLog.getTime(); + if (stepModel.isDoBackup() && source.isLocal()) { - File backupFile = stepModel.getBackupFile(); + sendMessage("Sauvegarde de la base locale vers " + stepModel.getBackupFile()); - DataSourceService dumpService = source.getDataSourceService(); - CreateDatabaseRequest request = CreateDatabaseRequest.builder(false, source.getVersion()).addGeneratedSchema().addVersionTable().addStandaloneTables().addAllData().build(); - SqlScript dump = dumpService.produceCreateSqlScript(request); - dump.copyAndCompress(backupFile.toPath()); + File backupFile = stepModel.getBackupFile(); - stepModel.getClientConfig().updateBackupDirectory(backupFile); - } + DataSourceService dumpService = source.getDataSourceService(); + CreateDatabaseRequest request = CreateDatabaseRequest.builder(false, source.getVersion()).addGeneratedSchema().addVersionTable().addStandaloneTables().addAllData().build(); + SqlScript dump = dumpService.produceCreateSqlScript(request); + dump.copyAndCompress(backupFile.toPath()); - if (stepModel.containsStepForSave(AdminStep.SYNCHRONIZE)) { - saveUnidirectionalSynchronizeReferential(); + stepModel.getClientConfig().updateBackupDirectory(backupFile); + } + if (stepModel.containsStepForSave(AdminStep.SYNCHRONIZE)) { + saveUnidirectionalSynchronizeReferential(); + } + sendMessage(t("observe.ui.datasource.editor.actions.operation.message.done", new Date(), Strings.convertTime(TimeLog.getTime() - t00))); } - sendMessage(t("observe.ui.datasource.editor.actions.operation.message.done", new Date(), Strings.convertTime(TimeLog.getTime() - t00))); - return WizardState.SUCCESSED; } ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/actions/Start.java ===================================== @@ -56,26 +56,26 @@ public class Start extends DataSynchroUIActionSupport { ConfigModel configModel = ui.getModel().getConfigModel(); - ObserveSwingDataSource leftSource = configModel.getLeftSourceModel().getSafeSource(true); - DataSelectionTreePaneModel leftModel = stepModel.getModel(true); - leftModel.setSource(leftSource); - - ObserveSwingDataSource rightSource = configModel.getRightSourceModel().getSafeSource(true); - DataSelectionTreePaneModel rightModel = stepModel.getModel(false); - rightModel.setSource(rightSource); - - DataSelectionTreePane leftTreePane = tabUI.getLeftTreePane(); - DataSelectionTreePaneHandler.initDatasource(configModel.getLeftSourceModel(), rightSource.getDataSourceInformation().canWriteData(), leftTreePane, leftModel.getIdStates()); - sendMessage(t("observe.ui.datasource.editor.actions.synchro.data.message.data.loaded", leftSourceLabel)); - - DataSelectionTreePane rightTreePane = tabUI.getRightTreePane(); - DataSelectionTreePaneHandler.initDatasource(configModel.getRightSourceModel(), leftSource.getDataSourceInformation().canWriteData(), rightTreePane, rightModel.getIdStates()); - sendMessage(t("observe.ui.datasource.editor.actions.synchro.data.message.data.loaded", rightSourceLabel)); - - stepModel.buildFirstSelectionModels(); - - DataSelectionTreePaneHandler.finalizeTree(leftTreePane); - DataSelectionTreePaneHandler.finalizeTree(rightTreePane); + try (ObserveSwingDataSource leftSource = configModel.getLeftSourceModel().getSafeSource(true)) { + DataSelectionTreePaneModel leftModel = stepModel.getModel(true); + leftModel.setSource(leftSource); + + try (ObserveSwingDataSource rightSource = configModel.getRightSourceModel().getSafeSource(true)) { + DataSelectionTreePaneModel rightModel = stepModel.getModel(false); + rightModel.setSource(rightSource); + + DataSelectionTreePane leftTreePane = tabUI.getLeftTreePane(); + DataSelectionTreePaneHandler.initDatasource(configModel.getLeftSourceModel(), rightSource.getDataSourceInformation().canWriteData(), leftTreePane, leftModel.getIdStates()); + sendMessage(t("observe.ui.datasource.editor.actions.synchro.data.message.data.loaded", leftSourceLabel)); + + DataSelectionTreePane rightTreePane = tabUI.getRightTreePane(); + DataSelectionTreePaneHandler.initDatasource(configModel.getRightSourceModel(), leftSource.getDataSourceInformation().canWriteData(), rightTreePane, rightModel.getIdStates()); + sendMessage(t("observe.ui.datasource.editor.actions.synchro.data.message.data.loaded", rightSourceLabel)); + stepModel.buildFirstSelectionModels(); + DataSelectionTreePaneHandler.finalizeTree(leftTreePane); + DataSelectionTreePaneHandler.finalizeTree(rightTreePane); + } + } ui.getModel().setWasDone(true); return WizardState.NEED_FIX; } ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/actions/Start.java ===================================== @@ -77,51 +77,54 @@ public class Start extends SynchroUIActionSupport { // on cree les sources de données - ObserveSwingDataSource source = ui.getModel().getConfigModel().getLeftSourceModel().getSafeSourceNotOpened(); - stepModel.setSource(source); - - ObserveSwingDataSource centralSource = ui.getModel().getConfigModel().getRightSourceModel().getSafeSourceNotOpened(); - stepModel.setCentralSource(centralSource); - - openSource(source); - openSource(centralSource); - - // construction du différentiel - sendMessage(t("observe.ui.datasource.editor.actions.synchro.referential.message.build.diff", centralSource.getLabel())); - - DifferentialModelBuilder diffsEngine = stepModel.newDifferentialModelBuilder(source, centralSource); - SynchronizeEngine synchronizeEngine = stepModel.newReferentialSynchronizeEngine(source, centralSource); - UnidirectionalSynchronizeEngine engine = new UnidirectionalSynchronizeEngine(diffsEngine, synchronizeEngine); - stepModel.setEngine(engine); - - ProgressionModel progressionModel = stepModel.getProgressModel(); - UnidirectionalSynchronizeContext context = engine.prepareContext(progressionModel); - stepModel.setReferentialSynchronizeContext(context); - boolean needCallback = context.isNeedCallback(); - if (needCallback) { - // il existe des références obsolètes à traiter - sendMessage(t("observe.ui.datasource.editor.actions.operation.message.needFix")); - stepModel.setReferentialSynchronizeCallbackResults(new UnidirectionalCallbackResults()); - - // des références obsolètes ont été détectées, on prépare les interfaces graphiques avec les données à corriger - List<ObsoleteReferentialReference<?>> obsoleteReferentialReferences = new LinkedList<>(); - UnidirectionalCallbackRequests callbackRequests = stepModel.getReferentialSynchronizeContext().getCallbackRequests(); - - DecoratorService decoratorService = getDecoratorService(); - for (UnidirectionalCallbackRequest<?> callbackRequest : callbackRequests) { - Class<? extends ReferentialDto> dtoType = callbackRequest.getDtoType(); - List<ObsoleteReferentialReference<?>> obsoleteReferences = callbackRequest.getReferentialToReplace().stream() - .map(d -> ObsoleteReferentialReference.create(dtoType, decoratorService, d)) - .collect(Collectors.toList()); - obsoleteReferentialReferences.addAll(obsoleteReferences); + try (ObserveSwingDataSource source = ui.getModel().getConfigModel().getLeftSourceModel().getSafeSource(true)) { + stepModel.setSource(source); + + try (ObserveSwingDataSource centralSource = ui.getModel().getConfigModel().getRightSourceModel().getSafeSource(true)) { + stepModel.setCentralSource(centralSource); + +// openSource(source); +// openSource(centralSource); + + // construction du différentiel + sendMessage(t("observe.ui.datasource.editor.actions.synchro.referential.message.build.diff", centralSource.getLabel())); + + DifferentialModelBuilder diffsEngine = stepModel.newDifferentialModelBuilder(source, centralSource); + SynchronizeEngine synchronizeEngine = stepModel.newReferentialSynchronizeEngine(source, centralSource); + + UnidirectionalSynchronizeEngine engine = new UnidirectionalSynchronizeEngine(diffsEngine, synchronizeEngine); + stepModel.setEngine(engine); + + ProgressionModel progressionModel = stepModel.getProgressModel(); + UnidirectionalSynchronizeContext context = engine.prepareContext(progressionModel); + stepModel.setReferentialSynchronizeContext(context); + boolean needCallback = context.isNeedCallback(); + if (needCallback) { + // il existe des références obsolètes à traiter + sendMessage(t("observe.ui.datasource.editor.actions.operation.message.needFix")); + stepModel.setReferentialSynchronizeCallbackResults(new UnidirectionalCallbackResults()); + + // des références obsolètes ont été détectées, on prépare les interfaces graphiques avec les données à corriger + List<ObsoleteReferentialReference<?>> obsoleteReferentialReferences = new LinkedList<>(); + UnidirectionalCallbackRequests callbackRequests = stepModel.getReferentialSynchronizeContext().getCallbackRequests(); + + DecoratorService decoratorService = getDecoratorService(); + for (UnidirectionalCallbackRequest<?> callbackRequest : callbackRequests) { + Class<? extends ReferentialDto> dtoType = callbackRequest.getDtoType(); + List<ObsoleteReferentialReference<?>> obsoleteReferences = callbackRequest.getReferentialToReplace().stream() + .map(d -> ObsoleteReferentialReference.create(dtoType, decoratorService, d)) + .collect(Collectors.toList()); + obsoleteReferentialReferences.addAll(obsoleteReferences); + } + stepModel.setObsoleteReferences(obsoleteReferentialReferences); + // need user fix on obsolete references + return WizardState.NEED_FIX; + } + // pas de reference obsolete à traiter + // on termine le traitement + beforeSuccess(); } - stepModel.setObsoleteReferences(obsoleteReferentialReferences); - // need user fix on obsolete references - return WizardState.NEED_FIX; } - // pas de reference obsolete à traiter - // on termine le traitement - beforeSuccess(); return WizardState.SUCCESSED; } ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/actions/Start.java ===================================== @@ -60,20 +60,22 @@ public class Start extends ReferentialSynchroUIActionSupport { ReferentialSynchroModel stepModel = ui.getStepModel(); - ObserveSwingDataSource leftSource = ui.getModel().getConfigModel().getLeftSourceModel().getSafeSource(true); - stepModel.setLeftSource(leftSource); - - ObserveSwingDataSource rightSource = ui.getModel().getConfigModel().getRightSourceModel().getSafeSource(true); - stepModel.setRightSource(rightSource); - DifferentialModelBuilder engine = stepModel.newDifferentialModelBuilder(leftSource, rightSource); - stepModel.setEngine(engine); - - ReferentialSynchronizeMode synchronizeMode = stepModel.getSynchronizeMode(); - ProgressionModel progressionModel = stepModel.getProgressModel(); - ReferentialSynchronizeTreeModelsBuilder treeModelsBuilder = new ReferentialSynchronizeTreeModelsBuilder(synchronizeMode, stepModel.isShowProperties(), engine, progressionModel); - Pair<ReferentialSynchronizeTreeModel, ReferentialSynchronizeTreeModel> treePair = treeModelsBuilder.build(); - stepModel.setLeftTreeModel(treePair.getLeft()); - stepModel.setRightTreeModel(treePair.getRight()); + try (ObserveSwingDataSource leftSource = ui.getModel().getConfigModel().getLeftSourceModel().getSafeSource(true)) { + stepModel.setLeftSource(leftSource); + + try (ObserveSwingDataSource rightSource = ui.getModel().getConfigModel().getRightSourceModel().getSafeSource(true)) { + stepModel.setRightSource(rightSource); + DifferentialModelBuilder engine = stepModel.newDifferentialModelBuilder(leftSource, rightSource); + stepModel.setEngine(engine); + ReferentialSynchronizeMode synchronizeMode = stepModel.getSynchronizeMode(); + ProgressionModel progressionModel = stepModel.getProgressModel(); + ReferentialSynchronizeTreeModelsBuilder treeModelsBuilder = new ReferentialSynchronizeTreeModelsBuilder(synchronizeMode, stepModel.isShowProperties(), engine, progressionModel); + Pair<ReferentialSynchronizeTreeModel, ReferentialSynchronizeTreeModel> treePair = treeModelsBuilder.build(); + stepModel.setLeftTreeModel(treePair.getLeft()); + stepModel.setRightTreeModel(treePair.getRight()); + } + } + stepModel.getTasks().removeAllElements(); AdminUIModel model = ui.getModel(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/69061c0d31aff16de9cd5f6cc… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/69061c0d31aff16de9cd5f6cc… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Exception lors de la modification des statuts d'une marée - Closes #2835
by Tony CHEMIT (＠tchemit) 26 Feb '24

26 Feb '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: dca76532 by Tony Chemit at 2024-02-26T08:10:10+01:00 Exception lors de la modification des statuts d'une marée - Closes #2835 - - - - - 0f5f3b7b by Tony Chemit at 2024-02-26T08:10:10+01:00 Erreur retournée si envoie de marée logbook LL avec un coup de pêche sans captures - Closes #2840 - - - - - 6 changed files: - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/actions/SaveContentRootOpenableUIAdapter.java - client/runner/src/main/i18n/translations/client-runner_en_GB.properties - client/runner/src/main/i18n/translations/client-runner_es_ES.properties - client/runner/src/main/i18n/translations/client-runner_fr_FR.properties - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/ActivitySpi.java Changes: ===================================== client/datasource/editor/api/src/main/i18n/getters/java.getter ===================================== @@ -325,6 +325,8 @@ observe.ui.tree.action.searchOrCreate.tip observe.ui.tree.action.selectAll.tip observe.ui.tree.action.unselectAll.tip observe.ui.tree.loaded +observe.ui.tree.need.reload.message +observe.ui.tree.need.reload.title observe.ui.tree.reload observe.ui.type.action.create observe.ui.type.action.delete ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/actions/SaveContentRootOpenableUIAdapter.java ===================================== @@ -29,15 +29,21 @@ import fr.ird.observe.client.datasource.editor.api.content.data.ropen.ContentRoo import fr.ird.observe.client.datasource.editor.api.content.data.ropen.ContentRootOpenableUIModel; import fr.ird.observe.client.datasource.editor.api.content.data.ropen.ContentRootOpenableUINavigationNode; import fr.ird.observe.client.datasource.editor.api.navigation.NavigationTree; +import fr.ird.observe.client.datasource.editor.api.navigation.NavigationTreeModel; import fr.ird.observe.client.datasource.editor.api.navigation.NavigationUI; import fr.ird.observe.client.datasource.editor.api.navigation.tree.capability.ReferenceContainerCapability; import fr.ird.observe.client.datasource.editor.api.navigation.tree.root.RootNavigationNode; import fr.ird.observe.dto.data.DataGroupByDto; import fr.ird.observe.dto.data.RootOpenableDto; import fr.ird.observe.dto.reference.DataDtoReference; +import fr.ird.observe.dto.reference.ReferentialDtoReference; import fr.ird.observe.navigation.tree.NavigationResult; +import fr.ird.observe.navigation.tree.io.request.ToolkitTreeFlatModelRootRequest; +import fr.ird.observe.navigation.tree.navigation.NavigationTreeConfig; +import io.ultreia.java4all.i18n.I18n; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.nuiton.jaxx.runtime.swing.JOptionPanes; import java.util.Objects; @@ -63,13 +69,13 @@ public class SaveContentRootOpenableUIAdapter<D extends RootOpenableDto, U exten // get old groupBy dto @SuppressWarnings("unchecked") DataGroupByDto<D> oldGroupByDto = (DataGroupByDto<D>) node.getParentReference(); - // new groupBy value - String newGroupByValue = oldGroupByDto.definition().toGroupByValue(bean, ((RootNavigationNode) node.getRoot()).getInitializer().getRequest().getGroupByFlavor()); - // is groupBy has changed? - boolean groupByChanged = !Objects.equals(oldGroupByDto.getFilterValue(), newGroupByValue); + ToolkitTreeFlatModelRootRequest navigationRequest = ((RootNavigationNode) node.getRoot()).getInitializer().getRequest(); + ComputeNavigationRequestChange<D,U> computeNavigationRequestChange = new ComputeNavigationRequestChange<>(oldGroupByDto, navigationRequest, bean); + computeNavigationRequestChange.warnUserIfNecessary(ui); + // We need to inject ot node the new reference (it could does not know the id if not persisted) // As I prefer to use a unique code (for persisted or not, keep it like this) - node = updateReference(dataSourceEditor.getNavigationUI(), node, bean.getId(), oldGroupByDto, groupByChanged, newGroupByValue); + node = updateReference(dataSourceEditor.getNavigationUI(), node, computeNavigationRequestChange); tree.reSelectSafeNodeThen(node, () -> { dataSourceEditor.getModel().resetFromPreviousUi(ui); @@ -79,17 +85,125 @@ public class SaveContentRootOpenableUIAdapter<D extends RootOpenableDto, U exten }); } + public static class ComputeNavigationRequestChange<D extends RootOpenableDto, U extends ContentRootOpenableUI<D, U>> { + private final DataGroupByDto<D> oldGroupByDto; + private final ToolkitTreeFlatModelRootRequest navigationRequest; + private final D bean; + private final String newGroupByValue; + private final boolean groupByChanged; + private final boolean changeNavigationRequest; + private final boolean addNullGroupBy; + private final boolean addDisabledGroupBy; + + ComputeNavigationRequestChange(DataGroupByDto<D> oldGroupByDto, ToolkitTreeFlatModelRootRequest navigationRequest, D bean) { + this.oldGroupByDto = oldGroupByDto; + this.navigationRequest = navigationRequest; + this.bean = bean; + this.newGroupByValue = oldGroupByDto.definition().toGroupByValue(bean, navigationRequest.getGroupByFlavor()); + this.groupByChanged = !Objects.equals(oldGroupByDto.getFilterValue(), newGroupByValue); + boolean changeNavigationRequest = false; + boolean addNullGroupBy = false; + boolean addDisabledGroupBy = false; + if (groupByChanged) { + // check if old navigation request is compliant with new groupBy value + if (newGroupByValue == null) { + if (!navigationRequest.isLoadNullGroupBy()) { + // need to add null groupBy in navigation request + changeNavigationRequest = true; + addNullGroupBy = true; + } + } else { + if (oldGroupByDto.definition().isQualitative() && !navigationRequest.isLoadDisabledGroupBy()) { + ReferentialDtoReference groupByObjectValue = (ReferentialDtoReference) oldGroupByDto.definition().toGroupByObjectValue(bean); + if (groupByObjectValue.isDisabled()) { + // need to add disabled groupBy in navigation request + changeNavigationRequest = true; + addDisabledGroupBy = true; + } + } + } + } + this.changeNavigationRequest = changeNavigationRequest; + this.addNullGroupBy = addNullGroupBy; + this.addDisabledGroupBy = addDisabledGroupBy; + } + + public void warnUserIfNecessary(U ui) { + if (!isChangeNavigationRequest()) { + return; + } + // display message to user + if (isAddNullGroupBy()) { + // add null groupBy in navigation request + JOptionPanes.displayWarning(ui, I18n.t("observe.ui.tree.need.reload.title"), I18n.t("observe.ui.tree.need.reload.message")); + return; + } + if (isAddDisabledGroupBy()) { + // add disabled groupBy in navigation request + JOptionPanes.displayWarning(ui, I18n.t("observe.ui.tree.need.reload.title"), I18n.t("observe.ui.tree.need.reload.message")); + } + } + + public DataGroupByDto<D> getOldGroupByDto() { + return oldGroupByDto; + } + + public ToolkitTreeFlatModelRootRequest getNavigationRequest() { + return navigationRequest; + } + + public D getBean() { + return bean; + } + + public String getNewGroupByValue() { + return newGroupByValue; + } + + public boolean isGroupByChanged() { + return groupByChanged; + } + + public boolean isChangeNavigationRequest() { + return changeNavigationRequest; + } + + public boolean isAddNullGroupBy() { + return addNullGroupBy; + } + + public boolean isAddDisabledGroupBy() { + return addDisabledGroupBy; + } + + NavigationResult updateNavigationResult(NavigationTreeModel navigationTreeModel) { + NavigationTreeConfig navigationTreeConfig = navigationTreeModel.getConfig(); + if (isAddNullGroupBy()) { + navigationTreeConfig.setLoadNullGroupBy(true); + navigationTreeModel.getClientConfig().saveTreeConfig(navigationTreeConfig); + navigationRequest.setLoadNullGroupBy(true); + } + if (isAddDisabledGroupBy()) { + navigationTreeConfig.setLoadDisabledGroupBy(true); + navigationRequest.setLoadDisabledGroupBy(true); + navigationTreeModel.getClientConfig().saveTreeConfig(navigationTreeConfig); + } + return navigationTreeModel.updateNavigationResult(); + } + } + public ContentRootOpenableUINavigationNode updateReference(NavigationUI navigationUI, ContentRootOpenableUINavigationNode node, - String id, - DataGroupByDto<D> oldGroupByDto, - boolean groupByChanged, - String newGroupByValue) { + ComputeNavigationRequestChange<D, U> computeNavigationRequestChange) { boolean notPersisted = node.getInitializer().isNotPersisted(); + String id = computeNavigationRequestChange.getBean().getId(); + DataGroupByDto<D> oldGroupByDto = computeNavigationRequestChange.getOldGroupByDto(); + boolean groupByChanged = computeNavigationRequestChange.isGroupByChanged(); + String newGroupByValue = computeNavigationRequestChange.getNewGroupByValue(); ContentRootListUINavigationNode parent = node.getParent(); if (groupByChanged) { // the navigation must be updated, new parent groupBy value has changed - NavigationResult navigationResult = navigationUI.getTree().getModel().updateNavigationResult(); + NavigationResult navigationResult = computeNavigationRequestChange.updateNavigationResult(navigationUI.getTree().getModel()); // groupBy has changed (remove node from parent) RootNavigationNode rootNode = (RootNavigationNode) node.getRoot(); node.removeFromParent(); ===================================== client/runner/src/main/i18n/translations/client-runner_en_GB.properties ===================================== @@ -927,6 +927,8 @@ observe.ui.tree.action.searchOrCreate.tip=Search or create a new trip observe.ui.tree.action.selectAll.tip=Select All observe.ui.tree.action.unselectAll.tip=Unselect All observe.ui.tree.loaded=Tree reloaded (in %s) +observe.ui.tree.need.reload.message=The current navigation tree configuration does not allow to display this trip after its update, it will be updated accordingly. +observe.ui.tree.need.reload.title=Navigation tree update observe.ui.tree.reload=Reload tree structure observe.ui.type.action.create=Create a new %s observe.ui.type.action.delete=Delete selected %s ===================================== client/runner/src/main/i18n/translations/client-runner_es_ES.properties ===================================== @@ -927,6 +927,8 @@ observe.ui.tree.action.searchOrCreate.tip=Search or create a new trip \#TODO observe.ui.tree.action.selectAll.tip=Seleccionar todo observe.ui.tree.action.unselectAll.tip=Deseleccionar todo observe.ui.tree.loaded=Tree reloaded (in %s) +observe.ui.tree.need.reload.message=The current navigation tree configuration does not allow to display this trip after its update, it will be updated accordingly. \#TODO +observe.ui.tree.need.reload.title=Navigation tree update \#TODO observe.ui.tree.reload=Reload tree structure observe.ui.type.action.create=Crear un objeto de tipo '%s' observe.ui.type.action.delete=Eliminar el objeto de tipo '%s' seleccionado ===================================== client/runner/src/main/i18n/translations/client-runner_fr_FR.properties ===================================== @@ -927,6 +927,8 @@ observe.ui.tree.action.searchOrCreate.tip=Rechercher ou créer une nouvelle mar observe.ui.tree.action.selectAll.tip=Tout sélectionner observe.ui.tree.action.unselectAll.tip=Tout désélectionner observe.ui.tree.loaded=Arbre rechargé (en %s) +observe.ui.tree.need.reload.message=La configuration actuelle de l'arbre de navigation ne permet plus d'afficher cette marée après sa modification, elle va être adaptée en conséquence. +observe.ui.tree.need.reload.title=Mise à jour de la configuration de l'arbre observe.ui.tree.reload=Chargement de la structure de l'arbre observe.ui.type.action.create=Créer un objet de type '%s' observe.ui.type.action.delete=Supprimer l'objet de type '%s' sélectionné ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/ActivitySpi.java ===================================== @@ -68,7 +68,7 @@ public class ActivitySpi extends GeneratedActivitySpi { ActivitySampleDto activitySampleDto = Sample.ACTIVITY_SAMPLE_SPI.toDto(referentialLocale, sample); dto.setActivitySample(ActivitySampleReference.of(referentialLocale, activitySampleDto)); } - if (set != null) { + if (set != null && set.isCatchesNotEmpty()) { dto.setCatchSpeciesIds(set.getCatches().stream().map(Catch::getSpecies).distinct().map(Species::getTopiaId).collect(Collectors.toSet())); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/10414880cc44c550ad2436ca… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/10414880cc44c550ad2436ca… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: update pom
by Tony CHEMIT (＠tchemit) 23 Feb '24

23 Feb '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7a361345 by Tony Chemit at 2024-02-23T09:54:32+01:00 update pom - - - - - 10414880 by Tony Chemit at 2024-02-23T09:55:05+01:00 Exception lors de la modification des statuts d'une marée - See #2835 - - - - - 8 changed files: - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/actions/SaveContentRootOpenableUIAdapter.java - client/runner/pom.xml - client/runner/src/main/i18n/translations/client-runner_en_GB.properties - client/runner/src/main/i18n/translations/client-runner_es_ES.properties - client/runner/src/main/i18n/translations/client-runner_fr_FR.properties - pom.xml - server/runner/pom.xml Changes: ===================================== client/datasource/editor/api/src/main/i18n/getters/java.getter ===================================== @@ -325,6 +325,9 @@ observe.ui.tree.action.searchOrCreate.tip observe.ui.tree.action.selectAll.tip observe.ui.tree.action.unselectAll.tip observe.ui.tree.loaded +observe.ui.tree.need.add.disabled.groupBy.message +observe.ui.tree.need.add.null.groupBy.message +observe.ui.tree.need.reload.title observe.ui.tree.reload observe.ui.type.action.create observe.ui.type.action.delete ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/actions/SaveContentRootOpenableUIAdapter.java ===================================== @@ -29,15 +29,21 @@ import fr.ird.observe.client.datasource.editor.api.content.data.ropen.ContentRoo import fr.ird.observe.client.datasource.editor.api.content.data.ropen.ContentRootOpenableUIModel; import fr.ird.observe.client.datasource.editor.api.content.data.ropen.ContentRootOpenableUINavigationNode; import fr.ird.observe.client.datasource.editor.api.navigation.NavigationTree; +import fr.ird.observe.client.datasource.editor.api.navigation.NavigationTreeModel; import fr.ird.observe.client.datasource.editor.api.navigation.NavigationUI; import fr.ird.observe.client.datasource.editor.api.navigation.tree.capability.ReferenceContainerCapability; import fr.ird.observe.client.datasource.editor.api.navigation.tree.root.RootNavigationNode; import fr.ird.observe.dto.data.DataGroupByDto; import fr.ird.observe.dto.data.RootOpenableDto; import fr.ird.observe.dto.reference.DataDtoReference; +import fr.ird.observe.dto.reference.ReferentialDtoReference; import fr.ird.observe.navigation.tree.NavigationResult; +import fr.ird.observe.navigation.tree.io.request.ToolkitTreeFlatModelRootRequest; +import fr.ird.observe.navigation.tree.navigation.NavigationTreeConfig; +import io.ultreia.java4all.i18n.I18n; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.nuiton.jaxx.runtime.swing.JOptionPanes; import java.util.Objects; @@ -63,13 +69,13 @@ public class SaveContentRootOpenableUIAdapter<D extends RootOpenableDto, U exten // get old groupBy dto @SuppressWarnings("unchecked") DataGroupByDto<D> oldGroupByDto = (DataGroupByDto<D>) node.getParentReference(); - // new groupBy value - String newGroupByValue = oldGroupByDto.definition().toGroupByValue(bean, ((RootNavigationNode) node.getRoot()).getInitializer().getRequest().getGroupByFlavor()); - // is groupBy has changed? - boolean groupByChanged = !Objects.equals(oldGroupByDto.getFilterValue(), newGroupByValue); + ToolkitTreeFlatModelRootRequest navigationRequest = ((RootNavigationNode) node.getRoot()).getInitializer().getRequest(); + ComputeNavigationRequestChange<D,U> computeNavigationRequestChange = new ComputeNavigationRequestChange<>(oldGroupByDto, navigationRequest, bean); + computeNavigationRequestChange.warnUserIfNecessary(ui); + // We need to inject ot node the new reference (it could does not know the id if not persisted) // As I prefer to use a unique code (for persisted or not, keep it like this) - node = updateReference(dataSourceEditor.getNavigationUI(), node, bean.getId(), oldGroupByDto, groupByChanged, newGroupByValue); + node = updateReference(dataSourceEditor.getNavigationUI(), node, computeNavigationRequestChange); tree.reSelectSafeNodeThen(node, () -> { dataSourceEditor.getModel().resetFromPreviousUi(ui); @@ -79,17 +85,125 @@ public class SaveContentRootOpenableUIAdapter<D extends RootOpenableDto, U exten }); } + public static class ComputeNavigationRequestChange<D extends RootOpenableDto, U extends ContentRootOpenableUI<D, U>> { + private final DataGroupByDto<D> oldGroupByDto; + private final ToolkitTreeFlatModelRootRequest navigationRequest; + private final D bean; + private final String newGroupByValue; + private final boolean groupByChanged; + private final boolean changeNavigationRequest; + private final boolean addNullGroupBy; + private final boolean addDisabledGroupBy; + + ComputeNavigationRequestChange(DataGroupByDto<D> oldGroupByDto, ToolkitTreeFlatModelRootRequest navigationRequest, D bean) { + this.oldGroupByDto = oldGroupByDto; + this.navigationRequest = navigationRequest; + this.bean = bean; + this.newGroupByValue = oldGroupByDto.definition().toGroupByValue(bean, navigationRequest.getGroupByFlavor()); + this.groupByChanged = !Objects.equals(oldGroupByDto.getFilterValue(), newGroupByValue); + boolean changeNavigationRequest = false; + boolean addNullGroupBy = false; + boolean addDisabledGroupBy = false; + if (groupByChanged) { + // check if old navigation request is compliant with new groupBy value + if (newGroupByValue == null) { + if (!navigationRequest.isLoadNullGroupBy()) { + // need to add null groupBy in navigation request + changeNavigationRequest = true; + addNullGroupBy = true; + } + } else { + if (oldGroupByDto.definition().isQualitative() && !navigationRequest.isLoadDisabledGroupBy()) { + ReferentialDtoReference groupByObjectValue = (ReferentialDtoReference) oldGroupByDto.definition().toGroupByObjectValue(bean); + if (groupByObjectValue.isDisabled()) { + // need to add disabled groupBy in navigation request + changeNavigationRequest = true; + addDisabledGroupBy = true; + } + } + } + } + this.changeNavigationRequest = changeNavigationRequest; + this.addNullGroupBy = addNullGroupBy; + this.addDisabledGroupBy = addDisabledGroupBy; + } + + public void warnUserIfNecessary(U ui) { + if (!isChangeNavigationRequest()) { + return; + } + // display message to user + if (isAddNullGroupBy()) { + // add null groupBy in navigation request + JOptionPanes.displayWarning(ui, I18n.t("observe.ui.tree.need.reload.title"), I18n.t("observe.ui.tree.need.add.null.groupBy.message")); + return; + } + if (isAddDisabledGroupBy()) { + // add disabled groupBy in navigation request + JOptionPanes.displayWarning(ui, I18n.t("observe.ui.tree.need.reload.title"), I18n.t("observe.ui.tree.need.add.disabled.groupBy.message")); + } + } + + public DataGroupByDto<D> getOldGroupByDto() { + return oldGroupByDto; + } + + public ToolkitTreeFlatModelRootRequest getNavigationRequest() { + return navigationRequest; + } + + public D getBean() { + return bean; + } + + public String getNewGroupByValue() { + return newGroupByValue; + } + + public boolean isGroupByChanged() { + return groupByChanged; + } + + public boolean isChangeNavigationRequest() { + return changeNavigationRequest; + } + + public boolean isAddNullGroupBy() { + return addNullGroupBy; + } + + public boolean isAddDisabledGroupBy() { + return addDisabledGroupBy; + } + + NavigationResult updateNavigationResult(NavigationTreeModel navigationTreeModel) { + NavigationTreeConfig navigationTreeConfig = navigationTreeModel.getConfig(); + if (isAddNullGroupBy()) { + navigationTreeConfig.setLoadNullGroupBy(true); + navigationTreeModel.getClientConfig().saveTreeConfig(navigationTreeConfig); + navigationRequest.setLoadNullGroupBy(true); + } + if (isAddDisabledGroupBy()) { + navigationTreeConfig.setLoadDisabledGroupBy(true); + navigationRequest.setLoadDisabledGroupBy(true); + navigationTreeModel.getClientConfig().saveTreeConfig(navigationTreeConfig); + } + return navigationTreeModel.updateNavigationResult(); + } + } + public ContentRootOpenableUINavigationNode updateReference(NavigationUI navigationUI, ContentRootOpenableUINavigationNode node, - String id, - DataGroupByDto<D> oldGroupByDto, - boolean groupByChanged, - String newGroupByValue) { + ComputeNavigationRequestChange<D, U> computeNavigationRequestChange) { boolean notPersisted = node.getInitializer().isNotPersisted(); + String id = computeNavigationRequestChange.getBean().getId(); + DataGroupByDto<D> oldGroupByDto = computeNavigationRequestChange.getOldGroupByDto(); + boolean groupByChanged = computeNavigationRequestChange.isGroupByChanged(); + String newGroupByValue = computeNavigationRequestChange.getNewGroupByValue(); ContentRootListUINavigationNode parent = node.getParent(); if (groupByChanged) { // the navigation must be updated, new parent groupBy value has changed - NavigationResult navigationResult = navigationUI.getTree().getModel().updateNavigationResult(); + NavigationResult navigationResult = computeNavigationRequestChange.updateNavigationResult(navigationUI.getTree().getModel()); // groupBy has changed (remove node from parent) RootNavigationNode rootNode = (RootNavigationNode) node.getRoot(); node.removeFromParent(); ===================================== client/runner/pom.xml ===================================== @@ -140,6 +140,11 @@ <artifactId>jaxb-runtime</artifactId> <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-converter</artifactId> + <scope>runtime</scope> + </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>client-datasource-editor-api-test</artifactId> ===================================== client/runner/src/main/i18n/translations/client-runner_en_GB.properties ===================================== @@ -927,6 +927,9 @@ observe.ui.tree.action.searchOrCreate.tip=Search or create a new trip observe.ui.tree.action.selectAll.tip=Select All observe.ui.tree.action.unselectAll.tip=Unselect All observe.ui.tree.loaded=Tree reloaded (in %s) +observe.ui.tree.need.add.disabled.groupBy.message=The current navigation tree configuration do not allow to display disabled groupBy, configuration will be updated to enable this and make possible to display the saved trip. +observe.ui.tree.need.add.null.groupBy.message=The current navigation tree configuration do not allow to display not grouped groupBy, configuration will be updated to enable this and make possible to display the saved trip. +observe.ui.tree.need.reload.title=Navigation structure modification required observe.ui.tree.reload=Reload tree structure observe.ui.type.action.create=Create a new %s observe.ui.type.action.delete=Delete selected %s ===================================== client/runner/src/main/i18n/translations/client-runner_es_ES.properties ===================================== @@ -927,6 +927,9 @@ observe.ui.tree.action.searchOrCreate.tip=Search or create a new trip \#TODO observe.ui.tree.action.selectAll.tip=Seleccionar todo observe.ui.tree.action.unselectAll.tip=Deseleccionar todo observe.ui.tree.loaded=Tree reloaded (in %s) +observe.ui.tree.need.add.disabled.groupBy.message=The current navigation tree configuration do not allow to display disabled groupBy, configuration will be updated to enable this and make possible to display the saved trip. #TODO +observe.ui.tree.need.add.null.groupBy.message=The current navigation tree configuration do not allow to display not grouped groupBy, configuration will be updated to enable this and make possible to display the saved trip. #TODO +observe.ui.tree.need.reload.title=Navigation structure modification required #TODO observe.ui.tree.reload=Reload tree structure observe.ui.type.action.create=Crear un objeto de tipo '%s' observe.ui.type.action.delete=Eliminar el objeto de tipo '%s' seleccionado ===================================== client/runner/src/main/i18n/translations/client-runner_fr_FR.properties ===================================== @@ -927,6 +927,9 @@ observe.ui.tree.action.searchOrCreate.tip=Rechercher ou créer une nouvelle mar observe.ui.tree.action.selectAll.tip=Tout sélectionner observe.ui.tree.action.unselectAll.tip=Tout désélectionner observe.ui.tree.loaded=Arbre rechargé (en %s) +observe.ui.tree.need.add.disabled.groupBy.message=La configuration actuelle de l'arbre de navigation ne permet pas d'afficher une modalité désactivée, elle sera modifiée dans ce sens afin de pouvoir afficher cette marée après enregistrement. +observe.ui.tree.need.add.null.groupBy.message=La configuration actuelle de l'arbre de navigation ne permet pas d'afficher une modalité nulle, elle sera modifiée dans ce sens afin de pouvoir afficher cette marée après enregistrement. +observe.ui.tree.need.reload.title=Adaptation de la structure de l'arbre requise observe.ui.tree.reload=Chargement de la structure de l'arbre observe.ui.type.action.create=Créer un objet de type '%s' observe.ui.type.action.delete=Supprimer l'objet de type '%s' sélectionné ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2024.03</version> + <version>2024.09</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> @@ -113,7 +113,10 @@  <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <lib.version.java4all.decorator>0.0.15</lib.version.java4all.decorator> +  + <lib.version.java4all.jaxx>3.0.25</lib.version.java4all.jaxx> + <lib.version.java4all.validation>1.0.3</lib.version.java4all.validation> + <lib.version.java4all.i18n>4.0-beta-26</lib.version.java4all.i18n> <lib.version.ognl>3.1.29</lib.version.ognl>  <lib.version.h2>1.4.196</lib.version.h2> @@ -129,6 +132,7 @@  <lib.version.hsqldb>2.7.0</lib.version.hsqldb>  +   <license.licenseName>gpl_v3</license.licenseName> <license.organizationName>IRD, Ultreia.io</license.organizationName> ===================================== server/runner/pom.xml ===================================== @@ -87,6 +87,11 @@ <artifactId>flexmark-util-data</artifactId> <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-converter</artifactId> + <scope>runtime</scope> + </dependency> </dependencies> <build> <finalName>${applicationName}-${project.version}</finalName> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/80d425d35a770af273415be8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/80d425d35a770af273415be8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/issue-2594] 11 commits: use new validation and jaxx validation API
by Tony CHEMIT (＠tchemit) 22 Feb '24

22 Feb '24

Tony CHEMIT pushed to branch feature/issue-2594 at ultreiaio / ird-observe Commits: 55c9027d by Tony Chemit at 2024-02-22T13:56:44+01:00 use new validation and jaxx validation API - - - - - 1fc0ddd1 by Tony Chemit at 2024-02-22T13:56:44+01:00 implements new field validator using new API - - - - - 96b4a3da by Tony Chemit at 2024-02-22T13:59:17+01:00 use new validation maven gav - - - - - b4687f33 by Tony Chemit at 2024-02-22T13:59:20+01:00 rewrite validation models - - - - - 098de5d4 by Tony Chemit at 2024-02-22T13:59:20+01:00 Fix some validation errors discovered with the new validation implementation^^ - - - - - ca9622dd by Tony Chemit at 2024-02-22T13:59:20+01:00 Test both validation implementations in services tck - - - - - ba4c4a65 by Tony Chemit at 2024-02-22T14:00:48+01:00 Move I18nReferentialDto.isLabelTranslated method to WithI18n - - - - - 4f4c0d89 by Tony Chemit at 2024-02-22T14:00:48+01:00 I18n does not parse any longer xml files - - - - - 4108a4aa by Tony Chemit at 2024-02-22T14:00:48+01:00 Manage extra validators in client datasource editors - - - - - b1c4ba3c by Tony Chemit at 2024-02-22T14:00:48+01:00 Fix some missing i18n keys - - - - - 4f00fd2c by Tony Chemit at 2024-02-22T14:09:23+01:00 update pom - - - - - 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/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/core/pom.xml - client/core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client/core/src/main/java/fr/ird/observe/client/ClientUIContextApi.java - client/core/src/main/java/fr/ird/observe/client/WithClientUIContextApi.java - client/core/src/main/java/fr/ird/observe/client/datasource/validation/ClientValidationContext.java - client/core/src/main/java/fr/ird/observe/client/datasource/validation/ContentMessageTableModel.java - client/core/src/main/java/fr/ird/observe/client/datasource/validation/ContentMessageTableRenderer.java - client/core/src/main/java/fr/ird/observe/client/datasource/validation/ObserveSwingValidator.java - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializerContext.java - client/core/src/main/java/fr/ird/observe/client/util/table/EditableTableModel.java - client/datasource/actions/pom.xml - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidateConfigUI.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidateModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidateUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidationMessageTableModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidationMessageTableRenderer.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/actions/SelectValidationScope.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/actions/Start.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/tree/ValidationNode.java - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/RunObserveListener.java - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/.mvn/i18n/parse-validation-messages → client/datasource/editor/ll-validation/.mvn/add-auto-service - client/datasource/editor/ps/.mvn/i18n/parse-validation-messages → client/datasource/editor/ll-validation/.mvn/i18n/parse-java - + client/datasource/editor/ll-validation/.mvn/pom.gitflow.develop The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1fdfb552121ed5c922685b4b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1fdfb552121ed5c922685b4b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/issue-2594] 11 commits: use new validation and jaxx validation API
by Tony CHEMIT (＠tchemit) 20 Feb '24

20 Feb '24

Tony CHEMIT pushed to branch feature/issue-2594 at ultreiaio / ird-observe Commits: 4c8554c8 by Tony Chemit at 2024-02-20T14:59:27+01:00 use new validation and jaxx validation API - - - - - f8c2a994 by Tony Chemit at 2024-02-20T14:59:27+01:00 implements new field validator using new API - - - - - 6f82c1ef by Tony Chemit at 2024-02-20T14:59:27+01:00 use new validation maven gav - - - - - 763168a7 by Tony Chemit at 2024-02-20T14:59:27+01:00 rewrite validation models - - - - - 05021498 by Tony Chemit at 2024-02-20T14:59:27+01:00 Fix some validation errors discovered with the new validation implementation^^ - - - - - 534e3d53 by Tony Chemit at 2024-02-20T14:59:27+01:00 Test both validation implementations in services tck - - - - - 1d8dcd75 by Tony Chemit at 2024-02-20T14:59:27+01:00 I18n editor was relocated into jaxx update pom FIXME - - - - - 1832df35 by Tony Chemit at 2024-02-20T14:59:28+01:00 Move I18nReferentialDto.isLabelTranslated method to WithI18n - - - - - 26cc497b by Tony Chemit at 2024-02-20T14:59:28+01:00 I18n does not parse any longer xml files - - - - - 99710d3a by Tony Chemit at 2024-02-20T14:59:28+01:00 Manage extra validators in client datasource editors - - - - - 1fdfb552 by Tony Chemit at 2024-02-20T18:04:15+01:00 stash - - - - - 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/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/core/pom.xml - client/core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client/core/src/main/java/fr/ird/observe/client/ClientUIContextApi.java - client/core/src/main/java/fr/ird/observe/client/WithClientUIContextApi.java - client/core/src/main/java/fr/ird/observe/client/datasource/validation/ClientValidationContext.java - client/core/src/main/java/fr/ird/observe/client/datasource/validation/ContentMessageTableModel.java - client/core/src/main/java/fr/ird/observe/client/datasource/validation/ContentMessageTableRenderer.java - client/core/src/main/java/fr/ird/observe/client/datasource/validation/ObserveSwingValidator.java - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializerContext.java - client/core/src/main/java/fr/ird/observe/client/util/table/EditableTableModel.java - client/datasource/actions/pom.xml - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidateConfigUI.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidateModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidateUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidationMessageTableModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidationMessageTableRenderer.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/actions/SelectValidationScope.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/actions/Start.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/tree/ValidationNode.java - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/RunObserveListener.java - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/.mvn/i18n/parse-validation-messages → client/datasource/editor/ll-validation/.mvn/add-auto-service - client/datasource/editor/ps/.mvn/i18n/parse-validation-messages → client/datasource/editor/ll-validation/.mvn/i18n/parse-java - + client/datasource/editor/ll-validation/.mvn/pom.gitflow.develop The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f6ee664db998a98a751c390b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f6ee664db998a98a751c390b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/issue-2594] 16 commits: En 9.2.2, impossible de créer une marée en mode serveur - Closes #2838
by Tony CHEMIT (＠tchemit) 16 Feb '24

16 Feb '24

Tony CHEMIT pushed to branch feature/issue-2594 at ultreiaio / ird-observe Commits: 118a55d7 by Tony Chemit at 2024-02-15T07:04:08+01:00 En 9.2.2, impossible de créer une marée en mode serveur - Closes #2838 - - - - - 7073ca15 by Tony Chemit at 2024-02-15T09:09:20+01:00 Fix DtoFormValidatorTransformer on timeStampAfter validation - See #2837 - - - - - b41a9d7b by Tony Chemit at 2024-02-15T09:31:17+01:00 Sur PS / Observations / Calée, les contrôles sur les dates/heures ne fonctionnent plus correctement - Closes #2837 - - - - - 80d425d3 by Tony Chemit at 2024-02-15T11:07:09+01:00 Update changelog for v.9.2.3 [skip CI] - - - - - 55f9c3b4 by Tony Chemit at 2024-02-16T17:53:20+01:00 Improve validation comments - - - - - 297ad764 by Tony Chemit at 2024-02-16T17:53:23+01:00 Depreciate xwork field validators - - - - - 62129e0f by Tony Chemit at 2024-02-16T17:53:23+01:00 use new validation and jaxx validation API - - - - - ea623b24 by Tony Chemit at 2024-02-16T18:26:03+01:00 implements new field validator using new API - - - - - 2dea90b9 by Tony Chemit at 2024-02-16T18:26:03+01:00 use new validation maven gav - - - - - 04d2f4fb by Tony Chemit at 2024-02-16T18:26:11+01:00 rewrite validation models - - - - - bcee7b8a by Tony Chemit at 2024-02-16T18:26:11+01:00 Fix some validation errors discovered with the new validation implementation^^ - - - - - e801ee28 by Tony Chemit at 2024-02-16T18:26:11+01:00 Test both validation implementations in services tck - - - - - ead6d05f by Tony Chemit at 2024-02-16T18:26:11+01:00 I18n editor was relocated into jaxx update pom FIXME - - - - - a7b46aca by Tony Chemit at 2024-02-16T18:26:11+01:00 Move I18nReferentialDto.isLabelTranslated method to WithI18n - - - - - 5af9ebbe by Tony Chemit at 2024-02-16T18:26:11+01:00 I18n does not parse any longer xml files - - - - - f6ee664d by Tony Chemit at 2024-02-16T18:26:11+01:00 Manage extra validators in client datasource editors - - - - - 30 changed files: - CHANGELOG.md - client/configuration/pom.xml - client/configuration/src/main/filtered-resources/log4j2.xml - client/configuration/src/main/filtered-resources/observe-log4j2.xml - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/core/pom.xml - client/core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client/core/src/main/java/fr/ird/observe/client/ClientUIContextApi.java - client/core/src/main/java/fr/ird/observe/client/WithClientUIContextApi.java - client/core/src/main/java/fr/ird/observe/client/datasource/validation/ClientValidationContext.java - client/core/src/main/java/fr/ird/observe/client/datasource/validation/ContentMessageTableModel.java - client/core/src/main/java/fr/ird/observe/client/datasource/validation/ContentMessageTableRenderer.java - client/core/src/main/java/fr/ird/observe/client/datasource/validation/ObserveSwingValidator.java - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializerContext.java - client/core/src/main/java/fr/ird/observe/client/util/table/EditableTableModel.java - client/datasource/actions/pom.xml - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidateConfigUI.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidateModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidateUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidationMessageTableModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidationMessageTableRenderer.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/actions/SelectValidationScope.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/actions/Start.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/tree/ValidationNode.java - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/RunObserveListener.java - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/.mvn/i18n/parse-validation-messages → client/datasource/editor/ll-validation/.mvn/add-auto-service - client/datasource/editor/ps/.mvn/i18n/parse-validation-messages → client/datasource/editor/ll-validation/.mvn/i18n/parse-java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/82eeff5f8a43209d6ea05738… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/82eeff5f8a43209d6ea05738… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Remove old versions
by Tony CHEMIT (＠tchemit) 15 Feb '24

15 Feb '24

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 41d27332 by Tony Chemit at 2024-02-15T12:13:06+01:00 Remove old versions - - - - - 1 changed file: - versions.json Changes: ===================================== versions.json ===================================== @@ -1,14 +1,8 @@ { "9.2.3": "15/02/2024 10:02 UTC", "9.3.0-RC-3": "25/01/2024 15:55 UTC", - "9.3.0-RC-2": "22/01/2024 14:53 UTC", "9.2.2": "22/01/2024 11:52 UTC", - "9.2.1": "14/11/2023 16:35 UTC", - "9.2.0": "09/10/2023 10:38 UTC", "9.1.6": "16/07/2023 09:50 UTC", - "9.1.5": "25/06/2023 16:09 UTC", - "9.1.4": "01/06/2023 18:40 UTC", - "9.1.3": "20/05/2023 12:37 UTC", "9.0.30": "01/04/2023 16:53 UTC", "7.6.14": "29/07/2022 01:00 UTC" } \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/41d273327a76832e1470ecbc7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/41d273327a76832e1470ecbc7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Remove old versions
by Tony CHEMIT (＠tchemit) 15 Feb '24

15 Feb '24

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: c336bc72 by Tony Chemit at 2024-02-15T12:11:35+01:00 Remove old versions - - - - - 8 changed files: - − 9.1.3/CHANGELOG.html - − 9.1.3/architecture-logicielle.html - − 9.1.3/avdth/common.html - − 9.1.3/avdth/index.html - − 9.1.3/avdth/landing.html - − 9.1.3/avdth/local_market.html - − 9.1.3/avdth/logbook.html - − 9.1.3/avdth/referential.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/c336bc72c77d6e37f6914291f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/c336bc72c77d6e37f6914291f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Update changelog for v.9.2.3 [skip CI]
by Tony CHEMIT (＠tchemit) 15 Feb '24

15 Feb '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 80d425d3 by Tony Chemit at 2024-02-15T11:07:09+01:00 Update changelog for v.9.2.3 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,20 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2024-01-22 12:54. + * Last generated at 2024-02-15 10:37. + +## Version [9.2.3](https://gitlab.com/ultreiaio/ird-observe/-/milestones/276) + +**Closed at 2024-02-15.** + +### Download +* [Client (observe-9.2.3-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) +* [Serveur (observe-9.2.3.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9…) +* [Serveur (observe-9.2.3-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) + +### Issues + * [[Type::Anomalie 2837]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2837) **Sur PS / Observations / Calée, les contrôles sur les dates/heures ne fonctionnent plus correctement** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2838]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2838) **En 9.2.2, impossible de créer une marée en mode serveur** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) ## Version [9.2.2](https://gitlab.com/ultreiaio/ird-observe/-/milestones/273) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/80d425d35a770af273415be8f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/80d425d35a770af273415be8f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe (version 9.2.3)
by Tony CHEMIT (＠tchemit) 15 Feb '24

15 Feb '24

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 9279bb56 by Tony Chemit at 2024-02-15T11:02:32+01:00 Site checkin for project ObServe (version 9.2.3) - - - - - 8 changed files: - + 9.2.3/CHANGELOG.html - + 9.2.3/architecture-logicielle.html - + 9.2.3/avdth/common.html - + 9.2.3/avdth/index.html - + 9.2.3/avdth/landing.html - + 9.2.3/avdth/local_market.html - + 9.2.3/avdth/logbook.html - + 9.2.3/avdth/referential.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9279bb562798fc241bd1778bb… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9279bb562798fc241bd1778bb… You're receiving this email because of your account on gitlab.com.

1 0