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

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 9.0.0-RC-27-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 20 Mar '22

20 Mar '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6c48571f by Tony Chemit at 2022-03-20T21:43:56+01:00 [jgitflow-maven-plugin]updating poms for 9.0.0-RC-27-SNAPSHOT development[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/java/pom.xml - core/persistence/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml - core/pom.xml - core/services/client/pom.xml - core/services/i18n/pom.xml - core/services/local/pom.xml - core/services/pom.xml - core/services/test/pom.xml - model/pom.xml - observe/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/6c48571f445a130eb4475ca4a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/6c48571f445a130eb4475ca4a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/9.0.0-RC-26
by Tony CHEMIT (＠tchemit) 20 Mar '22

20 Mar '22

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

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: Update changelog for v.9.0.0-rc-26 [skip CI]
by Tony CHEMIT (＠tchemit) 20 Mar '22

20 Mar '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 18fcf0e3 by Tony Chemit at 2022-03-20T21:34:57+01:00 Update changelog for v.9.0.0-rc-26 [skip CI] - - - - - 7f5fb1b0 by Tony Chemit at 2022-03-20T21:34:57+01:00 Fix some errors on LL - Observation - SetCatch (inline models editable but should not) - - - - - 850a0f11 by Tony Chemit at 2022-03-20T21:34:57+01:00 Amélioration écran Compositions globales - See #2230 - - - - - a2c579eb by Tony Chemit at 2022-03-20T21:34:57+01:00 Fix some errors on LL - Logbook - Set (action are not visible) - - - - - e58ad56a by Tony Chemit at 2022-03-20T21:34:57+01:00 update pom - - - - - d0e30109 by Tony Chemit at 2022-03-20T21:37:26+01:00 Amélioration de la fin de la synchronisation simple de référentiel - Closes ultreiaio/ird-observe#2231 - - - - - 12 changed files: - CHANGELOG.md - 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/referential/legacy/actions/SynchroUIActionSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUITableModel.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetUI.jcss - 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/SetCatchUITableModel.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jcss - core/services/local/src/main/java/fr/ird/observe/services/local/service/referential/SynchronizeServiceLocalSupport.java - pom.xml Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,57 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2022-03-03 09:21. + * Last generated at 2022-03-20 21:33. + +## Version [9.0.0-RC-26](https://gitlab.com/ultreiaio/ird-observe/-/milestones/217) + +**Closed at 2022-03-20.** + +### Download +* [Client (observe-9.0.0-RC-26-client.zip)](https://repo1.maven.org/maven2/fr/ird/obse…) +* [Serveur (observe-9.0.0-RC-26.war)](https://repo1.maven.org/maven2/fr/ird/observe/obs…) +* [Serveur (observe-9.0.0-RC-26-server.zip)](https://repo1.maven.org/maven2/fr/ird/obse…) + +### Issues + * [[Type::Anomalie 629]](https://gitlab.com/ultreiaio/ird-observe/-/issues/629) **[SERVEUR WEB] Exceptions probablement lorsque la connexion est ponctuellement coupée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 886]](https://gitlab.com/ultreiaio/ird-observe/-/issues/886) **Problème d'exports de marées LL en v5.4** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 1832]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1832) **Erreur lors de l'effacement d'une base v9 par la v8** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 1867]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1867) **Impossible d'enregistrer le formulaire Marée LL avec section livre de bord et données associées** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 1868]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1868) **Impossible d'accéder au formulaire Composition détaillée en LL observations** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2137]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2137) **OptimisticLockException suite à requête PUT avortée** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2183]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2183) **Création d'un programme : exiger 'Observations' ou 'Livre de bord'** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2195]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2195) **Message d'erreur d'insertion de Trip** (Thanks to Tony CHEMIT) (Reported by adelphe n'goran) + * [[Type::Anomalie 2196]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2196) **Erreur sur utilisation de PUT pour MAJ une marée** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2197]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2197) **Bouton "Créer la base locale" ne marche pas** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2198]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2198) **La génération d'une base locale ne marche pas :(:(:(** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2199]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2199) **Impossible d'enregistrer une base :(:(:(** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2201]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2201) **Le changement de l'heure ne fire pas le bouton Enregistrer** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2202]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2202) **Le changement d'heure n'est pas enregistré** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2205]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2205) **Les trois formulaires Calée ont perdu le reset** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2210]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2210) **Les messages de validation sont mal encodés** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2213]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2213) **Correction sur les actions du comportements lors du retour sur onglet précédent après une action** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2219]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2219) **Plein d'échantillons, comptage de l'arbre : 0** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2220]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2220) **Problème de décoration de l'arbre de navigation** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2221]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2221) **Amélioration du mécanisme de remplacement de marée suite à un petit soucis lors de l'export de données (détection de faux positifs dans le script d'insertion)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2222]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2222) **Si on utilise un favori sur source serveur, le nom de la base optionel n'est pas renseigné dans son éditeur** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2227]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2227) **Corrections sur l'appairement d'activités** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2228]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2228) **Enfin avoir les erreur de WebMotion!** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 123]](https://gitlab.com/ultreiaio/ird-observe/-/issues/123) **Uniformiser les topiaid entre ObServe et t3+** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 236]](https://gitlab.com/ultreiaio/ird-observe/-/issues/236) **Permettre de copier-coller facilement le contenu de la fenêtre "Erreur..."** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 1085]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1085) **Generate navigation API** (Thanks to ) (Reported by Tony CHEMIT) + * [[Type::Evolution 1107]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1107) **Déplacer le fichier observe-client.conf dans le .observe** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 1595]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1595) **Supprimer les vieilles migrations ?** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 1668]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1668) **Extraire les configurations sauvegardés de sources de données dans des fichiers séparé** (Thanks to ) (Reported by Tony CHEMIT) + * [[Type::Evolution 1699]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1699) **Générer les usines de services** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2186]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2186) **Libellé d'affichage des marées** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2194]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2194) **Le classement des bateaux pourrait se faire sur les noms** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2203]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2203) **Contrôle sur l'heure d'activité sur le WS public en create et update** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2204]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2204) **Ne plus retourner le contenu en erreur de validation dans l'API publique** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2206]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2206) **Amélioration de la documentation de l'API publique pour voir les types de date utilisés** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2207]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2207) **Amélioration des validateurs sur collection** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2224]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2224) **Améloration sur l'écran Marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2231]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2231) **Amélioration de la fin de la synchronisation simple de référentiel** (Thanks to ) (Reported by Tony CHEMIT) + * [[Type::Tâche 2208]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2208) **Synchro simple du référentiel, associations espèce/océan** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) ## Version [9.0.0-RC-25](https://gitlab.com/ultreiaio/ird-observe/-/milestones/216) @@ -12,12 +62,10 @@ * [Serveur (observe-9.0.0-RC-25.war)](https://repo1.maven.org/maven2/fr/ird/observe/obs…) * [Serveur (observe-9.0.0-RC-25-server.zip)](https://repo1.maven.org/maven2/fr/ird/obse…) - ### Issues * [[Type::Anomalie 2178]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2178) **Souci lors de la configuration de l'arbre 1 avec base vierge** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2180]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2180) **Souci lors de la configuration de l'arbre 2** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2181]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2181) **Soucis lors de la configuration de l'arbre 3 avec base vierge** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) - * [[Type::Anomalie 2183]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2183) **Création d'un programme : exiger 'Observations' ou 'Livre de bord'** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2188]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2188) **Import AVDTH ne devrait pas être visible en mode serveur** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2189]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2189) **Impossible d'annuler une édition si un référentiel est désactivé** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2190]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2190) **Exception sur chargement de l'arbre (mode serveur) PS / Par bateaux** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) @@ -68,7 +116,7 @@ * [[Type::Evolution 1959]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1959) **Critères de groupement pour le nouvel arbre** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) * [[Type::Evolution 2051]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2051) **Supprimer ces flags sur Program** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 2133]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2133) **Ajout d'un ordre naturel sur les requêtes GetAll et GetSome** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Type::Evolution 2134]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2134) **Permettre d'avoir sur le serveur plusieurs instances du serveur tournant sur des configurations différentes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2134]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2134) **Permettre d'avoir plusieurs instances du serveur tournant sur des configurations différentes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Type::Evolution 2135]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2135) **Utilisation d'un seul fichier server.yml pour la configuration du serveur (remplace databases.yml et users.yml)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Type::Evolution 2155]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2155) **Amélioration de l'interface graphique des source de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Type::Evolution 2156]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2156) **Amélioration de l'API publique (GetSome)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) @@ -693,6 +741,7 @@ Merry Christmas * [Serveur (observe-8.0.0.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/8…) ### Issues + * [[Type::Anomalie 1428]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1428) **[V8] Bug sur clic sur programme** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) * [[Type::Anomalie 1576]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1576) **L'option afficher/cacher la légende semble ne pas fonctionner** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 1580]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1580) **Défauts d'affichage dans l'arbre** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 1581]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1581) **Les rapports FOB ne fonctionnent pas** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/save/actions/Start.java ===================================== @@ -92,7 +92,6 @@ public class Start extends SaveLocalUIActionSupport { } if (stepModel.containsStepForSave(AdminStep.SYNCHRONIZE)) { - sendMessage("Sauvegarde du référentiel."); saveUnidirectionalSynchronizeReferential(); } @@ -108,8 +107,11 @@ public class Start extends SaveLocalUIActionSupport { UnidirectionalSynchronizeContext referentialSynchronizeContext = stepModel.getReferentialSynchronizeContext(); - sendMessage(t("observe.ui.datasource.editor.actions.synchro.referential.message.script.path", referentialSynchronizeContext.getSqlScriptPath())); - + if (referentialSynchronizeContext.getSqlScript().isPresent()) { + sendMessage("Sauvegarde des modifications de la synchronisation simple."); + sendMessage(t("observe.ui.datasource.editor.actions.synchro.referential.message.script.path", referentialSynchronizeContext.getSqlScriptPath())); + } + sendMessage("Mise à jour de la date de dernière de synchronisation de référentiel simple."); referentialSynchronizeContext.finish(stepModel.getSource().getSynchronizeService()); stepModel.getSource().setModified(true); sendMessage(t("observe.ui.datasource.editor.actions.synchro.referential.message.apply.done", new Date())); ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/actions/SynchroUIActionSupport.java ===================================== @@ -59,7 +59,9 @@ public abstract class SynchroUIActionSupport extends AdminTabUIActionSupport<Syn stepModel.setReferentialSynchronizeResult(referentialSynchronizeResult); if (referentialSynchronizeResult.isEmpty()) { + //Update lastUpdateDate anyway (See https://gitlab.com/ultreiaio/ird-observe/-/issues/2231) sendMessage(t("observe.ui.datasource.editor.actions.synchro.referential.message.ref.is.updtodate")); + ui.getModel().getSaveLocalModel().addStepForSave(AdminStep.SYNCHRONIZE); } else { for (Class<? extends ReferentialDto> referentialName : referentialSynchronizeResult.getReferentialNames()) { String referentialStr = t(I18nDecoratorHelper.getType(referentialName)); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUITableModel.java ===================================== @@ -243,6 +243,10 @@ public abstract class ContentTableUITableModel<D extends DataDto, C extends Cont validator.setBean(tableEditBean); validator.setChanged(false); inlineModels.keySet().forEach(t -> t.getRowValidator().setParentValidator(validator)); + startEditTableEditBeanOnInlineModels(); + } + + protected void startEditTableEditBeanOnInlineModels() { // make inline models editable inlineModels.keySet().forEach(t -> t.setEditable(true)); } ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetUI.jaxx ===================================== @@ -368,7 +368,7 @@ </row> </Table> </JPanel> - <Table id='actions' addToContainer="true" forceOverride="2"> + <Table id='actions' forceOverride="2"> <row> <cell fill="both" columns="2"> <JButton id='copyValuesAndSave'/> ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetUI.jcss ===================================== @@ -29,10 +29,6 @@ DateTimeEditor { showReset:true; } -#extraActions { - visible:{!states.isReadingMode()}; -} - #copyValuesAndSave { enabled:{states.isUpdatingMode() && states.getCopySetCandidate() != null && states.isValid()}; text:"observe.data.ll.logbook.Set.action.copyValuesAndSave"; ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIHandler.java ===================================== @@ -275,12 +275,14 @@ public class SetCatchUIHandler extends GeneratedSetCatchUIHandler { // on propage le mode de saisie dans le bean editBean.setAcquisitionMode(newMode.ordinal()); } - boolean showIndividualTabs = !createMode && isIndividual; +// boolean showIndividualTabs = !createMode && isIndividual; + boolean showIndividualTabs = isIndividual; getModel().getStates().setShowIndividualTabs(showIndividualTabs); } void updateShowIndividualTabs() { - boolean showIndividualTabs = !ui.getTableModel().isCreate() && ui.getTableEditBean().getAcquisitionMode() == CatchAcquisitionMode.INDIVIDUAL.ordinal(); +// boolean showIndividualTabs = !ui.getTableModel().isCreate() && ui.getTableEditBean().getAcquisitionMode() == CatchAcquisitionMode.INDIVIDUAL.ordinal(); + boolean showIndividualTabs = ui.getTableEditBean().getAcquisitionMode() == CatchAcquisitionMode.INDIVIDUAL.ordinal(); getModel().getStates().setShowIndividualTabs(showIndividualTabs); } ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUITableModel.java ===================================== @@ -135,4 +135,11 @@ public class SetCatchUITableModel extends GeneratedSetCatchUITableModel { getModel().getStates().resetPosition(tableEditBean); } + + @Override + protected void startEditTableEditBeanOnInlineModels() { + if (getModel().getStates().isShowIndividualTabs()) { + super.startEditTableEditBeanOnInlineModels(); + } + } } ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jaxx ===================================== @@ -86,7 +86,7 @@ <BeanValidator id='basketValidator' beanClass='fr.ird.observe.dto.data.ll.observation.BasketDto' errorTableModel='{getErrorTableModel()}' context='update'> - <field name='branchline' component='basketsPane'/> + <field name='branchline' component='basketsPanel'/> <field name='floatline1Length' component='basketsPanel'/> <field name='floatline2Length' component='basketsPanel'/> </BeanValidator> ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jcss ===================================== @@ -92,6 +92,10 @@ EditableTableModel { _doNotTranslateFieldName: true; } +#branchlinesPane { + _doNotTranslateFieldName: true; +} + /* ***************************************************************************** */ /* BRANCHLINE TAB ************************************************************* */ /* ***************************************************************************** */ ===================================== core/services/local/src/main/java/fr/ird/observe/services/local/service/referential/SynchronizeServiceLocalSupport.java ===================================== @@ -77,7 +77,9 @@ public class SynchronizeServiceLocalSupport extends ObserveServiceLocal implemen @Override public void applySql(TopiaSqlScript script, String lastUpdateDateKey) { - getTopiaPersistenceContext().executeSqlScript(script); + if (script != null) { + getTopiaPersistenceContext().executeSqlScript(script); + } updateLastUpdateDates(lastUpdateDateKey); } ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2022.39</version> + <version>2022.40</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> @@ -155,7 +155,7 @@  <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <lib.version.toolkit>6.0.6</lib.version.toolkit> + <lib.version.toolkit>6.0.7</lib.version.toolkit> <lib.version.ognl>3.1.29</lib.version.ognl>  <lib.version.h2>1.4.196</lib.version.h2> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b5fe8033cce56c6b13d87df4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b5fe8033cce56c6b13d87df4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Update changelog for v.9.0.0-rc-26 [skip CI]
by Tony CHEMIT (＠tchemit) 20 Mar '22

20 Mar '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b5fe8033 by Tony Chemit at 2022-03-20T16:46:14+01:00 Update changelog for v.9.0.0-rc-26 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,52 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2022-03-03 09:21. + * Last generated at 2022-03-20 16:46. + +## Version [9.0.0-RC-26](https://gitlab.com/ultreiaio/ird-observe/-/milestones/217) + +**Closed at 2022-03-20.** + + +### Issues + * [[Type::Anomalie 629]](https://gitlab.com/ultreiaio/ird-observe/-/issues/629) **[SERVEUR WEB] Exceptions probablement lorsque la connexion est ponctuellement coupée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 886]](https://gitlab.com/ultreiaio/ird-observe/-/issues/886) **Problème d'exports de marées LL en v5.4** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 1832]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1832) **Erreur lors de l'effacement d'une base v9 par la v8** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 1867]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1867) **Impossible d'enregistrer le formulaire Marée LL avec section livre de bord et données associées** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 1868]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1868) **Impossible d'accéder au formulaire Composition détaillée en LL observations** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2137]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2137) **OptimisticLockException suite à requête PUT avortée** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2183]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2183) **Création d'un programme : exiger 'Observations' ou 'Livre de bord'** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2195]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2195) **Message d'erreur d'insertion de Trip** (Thanks to Tony CHEMIT) (Reported by adelphe n'goran) + * [[Type::Anomalie 2196]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2196) **Erreur sur utilisation de PUT pour MAJ une marée** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2197]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2197) **Bouton "Créer la base locale" ne marche pas** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2198]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2198) **La génération d'une base locale ne marche pas :(:(:(** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2199]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2199) **Impossible d'enregistrer une base :(:(:(** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2201]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2201) **Le changement de l'heure ne fire pas le bouton Enregistrer** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2202]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2202) **Le changement d'heure n'est pas enregistré** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2205]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2205) **Les trois formulaires Calée ont perdu le reset** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2210]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2210) **Les messages de validation sont mal encodés** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2213]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2213) **Correction sur les actions du comportements lors du retour sur onglet précédent après une action** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2219]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2219) **Plein d'échantillons, comptage de l'arbre : 0** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2220]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2220) **Problème de décoration de l'arbre de navigation** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2221]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2221) **Amélioration du mécanisme de remplacement de marée suite à un petit soucis lors de l'export de données (détection de faux positifs dans le script d'insertion)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2222]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2222) **Si on utilise un favori sur source serveur, le nom de la base optionel n'est pas renseigné dans son éditeur** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2227]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2227) **Corrections sur l'appairement d'activités** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2228]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2228) **Enfin avoir les erreur de WebMotion!** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 123]](https://gitlab.com/ultreiaio/ird-observe/-/issues/123) **Uniformiser les topiaid entre ObServe et t3+** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 236]](https://gitlab.com/ultreiaio/ird-observe/-/issues/236) **Permettre de copier-coller facilement le contenu de la fenêtre "Erreur..."** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 1085]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1085) **Generate navigation API** (Thanks to ) (Reported by Tony CHEMIT) + * [[Type::Evolution 1107]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1107) **Déplacer le fichier observe-client.conf dans le .observe** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 1595]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1595) **Supprimer les vieilles migrations ?** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 1668]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1668) **Extraire les configurations sauvegardés de sources de données dans des fichiers séparé** (Thanks to ) (Reported by Tony CHEMIT) + * [[Type::Evolution 1699]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1699) **Générer les usines de services** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2186]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2186) **Libellé d'affichage des marées** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2194]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2194) **Le classement des bateaux pourrait se faire sur les noms** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2203]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2203) **Contrôle sur l'heure d'activité sur le WS public en create et update** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2204]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2204) **Ne plus retourner le contenu en erreur de validation dans l'API publique** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2206]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2206) **Amélioration de la documentation de l'API publique pour voir les types de date utilisés** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2207]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2207) **Amélioration des validateurs sur collection** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2224]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2224) **Améloration sur l'écran Marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Tâche 2208]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2208) **Synchro simple du référentiel, associations espèce/océan** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) ## Version [9.0.0-RC-25](https://gitlab.com/ultreiaio/ird-observe/-/milestones/216) @@ -12,12 +57,10 @@ * [Serveur (observe-9.0.0-RC-25.war)](https://repo1.maven.org/maven2/fr/ird/observe/obs…) * [Serveur (observe-9.0.0-RC-25-server.zip)](https://repo1.maven.org/maven2/fr/ird/obse…) - ### Issues * [[Type::Anomalie 2178]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2178) **Souci lors de la configuration de l'arbre 1 avec base vierge** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2180]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2180) **Souci lors de la configuration de l'arbre 2** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2181]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2181) **Soucis lors de la configuration de l'arbre 3 avec base vierge** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) - * [[Type::Anomalie 2183]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2183) **Création d'un programme : exiger 'Observations' ou 'Livre de bord'** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2188]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2188) **Import AVDTH ne devrait pas être visible en mode serveur** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2189]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2189) **Impossible d'annuler une édition si un référentiel est désactivé** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2190]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2190) **Exception sur chargement de l'arbre (mode serveur) PS / Par bateaux** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b5fe8033cce56c6b13d87df41… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b5fe8033cce56c6b13d87df41… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 12 commits: Améloration sur l'écran Marée - Closes #2224
by Tony CHEMIT (＠tchemit) 20 Mar '22

