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

[Git][ultreiaio/ird-observe][develop] L'UI Confirmation pour insérer les référentiels manquants ne rentre pas dans...
by Tony CHEMIT (＠tchemit) 28 Sep '21

28 Sep '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 21c79565 by Tony Chemit at 2021-09-28T10:51:02+02:00 L'UI Confirmation pour insérer les référentiels manquants ne rentre pas dans l'écran - Closes #2004 - - - - - 3 changed files: - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/DataManager.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsagePanel.jaxx Changes: ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java ===================================== @@ -500,7 +500,7 @@ public class ObserveSwingDataSource extends ObserveServicesProviderSupport imple public SetMultimap<Class<? extends ReferentialDto>, ToolkitIdLabel> getReferentialMap(SetMultimap<Class<? extends ReferentialDto>, String> referentialIds) { SetMultimap<Class<? extends ReferentialDto>, ToolkitIdLabel> result = LinkedHashMultimap.create(); - for (Class<? extends ReferentialDto> dtoType : referentialIds.keys()) { + for (Class<? extends ReferentialDto> dtoType : referentialIds.keySet()) { Set<String> ids = referentialIds.get(dtoType); Class<ReferentialDtoReference> referenceType = ObserveBusinessProject.get().getMapping().getReferenceType(dtoType); Set<ReferentialDtoReference> references = getReferentialReferenceSet(referenceType).subSet(ids).collect(Collectors.toSet()); ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/DataManager.java ===================================== @@ -22,7 +22,6 @@ package fr.ird.observe.client.datasource.actions.actions; * #L% */ -import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.SetMultimap; import fr.ird.observe.client.datasource.api.ObserveSwingDataSource; import fr.ird.observe.client.datasource.editor.api.content.referential.usage.UsageForDisplayUIHandler; ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsagePanel.jaxx ===================================== @@ -17,18 +17,14 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<Table fill="both" constraints="BorderLayout.CENTER"> +<JPanel id="usages" border='{new TitledBorder(t("observe.ui.usage.usageTitle"))}' layout="{new BorderLayout()}"> <import> static io.ultreia.java4all.i18n.I18n.t </import> - <row> - <cell weighty="1" weightx="1"> - <JPanel id="usages" border='{new TitledBorder(t("observe.ui.usage.usageTitle"))}' layout="{new BorderLayout()}"> - <JPanel id="usagesCount" constraints="BorderLayout.WEST" layout="{new GridLayout(0, 1)}"/> - <JScrollPane id="dataPane" constraints='BorderLayout.CENTER'> - <JList id="dataList" genericType="String"/> - </JScrollPane> - </JPanel> - </cell> - </row> -</Table> + <JScrollPane id="usagesPane" constraints='BorderLayout.WEST' horizontalScrollBarPolicy='{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}'> + <JPanel id="usagesCount" layout="{new GridLayout(0, 1)}"/> + </JScrollPane> + <JScrollPane id="dataPane" constraints='BorderLayout.CENTER'> + <JList id="dataList" genericType="String"/> + </JScrollPane> +</JPanel> \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/21c795653e122a9ef33851f56… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/21c795653e122a9ef33851f56… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: La synchro simple de marées ne marche pas - See ultreiaio/ird-observe#2003
by Tony CHEMIT (＠tchemit) 27 Sep '21

