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

[Git][ultreiaio/ird-observe][develop] 2 commits: Make possible to override properties in referential reference cache
by Tony CHEMIT 18 Jan '21

18 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 914fb93e by Tony Chemit at 2021-01-18T16:59:06+01:00 Make possible to override properties in referential reference cache - - - - - 38b0dc72 by Tony Chemit at 2021-01-18T16:59:55+01:00 Valider tous les écrans du modèle LL - See #1665 Composition détaillée fonctionne \o/ - - - - - 5 changed files: - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesCache.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 - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/SetDetailCompositionUIValidationHelper.java Changes: ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesCache.java ===================================== @@ -128,9 +128,13 @@ public class ReferencesCache { public void loadReferentialReferenceSetsInModel(FormDefinition<?> formDefinition, boolean clear) { Class<? extends IdDto> dtoType = formDefinition.getType(); ImmutableMap.Builder<String, ReferentialDtoReferenceSet<?>> modelReferentialReferenceSets = ImmutableMap.builder(); + Set<String> existingProperties; if (!clear) { // keep existing sets modelReferentialReferenceSets.putAll(referentialReferenceSetsByPropertyName); + existingProperties = referentialReferenceSetsByPropertyName.keySet(); + } else { + existingProperties = Collections.emptySet(); } log.debug("Update referential reference sets for: " + dtoType); // mettre à jour le cache de référentiel @@ -138,6 +142,10 @@ public class ReferencesCache { // calculer les listes de référentiels à utiliser dans le modèle for (Map.Entry<String, ReferentialDtoReferenceDefinition<?, ?>> entry : formDefinition.getProperties().entrySet()) { String propertyName = entry.getKey(); + if (existingProperties.contains(propertyName)) { + // already in cache + continue; + } ReferentialDtoReferenceDefinition definition = entry.getValue(); ReferentialDtoReferenceSet<?> referentialReferenceSet = referentialReferenceSetsByType.get(definition.getType()); ReferentialDtoReferenceSet<?> filteredReferentialReferenceSet = filterReferentialReferenceSet(propertyName, definition, referentialReferenceSet); ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jaxx ===================================== @@ -63,9 +63,9 @@ <BasketTableModel id='basketsTableModel' initializer="getStates().getBasketsTableModel()"/> <BranchlineTableModel id='branchlinesTableModel' initializer="getStates().getBranchlinesTableModel()"/> - <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.dto.data.ll.observation.SetDetailCompositionDto' - errorTableModel='{getErrorTableModel()}' context='update-detailComposition'> + <BeanValidator id='validator' beanClass='fr.ird.observe.dto.data.ll.observation.SetDetailCompositionDto' + errorTableModel='{getErrorTableModel()}' context='update'> + <field name='comment' component='contentBody'/> </BeanValidator> <BeanValidator id='generateValidator' @@ -88,9 +88,13 @@ <BeanValidator id='branchlineValidator' beanClass='fr.ird.observe.dto.data.ll.observation.BranchlineDto' errorTableModel='{getErrorTableModel()}' context='update'> - <field name='settingIdentifier' component='branchlinesPane'/> - <field name='tracelineLength' component='branchlinesPane'/> - <field name='branchlineLength' component='branchlinesPane'/> + <field name='settingIdentifier' component='branchlinesTable'/> + <field name='tracelineLength' component='branchlinesTable'/> + <field name='branchlineLength' component='branchlinesTable'/> + </BeanValidator> + + <BeanValidator id='branchlineDetailValidator' autoField="true" beanClass='fr.ird.observe.dto.data.ll.observation.BranchlineDto' + errorTableModel='{getErrorTableModel()}' context='update'> </BeanValidator> <JPopupMenu id='sectionTemplatesPopup'> @@ -326,7 +330,7 @@ </cell> </row> <row> - <cell> + <cell weighty="1" fill="both"> <BigTextEditor id="comment"/> </cell> </row> ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jcss ===================================== @@ -25,7 +25,7 @@ valid:{states.isCompositionTabValid() && states.isBranchlineDetailTabValid()}; generateTabValid: {!states.isCanGenerate() || sectionTemplatesTableModel.isValid()}; compositionTabValid: {sectionsTableModel.isValid() && basketsTableModel.isValid() && branchlinesTableModel.isValid()}; - branchlineDetailTabValid: {branchlineValidator.isValid()}; + branchlineDetailTabValid: {branchlineDetailValidator.isValid()}; } #mainTabbedPane { @@ -117,7 +117,7 @@ /* ***************************************************************************** */ #branchlineTab { - enabled: {compositionTab.isEnabled() && states.isCompositionTabValid() && !branchlinesTableModel.isSelectionEmpty()}; + enabled: {compositionTab.isEnabled() && states.isCompositionTabValid() && branchlinesTableModel.getSelectedRowIndex() != -1}; } #noBranchlineSelected { @@ -146,9 +146,9 @@ } #resetBranchline { - enabled:{branchlineValidator.isChanged()}; + enabled:{branchlineDetailValidator.isChanged()}; } #saveBranchline { - enabled:{branchlineValidator.isChanged() && branchlineValidator.isValid()}; + enabled:{branchlineDetailValidator.isChanged() && branchlineDetailValidator.isValid()}; } ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIHandler.java ===================================== @@ -105,11 +105,12 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition ResetAction.installAction(ui, ui.getReset(), new DefaultResetAdapter<>() { @Override public void onUpdate(SetDetailCompositionUI ui) { - BranchlineDto branchline = ui.getBranchlinesTableModel().getSelectedRow(); +// BranchlineDto branchline = ui.getBranchlinesTableModel().getSelectedRow(); + onBranchlineChanged(null); + ui.getSectionsTableModel().clear(); + ui.getBasketsTableModel().clear(); + ui.getBranchlinesTableModel().clear(); super.onUpdate(ui); - if (branchline != null) { - onBranchlineChanged(branchline); - } } }); ResetAction<SetDetailCompositionUI> action = ResetAction.prepareAction(new DefaultResetAdapter<>() { @@ -145,7 +146,9 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition model.getStates().getSectionTemplatesTableModel().setData(new ArrayList<>()); BranchlineDto selectedRow = model.getStates().getBranchlinesTableModel().getSelectedRow(); - onBranchlineChanged(selectedRow); + if (ui.getMainTabbedPane().getSelectedIndex() == 2) { + onBranchlineChanged(selectedRow); + } } @Override @@ -171,6 +174,9 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition public void onInstallValidators(IdDto editBean) { super.onInstallValidators(editBean); ui.getGenerateValidator().setBean(getModel().getStates()); + if (ui.getMainTabbedPane().getSelectedIndex() == 2 && getModel().getStates().getBranchlinesTableModel().getSelectedRow() != null) { + ui.getBranchlineDetailValidator().setBean(ui.getBranchlineBean()); + } } @Override @@ -280,7 +286,7 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition } public void onBranchlineChanged(BranchlineDto newValue) { - boolean changed = ui.getValidator().isChanged(); + boolean changed = ui.getValidator().isChanged() || ui.getModel().getStates().isModified(); String oldId = null; BranchlineDto branchlineBean = ui.getModel().getStates().getBranchlineBean(); @@ -296,8 +302,7 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition return; } - SwingValidator<BranchlineDto> branchlineValidator = ui.getBranchlineValidator(); - SetDetailCompositionUIModel model = getModel(); + SwingValidator<BranchlineDto> branchlineValidator = ui.getBranchlineDetailValidator(); if (newValue == null) { log.info(String.format("%s Remove branchline", prefix)); branchlineValidator.setBean(null); @@ -314,9 +319,9 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition void updateBranchlineAccessibility(boolean withBranchline) { if (withBranchline) { - ui.getMainTabbedPane().setComponentAt(5, ui.getBranchlinePanel()); + ui.getMainTabbedPane().setComponentAt(2, ui.getBranchlinePanel()); } else { - ui.getMainTabbedPane().setComponentAt(5, ui.getNoBranchlineForm()); + ui.getMainTabbedPane().setComponentAt(2, ui.getNoBranchlineForm()); } } @@ -324,7 +329,7 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition boolean canContinue; SetDetailCompositionUIModel model = getModel(); SetDetailCompositionUIModelStates states = model.getStates(); - if (states.isEditing() && ui.getBranchlineValidator().isChanged()) { + if (states.isEditing() && ui.getBranchlineDetailValidator().isChanged()) { canContinue = false; if (states.isBranchlineDetailTabValid()) { // le formulaire est valide, on demande a l'utilisateur s'il @@ -384,8 +389,9 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition public void doSaveBranchline() { BranchlineDto beanToSave = ui.getModel().getStates().getBranchlineBean(); beanToSave.copy(ui.getModel().getStates().getBranchlinesTableModel().getSelectedRow()); - ui.getBranchlineValidator().setChanged(false); - ui.getBranchlineValidator().setValid(true); + ui.getBranchlineDetailValidator().setChanged(false); + ui.getBranchlineDetailValidator().setValid(true); + ui.getValidator().setChanged(true); } void onTimerChanged(Boolean newValue) { ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/SetDetailCompositionUIValidationHelper.java ===================================== @@ -35,6 +35,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.validator.swing.SwingValidator; import org.nuiton.jaxx.validator.swing.SwingValidatorMessage; +import org.nuiton.validator.NuitonValidatorScope; import org.nuiton.validator.bean.simple.SimpleBeanValidator; import javax.swing.JComponent; @@ -79,7 +80,8 @@ public class SetDetailCompositionUIValidationHelper { List<SwingValidatorMessage> messages = validatorService.validateSections(notEmptyData); removeOldMessages(); errorTableModel.addMessages(messages); - model.getStates().setCompositionTabValid(messages.isEmpty()); + long errorMessagesCount = messages.stream().filter(m -> m.getScope() == NuitonValidatorScope.ERROR).count(); + model.getStates().setCompositionTabValid(errorMessagesCount == 0); } } @@ -90,7 +92,8 @@ public class SetDetailCompositionUIValidationHelper { List<SwingValidatorMessage> messages = validatorService.validateSections(notEmptyData); removeOldMessages(); errorTableModel.addMessages(messages); - model.getStates().setCompositionTabValid(messages.isEmpty()); + long errorMessagesCount = messages.stream().filter(m -> m.getScope() == NuitonValidatorScope.ERROR).count(); + model.getStates().setCompositionTabValid(errorMessagesCount == 0); } } @@ -101,7 +104,8 @@ public class SetDetailCompositionUIValidationHelper { List<SwingValidatorMessage> messages = validatorService.validateSections(notEmptyData); removeOldMessages(); errorTableModel.addMessages(messages); - model.getStates().setCompositionTabValid(messages.isEmpty()); + long errorMessagesCount = messages.stream().filter(m -> m.getScope() == NuitonValidatorScope.ERROR).count(); + model.getStates().setCompositionTabValid(errorMessagesCount == 0); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/fd7adab93f7415422d866774… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/fd7adab93f7415422d866774… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: At init time, always go on first tab - See #1418
by Tony CHEMIT 18 Jan '21