20 Mar '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8ddab981 by Tony Chemit at 2022-03-20T07:31:59+01:00 Améloration sur l'écran Marée - Closes #2224 - - - - - cb50b94d by Tony Chemit at 2022-03-20T10:14:57+01:00 Corrections sur l'appairement d'activités - Closes ultreiaio/ird-observe#2227 - - - - - aa525e0e by Tony Chemit at 2022-03-20T11:40:59+01:00 Corrections sur l'appairement d'activités - Closes ultreiaio/ird-observe#2227 - - - - - a3e2de16 by Tony Chemit at 2022-03-20T11:41:09+01:00 Clean ObserveRequestBuilder - - - - - 5ed25b8d by Tony Chemit at 2022-03-20T11:47:31+01:00 Remove JSoup usage in http-api - See ultreiaio/http#49 - - - - - d0aacabf by Tony Chemit at 2022-03-20T12:00:05+01:00 Add FIXME - - - - - 90b3ba95 by Tony Chemit at 2022-03-20T12:02:09+01:00 Add FIXME - - - - - 3966be60 by Tony Chemit at 2022-03-20T14:17:07+01:00 Impossible de créer une base centrale vierge, quelque soit la méthode appliquée - See ultreiaio/ird-observe#2214 - - - - - 72532596 by Tony Chemit at 2022-03-20T15:33:19+01:00 Enfin avoir les erreur de WebMotion! - Closes #2228 - - - - - 0a37a361 by Tony Chemit at 2022-03-20T16:37:54+01:00 Clean webmotion parameters mess (need to be finished) - See #2229 - - - - - 985029be by Tony Chemit at 2022-03-20T16:38:22+01:00 Can see error on loading any datasource - - - - - 46155b0f by Tony Chemit at 2022-03-20T16:40:53+01:00 update toolkit \o/ - - - - - 30 changed files: - client/core/src/main/i18n/templates/feedBackOnOpeningLocalDataSource_en_GB.ftl - client/core/src/main/i18n/templates/feedBackOnOpeningLocalDataSource_es_ES.ftl - client/core/src/main/i18n/templates/feedBackOnOpeningLocalDataSource_fr_FR.ftl - client/core/src/main/java/fr/ird/observe/client/datasource/api/action/OpenLocalDataSourceFeedBackModel.java - client/datasource/actions/src/main/i18n/getters/java.getter - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ActivityPairingModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/actions/Start.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ll/RootNodeBuilder.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ps/RootNodeBuilder.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ps/node/RouteNode.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ps/node/TripNode.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/tree/PairingTreeTableCellEditor.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/tree/PairingTreeTableCellRenderer.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/tree/PairingTreeTableModelSupport.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/tree/PairingTreeTableSupport.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/tree/node/ActivityNodeSupport.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/tree/node/ProgramNode.java → client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/tree/node/GroupByNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/loading/open/OpenDataSourceAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/StorageUIModel.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUIModelStates.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/api/dto/src/main/i18n/getters/java.getter - core/api/dto/src/main/java/fr/ird/observe/dto/data/ll/pairing/ActivityPairingResult.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ll/pairing/ActivityPairingResultItem.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ll/pairing/TripPairingContext.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ll/pairing/TripPairingResult.java - + core/api/dto/src/main/java/fr/ird/observe/dto/data/pairing/ActivityPairingResultItemSupport.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/52c61fc7ec3836485eb55076… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/52c61fc7ec3836485eb55076… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Fix save adapters
by Tony CHEMIT (＠tchemit) 19 Mar '22