27 Sep '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 023def69 by Tony Chemit at 2021-09-27T11:49:33+02:00 La synchro simple de marées ne marche pas - See ultreiaio/ird-observe#2003 - - - - - 28457534 by Tony Chemit at 2021-09-27T11:49:33+02:00 force build - - - - - 0cb274a0 by Tony Chemit at 2021-09-27T11:49:33+02:00 Add FIXME (See #1999) - - - - - 62239db6 by Tony Chemit at 2021-09-27T14:00:57+02:00 L'UI Confirmation pour insérer les référentiels manquants ne rentre pas dans l'écran - Closes #2004 - - - - - b63a2a9d by Tony Chemit at 2021-09-27T14:56:14+02:00 update pom - - - - - 13 changed files: - client/datasource/actions/src/main/i18n/getters/java.getter - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/DataManager.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/content/referential/actions/ShowUsagesReferential.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageForDeleteUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageForDesactivateUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageForDisplayUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageUIHandlerSupport.java - pom.xml - services/api-test/src/main/java/fr/ird/observe/services/service/referential/ReferentialServiceFixtures.java - services/client-impl/pom.xml - − services/client-impl/src/main/java/fr/ird/observe/services/client/referential/ReferentialServiceClient.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocalSupport.java Changes: ===================================== client/datasource/actions/src/main/i18n/getters/java.getter ===================================== @@ -26,7 +26,6 @@ observe.ui.action.goto.previous.stage observe.ui.action.goto.previous.stage.tip observe.ui.action.info.storage.tip observe.ui.choice.cancel -observe.ui.choice.confirm.insert observe.ui.choice.replace observe.ui.datasource.actions.config.data.sources.equals observe.ui.datasource.editor.actions.consolidate @@ -47,7 +46,6 @@ observe.ui.datasource.editor.actions.data.export.result observe.ui.datasource.editor.actions.data.import.add.missing.referential observe.ui.datasource.editor.actions.data.import.add.missing.referential.for.type observe.ui.datasource.editor.actions.data.import.result -observe.ui.datasource.editor.actions.data.import.title.require.add.missing.referential observe.ui.datasource.editor.actions.exportData observe.ui.datasource.editor.actions.exportData.description observe.ui.datasource.editor.actions.exportData.message.not.possible ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/DataManager.java ===================================== @@ -22,10 +22,9 @@ package fr.ird.observe.client.datasource.actions.actions; * #L% */ +import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.SetMultimap; -import fr.ird.observe.client.ClientUIContext; import fr.ird.observe.client.datasource.api.ObserveSwingDataSource; -import fr.ird.observe.client.datasource.editor.api.content.referential.usage.UsageForDisplayUI; import fr.ird.observe.client.datasource.editor.api.content.referential.usage.UsageForDisplayUIHandler; import fr.ird.observe.client.util.ProgressModel; import fr.ird.observe.dto.ToolkitIdLabel; @@ -40,6 +39,7 @@ import fr.ird.observe.services.service.referential.ReferentialService; import fr.ird.observe.spi.decoration.I18nDecoratorHelper; import fr.ird.observe.spi.referential.MissingReferentialRequest; import fr.ird.observe.spi.referential.MissingReferentialResult; +import fr.ird.observe.spi.referential.ReferentialIds; import io.ultreia.java4all.application.template.spi.GenerateTemplate; import io.ultreia.java4all.lang.Strings; import org.apache.commons.lang3.StringUtils; @@ -47,7 +47,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState; -import javax.swing.JOptionPane; import java.util.Collection; import java.util.Objects; import java.util.Set; @@ -57,7 +56,7 @@ import static io.ultreia.java4all.i18n.I18n.n; import static io.ultreia.java4all.i18n.I18n.t; /** - * Hi-level object to perform business data management (says: delete some trip, copy some trip) + * Hi-level object to perform business data management (says: delete some trip, copy some trip, insert missing referential, ...) * <p> * Created on 10/02/2021. * @@ -116,9 +115,13 @@ public class DataManager { public WizardState insertMissingReferential(Collection<String> idsToCopy) { progressModel.increments(); + //FIXME Review this code, if a referential synchro was just performed before + //FIXME We then have already resolved all ids that are only on incoming source + //FIXME From this ids, retains all that are in data to export (on incoming source) + //FIXME That's all, no need to call target source ReferentialService targetReferentialService = targetSource.getReferentialService(); - SetMultimap<Class<? extends ReferentialDto>, String> targetSourceReferential = targetReferentialService.getReferentialIds(); - MissingReferentialRequest missingReferentialRequest = MissingReferentialRequest.of(targetSourceReferential, idsToCopy.toArray(new String[0])); + ReferentialIds targetSourceReferential = targetReferentialService.getReferentialIds(); + MissingReferentialRequest missingReferentialRequest = MissingReferentialRequest.of(targetSourceReferential.getIds(), idsToCopy.toArray(new String[0])); MissingReferentialResult missingReferentialResult = incomingSource.getReferentialService().computeMissingReferential(missingReferentialRequest); progressModel.increments(); @@ -132,18 +135,9 @@ public class DataManager { SetMultimap<Class<? extends ReferentialDto>, ToolkitIdLabel> usages = incomingSource.getReferentialMap(missingReferentialResult.getMissingIds()); - UsageForDisplayUI usagesUI = UsageForDisplayUIHandler.showMissingReferential(getMessage(), usages); + boolean response = UsageForDisplayUIHandler.showMissingReferential(getMessage(), usages, getTargetSourceLabel()); - int response = ClientUIContext.askUser(null, - t("observe.ui.datasource.editor.actions.data.import.title.require.add.missing.referential", getTargetSourceLabel()), - usagesUI, - JOptionPane.WARNING_MESSAGE, - new Object[]{ - t("observe.ui.choice.confirm.insert"), - t("observe.ui.choice.cancel")}, - 0); - - if (response != 0) { + if (!response) { progressModel.increments(); return WizardState.CANCELED; } ===================================== client/datasource/editor/api/src/main/i18n/getters/java.getter ===================================== @@ -186,6 +186,7 @@ observe.ui.action.storage.applyAction observe.ui.choice.cancel observe.ui.choice.cancel.tip observe.ui.choice.confirm.delete +observe.ui.choice.confirm.insert observe.ui.choice.confirm.move observe.ui.choice.confirm.replace observe.ui.choice.continue @@ -208,6 +209,7 @@ observe.ui.datasource.avdth.import observe.ui.datasource.avdth.import.tip observe.ui.datasource.avdth.newImport observe.ui.datasource.avdth.newImport.tip +observe.ui.datasource.editor.actions.data.import.title.require.add.missing.referential observe.ui.datasource.editor.content.map.action.exportPng observe.ui.datasource.editor.content.map.action.exportPng.tip observe.ui.datasource.editor.content.map.action.zoomIt ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/actions/ShowUsagesReferential.java ===================================== @@ -22,14 +22,11 @@ package fr.ird.observe.client.datasource.editor.api.content.referential.actions; * #L% */ -import fr.ird.observe.client.ClientUIContext; import fr.ird.observe.client.datasource.editor.api.ObserveKeyStrokesEditorApi; import fr.ird.observe.client.datasource.editor.api.content.actions.ConfigureMenuAction; import fr.ird.observe.client.datasource.editor.api.content.referential.ContentReferentialUI; import fr.ird.observe.client.datasource.editor.api.content.referential.ContentReferentialUIModel; -import fr.ird.observe.client.datasource.editor.api.content.referential.usage.UsageForDisplayUI; import fr.ird.observe.client.datasource.editor.api.content.referential.usage.UsageForDisplayUIHandler; -import fr.ird.observe.client.util.UIHelper; import fr.ird.observe.dto.ToolkitIdLabel; import fr.ird.observe.dto.UsageCount; import fr.ird.observe.dto.reference.ReferentialDtoReference; @@ -37,8 +34,6 @@ import fr.ird.observe.dto.referential.ReferentialDto; import fr.ird.observe.dto.referential.ToolkitReferentialDtoBean; import fr.ird.observe.services.service.referential.UsageService; -import javax.swing.JOptionPane; -import java.awt.Dimension; import java.awt.event.ActionEvent; import static io.ultreia.java4all.i18n.I18n.t; @@ -72,18 +67,7 @@ public final class ShowUsagesReferential<D extends ReferentialDto, R extends Ref ToolkitIdLabel reference = bean.toLabel(); getDecoratorService().installToolkitIdLabelDecorator(request.getType(), reference); - UsageForDisplayUI usagesUI = UsageForDisplayUIHandler.showUsages(usageService, reference, request, usages); - - Object[] options = {t("observe.ui.choice.quit")}; - JOptionPane pane = new JOptionPane(usagesUI, JOptionPane.INFORMATION_MESSAGE, - JOptionPane.DEFAULT_OPTION, null, - options, options[0]); - - Dimension size = getMainUI().getPreferredSize(); - Dimension thisSize = new Dimension((int) size.getWidth() - 20, (int) size.getHeight() - 20); - pane.setPreferredSize(thisSize); - pane.putClientProperty(UIHelper.NO_PACK, true); - ClientUIContext.askUser(pane, t("observe.ui.title.show.usage"), options); + UsageForDisplayUIHandler.showUsages(usageService, reference, request, usages); } } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageForDeleteUIHandler.java ===================================== @@ -23,8 +23,6 @@ package fr.ird.observe.client.datasource.editor.api.content.referential.usage; */ import fr.ird.observe.client.ClientUIContext; -import fr.ird.observe.client.ClientUIContextApplicationComponent; -import fr.ird.observe.client.util.UIHelper; import fr.ird.observe.dto.BusinessDto; import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.ToolkitIdLabel; @@ -39,7 +37,6 @@ import org.apache.commons.lang3.tuple.Pair; import javax.swing.JLabel; import javax.swing.JOptionPane; -import java.awt.Dimension; import java.util.Collection; import java.util.List; @@ -81,10 +78,7 @@ public class UsageForDeleteUIHandler extends UsageUIHandlerSupport<UsageForDelet usagesUI.getHandler().attachToOptionPane(pane, replaceText); - Dimension size = ClientUIContextApplicationComponent.value().getMainUI().getPreferredSize(); - Dimension thisSize = new Dimension((int) size.getWidth() - 20, (int) size.getHeight() - 20); - pane.setPreferredSize(thisSize); - pane.putClientProperty(UIHelper.NO_PACK, true); + usagesUI.getHandler().setUISize(pane); int response = ClientUIContext.askUser(pane, t("observe.ui.title.can.not.delete.referentiel"), options); if (response == 0) { ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageForDesactivateUIHandler.java ===================================== @@ -23,8 +23,6 @@ package fr.ird.observe.client.datasource.editor.api.content.referential.usage; */ import fr.ird.observe.client.ClientUIContext; -import fr.ird.observe.client.ClientUIContextApplicationComponent; -import fr.ird.observe.client.util.UIHelper; import fr.ird.observe.dto.BusinessDto; import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.ToolkitIdLabel; @@ -41,7 +39,6 @@ import org.apache.logging.log4j.Logger; import javax.swing.JLabel; import javax.swing.JOptionPane; -import java.awt.Dimension; import java.util.Collection; import java.util.List; @@ -87,10 +84,7 @@ public class UsageForDesactivateUIHandler extends UsageUIHandlerSupport<UsageFor JOptionPane pane = new JOptionPane(usagesUI, JOptionPane.WARNING_MESSAGE, JOptionPane.DEFAULT_OPTION, null, options, options[0]); usagesUI.getHandler().attachToOptionPane(pane, replaceText); - Dimension size = ClientUIContextApplicationComponent.value().getMainUI().getPreferredSize(); - Dimension thisSize = new Dimension((int) size.getWidth() - 20, (int) size.getHeight() - 20); - pane.setPreferredSize(thisSize); - pane.putClientProperty(UIHelper.NO_PACK, true); + usagesUI.getHandler().setUISize(pane); int response = ClientUIContext.askUser(pane, t("observe.ui.title.need.confirm.to.desactivate.referentiel"), options); log.debug("response : " + response); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageForDisplayUIHandler.java ===================================== @@ -23,6 +23,7 @@ package fr.ird.observe.client.datasource.editor.api.content.referential.usage; */ import com.google.common.collect.SetMultimap; +import fr.ird.observe.client.ClientUIContext; import fr.ird.observe.dto.BusinessDto; import fr.ird.observe.dto.ToolkitIdLabel; import fr.ird.observe.dto.UsageCount; @@ -34,6 +35,7 @@ import io.ultreia.java4all.jaxx.widgets.combobox.JaxxComboBox; import io.ultreia.java4all.util.SingletonSupplier; import javax.swing.JLabel; +import javax.swing.JOptionPane; import java.util.Collection; import static io.ultreia.java4all.i18n.I18n.t; @@ -46,10 +48,10 @@ import static io.ultreia.java4all.i18n.I18n.t; */ public class UsageForDisplayUIHandler extends UsageUIHandlerSupport<UsageForDisplayUI> { - public static UsageForDisplayUI showUsages(UsageService usageService, - ToolkitIdLabel reference, - ToolkitReferentialDtoBean request, - UsageCount usages) { + public static void showUsages(UsageService usageService, + ToolkitIdLabel reference, + ToolkitReferentialDtoBean request, + UsageCount usages) { //FIXME utiliser une template String type = I18nDecoratorHelper.getType(request.getType()); String message = t("observe.ui.message.show.usages", type, reference); @@ -64,10 +66,20 @@ public class UsageForDisplayUIHandler extends UsageUIHandlerSupport<UsageForDisp return SingletonSupplier.of(() -> usageService.find(request, dtoType)); } }; - return UsageForDisplayUI.build(message, getter); + UsageForDisplayUI usagesUI = UsageForDisplayUI.build(message, getter); + + Object[] options = {t("observe.ui.choice.quit")}; + JOptionPane pane = new JOptionPane(usagesUI, JOptionPane.INFORMATION_MESSAGE, + JOptionPane.DEFAULT_OPTION, null, + options, options[0]); + + usagesUI.getHandler().setUISize(pane); + ClientUIContext.askUser(pane, t("observe.ui.title.show.usage"), options); } - public static UsageForDisplayUI showMissingReferential(String message, SetMultimap<Class<? extends ReferentialDto>, ToolkitIdLabel> usages) { + public static boolean showMissingReferential(String message, + SetMultimap<Class<? extends ReferentialDto>, ToolkitIdLabel> usages, + String targetSourceLabel) { UsageCount count = new UsageCount(); for (Class<? extends ReferentialDto> dtoType : usages.keys()) { count.put(dtoType, (long) usages.get(dtoType).size()); @@ -84,7 +96,18 @@ public class UsageForDisplayUIHandler extends UsageUIHandlerSupport<UsageForDisp return SingletonSupplier.of(() -> usages.get((Class<? extends ReferentialDto>) dtoType)); } }; - return UsageForDisplayUI.build(message, getter); + UsageForDisplayUI usagesUI = UsageForDisplayUI.build(message, getter); + + String[] options = { + t("observe.ui.choice.confirm.insert"), + t("observe.ui.choice.cancel")}; + JOptionPane pane = new JOptionPane(usagesUI, JOptionPane.WARNING_MESSAGE, JOptionPane.DEFAULT_OPTION, null, options, options[0]); + + usagesUI.getHandler().setUISize(pane); + String title = t("observe.ui.datasource.editor.actions.data.import.title.require.add.missing.referential", targetSourceLabel); + int response = ClientUIContext.askUser(pane, title, options); + return response == 0; + } @Override ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageUIHandlerSupport.java ===================================== @@ -22,8 +22,10 @@ package fr.ird.observe.client.datasource.editor.api.content.referential.usage; * #L% */ +import fr.ird.observe.client.ClientUIContextApplicationComponent; import fr.ird.observe.client.WithClientUIContext; import fr.ird.observe.client.util.DisabledItemSelectionModel; +import fr.ird.observe.client.util.UIHelper; import fr.ird.observe.dto.BusinessDto; import fr.ird.observe.dto.ToolkitIdLabel; import fr.ird.observe.dto.UsageCount; @@ -36,12 +38,14 @@ import org.nuiton.jaxx.runtime.spi.UIHandler; import javax.swing.ButtonGroup; import javax.swing.JButton; +import javax.swing.JComponent; import javax.swing.JLabel; import javax.swing.JList; import javax.swing.JOptionPane; import javax.swing.JToggleButton; import java.awt.Component; import java.awt.Container; +import java.awt.Dimension; import java.util.Collection; import java.util.List; import java.util.Objects; @@ -97,6 +101,8 @@ public abstract class UsageUIHandlerSupport<U extends JAXXObject> implements UIH String message = ui.getContextValue(String.class); getMessage().setText(message); + Dimension preferredSize = getClientUIContext().getMainUI().getPreferredSize(); + ((JComponent) ui).setMaximumSize(preferredSize); UsagesGetter usagesGetter = Objects.requireNonNull(ui.getContextValue(UsagesGetter.class)); if (usagesGetter.isEmpty()) { @@ -146,6 +152,13 @@ public abstract class UsageUIHandlerSupport<U extends JAXXObject> implements UIH }); } + protected void setUISize(JOptionPane pane) { + Dimension size = ClientUIContextApplicationComponent.value().getMainUI().getPreferredSize(); + Dimension thisSize = new Dimension((int) size.getWidth() - 20, (int) size.getHeight() - 20); + pane.setPreferredSize(thisSize); + pane.putClientProperty(UIHelper.NO_PACK, true); + } + private <D extends BusinessDto> void buildUsagePanel(ButtonGroup buttonGroup, Class<D> dtoType, UsagesGetter usagesGetter) { long count = usagesGetter.getCount().get(dtoType); SingletonSupplier<Collection<ToolkitIdLabel>> factory = usagesGetter.getUsages(dtoType); ===================================== pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2021.96</version> + <version>2021.98</version> </parent> <groupId>fr.ird.observe</groupId> @@ -161,7 +161,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - + <lib.version.toolkit>5.0.45-SNAPSHOT</lib.version.toolkit> <lib.version.ognl>3.1.29</lib.version.ognl>  @@ -172,8 +172,8 @@ <lib.version.graalvm>21.1.0</lib.version.graalvm>  -  -  + +    ===================================== services/api-test/src/main/java/fr/ird/observe/services/service/referential/ReferentialServiceFixtures.java ===================================== @@ -24,17 +24,16 @@ package fr.ird.observe.services.service.referential; import com.google.common.collect.LinkedHashMultimap; -import com.google.common.collect.SetMultimap; import fr.ird.observe.dto.ToolkitIdLabel; import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet; -import fr.ird.observe.dto.referential.ReferentialDto; import fr.ird.observe.dto.referential.common.ProgramDto; import fr.ird.observe.dto.referential.common.ProgramReference; import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.services.ObserveServicesProvider; import fr.ird.observe.spi.referential.MissingReferentialRequest; import fr.ird.observe.spi.referential.MissingReferentialResult; +import fr.ird.observe.spi.referential.ReferentialIds; import org.junit.Assert; import java.util.Collections; @@ -105,7 +104,7 @@ public class ReferentialServiceFixtures extends GeneratedReferentialServiceFixtu @Override public void getReferentialIds(ObserveServicesProvider servicesProvider, ReferentialService service) { - SetMultimap<Class<? extends ReferentialDto>, String> actual = service.getReferentialIds(); + ReferentialIds actual = service.getReferentialIds(); Assert.assertNotNull(actual); Assert.assertEquals(getIntegerProperty("getReferentialIds.count"), actual.keySet().size()); Assert.assertEquals(REFERENTIAL_COUNT, actual.size()); ===================================== services/client-impl/pom.xml ===================================== @@ -113,10 +113,6 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> ===================================== services/client-impl/src/main/java/fr/ird/observe/services/client/referential/ReferentialServiceClient.java deleted ===================================== @@ -1,44 +0,0 @@ -package fr.ird.observe.services.client.referential; - -/*- - * #%L - * ObServe Services :: Client implementation - * %% - * Copyright (C) 2008 - 2021 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 com.google.common.collect.SetMultimap; -import com.google.gson.reflect.TypeToken; -import fr.ird.observe.dto.referential.ReferentialDto; -import org.apache.http.HttpStatus; - -import javax.annotation.Generated; -import java.util.concurrent.TimeUnit; - -@Generated(value = "io.ultreia.java4all.http.maven.plugin.GenerateHttpClientMojo", date = "Fri Sep 17 15:00:51 CEST 2021") -public class ReferentialServiceClient extends GeneratedReferentialServiceClient { - - //FIXME Generate this - @Override - public SetMultimap<Class<? extends ReferentialDto>, String> getReferentialIds() { - return executeRequest(create("getReferentialIds") - .addAuthToken() - .setTimeout(TimeUnit.MINUTES, 1) - .post(), HttpStatus.SC_OK).toJson(new TypeToken<SetMultimap<Class<? extends ReferentialDto>, String>>(){}.getType()); - } -} ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocalSupport.java ===================================== @@ -48,6 +48,7 @@ import fr.ird.observe.spi.module.ObserveBusinessProject; import fr.ird.observe.spi.referential.MissingReferentialIdsBuilder; import fr.ird.observe.spi.referential.MissingReferentialRequest; import fr.ird.observe.spi.referential.MissingReferentialResult; +import fr.ird.observe.spi.referential.ReferentialIds; import fr.ird.observe.spi.referential.sql.ReplaceSqlStatementGenerator; import fr.ird.observe.spi.referential.synchro.OneSideSqlRequest; import fr.ird.observe.spi.referential.synchro.OneSideSqlResult; @@ -244,14 +245,14 @@ class ReferentialServiceLocalSupport extends ObserveServiceLocal implements Refe } @Override - public SetMultimap<Class<? extends ReferentialDto>, String> getReferentialIds() { + public ReferentialIds getReferentialIds() { SetMultimap<Class<? extends ReferentialDto>, String> result = LinkedHashMultimap.create(); for (Class<? extends ReferentialDto> dtoType : ObserveBusinessProject.get().getReferentialTypes()) { ReferentialDtoEntityContext<?, ?, ?, ?> spi = ObservePersistenceBusinessProject.fromReferentialDto(dtoType); List<String> allIds = spi.getDao(getTopiaPersistenceContext()).findAllIds(); result.putAll(dtoType, allIds); } - return result; + return ReferentialIds.of(result); } @Override View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/359abaa9a5eb36a52516d787… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/359abaa9a5eb36a52516d787… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] force build
by Tony CHEMIT (＠tchemit) 26 Sep '21

26 Sep '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 359abaa9 by Tony Chemit at 2021-09-26T19:08:38+02:00 force build - - - - - 2 changed files: - pom.xml - services/client-impl/pom.xml Changes: ===================================== pom.xml ===================================== @@ -161,7 +161,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - + <lib.version.toolkit>5.0.45-SNAPSHOT</lib.version.toolkit> <lib.version.ognl>3.1.29</lib.version.ognl>  @@ -172,8 +172,8 @@ <lib.version.graalvm>21.1.0</lib.version.graalvm>  -  -  + <lib.version.java4all.topia>1.52-SNAPSHOT</lib.version.java4all.topia> + <lib.version.java4all.eugene>3.0-alpha-42-SNAPSHOT</lib.version.java4all.eugene>    ===================================== services/client-impl/pom.xml ===================================== @@ -113,10 +113,6 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/359abaa9a5eb36a52516d7871… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/359abaa9a5eb36a52516d7871… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 12 commits: Revue de la modélisation ps logbook Sample - See ultreiaio/ird-observe#2001
by Tony CHEMIT (＠tchemit) 26 Sep '21

26 Sep '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 17fdef03 by Tony Chemit at 2021-09-26T05:44:35+02:00 Revue de la modélisation ps logbook Sample - See ultreiaio/ird-observe#2001 - - - - - bf6e317b by Tony Chemit at 2021-09-26T17:00:47+02:00 Définition des reports PS logbooks tabulaires [sample] - See #1969 - - - - - f3e13a9d by Tony Chemit at 2021-09-26T17:00:47+02:00 update public api doc - - - - - 4af9749f by Tony Chemit at 2021-09-26T17:00:47+02:00 fix Survey decorator - - - - - 4298e31b by Tony Chemit at 2021-09-26T17:00:47+02:00 Ajout d'une action nouvel import - Closes #2002 - - - - - 99dc2c27 by Tony Chemit at 2021-09-26T17:00:47+02:00 Remplir les données depuis AVDTH - See #1866 ne pas conserver les échantillon marhcé local qui sont en fait vides. - - - - - 70f31063 by Tony Chemit at 2021-09-26T17:00:47+02:00 amélioration report psLogbookTrip - - - - - d4d757c3 by Tony Chemit at 2021-09-26T17:00:55+02:00 Amélioration du rendu visuel d'une activité - Closes #1610 - - - - - 548e8914 by Tony Chemit at 2021-09-26T17:00:55+02:00 use tck db for more tests - - - - - 8af34ccc by Tony Chemit at 2021-09-26T17:00:55+02:00 improve layout and reduce some actions texts - - - - - 5948c791 by Tony Chemit at 2021-09-26T17:00:55+02:00 fix log - - - - - 0b861db0 by Tony Chemit at 2021-09-26T19:03:35+02:00 La synchro simple de marées ne marche pas - See ultreiaio/ird-observe#2003 - - - - - 30 changed files: - client/core/src/main/java/fr/ird/observe/client/util/UIHelper.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/DataManager.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/DataSourceEditorBodyContent.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/ObserveKeyStrokesEditorApi.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialog.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialog.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/Import.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/NewImport.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/ui/table/action/AddNewRow.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/action/DeleteSelectedRow.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/actions/ImportAvdthFileAction.java - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SampleSpeciesUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIModelStates.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleActivityTableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleSpeciesUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/TripWellPlanUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/TripWellPlanUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/TripWellPlanUITableModel.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/table/GenerateContentTableUITableModel.java - client/i18n/src/main/i18n/translations/observe_en_GB.properties - client/i18n/src/main/i18n/translations/observe_es_ES.properties - client/i18n/src/main/i18n/translations/observe_fr_FR.properties The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b4e82c08837493b5809be30f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b4e82c08837493b5809be30f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: Revue de la modélisation ps logbook Sample - See ultreiaio/ird-observe#2001
by Tony CHEMIT (＠tchemit) 24 Sep '21

24 Sep '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: aac3e127 by Tony Chemit at 2021-09-24T16:56:55+02:00 Revue de la modélisation ps logbook Sample - See ultreiaio/ird-observe#2001 - - - - - fb623280 by Tony Chemit at 2021-09-24T16:56:55+02:00 Définition des reports PS logbooks tabulaires [sample] - See #1969 - - - - - c448d20b by Tony Chemit at 2021-09-24T16:56:55+02:00 update public api doc - - - - - d9b55b30 by Tony Chemit at 2021-09-24T16:56:55+02:00 fix Survey decorator - - - - - e4c36acc by Tony Chemit at 2021-09-24T16:56:55+02:00 Ajout d'une action nouvel import - Closes #2002 - - - - - b4e82c08 by Tony Chemit at 2021-09-24T16:56:55+02:00 Remplir les données depuis AVDTH - See #1866 ne pas conserver les échantillon marhcé local qui sont en fait vides. - - - - - 30 changed files: - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorBodyContent.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/ObserveKeyStrokesEditorApi.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialog.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialog.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/Import.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/NewImport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/actions/ImportAvdthFileAction.java - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleUI.jaxx - client/i18n/src/main/i18n/translations/observe_en_GB.properties - client/i18n/src/main/i18n/translations/observe_es_ES.properties - client/i18n/src/main/i18n/translations/observe_fr_FR.properties - models/definition/src/main/models/Observe/dto/21-data-ps-logbook.model - models/definition/src/main/models/Observe/dto/attribute/notNull.properties - models/definition/src/main/models/Observe/dto/attribute/strictlyPositiveNumber.properties - models/definition/src/main/models/Observe/dto/class/decorator.properties - models/definition/src/main/models/Observe/dto/class/i18nLabels.properties - models/definition/src/main/models/Observe/dto/class/references.properties - models/definition/src/main/models/Observe/persistence/21-data-ps-logbook.model - models/definition/src/main/models/Observe/persistence/attribute/notNull.properties - models/definition/src/main/models/Observe/persistence/attribute/orderBy.properties - models/dto/i18n/src/main/i18n/getters/labels.getter - models/dto/java/src/main/resources/observe-reports.properties - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportEngine.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/localmarket/SampleWriter.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/SampleReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/SampleWriter.java - models/persistence/migration/src/main/resources/db/migration/9.0/05_create-schema-ps_logbook-H2.sql - models/persistence/migration/src/main/resources/db/migration/9.0/05_create-schema-ps_logbook-PG.sql The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/234bde6420e73d542b42ddf9… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/234bde6420e73d542b42ddf9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe (version 9.0.0-RC-14)
by Tony CHEMIT (＠tchemit) 23 Sep '21

23 Sep '21

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 830b8482 by Tony Chemit at 2021-09-23T18:53:30+02:00 Site checkin for project ObServe (version 9.0.0-RC-14) - - - - - 1 changed file: - + 9.0.0-RC-14/CHANGELOG.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/830b8482eebff0dd142d2e8dd… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/830b8482eebff0dd142d2e8dd… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/9.0.0-RC-14
by Tony CHEMIT (＠tchemit) 23 Sep '21

23 Sep '21

Tony CHEMIT deleted branch release/9.0.0-RC-14 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v9.0.0-RC-14
by Tony CHEMIT (＠tchemit) 23 Sep '21

23 Sep '21

Tony CHEMIT pushed new tag v9.0.0-RC-14 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/v9.0.0-RC-14 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master] 37 commits: [jgitflow-maven-plugin]updating poms for 9.0.0-RC-14-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 23 Sep '21

23 Sep '21

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: e30b9207 by Tony Chemit at 2021-09-20T17:58:47+02:00 [jgitflow-maven-plugin]updating poms for 9.0.0-RC-14-SNAPSHOT development[skip ci] - - - - - 697ae821 by Tony Chemit at 2021-09-20T18:11:35+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - dea64d1f by Tony Chemit at 2021-09-20T18:11:36+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 157f891f by Tony Chemit at 2021-09-20T18:11:37+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - f8c4064a by Tony Chemit at 2021-09-21T13:35:06+02:00 clean memory when report changed - - - - - 691f7c3b by Tony Chemit at 2021-09-22T21:54:22+02:00 Définition des reports PS logbooks tabulaires [localmarket] - See #1969 - - - - - fb49c7fb by Tony Chemit at 2021-09-22T21:54:22+02:00 Amélioration du code pour les reports sur les équipements - - - - - 00985781 by Tony Chemit at 2021-09-22T21:54:22+02:00 Mode de saisie par défaut - Closes #1992 - - - - - 3d2042a2 by Tony Chemit at 2021-09-22T21:54:22+02:00 Origine de ces libellés ? - Closes #1994 - - - - - afd1b49e by Tony Chemit at 2021-09-23T13:37:29+02:00 Problème de données AVDTH / OA / Marché local sondage - Closes #1997 - - - - - e8872bd8 by Tony Chemit at 2021-09-23T13:37:29+02:00 Affichage d'un **Date non définie** plutot que aucun sur les données avec un champs **date** - - - - - 98f79e22 by Tony Chemit at 2021-09-23T13:37:29+02:00 Improve Report API, now we can have operations with parameters and no more enumeration to describe operations, use ReportOperationConsumer. More over introduce also ReportRequestExecutor with common code inside it, the service local is one of it. (service code goes from 517 lines to 142 :)) - - - - - 1d80b2ab by Tony Chemit at 2021-09-23T13:37:29+02:00 update fixtures (migration timestamp changed...) - - - - - c52ecaf9 by Tony Chemit at 2021-09-23T13:37:29+02:00 Revue de l'API de consolidation (un peu de clean) Intégration dans la consolidation des sondages (localMarket) Algorithme d'estimation du poids des batch de localmarket - See #1991 - - - - - 5cccd9b3 by Tony Chemit at 2021-09-23T13:37:29+02:00 fix NPE when exiting application - - - - - 96d64eac by Tony Chemit at 2021-09-23T13:37:29+02:00 Correction label Packaging.meanWeight - - - - - e42a1c7a by Tony Chemit at 2021-09-23T13:37:29+02:00 Mise à jour pendant l'import avdth des bons statut d'acquisition - - - - - 4e1626a2 by Tony Chemit at 2021-09-23T13:37:29+02:00 amélioration code récupération id de cuve pendant l'import avdth meilleure gestion des arrondis pendant l'import avdth - - - - - 3d7cb417 by Tony Chemit at 2021-09-23T13:37:29+02:00 update public api doc - - - - - 9b0d624c by Tony Chemit at 2021-09-23T13:37:29+02:00 Il n'est toujours pas possible de synchroniser simple un référentiel local avec un login distant de type référentiel - Closes #1995 - - - - - 569183f9 by Tony Chemit at 2021-09-23T13:37:29+02:00 La synchro avancée de référentiel montre des différences qui ne devraient pas être là - Closes ultreiaio/ird-observe#1998 Il manque des décorateurs sur la synchro avancée de référentiel - - - - - 0f92c7bc by Tony Chemit at 2021-09-23T13:37:29+02:00 fix bug if program is not in tree while saving a such referential - - - - - 196f745c by Tony Chemit at 2021-09-23T14:09:23+02:00 update pom and toolkit - - - - - e7470af2 by Tony Chemit at 2021-09-23T15:19:51+02:00 fix menu action fires when editing a text field - - - - - 6c519609 by Tony Chemit at 2021-09-23T16:39:18+02:00 fix number renderer (if <1 won't display it) - - - - - 91895f04 by Tony Chemit at 2021-09-23T16:46:03+02:00 fix enumeration decoration - - - - - b932e830 by Tony Chemit at 2021-09-23T16:46:15+02:00 fix i18n - - - - - bfe74226 by Tony Chemit at 2021-09-23T16:46:36+02:00 remove batch validation since now with the computed value we can have both - - - - - cfe587d0 by Tony Chemit at 2021-09-23T16:47:03+02:00 fix reset computed value and remove for the moment auto-consolidation - - - - - 8c23e69a by Tony Chemit at 2021-09-23T16:47:20+02:00 move origin field to a normal text editor - - - - - 5e81b40b by Tony Chemit at 2021-09-23T17:10:58+02:00 fix typo - - - - - 1f076526 by Tony Chemit at 2021-09-23T18:10:54+02:00 ps logbook Activity.time may be not null - - - - - 1e6cb46c by Tony Chemit at 2021-09-23T18:27:08+02:00 Problème de reset sur l'éditeur de temps (ps logbook activity) - Closes #2000 - - - - - 14a9fc70 by Tony Chemit at 2021-09-23T18:31:26+02:00 update CHANGELOG [skip ci] - - - - - d7cfd38e by Tony Chemit at 2021-09-23T18:32:27+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.0-RC-14' with non-snapshot versions[skip ci] - - - - - 91c61cbe by Tony Chemit at 2021-09-23T18:50:22+02:00 fix i18n - - - - - 1ef42688 by Tony Chemit at 2021-09-23T18:51:19+02:00 [jgitflow-maven-plugin]merging 'release/9.0.0-RC-14' into 'master' - - - - - 30 changed files: - CHANGELOG.md - client/configuration/pom.xml - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/core/pom.xml - client/core/src/main/java/fr/ird/observe/client/ErrorHandler.java - client/core/src/main/java/fr/ird/observe/client/main/ObserveMainUIHandler.java - client/core/src/main/java/fr/ird/observe/client/util/JMenuWithAccelerator.java - client/core/src/main/java/fr/ird/observe/client/util/table/JXTableUtil.java - client/datasource/actions/pom.xml - client/datasource/actions/src/main/i18n/getters/java.getter - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/node/ReferentialSynchroNodeSupport.java - client/datasource/api/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/actions/ResetComputedValue.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/ResetComputedValue.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/actions/SaveContentReferentialUIAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/DataSourceEditorNavigationMenuHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/DataSourceEditorNavigationModuleContext.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/connexion/DataSourceSelectorModel.java - 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/ps/src/main/i18n/getters/java.getter - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/53815fcbbe659eac70019e09… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/53815fcbbe659eac70019e09… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: [jgitflow-maven-plugin]updating poms for branch'release/9.0.0-RC-14' with...
by Tony CHEMIT (＠tchemit) 23 Sep '21

23 Sep '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d7cfd38e by Tony Chemit at 2021-09-23T18:32:27+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.0-RC-14' with non-snapshot versions[skip ci] - - - - - 91c61cbe by Tony Chemit at 2021-09-23T18:50:22+02:00 fix i18n - - - - - 1ef42688 by Tony Chemit at 2021-09-23T18:51:19+02:00 [jgitflow-maven-plugin]merging 'release/9.0.0-RC-14' into 'master' - - - - - 6afd2e23 by Tony Chemit at 2021-09-23T18:51:23+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 019835da by Tony Chemit at 2021-09-23T18:51:24+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 234bde64 by Tony Chemit at 2021-09-23T18:51:25+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 1 changed file: - services/i18n/src/main/i18n/translations/services_en_GB.properties Changes: ===================================== services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -408,7 +408,7 @@ observe.common.exist.on.remote=%1$s (already exist) observe.constant.AcquisitionMode.individual=By individu observe.constant.AcquisitionMode.number=By effectif observe.constant.BatchWeightComputedValueSource.fromPackagingMeanWeight=Computed from packaging mean weight -<F extends DataDto&FloatingObjectAware, P extends DataDto&FloatingObjectPartAware>Computed from species mean weight +observe.constant.BatchWeightComputedValueSource.fromSpeciesMeanWeight=Computed from species mean weight observe.constant.CatchAcquisitionMode.GROUPED=Batch observe.constant.CatchAcquisitionMode.INDIVIDUAL=Individual observe.constant.CatchComputedValueSource.fromData=Computed from data View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d3787c812240945e27e824ec… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d3787c812240945e27e824ec… You're receiving this email because of your account on gitlab.com.

1 0