18 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 93b221d8 by Tony Chemit at 2021-01-17T12:05:48+01:00 At init time, always go on first tab - See #1418 - - - - - fd60bfb9 by Tony Chemit at 2021-01-17T12:06:28+01:00 Improve Branchline form on SetCatch - See #1418 - - - - - 0cdc8301 by Tony Chemit at 2021-01-17T18:55:49+01:00 Review ContentTableUI API : simplify it and control more what can be overridden by client Clean LL SetTdr and SetCatch See #1418 - - - - - 6a276219 by Tony Chemit at 2021-01-17T19:23:13+01:00 update pom - - - - - fd7adab9 by Tony Chemit at 2021-01-18T13:08:57+01:00 At last, remove bad design BranchlineUI, replace it by inline code in SetDetailCompositionUI Then remove any support for not standalone ContentSimpleUI And then remove any service in ContentUIModel, prefer to generate them. See #1665 - - - - - 30 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/create/CreateNewOpenableUI.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveRequestBuilder.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/open/ContentOpen.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripUIHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIOpenExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/actions/DeleteEdit.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIOpenExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/actions/DeleteMultiple.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/actions/GotoSelectedData.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/actions/MoveMultiple.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIOpenExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/actions/DeleteOpenable.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/actions/MoveOpenable.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModelSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUINavigationNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIOpenExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIListSelectionModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/483ac6ca5b1d976b133e7011… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/483ac6ca5b1d976b133e7011… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Libellé erreur suppresion base locale - Closes #1758
by Tony CHEMIT 17 Jan '21