19 Mar '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2e099e71 by Tony Chemit at 2022-03-19T16:49:35+01:00 Fix save adapters - - - - - 52c61fc7 by Tony Chemit at 2022-03-19T16:49:35+01:00 Improve delete adapters and begin of update statistics - - - - - 15 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteExecutor.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteRootTreeAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteTreeAdapter.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/actions/SaveContentOpenableUIAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/actions/SaveContentRootOpenableUIAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/ActivityUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/ActivityUIHandler.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/edit/GenerateContentEditUIDeleteTreeAdapter.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/openable/GenerateContentOpenableUIDeleteTreeAdapter.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/rlist/GenerateContentRootListUINavigationNode.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/ropen/GenerateContentRootOpenableUIDeleteTreeAdapter.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteExecutor.java ===================================== @@ -24,6 +24,7 @@ package fr.ird.observe.client.datasource.editor.api.content.actions.delete; import fr.ird.observe.client.datasource.editor.api.DataSourceEditor; import fr.ird.observe.client.datasource.editor.api.navigation.NavigationTree; +import fr.ird.observe.client.datasource.editor.api.navigation.NavigationUI; import fr.ird.observe.client.util.ObserveSwingTechnicalException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -73,13 +74,14 @@ public class DeleteExecutor { if (optionalRequest.isPresent()) { DeleteRequest request = optionalRequest.get(); String label = t("observe.ui.choice.confirm.delete"); - actionExecutor.addAction(label, () -> consume(request, dataSourceEditor.getNavigationUI().getTree())); + actionExecutor.addAction(label, () -> consume(request, dataSourceEditor.getNavigationUI())); return; } log.warn("User cancel action."); } - protected void consume(DeleteRequest request, NavigationTree tree) { + protected void consume(DeleteRequest request, NavigationUI navigationUI) { + NavigationTree tree = navigationUI.getTree(); Set<String> ids = request.getIds(); log.info(String.format("Delete adapt tree [start] %s", ids)); Consumer<String> idConsumer = consumer.apply(request); @@ -88,7 +90,7 @@ public class DeleteExecutor { } DeleteTreeAdapter<?> treeAdapter = this.treeAdapter.apply(request); try { - SwingUtilities.invokeAndWait(() -> treeAdapter.adaptTree(request, tree)); + SwingUtilities.invokeAndWait(() -> treeAdapter.adaptTree(request, navigationUI, tree)); } catch (Exception e) { throw new ObserveSwingTechnicalException(e); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteRootTreeAdapter.java ===================================== @@ -0,0 +1,55 @@ +package fr.ird.observe.client.datasource.editor.api.content.actions.delete; + +/*- + * #%L + * ObServe Client :: DataSource :: Editor :: API + * %% + * Copyright (C) 2008 - 2022 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.client.datasource.editor.api.navigation.NavigationUI; +import fr.ird.observe.client.datasource.editor.api.navigation.NavigationUIHandler; +import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationNode; +import fr.ird.observe.client.datasource.editor.api.navigation.tree.root.RootNavigationInitializer; + +import java.util.Set; +import java.util.function.Function; + +/** + * Created on 19/03/2022. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.0.0 + */ +public abstract class DeleteRootTreeAdapter<OldParent extends NavigationNode> extends DeleteTreeAdapter<OldParent> { + + public DeleteRootTreeAdapter(NavigationNode incomingNode, Function<NavigationNode, OldParent> parentSupplier) { + super(incomingNode, parentSupplier); + } + + @Override + public void removeChildren(NavigationUI navigationUI, OldParent parentNode, Set<String> ids) { + super.removeChildren(navigationUI, parentNode, ids); + RootNavigationInitializer initializer = (RootNavigationInitializer) parentNode.getRoot().getInitializer(); + boolean removeGroupBy = parentNode.getChildCount() == 0 && !initializer.getRequest().isLoadEmptyGroupBy(); + if (removeGroupBy) { + parentNode.removeFromParent(); + } + NavigationUIHandler.updateStatistics(navigationUI, removeGroupBy ? -1 : 0, -ids.size()); + } +} ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteTreeAdapter.java ===================================== @@ -23,6 +23,7 @@ package fr.ird.observe.client.datasource.editor.api.content.actions.delete; */ import fr.ird.observe.client.datasource.editor.api.navigation.NavigationTree; +import fr.ird.observe.client.datasource.editor.api.navigation.NavigationUI; import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationNode; import java.util.Objects; @@ -52,12 +53,14 @@ public abstract class DeleteTreeAdapter<OldParent extends NavigationNode> { this.parentSupplier = Objects.requireNonNull(parentSupplier); } - public abstract void removeChildren(OldParent parentNode, Set<String> ids); + public void removeChildren(NavigationUI navigationUI, OldParent parentNode, Set<String> ids) { + parentNode.removeChildren(ids); + } - public final void adaptTree(DeleteRequest request, NavigationTree tree) { + public final void adaptTree(DeleteRequest request, NavigationUI navigationUI, NavigationTree tree) { OldParent parentNode = getOldParentNode(getIncomingNode()); Set<String> ids = request.getIds(); - adaptParentNode(parentNode, ids); + adaptParentNode(navigationUI, parentNode, ids); doFinalSelect(tree, parentNode); } @@ -65,11 +68,11 @@ public abstract class DeleteTreeAdapter<OldParent extends NavigationNode> { return parentSupplier.apply(incomingNode); } - public final void adaptParentNode(OldParent parentNode, Set<String> ids) { + public final void adaptParentNode(NavigationUI navigationUI, OldParent parentNode, Set<String> ids) { // reload node data parentNode.reloadNodeData(); // remove obsolete nodes - removeChildren(parentNode, ids); + removeChildren(navigationUI, parentNode, ids); } public final void doFinalSelect(NavigationTree tree, OldParent parentNode) { ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/actions/SaveContentEditUIAdapter.java ===================================== @@ -53,5 +53,9 @@ public class SaveContentEditUIAdapter<D extends EditableDto, U extends ContentEd // apply extra actions from previous opened content (go back to correct tab if any, ...) U newUi = dataSourceEditor.getModel().getTypedContent(); newUi.resetFromPreviousUi(ui); + + if (notPersisted) { + dataSourceEditor.getNavigationUI().getTree().expandPath(dataSourceEditor.getNavigationUI().getTree().getSelectionPath()); + } } } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/actions/SaveContentOpenableUIAdapter.java ===================================== @@ -27,6 +27,7 @@ import fr.ird.observe.client.datasource.editor.api.content.actions.save.SaveUIAd import fr.ird.observe.client.datasource.editor.api.content.data.open.ContentOpenableUI; import fr.ird.observe.client.datasource.editor.api.content.data.open.ContentOpenableUIModel; import fr.ird.observe.client.datasource.editor.api.content.data.open.ContentOpenableUINavigationNode; +import fr.ird.observe.client.datasource.editor.api.navigation.NavigationTree; import fr.ird.observe.dto.data.OpenableDto; import javax.swing.AbstractButton; @@ -68,23 +69,28 @@ public class SaveContentOpenableUIAdapter<D extends OpenableDto, U extends Conte // As I prefer to use a unique code (for persisted or not, keep it like this) node.updateReference(bean.getId()); - afterNodeUpdated(dataSourceEditor, ui, node, notPersisted, bean); + NavigationTree tree = dataSourceEditor.getNavigationUI().getTree(); + afterNodeUpdated(dataSourceEditor, ui, tree, node, notPersisted, bean); } - protected void afterNodeUpdated(DataSourceEditor dataSourceEditor, U ui, ContentOpenableUINavigationNode node, boolean notPersisted, D bean) { + protected void afterNodeUpdated(DataSourceEditor dataSourceEditor, U ui, NavigationTree tree, ContentOpenableUINavigationNode node, boolean notPersisted, D bean) { //FIXME A startEdit should do the math? - dataSourceEditor.getNavigationUI().getTree().reSelectSafeNode(node); + tree.reSelectSafeNode(node); U newUi = dataSourceEditor.getModel().getTypedContent(); if (notPersisted && predicate.test(bean)) { // reload ui and do click -// U content = dataSourceEditor.getModel().getTypedContent(); SwingUtilities.invokeLater(() -> Objects.requireNonNull(buttonGetter).apply(newUi).doClick()); + return; } else { // apply extra actions from previous opened content (go back to correct tab if any, ...) newUi.resetFromPreviousUi(ui); } + + if (notPersisted) { + tree.expandPath(tree.getSelectionPath()); + } } } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/actions/SaveContentRootOpenableUIAdapter.java ===================================== @@ -27,14 +27,10 @@ import fr.ird.observe.client.datasource.editor.api.content.actions.save.SaveUIAd import fr.ird.observe.client.datasource.editor.api.content.data.ropen.ContentRootOpenableUI; 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.NavigationUIHandler; import fr.ird.observe.dto.data.RootOpenableDto; -import javax.swing.AbstractButton; -import javax.swing.SwingUtilities; -import java.util.Objects; -import java.util.function.Function; -import java.util.function.Predicate; - /** * Created on 16/10/2020. * @@ -43,48 +39,28 @@ import java.util.function.Predicate; */ public class SaveContentRootOpenableUIAdapter<D extends RootOpenableDto, U extends ContentRootOpenableUI<D, U>> implements SaveUIAdapter<D, U> { - private final Predicate<D> predicate; - private final Function<U, AbstractButton> buttonGetter; - - public SaveContentRootOpenableUIAdapter() { - this.predicate = t -> false; - this.buttonGetter = null; - } - - public SaveContentRootOpenableUIAdapter(Predicate<D> predicate, Function<U, AbstractButton> buttonGetter) { - this.predicate = Objects.requireNonNull(predicate); - this.buttonGetter = Objects.requireNonNull(buttonGetter); - } - @Override public final void adaptUi(DataSourceEditor dataSourceEditor, U ui, boolean notPersisted, D bean) { ContentRootOpenableUIModel<?> model = ui.getModel(); ui.stopEdit(); - ContentRootOpenableUINavigationNode node = model.getSource(); //??? .upToReferenceNode(model.getSource().getScope().getMainReferenceType()); -// IdDto bean = request.getBean(); + ContentRootOpenableUINavigationNode node = model.getSource(); // 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(bean.getId()); - afterNodeUpdated(dataSourceEditor, ui, node, notPersisted, bean); - } - - protected void afterNodeUpdated(DataSourceEditor dataSourceEditor, U ui, ContentRootOpenableUINavigationNode node, boolean notPersisted, D bean) { - - //FIXME A startEdit should do the math? - dataSourceEditor.getNavigationUI().getTree().reSelectSafeNode(node); + NavigationTree tree = dataSourceEditor.getNavigationUI().getTree(); + tree.reSelectSafeNode(node); U newUi = dataSourceEditor.getModel().getTypedContent(); - if (notPersisted && predicate.test(bean)) { - // reload ui and do click -// U content = dataSourceEditor.getModel().getTypedContent(); - SwingUtilities.invokeLater(() -> Objects.requireNonNull(buttonGetter).apply(newUi).doClick()); - } else { - // apply extra actions from previous opened content (go back to correct tab if any, ...) - newUi.resetFromPreviousUi(ui); + // apply extra actions from previous opened content (go back to correct tab if any, ...) + newUi.resetFromPreviousUi(ui); + + if (notPersisted) { + tree.expandPath(tree.getSelectionPath()); } + NavigationUIHandler.updateStatistics(dataSourceEditor.getNavigationUI(), 0, 1); } } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationUIHandler.java ===================================== @@ -50,6 +50,18 @@ public class NavigationUIHandler implements UIHandler<NavigationUI>, WithClientU private Set<ReloadAction> actionsToReload; private NavigationUIInitializer initializer; + public static void updateStatistics(NavigationUI ui, int groupByCountDiff, int dataCountDiff) { + NavigationResult navigationResult = ui.getTree().getRootNode().getInitializer().getNavigationResult(); + TreeConfigUIHandler.updateStatistics(navigationResult.getRequest(), + ui.getTree().getModel().getGroupByHelper(), + () -> navigationResult.getGroupByCount() + groupByCountDiff, + () -> navigationResult.getGroupByDataCount() + dataCountDiff, + () -> navigationResult.getDataCount() + dataCountDiff, + ui::setStatisticsText, + ui::setStatisticsTip, + ui.getStatisticsLabel()::setIcon); + } + public static void updateStatistics(NavigationUI ui) { NavigationResult navigationResult = ui.getTree().getRootNode().getInitializer().getNavigationResult(); TreeConfigUIHandler.updateStatistics(navigationResult.getRequest(), ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUIHandler.java ===================================== @@ -27,6 +27,7 @@ import fr.ird.observe.client.datasource.editor.api.content.actions.save.NodeChil import fr.ird.observe.client.datasource.editor.api.content.actions.save.SaveAction; import fr.ird.observe.client.datasource.editor.api.content.data.open.ContentOpenableUINavigationNode; import fr.ird.observe.client.datasource.editor.api.content.data.open.actions.SaveContentOpenableUIAdapter; +import fr.ird.observe.client.datasource.editor.api.navigation.NavigationTree; import fr.ird.observe.dto.data.ll.logbook.ActivityDto; /** @@ -44,9 +45,9 @@ class ActivityUIHandler extends GeneratedActivityUIHandler { .call((r, d) -> getOpenableService().save(r.getParentId(), d)) .then(new SaveContentOpenableUIAdapter<>(ActivityDto::isSetEnabled, ActivityUI::getAddSet) { @Override - protected void afterNodeUpdated(DataSourceEditor dataSourceEditor, ActivityUI ui, ContentOpenableUINavigationNode node, boolean notPersisted, ActivityDto bean) { + protected void afterNodeUpdated(DataSourceEditor dataSourceEditor, ActivityUI ui, NavigationTree tree, ContentOpenableUINavigationNode node, boolean notPersisted, ActivityDto bean) { ActivityUINavigationCapability.fillBuilder(NodeChildrenUpdate.afterUpdate(node, bean)).update(); - super.afterNodeUpdated(dataSourceEditor, ui, node, notPersisted, bean); + super.afterNodeUpdated(dataSourceEditor, ui, tree, node, notPersisted, bean); } }) .install(ui.getSave()); ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/ActivityUIHandler.java ===================================== @@ -27,6 +27,7 @@ import fr.ird.observe.client.datasource.editor.api.content.actions.save.NodeChil import fr.ird.observe.client.datasource.editor.api.content.actions.save.SaveAction; import fr.ird.observe.client.datasource.editor.api.content.data.open.ContentOpenableUINavigationNode; import fr.ird.observe.client.datasource.editor.api.content.data.open.actions.SaveContentOpenableUIAdapter; +import fr.ird.observe.client.datasource.editor.api.navigation.NavigationTree; import fr.ird.observe.dto.data.ll.observation.ActivityDto; /** @@ -45,9 +46,9 @@ class ActivityUIHandler extends GeneratedActivityUIHandler { .call((r, d) -> getOpenableService().save(r.getParentId(), d)) .then(new SaveContentOpenableUIAdapter<>(ActivityDto::isSetEnabled, ActivityUI::getAddSet) { @Override - protected void afterNodeUpdated(DataSourceEditor dataSourceEditor, ActivityUI ui, ContentOpenableUINavigationNode node, boolean notPersisted, ActivityDto bean) { + protected void afterNodeUpdated(DataSourceEditor dataSourceEditor, ActivityUI ui, NavigationTree tree, ContentOpenableUINavigationNode node, boolean notPersisted, ActivityDto bean) { ActivityUINavigationCapability.fillBuilder(NodeChildrenUpdate.afterUpdate(node, bean)).update(); - super.afterNodeUpdated(dataSourceEditor, ui, node, notPersisted, bean); + super.afterNodeUpdated(dataSourceEditor, ui, tree, node, notPersisted, bean); } }) .install(ui.getSave()); ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIHandler.java ===================================== @@ -26,6 +26,7 @@ import fr.ird.observe.client.datasource.editor.api.content.actions.save.NodeChil import fr.ird.observe.client.datasource.editor.api.content.actions.save.SaveAction; import fr.ird.observe.client.datasource.editor.api.content.data.open.ContentOpenableUINavigationNode; import fr.ird.observe.client.datasource.editor.api.content.data.open.actions.SaveContentOpenableUIAdapter; +import fr.ird.observe.client.datasource.editor.api.navigation.NavigationTree; import fr.ird.observe.dto.data.ps.logbook.ActivityDto; import fr.ird.observe.dto.referential.ps.common.VesselActivityReference; @@ -52,9 +53,9 @@ class ActivityUIHandler extends GeneratedActivityUIHandler { .then(new SaveContentOpenableUIAdapter<>(ActivityDto::isSetEnabled, ActivityUI::getAddSet) { @Override - protected void afterNodeUpdated(DataSourceEditor dataSourceEditor, ActivityUI ui, ContentOpenableUINavigationNode node, boolean notPersisted, ActivityDto bean) { + protected void afterNodeUpdated(DataSourceEditor dataSourceEditor, ActivityUI ui, NavigationTree tree, ContentOpenableUINavigationNode node, boolean notPersisted, ActivityDto bean) { ActivityUINavigationCapability.fillBuilder(NodeChildrenUpdate.afterUpdate(node, bean)).update(); - super.afterNodeUpdated(dataSourceEditor, ui, node, notPersisted, bean); + super.afterNodeUpdated(dataSourceEditor, ui, tree, node, notPersisted, bean); } }) .install(ui.getSave()); ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/ActivityUIHandler.java ===================================== @@ -26,6 +26,7 @@ import fr.ird.observe.client.datasource.editor.api.content.actions.save.NodeChil import fr.ird.observe.client.datasource.editor.api.content.actions.save.SaveAction; import fr.ird.observe.client.datasource.editor.api.content.data.open.ContentOpenableUINavigationNode; import fr.ird.observe.client.datasource.editor.api.content.data.open.actions.SaveContentOpenableUIAdapter; +import fr.ird.observe.client.datasource.editor.api.navigation.NavigationTree; import fr.ird.observe.dto.ProtectedIdsPs; import fr.ird.observe.dto.data.ps.observation.ActivityDto; import fr.ird.observe.dto.referential.ps.common.VesselActivityReference; @@ -81,10 +82,9 @@ public class ActivityUIHandler extends GeneratedActivityUIHandler { .call((r, d) -> getOpenableService().save(r.getParentId(), d)) .then(new SaveContentOpenableUIAdapter<>(ActivityDto::isStrongSetOperation, ActivityUI::getAddSet) { @Override - protected void afterNodeUpdated(DataSourceEditor dataSourceEditor, ActivityUI ui, ContentOpenableUINavigationNode node, boolean notPersisted, ActivityDto bean) { - ActivityUINavigationCapability.fillBuilder(NodeChildrenUpdate.afterUpdate(node, bean)) - .update(); - super.afterNodeUpdated(dataSourceEditor, ui, node, notPersisted, bean); + protected void afterNodeUpdated(DataSourceEditor dataSourceEditor, ActivityUI ui, NavigationTree tree, ContentOpenableUINavigationNode node, boolean notPersisted, ActivityDto bean) { + ActivityUINavigationCapability.fillBuilder(NodeChildrenUpdate.afterUpdate(node, bean)).update(); + super.afterNodeUpdated(dataSourceEditor, ui, tree, node, notPersisted, bean); } }) .install(ui.getSave()); ===================================== client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/edit/GenerateContentEditUIDeleteTreeAdapter.java ===================================== @@ -47,10 +47,6 @@ public class GenerateContentEditUIDeleteTreeAdapter extends GenerateContentEditU " public Generated%1$sUIDeleteTreeAdapter(%1$sUINavigationNode incomingNode) {\n" + " super(incomingNode, e -> incomingNode.getParent());\n" + " }\n\n" + - " @Override\n" + - " public void removeChildren(%2$sUINavigationNode oldParentNode, Set<String> ids) {\n" + - " oldParentNode.removeChildren(ids);\n" + - " }\n" + "}\n"; public static final String CONTENT = "" + "public class %1$sUIDeleteTreeAdapter extends Generated%1$sUIDeleteTreeAdapter {\n\n" + @@ -62,10 +58,10 @@ public class GenerateContentEditUIDeleteTreeAdapter extends GenerateContentEditU @Override protected String generateAbstractContent0(Path sourceDirectory, Path targetDirectory, Path path, String packageName, String namePrefix) { List<String> imports = new LinkedList<>(); - imports.add(Set.class.getName()); - imports.add(DeleteTreeAdapter.class.getName()); imports.add(DeleteRequest.class.getName()); + imports.add(DeleteTreeAdapter.class.getName()); imports.add(Function.class.getName()); + imports.add(Set.class.getName()); imports.add(scopeBuilder.editNode.getType().getName()); return generate(GENERATED_CONTENT, imports, dtoNamePrefix, scopeBuilder.editNode.getType().getSimpleName().replace("Dto", "")); } ===================================== client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/openable/GenerateContentOpenableUIDeleteTreeAdapter.java ===================================== @@ -55,10 +55,6 @@ public class GenerateContentOpenableUIDeleteTreeAdapter extends GenerateContentO " public Generated%1$sUIDeleteTreeAdapter(%1$sUINavigationNode incomingNode) {\n" + " super(incomingNode, e -> incomingNode.getParent());\n" + " }\n\n" + - " @Override\n" + - " public void removeChildren(%1$sListUINavigationNode oldParentNode, Set<String> ids) {\n" + - " oldParentNode.removeChildren(ids);\n" + - " }\n" + "}\n"; public static final String CONTENT = "" + "public class %1$sUIDeleteTreeAdapter extends Generated%1$sUIDeleteTreeAdapter {\n\n" + @@ -73,10 +69,10 @@ public class GenerateContentOpenableUIDeleteTreeAdapter extends GenerateContentO @Override protected String generateAbstractContent0(Path sourceDirectory, Path targetDirectory, Path path, String packageName, String namePrefix) { List<String> imports = new LinkedList<>(); - imports.add(Set.class.getName()); - imports.add(DeleteTreeAdapter.class.getName()); imports.add(DeleteRequest.class.getName()); + imports.add(DeleteTreeAdapter.class.getName()); imports.add(Function.class.getName()); + imports.add(Set.class.getName()); String siblingMethod = "findParentSibling"; if (scopeBuilder.selectNode.getParent()==null) { siblingMethod = "findSibling"; ===================================== client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/rlist/GenerateContentRootListUINavigationNode.java ===================================== @@ -40,17 +40,6 @@ import java.util.Set; */ public class GenerateContentRootListUINavigationNode extends GenerateContentRootListUISupport { - public static final String REMOVE_CHILDREN = "" + - " @Override\n" + - " public void removeChildren(Set<String> ids) {\n" + - " if (getChildCount() == ids.size() && !getParent().getInitializer().getRequest().isLoadEmptyGroupBy()) {\n" + - " // limit case : node will be empty, must remove it\n" + - " removeFromParent();\n" + - " return;\n" + - " }\n" + - " super.removeChildren(ids);\n" + - " }\n\n"; - @Override protected String generateConcreteContent(Path path, String packageName, String namePrefix) { List<String> imports = new LinkedList<>(); @@ -67,8 +56,6 @@ public class GenerateContentRootListUINavigationNode extends GenerateContentRoot context += ContentUINavigationContextHelper.generateGetParentSibling(cleanClassName); imports.add(Set.class.getName()); context += ContentUINavigationContextHelper.generateAddChildren(dtoNamePrefix); - context += REMOVE_CHILDREN; return uiNavigationNodeHelper.generateContent(imports, context); } - } ===================================== client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/ropen/GenerateContentRootOpenableUIDeleteTreeAdapter.java ===================================== @@ -23,7 +23,7 @@ package fr.ird.observe.client.datasource.editor.spi.content.data.ropen; */ import fr.ird.observe.client.datasource.editor.api.content.actions.delete.DeleteRequest; -import fr.ird.observe.client.datasource.editor.api.content.actions.delete.DeleteTreeAdapter; +import fr.ird.observe.client.datasource.editor.api.content.actions.delete.DeleteRootTreeAdapter; import java.nio.file.Path; import java.util.LinkedList; @@ -40,7 +40,7 @@ import java.util.function.Function; public class GenerateContentRootOpenableUIDeleteTreeAdapter extends GenerateContentRootOpenableUISupport { public static final String GENERATED_CONTENT = "" + - "public abstract class Generated%1$sUIDeleteTreeAdapter extends DeleteTreeAdapter<%1$sListUINavigationNode> {\n" + + "public abstract class Generated%1$sUIDeleteTreeAdapter extends DeleteRootTreeAdapter<%1$sListUINavigationNode> {\n" + "\n" + " public static Function<DeleteRequest, %1$sUIDeleteTreeAdapter> create(%1$sListUI ui) {\n" + " return r -> new %1$sUIDeleteTreeAdapter(ui.getModel().getSource());\n" + @@ -55,10 +55,6 @@ public class GenerateContentRootOpenableUIDeleteTreeAdapter extends GenerateCont " public Generated%1$sUIDeleteTreeAdapter(%1$sUINavigationNode incomingNode) {\n" + " super(incomingNode, e -> incomingNode.getParent());\n" + " }\n\n" + - " @Override\n" + - " public void removeChildren(%1$sListUINavigationNode oldParentNode, Set<String> ids) {\n" + - " oldParentNode.removeChildren(ids);\n" + - " }\n" + "}\n"; public static final String CONTENT = "" + "public class %1$sUIDeleteTreeAdapter extends Generated%1$sUIDeleteTreeAdapter {\n\n" + @@ -73,10 +69,10 @@ public class GenerateContentRootOpenableUIDeleteTreeAdapter extends GenerateCont @Override protected String generateAbstractContent0(Path sourceDirectory, Path targetDirectory, Path path, String packageName, String namePrefix) { List<String> imports = new LinkedList<>(); - imports.add(Set.class.getName()); - imports.add(DeleteTreeAdapter.class.getName()); imports.add(DeleteRequest.class.getName()); + imports.add(DeleteRootTreeAdapter.class.getName()); imports.add(Function.class.getName()); + imports.add(Set.class.getName()); String siblingMethod = "findParentSibling"; if (scopeBuilder.selectNode.getParent() == null) { siblingMethod = "findSibling"; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4af4a51fc0e3a05c07c45d55… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4af4a51fc0e3a05c07c45d55… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: auto update end date of trip when saving route observation
by Tony CHEMIT (＠tchemit) 19 Mar '22