17 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 70cd590f by Tony Chemit at 2021-01-17T10:28:21+01:00 Libellé erreur suppresion base locale - Closes #1758 - - - - - 483ac6ca by Tony Chemit at 2021-01-17T10:28:30+01:00 update pom - - - - - 3 changed files: - client/datasource/editor/api/src/main/i18n/templates/feedBackOnClosingLocalDataSource_fr_FR.ftl - client/datasource/editor/api/src/main/i18n/templates/feedBackOnOpeningLocalDataSource_fr_FR.ftl - pom.xml Changes: ===================================== client/datasource/editor/api/src/main/i18n/templates/feedBackOnClosingLocalDataSource_fr_FR.ftl ===================================== @@ -24,7 +24,7 @@ <hr/> À ce stade, vous pouvez générer un retour d'expérience sous forme d'archive qui contiendra les données nécessaires - pour que nous puissons corriger le problème). + pour que nous puissions examiner le problème). L'archive sera générée ici: ${feedBackFile} @@ -35,12 +35,10 @@ Vous pouvez : <ul> <li>Annuler la génération du retour d'expérience - (cela annulera la suite de l'opération d'ouverturde de source de - données) + (cela annulera la suite de l'opération d'ouverture de source de données) </li> - <li>Generer le retour d'expérience (cela supprimera la base locale et poursuivera l'opération d'ouverture de - source de - données) + <li>Generer le retour d'expérience (cela supprimera la base locale et poursuivra l'opération d'ouverture de + source de données) </li> </ul> </body> ===================================== client/datasource/editor/api/src/main/i18n/templates/feedBackOnOpeningLocalDataSource_fr_FR.ftl ===================================== @@ -33,7 +33,7 @@ À ce stade, vous pouvez générer un retour d'expérience sous forme d'archive qui contiendra les données nécessaires - pour que nous puissons corriger le problème. + pour que nous puissions examiner le problème. L'archive sera générée ici: ${feedBackFile} ===================================== pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2021.2-SNAPSHOT</version> + <version>2021.2</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e4033872bc681bbc79430507… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e4033872bc681bbc79430507… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 7 commits: Use new jaxx list widgets (remove select ones)
by Tony CHEMIT 16 Jan '21

16 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c704ea5c by Tony Chemit at 2021-01-15T15:09:29+01:00 Use new jaxx list widgets (remove select ones) Clean jaxx files (remove dummy constructor who passes the ui to widgets, this is too much! and it works without it, so remove them) - - - - - b701b5a1 by Tony Chemit at 2021-01-15T16:33:02+01:00 [LL][Observations] Horodatage hook timers par défaut - Closes #1625 - - - - - 9c1ffd91 by Tony Chemit at 2021-01-16T14:36:06+01:00 Change Branchline.timeSinceContact to Integer - See #1757 - - - - - 810bcf8b by Tony Chemit at 2021-01-16T14:41:47+01:00 Introduce UnlimitedTimeEditor - See #1757 - - - - - be3b4ce7 by Tony Chemit at 2021-01-16T14:42:12+01:00 Specify java version - - - - - 6e4da3e6 by Tony Chemit at 2021-01-16T14:43:58+01:00 use UnlimitedTimeEditor on SetCatchUI and do the math (in fact just remove all specific code ^^) - See #1757 - - - - - e4033872 by Tony Chemit at 2021-01-16T15:34:55+01:00 use UnlimitedTimeEditor on BranchlineUI and do the math (in fact just remove all specific code ^^) - See #1757 Now functional on both forms :) - - - - - 30 changed files: - client/core/pom.xml - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesCache.java - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializer.java - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializerResult.java - client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java - client/core/src/main/java/fr/ird/observe/client/util/session/ObserveSwingSessionHelper.java - client/core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/Common.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUIHandler.java - client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/content/data/edit/CommonContentEditUI.jcss - client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/content/data/open/CommonContentOpenableUI.jcss - client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/content/data/simple/CommonContentSimpleUI.jcss - client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/content/referential/CommonContentI18nReferentialUI.jcss - client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/content/referential/CommonContentReferentialUI.jcss - client/datasource/editor/common/pom.xml - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/GearCharacteristicUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/GearUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/HarbourUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/LengthLengthParameterUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/LengthWeightParameterUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/OrganismUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/PersonUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/ProgramUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/ShipOwnerUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/SpeciesGroupUI.jaxx The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9ada1099b7e1f407d959b513… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9ada1099b7e1f407d959b513… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Fix some missing decorators
by Tony CHEMIT 15 Jan '21