19 Mar '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 32971917 by Tony Chemit at 2022-03-19T13:52:46+01:00 auto update end date of trip when saving route observation - - - - - c02275e0 by Tony Chemit at 2022-03-19T13:55:57+01:00 missing validators on ps observations set - - - - - 4af4a51f by Tony Chemit at 2022-03-19T13:55:57+01:00 fix Open node isLeaf method - - - - - 6 changed files: - 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/ropen/ContentRootOpenableUINavigationHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetUI.jaxx - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/RouteSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/RouteSpi.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUINavigationHandler.java ===================================== @@ -54,7 +54,13 @@ public abstract class ContentOpenableUINavigationHandler<N extends ContentOpenab @Override public final boolean isLeaf() { - return getNode().getInitializer().isNotPersisted() || getNode().getInitializer().isLeaf() || super.isLeaf(); + if (getNode().getInitializer().isNotPersisted()) { + return true; + } + if (!super.isLeaf()) { + return false; + } + return getNode().getInitializer().isLeaf(); } @Override ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/ContentRootOpenableUINavigationHandler.java ===================================== @@ -54,7 +54,13 @@ public abstract class ContentRootOpenableUINavigationHandler<N extends ContentRo @Override public final boolean isLeaf() { - return getNode().getInitializer().isNotPersisted() || getNode().getInitializer().isLeaf() || super.isLeaf(); + if (getNode().getInitializer().isNotPersisted()) { + return true; + } + if (!super.isLeaf()) { + return false; + } + return getNode().getInitializer().isLeaf(); } @Override ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetUI.jaxx ===================================== @@ -43,6 +43,10 @@ <BeanValidator id='validator' autoField='true' beanClass='fr.ird.observe.dto.data.ps.observation.SetDto' errorTableModel='{getErrorTableModel()}' context='update'> + <field name='endDate' component='endTimeStamp'/> + <field name='endTime' component='endTimeStamp'/> + <field name='haulingEndDate' component='haulingEndTimeStamp'/> + <field name='haulingEndTime' component='haulingEndTimeStamp'/> </BeanValidator> <JPanel id="contentBody" layout='{new BorderLayout()}'> ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripSpi.java ===================================== @@ -155,12 +155,14 @@ public class TripSpi extends GeneratedTripSpi { return new TripGroupByReferentialHelper(context); } - protected void updateEndDate(Trip entity) { + public static boolean updateEndDate(Trip entity) { Date theoreticalEndDate = entity.getTheoreticalEndDate(); Date realEndDate = entity.getEndDate(); if (realEndDate == null || theoreticalEndDate.after(realEndDate)) { entity.setEndDate(theoreticalEndDate); + return true; } + return false; } public ReferentialDtoReferenceSet<SpeciesReference> getSpeciesByListAndTrip(ServiceContext context, String tripId, String speciesListId) { ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/RouteSpi.java ===================================== @@ -26,7 +26,9 @@ import fr.ird.observe.dto.ToolkitIdDtoBean; import fr.ird.observe.dto.data.ps.logbook.ActivityDto; import fr.ird.observe.dto.data.ps.logbook.RouteDto; import fr.ird.observe.dto.form.Form; +import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.entities.data.ps.common.Trip; +import fr.ird.observe.entities.data.ps.common.TripSpi; import fr.ird.observe.spi.service.ServiceContext; import io.ultreia.java4all.util.Dates; import org.apache.commons.lang3.time.DateUtils; @@ -77,6 +79,17 @@ public class RouteSpi extends GeneratedRouteSpi { super.onDelete(context, parentEntity, entityToDelete, oldCollection); } + @Override + protected SaveResultDto saveEntity(ServiceContext context, Trip parent, Route entity) { + if (TripSpi.updateEndDate(parent)) { + return newSaveHelper(context) + .update(parentSpi(), parent) + .update(this, entity) + .build(entity); + } + return super.saveEntity(context, parent, entity); + } + @Override public Set<ToolkitIdDtoBean> getRealDependencies(ServiceContext context, Set<String> ids) { return Activity.SPI.byParentId(context, ids).map(id -> ToolkitIdDtoBean.of(ActivityDto.class, id)).collect(Collectors.toSet()); ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/RouteSpi.java ===================================== @@ -27,8 +27,10 @@ import fr.ird.observe.dto.data.ps.observation.ActivityDto; import fr.ird.observe.dto.data.ps.observation.ActivityStubDto; import fr.ird.observe.dto.data.ps.observation.RouteDto; import fr.ird.observe.dto.form.Form; +import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.entities.data.DataEntity; import fr.ird.observe.entities.data.ps.common.Trip; +import fr.ird.observe.entities.data.ps.common.TripSpi; import fr.ird.observe.spi.service.ServiceContext; import io.ultreia.java4all.util.Dates; import org.apache.commons.lang3.time.DateUtils; @@ -87,6 +89,17 @@ public class RouteSpi extends GeneratedRouteSpi { super.onSave(context, parent, entity, dto, needCopy); } + @Override + protected SaveResultDto saveEntity(ServiceContext context, Trip parent, Route entity) { + if (TripSpi.updateEndDate(parent)) { + return newSaveHelper(context) + .update(parentSpi(), parent) + .update(this, entity) + .build(entity); + } + return super.saveEntity(context, parent, entity); + } + @SuppressWarnings("unchecked") @Override public Class<? extends DataEntity>[] getEntityTypeToCreateOnReplicate() { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9fcd579f4a5f7410aa71e3ed… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9fcd579f4a5f7410aa71e3ed… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 11 commits: Impossible de créer une base centrale vierge, quelque soit la méthode...
by Tony CHEMIT (＠tchemit) 19 Mar '22