15 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9ada1099 by Tony Chemit at 2021-01-15T03:50:41+01:00 Fix some missing decorators - - - - - 1 changed file: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIHandler.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIHandler.java ===================================== @@ -323,7 +323,9 @@ public abstract class ContentUIHandler implements ObserveSe public final <R extends ReferentialDtoReference> List<R> getReferentialReferences(Class<R> type, String... ids) { ObserveSwingDataSource mainDataSource = getClientUIContext().getDataSourcesManager().getMainDataSource(); - return new LinkedList<>(mainDataSource.getReferentialReferences(type, ids)); + LinkedList<R> result = new LinkedList<>(mainDataSource.getReferentialReferences(type, ids)); + getDecoratorService().installDecorator(type, result.stream()); + return result; } @Override View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9ada1099b7e1f407d959b5134… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9ada1099b7e1f407d959b5134… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Découplage case 'Horloge' et champ 'Horodatage de montée à bord' - Closes #1754
by Tony CHEMIT 15 Jan '21

15 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ad9a007c by Tony Chemit at 2021-01-14T23:05:57+01:00 Découplage case 'Horloge' et champ 'Horodatage de montée à bord' - Closes #1754 Clean timeSinceContact when timer is off. - - - - - 8bfa20bb by Tony Chemit at 2021-01-15T03:31:30+01:00 Low some log level (in configuration file, do not touch the code) - - - - - 4bc05760 by Tony Chemit at 2021-01-15T03:36:59+01:00 Let's make overridable BusinessModule - - - - - 3c6c9b65 by Tony Chemit at 2021-01-15T03:40:20+01:00 Optimisation de l'arbre de sélection et navigation - Closes #1750 Première très concluante : on obtient des temps de l'ordre de quelques secondes pour une grosse base \o/ - - - - - 30 changed files: - client/configuration/src/main/resources/observe-log4j2.xml - client/core/src/main/java/fr/ird/observe/client/util/busy/BusyLayerUI.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/selection/RootSelectionTreeNodeProvider.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/selection/SelectionTreeModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/selection/nodes/RootSelectionTreeNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationCapability.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationTreeNodeProvider.java - client/datasource/editor/common/pom.xml - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/CommonRootSelectionTreeNodeProvider.java - client/datasource/editor/ll/pom.xml - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/LlRootNavigationTreeNodeProvider.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/LlRootSelectionTreeNodeProvider.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/PsRootNavigationTreeNodeProvider.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/PsRootSelectionTreeNodeProvider.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/helper/ContentUINavigationNodeHelper.java - + models/dto/src/main/java/fr/ird/observe/spi/module/ObserveBusinessModule.java - + models/dto/src/main/java/fr/ird/observe/spi/module/common/BusinessModule.java - + models/dto/src/main/java/fr/ird/observe/spi/module/ll/BusinessModule.java - + models/dto/src/main/java/fr/ird/observe/spi/module/ps/BusinessModule.java - models/persistence/src/main/java/fr/ird/observe/entities/data/TripAwareTopiaDao.java - models/persistence/src/main/java/fr/ird/observe/entities/data/ll/common/TripTopiaDao.java - models/persistence/src/main/java/fr/ird/observe/entities/data/ps/common/TripTopiaDao.java - server/core/src/main/filtered-resources/mapping - services/api/src/main/java/fr/ird/observe/services/service/data/NavigationResult.java - services/api/src/main/java/fr/ird/observe/services/service/data/NavigationService.java - + services/api/src/main/java/fr/ird/observe/services/service/data/SelectionResult.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/NavigationServiceLocalSupport.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/dbc89a2d7ccac8232bb6a6df… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/dbc89a2d7ccac8232bb6a6df… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] fix dependencies
by Tony CHEMIT 14 Jan '21