19 Mar '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e5033f7a by Tony Chemit at 2022-03-18T19:43:41+01:00 Impossible de créer une base centrale vierge, quelque soit la méthode appliquée - See ultreiaio/ird-observe#2214 - - - - - ea31a3de by Tony Chemit at 2022-03-18T19:43:41+01:00 update pom - - - - - f4cf5908 by Tony Chemit at 2022-03-18T19:43:41+01:00 add FIXME - - - - - 9a0cfd7c by Tony Chemit at 2022-03-18T19:43:41+01:00 Plein d'échantillons, comptage de l'arbre : 0 - Closes #2219 - - - - - 475c7d09 by Tony Chemit at 2022-03-18T19:43:41+01:00 Correction validation ObjectMaterial (des faux positifs étaient détecté sur tous les fils directs de parent.code == null - - - - - 2552f5f6 by Tony Chemit at 2022-03-18T19:43:41+01:00 Problème de décoration de l'arbre de navigation - Closes #2220 - - - - - 8b83e6d0 by Tony Chemit at 2022-03-18T19:43:41+01:00 Amélioration du mécanisme de remplacement de marée suite à un petit soucis lors de l'export de données (détection de faux positifs dans le script d'insertion) - See ultreiaio/ird-observe#2221 Improve association table column names order - Closes ultreiaio/topia-extension#120 - - - - - 4437134f by Tony Chemit at 2022-03-18T19:43:41+01:00 Improve TopiaMetadataModel design - Closes ultreiaio/topia-extension#121 - - - - - 077fc6f8 by Tony Chemit at 2022-03-18T19:43:41+01:00 update pom - - - - - 842d3b05 by Tony Chemit at 2022-03-18T19:43:41+01:00 Si on utilise un favori sur source serveur, le nom de la base optionel n'est pas renseigné dans son éditeur - Closes #2222 - - - - - 9fcd579f by Tony Chemit at 2022-03-19T10:00:32+01:00 Impossible de créer une base centrale vierge, quelque soit la méthode appliquée - See ultreiaio/ird-observe#2214 - - - - - 30 changed files: - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveDataSourcesManager.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client/core/src/main/java/fr/ird/observe/client/datasource/config/form/ServerConfigurationModel.java - client/core/src/main/java/fr/ird/observe/client/datasource/h2/backup/BackupsManager.java - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/mode/ChangeModeExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/loading/open/OpenDataSourceActionStep.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/DataSourceHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/StorageBackupUILauncher.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/StorageUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/StorageUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/launchers/CreateLauncher.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/tabs/ConfigDataUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/tabs/ConfigDataUI.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/tabs/ConfigDataUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/tabs/ConfigReferentialUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/tabs/ConfigReferentialUI.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/tabs/ConfigReferentialUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/tabs/SelectDataUIHandler.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/tabs/actions/ConfigDataUISelectDataSourceCreateModeAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/tabs/actions/ConfigDataUITestRemoteConnexionAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/tabs/actions/ConfigDataUITestServerConnexionAction.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/tabs/actions/ConfigReferentialUISelectDataSourceCreateModeAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/tabs/actions/ConfigReferentialUITestServerConnexionAction.java - client/runner/src/test/java/fr/ird/observe/client/ClientTestClassResource.java - + core/persistence/java/src/main/java/fr/ird/observe/entities/DataSourceCreateHelper.java - core/persistence/java/src/main/java/fr/ird/observe/entities/ObserveTopiaApplicationContext.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SetImpl.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SetSpi.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b495452199cbe2467e6c501c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b495452199cbe2467e6c501c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 9 commits: Impossible de créer une base centrale vierge, quelque soit la méthode...
by Tony CHEMIT (＠tchemit) 18 Mar '22

18 Mar '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b77f16c0 by Tony Chemit at 2022-03-18T12:08:45+01:00 Impossible de créer une base centrale vierge, quelque soit la méthode appliquée - See ultreiaio/ird-observe#2214 - - - - - 9b688e1c by Tony Chemit at 2022-03-18T12:08:45+01:00 update pom - - - - - 041a6bf6 by Tony Chemit at 2022-03-18T12:08:45+01:00 add FIXME - - - - - dbe8018b by Tony Chemit at 2022-03-18T12:08:45+01:00 Plein d'échantillons, comptage de l'arbre : 0 - Closes #2219 - - - - - d0fa78ba by Tony Chemit at 2022-03-18T12:08:45+01:00 Correction validation ObjectMaterial (des faux positifs étaient détecté sur tous les fils directs de parent.code == null - - - - - efc705f7 by Tony Chemit at 2022-03-18T12:08:45+01:00 Problème de décoration de l'arbre de navigation - Closes #2220 - - - - - 63c59f3a by Tony Chemit at 2022-03-18T15:30:30+01:00 Amélioration du mécanisme de remplacement de marée suite à un petit soucis lors de l'export de données (détection de faux positifs dans le script d'insertion) - See ultreiaio/ird-observe#2221 Improve association table column names order - Closes ultreiaio/topia-extension#120 - - - - - 17e4dcd0 by Tony Chemit at 2022-03-18T16:59:21+01:00 Improve TopiaMetadataModel design - Closes ultreiaio/topia-extension#121 - - - - - b4954521 by Tony Chemit at 2022-03-18T18:44:02+01:00 update pom - - - - - 18 changed files: - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveDataSourcesManager.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client/core/src/main/java/fr/ird/observe/client/datasource/h2/backup/BackupsManager.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/mode/ChangeModeExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/loading/open/OpenDataSourceActionStep.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/DataSourceHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/StorageBackupUILauncher.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/StorageUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/launchers/CreateLauncher.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/tabs/ConfigDataUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/tabs/SelectDataUIHandler.java - client/runner/src/test/java/fr/ird/observe/client/ClientTestClassResource.java - + core/persistence/java/src/main/java/fr/ird/observe/entities/DataSourceCreateHelper.java - core/persistence/java/src/main/java/fr/ird/observe/entities/ObserveTopiaApplicationContext.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SetImpl.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SetSpi.java - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlCopyPlanModel.json The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/068e8cb4d7a4c6d178bfd4f8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/068e8cb4d7a4c6d178bfd4f8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: add FIXME
by Tony CHEMIT (＠tchemit) 18 Mar '22