14 Jan '21

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 33140d2d by Tony Chemit at 2021-01-14T23:41:07+01:00 fix dependencies - - - - - 1 changed file: - client-core/pom.xml Changes: ===================================== client-core/pom.xml ===================================== @@ -377,6 +377,10 @@ <artifactId>java-lang</artifactId> <scope>runtime</scope> </dependency> + <dependency> + <groupId>io.ultreia.java4all</groupId> + <artifactId>java-util</artifactId> + </dependency>  View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/33140d2dc1de5d91c07d87217… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/33140d2dc1de5d91c07d87217… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Découplage case 'Horloge' et champ 'Horodatage de montée à bord' - Closes #1754
by Tony CHEMIT 14 Jan '21

14 Jan '21

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: f96ea336 by Tony Chemit at 2021-01-14T23:10:27+01:00 Découplage case 'Horloge' et champ 'Horodatage de montée à bord' - Closes #1754 Clean timeSinceContact when timer is off. - - - - - 1 changed file: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java ===================================== @@ -60,6 +60,7 @@ import fr.ird.observe.dto.referential.longline.CatchFateLonglineReference; import fr.ird.observe.dto.referential.longline.HealthStatusReference; import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.spi.DtoModelHelper; +import io.ultreia.java4all.util.Dates; import org.apache.commons.lang3.BooleanUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -112,6 +113,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat private final PropertyChangeListener branchlineChanged; private final PropertyChangeListener depredatedChanged; + private final PropertyChangeListener timerChanged; private final PropertyChangeListener sizeTableModelModified; @@ -135,7 +137,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat weightTableModelModified = evt -> onWeightTableModelModified((Boolean) evt.getNewValue()); sizeTableModelModified = evt -> onSizeTableModelModified((Boolean) evt.getNewValue()); depredatedChanged = evt -> onDepredatedChanged((Boolean) evt.getNewValue(), (CatchLonglineDto) evt.getSource()); - + timerChanged = evt -> onTimerChanged((Boolean) evt.getNewValue()); addReferentialFilter(CatchLonglineDto.PROPERTY_SPECIES_CATCH, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> { String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineCatchId(); String tripLonglineId = getDataContext().getSelectedTripLonglineId(); @@ -835,7 +837,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat if (log.isInfoEnabled()) { log.info("Remove branchline"); } - + branchline.removePropertyChangeListener(BranchlineDto.PROPERTY_TIMER, timerChanged); branchlineValidator.setBean(null); branchline.clear(); model.setBranchlineTimeSinceContact(null); @@ -845,7 +847,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat if (log.isInfoEnabled()) { log.info("Use branchline: " + newValue); } - + branchline.addPropertyChangeListener(BranchlineDto.PROPERTY_TIMER, timerChanged); String setLonglineId = getDataContext().getSelectedSetLonglineId(); Form<BranchlineDto> form = getBranchlineService().loadForm(setLonglineId, newValue.getId()); @@ -1038,7 +1040,15 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat model.setBranchlineTabValid(branchlineTabValid); } - + void onTimerChanged(Boolean newValue) { + if (Objects.equals(true, newValue)) { + // with timer + ui.getModel().setBranchlineTimeSinceContact(Dates.createDate(0, 0, 0, 0, 0, 0)); + } else { + // without timer + ui.getModel().setBranchlineTimeSinceContact(null); + } + } @Override protected CatchLonglineTableModel getTableModel() { return (CatchLonglineTableModel) super.getTableModel(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f96ea3362800bbf2772aee792… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f96ea3362800bbf2772aee792… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Optimisation de l'arbre de sélection et navigation - See #1750
by Tony CHEMIT 14 Jan '21