18 Mar '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f58b7358 by Tony Chemit at 2022-03-18T09:53:53+01:00 add FIXME - - - - - 9d5dda9f by Tony Chemit at 2022-03-18T10:47:24+01:00 Plein d'échantillons, comptage de l'arbre : 0 - Closes #2219 - - - - - 1a567975 by Tony Chemit at 2022-03-18T10:53:45+01:00 Correction validation ObjectMaterial (des faux positifs étaient détecté sur tous les fils directs de parent.code == null - - - - - 068e8cb4 by Tony Chemit at 2022-03-18T11:24:29+01:00 Problème de décoration de l'arbre de navigation - Closes #2220 - - - - - 7 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/mode/ChangeModeExecutor.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SetImpl.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SetSpi.java - model/src/main/models/Observe/persistence/20-data-ps-observation.model - server/core/src/main/java/fr/ird/observe/server/ObserveWebMainHandler.java - server/runner/src/main/webResources/doc/api/public/referential/ps/common/ObjectMaterial/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/referential/ps/common/ObjectMaterial/validation-update-error.xml Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/mode/ChangeModeExecutor.java ===================================== @@ -33,6 +33,7 @@ import fr.ird.observe.navigation.id.IdNode; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import javax.swing.SwingUtilities; import java.util.Objects; /** @@ -115,6 +116,7 @@ public class ChangeModeExecutor<U extends ContentUI> { selectedNode.reloadNodeData(); selectedNode.nodeChangedDeep(); afterOpenReselectNode(ui, dataSourceEditor, tree, selectedNode, id); + SwingUtilities.invokeLater(tree::invalidateCellSizeCache); } protected void afterOpenReselectNode(U ui, DataSourceEditor dataSourceEditor, NavigationTree tree, NavigationNode selectedNode, String id) { ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SetImpl.java ===================================== @@ -64,4 +64,12 @@ public class SetImpl extends SetAbstract { public boolean isUnknownSchoolType() { return schoolType != null && ProtectedIdsPs.PS_COMMON_SCHOOL_TYPE_UNDEFINED_ID.equals(schoolType.getTopiaId()); } + + @Override + public int getSampleMeasureSize() { + if (isSampleEmpty()) { + return 0; + } + return getSample().iterator().next().getSampleMeasureSize(); + } } ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SetSpi.java ===================================== @@ -41,9 +41,10 @@ public class SetSpi extends GeneratedSetSpi { @Override public void toDto(ReferentialLocale referentialLocale, Set entity, SetDto dto) { - super.toDto(referentialLocale, entity, dto); dto.setSampleMeasureEnabled(entity.canUseSample()); dto.setNonTargetCatchReleaseEnabled(entity.canUseNonTargetCatchRelease()); + dto.setSampleMeasureSize(entity.getSampleMeasureSize()); + super.toDto(referentialLocale, entity, dto); } @Override ===================================== model/src/main/models/Observe/persistence/20-data-ps-observation.model ===================================== @@ -117,6 +117,7 @@ canUseNonTargetCatchRelease() boolean isFreeSchoolType() boolean isSchoolObjectType() boolean isUnknownSchoolType() boolean +getSampleMeasureSize() int data.ps.observation.TransmittingBuoy > data.DataEntity comment + {*:1} String ===================================== server/core/src/main/java/fr/ird/observe/server/ObserveWebMainHandler.java ===================================== @@ -31,7 +31,6 @@ import org.debux.webmotion.server.handler.ExecutorMethodInvokerHandler; import org.debux.webmotion.server.handler.ExecutorParametersConvertorHandler; import org.debux.webmotion.server.handler.FilterFinderHandler; import org.debux.webmotion.server.handler.FilterMethodFinderHandler; -import org.debux.webmotion.server.handler.ParametersExtractorHandler; import org.debux.webmotion.server.handler.ParametersMultipartHandler; import org.debux.webmotion.server.tools.OrderedList; @@ -59,8 +58,10 @@ public class ObserveWebMainHandler extends WebMotionMainHandler { @Override public OrderedList<Class<? extends WebMotionHandler>> getExecutorHandlers() { return OrderedList.asList( + //FIXME Replace with by a better version of it ExecutorInstanceCreatorHandler.class, ObserveExecutorParametersInjectorHandler.class, + //FIXME Replace with by a better version of it ExecutorParametersConvertorHandler.class ); } ===================================== server/runner/src/main/webResources/doc/api/public/referential/ps/common/ObjectMaterial/validation-create-error.xml ===================================== @@ -38,7 +38,7 @@  <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ parent == null || parent.code == null || code.startsWith(parent.code + "-") ]]> + <![CDATA[ codeValid ]]> </param> <message>observe.referential.ps.common.ObjectMaterial.validation.bad.parentCode##${parent.code}</message> </field-validator> ===================================== server/runner/src/main/webResources/doc/api/public/referential/ps/common/ObjectMaterial/validation-update-error.xml ===================================== @@ -38,7 +38,7 @@  <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ parent == null || parent.code == null || code.startsWith(parent.code + "-") ]]> + <![CDATA[ codeValid ]]> </param> <message>observe.referential.ps.common.ObjectMaterial.validation.bad.parentCode##${parent.code}</message> </field-validator> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6883c98a842015f693cdd0a5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6883c98a842015f693cdd0a5… You're receiving this email because of your account on gitlab.com.

1 0