14 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d28d1be5 by Tony Chemit at 2021-01-14T19:24:59+01:00 Optimisation de l'arbre de sélection et navigation - See #1750 Ne pas recharger l'apparence des fils du parent (ce n'est pas nécessaire) - - - - - 3ffeb6ee by Tony Chemit at 2021-01-14T19:25:07+01:00 clean code - - - - - 10362d83 by Tony Chemit at 2021-01-14T22:01:03+01:00 Problème d'enregistrement sur avançon depuis le formulaire capture - Closes #1755 - - - - - dbc89a2d by Tony Chemit at 2021-01-14T22:39:19+01:00 Découplage case 'Horloge' et champ 'Horodatage de montée à bord' - Closes #1754 - - - - - 6 changed files: - 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/navigation/tree/NavigationNode.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUI.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/SetCatchUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/actions/SetCatchUISaveBranchline.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/mode/ChangeModeExecutor.java ===================================== @@ -108,7 +108,7 @@ public class ChangeModeExecutor { previousOpenedNode.refreshToRoot(); } NavigationNode selectedNode = tree.getSelectedNode(); - tree.getSelectedNode().nodeChanged(true, true); + selectedNode.nodeChanged(true, true); if (previousOpenedNode == null || !Objects.equals(previousOpenedNode.getParent(), selectedNode.getParent())) { selectedNode.getParent().refreshToRoot(); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/NavigationNode.java ===================================== @@ -340,7 +340,7 @@ public abstract class NavigationNode extends DefaultMutableTreeNode implements W public final void nodeChanged(boolean refreshFromParent, boolean refreshChildren) { if (refreshFromParent) { - getParent().nodeChanged(false, refreshChildren); + getParent().nodeChanged(false, false); } if (refreshChildren) { nodeChangedDeep(); ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUI.jcss ===================================== @@ -136,12 +136,11 @@ #timeSinceContact { enabled:{Objects.equals(true, branchlineBean.getTimer())}; - showTimeEditorSlider:false; + _showTimeEditorSlider:false; } #timerTimeOnBoard { - enabled:{Objects.equals(true, branchlineBean.getTimer())}; - showTimeEditorSlider:false; + _showTimeEditorSlider:false; } #branchlineActions { ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIHandler.java ===================================== @@ -285,7 +285,8 @@ public class SetCatchUIHandler extends GeneratedSetCatchUIHandler { if (timeSinceContact != null) { timeSinceContactDate = DateUtil.createDate(0, (int) (timeSinceContact % 60), (int) (timeSinceContact / 60f), 0, 0, 0); } - } else { + } + if (timeSinceContactDate == null) { timeSinceContactDate = DateUtil.createDate(0, 0, 0, 0, 0, 0); } log.info(String.format("%s Set time since contact: %s", prefix, timeSinceContactDate)); ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIModelStates.java ===================================== @@ -119,9 +119,9 @@ public class SetCatchUIModelStates extends GeneratedSetCatchUIModelStates { } public void setTimeSinceContact(Date timeSinceContact) { -// Date oldValue = getBranchlineTimeSinceContact(); + Date oldValue = getTimeSinceContact(); this.timeSinceContact = timeSinceContact; - firePropertyChange(PROPERTY_TIME_SINCE_CONTACT, null, timeSinceContact); + firePropertyChange(PROPERTY_TIME_SINCE_CONTACT, oldValue, timeSinceContact); } public void resetPosition(CatchDto dto) { ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/actions/SetCatchUISaveBranchline.java ===================================== @@ -26,6 +26,7 @@ import fr.ird.observe.client.datasource.editor.api.content.actions.ContentUIActi import fr.ird.observe.client.datasource.editor.ll.ObserveLLKeyStrokes; import fr.ird.observe.client.datasource.editor.ll.data.observation.SetCatchUI; import fr.ird.observe.client.datasource.editor.ll.data.observation.SetCatchUIModel; +import fr.ird.observe.client.datasource.editor.ll.data.observation.SetCatchUIModelStates; import fr.ird.observe.dto.data.ll.observation.BranchlineDto; import fr.ird.observe.dto.result.SaveResultDto; import org.apache.logging.log4j.LogManager; @@ -54,23 +55,24 @@ public class SetCatchUISaveBranchline extends ContentUIActionSupport<SetCatchUI> protected void doActionPerformed(ActionEvent e, SetCatchUI ui) { SetCatchUIModel model = ui.getModel(); String prefix = model.getPrefix(); - log.info(prefix + "Saved modified branchline"); + log.info(String.format("%sSaved modified branchline", prefix)); BranchlineDto branchline = ui.getBranchlineBean(); + SetCatchUIModelStates states = model.getStates(); if (Objects.equals(true, branchline.getTimer())) { Calendar calendar = Calendar.getInstance(); - calendar.setTime(model.getStates().getTimeSinceContact()); + calendar.setTime(states.getTimeSinceContact()); int minutes = calendar.get(Calendar.MINUTE); int hours = calendar.get(Calendar.HOUR_OF_DAY); branchline.setTimeSinceContact(minutes + 60L * hours); } else { branchline.setTimeSinceContact(null); } - log.debug(prefix + "Time since contact: " + branchline.getTimeSinceContact()); + log.info(String.format("%sTime since contact to keep: %d", prefix, branchline.getTimeSinceContact())); SaveResultDto saveResult = getServicesProvider().getLlObservationBranchlineService().save(branchline); saveResult.toDto(branchline); // on recopie le last update car c'est le last update de Set qui est renvoyé. - model.getStates().getBean().setLastUpdateDate(saveResult.getLastUpdateDate()); + states.getBean().setLastUpdateDate(saveResult.getLastUpdateDate()); ui.getBranchlineValidator().setChanged(false); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2462e0f4bd8e53079c81533c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2462e0f4bd8e53079c81533c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Découplage case 'Horloge' et champ 'Horodatage de montée à bord' - Closes #1754
by Tony CHEMIT 14 Jan '21

14 Jan '21

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 50026873 by Tony Chemit at 2021-01-14T22:40:23+01:00 Découplage case 'Horloge' et champ 'Horodatage de montée à bord' - Closes #1754 - - - - - 2 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUI.jcss Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUI.jaxx ===================================== @@ -420,7 +420,7 @@ <row> <cell> </cell> - <cell columns="2"> + <cell columns="3"> <DateTimeEditor id='timerTimeOnBoard' constructorParams='this'/> </cell> </row> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUI.jcss ===================================== @@ -335,7 +335,6 @@ JCheckBox { propertyDate: {BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD}; bean:{branchlineBean}; showTimeEditorSlider:false; - enabled:{BooleanUtils.isTrue(branchlineBean.getTimer())}; } #baitHaulingStatus { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/50026873164711f6a3bc8ce8b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/50026873164711f6a3bc8ce8b… You're receiving this email because of your account on gitlab.com.

1 0