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

[Git][ultreiaio/ird-observe][develop] 2 commits: Add client configuration option skipConsolidateStepForReport - Closes #281x ?
by Tony CHEMIT (＠tchemit) 14 Dec '23

14 Dec '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8f17bb9c by Tony Chemit at 2023-12-14T11:16:43+01:00 Add client configuration option skipConsolidateStepForReport - Closes #281x ? - - - - - 0ece0b67 by Tony Chemit at 2023-12-14T11:44:39+01:00 update pom - - - - - 3 changed files: - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportModel.java - pom.xml Changes: ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateModel.java ===================================== @@ -88,7 +88,6 @@ public class ConsolidateModel extends AdminActionModel { setConsolidationFailIfLengthWeightParameterNotFound(getClientConfig().isConsolidationFailIfLengthWeightParameterNotFound()); setConsolidationFailIfLengthLengthParameterNotFound(getClientConfig().isConsolidationFailIfLengthLengthParameterNotFound()); - uiModel.getConsolidateModel().setSkipForReport(getClientConfig().isSkipConsolidateStepForReport()); } @Override ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportModel.java ===================================== @@ -227,6 +227,7 @@ public class ReportModel extends AdminActionModel { }; selectDataModel.getSelectionDataModel().addPropertyChangeListener(SelectionTreeModel.SELECTED_COUNT, listenerSelectedDataForReport); updateReports(); + uiModel.getConsolidateModel().setSkipForReport(getClientConfig().isSkipConsolidateStepForReport()); } @Override ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2023.56</version> + <version>2023.57</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a2d4e73710d94ef8e357b9ab… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a2d4e73710d94ef8e357b9ab… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update pom
by Tony CHEMIT (＠tchemit) 13 Dec '23

13 Dec '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a2d4e737 by Tony Chemit at 2023-12-13T12:33:46+01:00 update pom - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2023.55</version> + <version>2023.56</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a2d4e73710d94ef8e357b9ab6… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a2d4e73710d94ef8e357b9ab6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Set focus to delete actions when deleting (instead of cancel)
by Tony CHEMIT (＠tchemit) 13 Dec '23

13 Dec '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5526b362 by Tony Chemit at 2023-12-13T12:02:41+01:00 Set focus to delete actions when deleting (instead of cancel) - - - - - db37308f by Tony Chemit at 2023-12-13T12:05:39+01:00 Add selection to states to replace single selection and adapt some code using it - - - - - 276c661e by Tony Chemit at 2023-12-13T12:06:07+01:00 Review delete action code for multiple selected references - - - - - 5687b830 by Tony Chemit at 2023-12-13T12:06:15+01:00 Merge branch 'feature/issue-2746' into develop Suppression de références en masse - Closes #2746 - - - - - 8 changed files: - 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/referential/ContentReferentialUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUI.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/actions/DeleteReferential.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/actions/ReferentialResetAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/actions/SaveContentReferentialUIAdapter.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/actions/DeleteEdit.java ===================================== @@ -104,7 +104,7 @@ public final class DeleteEdit<D extends EditableDto, U extends ContentEditUI<D, JOptionPane.WARNING_MESSAGE, new Object[]{t("observe.ui.choice.confirm.delete"), t("observe.ui.choice.cancel")}, - 1); + 0); } finally { busyModel.popTask(); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUI.jaxx ===================================== @@ -41,6 +41,7 @@ javax.swing.DefaultListModel javax.swing.ListSelectionModel + javax.swing.DefaultListSelectionModel javax.swing.JTable javax.swing.JTextField javax.swing.UIManager ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUI.jcss ===================================== @@ -35,7 +35,8 @@ JLabel { } #list { - selectionMode:{ListSelectionModel.SINGLE_SELECTION}; + selectionMode:{DefaultListSelectionModel.MULTIPLE_INTERVAL_SELECTION}; + selectionModel:{new DefaultListSelectionModel()}; model:{new DefaultListModel()}; } @@ -61,11 +62,11 @@ JLabel { } #modify { - enabled:{states.isSelectedBean()}; + enabled:{states.isSelectionSingle()}; } #detail { - enabled:{states.isSelectedBean()}; + enabled:{states.isSelectionSingle()}; } #editTable { @@ -91,11 +92,11 @@ JLabel { } #delete { - enabled:{states.isEditable() && states.isSelectedBean()}; + enabled:{states.isEditable() && !states.isSelectionEmpty()}; } #showTechnicalInformations { - enabled:{!states.isCreatingMode() && (states.isEditing() || states.isSelectedBean())}; + enabled:{!states.isCreatingMode() && (states.isEditing() || states.isSelectionSingle())}; } #showUniqueKeys { ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUIHandler.java ===================================== @@ -115,7 +115,7 @@ public class ContentReferentialUIHandler<D extends ReferentialDto, R extends Ref list.setFixedCellWidth(200); list.addListSelectionListener(e -> { if (!e.getValueIsAdjusting()) { - selectBean(list.getSelectedValue()); + selectBean(list.getSelectedValuesList()); } }); list.addMouseListener(new MouseAdapter() { @@ -315,17 +315,18 @@ public class ContentReferentialUIHandler<D extends ReferentialDto, R extends Ref getClientValidationContext().setEditingReferentielList(data); } - final void selectBean(R selectedReference) { + final void selectBean(List<R> selectedReference) { ContentReferentialUIModel<D, R> model = getModel(); - log.info(String.format("%sWill select entity [%s]", prefix, selectedReference)); - if (selectedReference == null) { - model.getStates().setSelectedBeanReference(null); - } else { - model.getStates().setSelectedBeanReference(selectedReference); - - //TODO update data cache - log.debug("Need update referential cache"); - } + log.info(String.format("%sWill select entity(ies) [%s]", prefix, selectedReference)); + model.getStates().setSelection(selectedReference); +// if (selectedReference == null) { +// model.getStates().setSelectedBeanReference(null); +// } else { +// model.getStates().setSelectedBeanReference(selectedReference); +// +// //TODO update data cache +// log.debug("Need update referential cache"); +// } if (!model.getStates().isResetEdit()) { getContentOpen().selectFirstTab(); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUIModelStates.java ===================================== @@ -52,7 +52,6 @@ import java.util.Objects; */ public abstract class ContentReferentialUIModelStates<D extends ReferentialDto, R extends ReferentialDtoReference> extends ContentUIModelStates { public static final String PROPERTY_SELECTED_BEAN_REFERENCE = "selectedBeanReference"; - public static final String PROPERTY_SELECTED_BEAN = "selectedBean"; /** * Reference cache. */ @@ -64,13 +63,11 @@ public abstract class ContentReferentialUIModelStates<D extends ReferentialDto, private final Class<D> mainType; private final Class<R> mainReferenceType; private final ContentReferentialUINavigationNode source; - private R selectedBeanReference; + private List<R> selection; private Form<D> form; private ToolkitIdLabel replaceReference; private ContentReferentialUI<D, R, ?> ui; - public abstract R toReference(D bean, ReferentialLocale referentialLocale); - public ContentReferentialUIModelStates(ContentReferentialUIModel<D, R> model, D bean) { source = Objects.requireNonNull(model).getSource(); this.referenceCache = source.getContext().newReferenceCache(); @@ -80,6 +77,8 @@ public abstract class ContentReferentialUIModelStates<D extends ReferentialDto, model.getDecoratorService().installDecorator(bean); } + public abstract R toReference(D bean, ReferentialLocale referentialLocale); + public ContentReferentialUINavigationNode source() { return source; } @@ -101,7 +100,7 @@ public abstract class ContentReferentialUIModelStates<D extends ReferentialDto, super.open(model); ListModel<R> listModel = ui.getList().getModel(); if (listModel.getSize() > 0) { - setSelectedBeanReference(listModel.getElementAt(0)); + setSelection(List.of(listModel.getElementAt(0))); } } @@ -128,14 +127,37 @@ public abstract class ContentReferentialUIModelStates<D extends ReferentialDto, } public R getSelectedBeanReference() { - return selectedBeanReference; + return isSelectionSingle() ? getSelection().get(0) : null; + } + + public boolean isSelectionEmpty() { + return getSelection() == null || getSelection().isEmpty(); + } + + public boolean isSelectionSingle() { + return getSelection() != null && getSelection().size() == 1; + } + + public boolean isSelectionMultiple() { + return getSelection() != null && getSelection().size() > 1; } - public void setSelectedBeanReference(R selectedBeanReference) { - R oldValue = getSelectedBeanReference(); - this.selectedBeanReference = selectedBeanReference; - firePropertyChange(PROPERTY_SELECTED_BEAN_REFERENCE, oldValue, selectedBeanReference); - firePropertyChange(PROPERTY_SELECTED_BEAN, isSelectedBean()); + public List<R> getSelection() { + return selection; + } + + public void setSelection(List<R> selection) { + List<R> oldValue = getSelection(); + R oldSelectionBean = getSelectedBeanReference(); + boolean oldSelectionEmpty = isSelectionEmpty(); + boolean oldSelectionSingle = isSelectionSingle(); + boolean oldSelectionMultiple = isSelectionMultiple(); + this.selection = selection; + firePropertyChange("selection", oldValue, selection); + firePropertyChange("selectionEmpty", oldSelectionEmpty, isSelectionEmpty()); + firePropertyChange("selectionSingle", oldSelectionSingle, isSelectionSingle()); + firePropertyChange("selectionMultiple", oldSelectionMultiple, isSelectionMultiple()); + firePropertyChange(PROPERTY_SELECTED_BEAN_REFERENCE, oldSelectionBean, getSelectedBeanReference()); } public ToolkitIdLabel getReplaceReference() { @@ -157,10 +179,6 @@ public abstract class ContentReferentialUIModelStates<D extends ReferentialDto, return referenceCache; } - public boolean isSelectedBean() { - return getSelectedBeanReference() != null; - } - public final List<R> getReferentialReferences(String... ids) { ObserveSwingDataSource mainDataSource = getDataSourcesManager().getMainDataSource(); LinkedList<R> result = new LinkedList<>(mainDataSource.getReferentialReferences(mainReferenceType, ids)); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/actions/DeleteReferential.java ===================================== @@ -29,7 +29,6 @@ import fr.ird.observe.client.datasource.editor.api.content.referential.ContentRe import fr.ird.observe.client.datasource.editor.api.content.referential.ContentReferentialUIModel; import fr.ird.observe.client.datasource.editor.api.content.referential.usage.UsageForDeleteUIHandler; import fr.ird.observe.client.datasource.editor.api.navigation.NavigationTree; -import fr.ird.observe.client.datasource.editor.api.navigation.NavigationTreeModel; import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationNode; import fr.ird.observe.client.datasource.editor.api.navigation.tree.root.RootNavigationNode; import fr.ird.observe.dto.I18nDecoratorHelper; @@ -46,7 +45,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.awt.event.ActionEvent; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.stream.Collectors; import static io.ultreia.java4all.i18n.I18n.n; @@ -63,39 +64,42 @@ public final class DeleteReferential<D extends ReferentialDto, R extends Referen private ToolkitIdLabel replaceReference; + public DeleteReferential(Class<D> dataType) { + super(dataType, n("observe.Common.action.delete"), I18n.t("observe.referential.Referential.action.delete.tip", I18nDecoratorHelper.getType(dataType)), "content-delete-16", ObserveKeyStrokesEditorApi.KEY_STROKE_DELETE_DATA_GLOBAL); + } + public static <D extends ReferentialDto, R extends ReferentialDtoReference, U extends ContentReferentialUI<D, R, U>> void installAction(U ui) { DeleteReferential<D, R, U> action = new DeleteReferential<>(ui.getModel().getScope().getMainType()); init(ui, ui.getDelete(), action); } - public DeleteReferential(Class<D> dataType) { - super(dataType, n("observe.Common.action.delete"), I18n.t("observe.referential.Referential.action.delete.tip", I18nDecoratorHelper.getType(dataType)), "content-delete-16", ObserveKeyStrokesEditorApi.KEY_STROKE_DELETE_DATA_GLOBAL); - } - @Override protected void doActionPerformed(ActionEvent event, U ui) { ContentReferentialUIModel<D, R> model = ui.getModel(); - R selectedBeanReference = model.getStates().getSelectedBeanReference(); - boolean canDelete = askToDelete(ui, selectedBeanReference); - if (canDelete) { - doDelete(ui, selectedBeanReference, replaceReference); - afterDelete(ui, selectedBeanReference); + List<R> selection = model.getStates().getSelection(); + Set<R> deleted = new LinkedHashSet<>(selection.size()); + Class<D> beanType = ui.getModel().getScope().getMainType(); + Class<R> referenceType = model.getScope().getMainReferenceType(); + ReferentialService referentialService = getServicesProvider().getReferentialService(); + UsageService usageService = getServicesProvider().getUsageService(); + for (R selectedBeanReference : selection) { + boolean canDelete = askToDelete(ui, model, beanType, referenceType, usageService, selectedBeanReference); + if (canDelete) { + doDelete(beanType, referentialService, selectedBeanReference, replaceReference); + deleted.add(selectedBeanReference); + } } + afterDelete(ui, deleted); } - private boolean askToDelete(U ui, R bean) { - - ContentReferentialUIModel<D, R> model = ui.getModel(); + private boolean askToDelete(U ui, ContentReferentialUIModel<D, R> model, Class<D> beanType, Class<R> referenceType, UsageService usageService, R bean) { // recherche des utilisation du bean dans la base - UsageService usageService = getServicesProvider().getUsageService(); ToolkitIdDtoBean request = model.getStates().toUsageRequest(bean.getId()); UsageCount usages = usageService.countReferential(request); replaceReference = null; - Class<D> beanType = model.getScope().getMainType(); - Class<R> referenceType = model.getScope().getMainReferenceType(); if (!usages.isEmpty()) { // some usages were found @@ -126,42 +130,46 @@ public final class DeleteReferential<D extends ReferentialDto, R extends Referen return DeleteEdit.confirmForEntityDelete(ui, bean); } - private void doDelete(U ui, ReferentialDtoReference bean, ToolkitIdLabel replaceReference) { + private void doDelete(Class<D> beanType, ReferentialService referentialService, ReferentialDtoReference bean, ToolkitIdLabel replaceReference) { String id = bean.getId(); - Class<D> beanType = ui.getModel().getScope().getMainType(); - ReferentialService referentialService = getServicesProvider().getReferentialService(); if (replaceReference != null) { String replaceId = replaceReference.getId(); log.info(String.format("Do replace reference before delete (%s → %s)", id, replaceId)); referentialService.replaceReference(beanType, id, replaceId); } referentialService.delete(beanType, id); - } - private void afterDelete(U ui, ReferentialDtoReference bean) { + private void afterDelete(U ui, Set<R> deleted) { + ui.getModel().getStates().setSelection(null); ui.stopEdit(); DataSourceEditor dataSourceEditor = getDataSourceEditor(); NavigationTree tree = dataSourceEditor.getNavigationUI().getTree(); - updateNavigationTreeStructure(tree, bean.getId()); + boolean needUpdateNavigationResult = isNeedUpdateNavigationResult(tree.getRootNode(), deleted); + if (needUpdateNavigationResult) { + // update navigation result + tree.getModel().updateNavigationResult(); + } NavigationNode selectedNode = tree.getSelectedNode(); selectedNode.reloadNodeData(); tree.reSelectSafeNodeThen(selectedNode, () -> dataSourceEditor.getModel().resetFromPreviousUi(ui)); } - private void updateNavigationTreeStructure(NavigationTree tree, String id) { - NavigationTreeModel model = tree.getModel(); - RootNavigationNode rootNode = tree.getRootNode(); + private boolean isNeedUpdateNavigationResult(RootNavigationNode rootNode, Set<R> deleted) { + boolean needUpdateNavigationResult = false; if (rootNode.getInitializer().getRequest().isLoadData()) { - NavigationNode groupByNode = rootNode.findChildById(id); - if (groupByNode != null) { - // remove node from tree - rootNode.remove(groupByNode); - // update navigation result - model.updateNavigationResult(); + for (R r : deleted) { + String id = r.getId(); + NavigationNode groupByNode = rootNode.findChildById(id); + if (groupByNode != null) { + // remove node from tree + rootNode.remove(groupByNode); + needUpdateNavigationResult = true; + } } } + return needUpdateNavigationResult; } } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/actions/ReferentialResetAdapter.java ===================================== @@ -28,6 +28,8 @@ import fr.ird.observe.client.datasource.editor.api.content.referential.ContentRe import fr.ird.observe.dto.reference.ReferentialDtoReference; import fr.ird.observe.dto.referential.ReferentialDto; +import java.util.List; + /** * Created on 19/10/2020. * @@ -52,7 +54,7 @@ public class ReferentialResetAdapter<D extends ReferentialDto, R extends Referen model.getStates().setResetEdit(true); try { ui.getList().setSelectedValue(selectedBean, false); - model.getStates().setSelectedBeanReference(selectedBean); + model.getStates().setSelection(List.of(selectedBean)); ui.getModify().doClick(); } finally { model.getStates().setResetEdit(false); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/actions/SaveContentReferentialUIAdapter.java ===================================== @@ -34,6 +34,8 @@ import fr.ird.observe.dto.reference.ReferentialDtoReference; import fr.ird.observe.dto.referential.ReferentialDto; import fr.ird.observe.navigation.tree.io.request.ToolkitTreeFlatModelRootRequest; +import java.util.List; + /** * Created on 19/10/2020. * @@ -53,7 +55,7 @@ public class SaveContentReferentialUIAdapter<D extends ReferentialDto, R extends ContentReferentialUIModelStates<D, R> states = ui.getModel().getStates(); R reference = states.toReference(bean, dataSourceEditor.getConfig().getReferentialLocale()); - states.setSelectedBeanReference(reference); + states.setSelection(List.of(reference)); updateNavigationTreeStructure(notPersisted, bean, tree, states); tree.reSelectSafeNodeThen(selectedNode, () -> dataSourceEditor.getModel().resetFromPreviousUi(ui)); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b3b3c6142d7e6fc908e386ef… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b3b3c6142d7e6fc908e386ef… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Ajouter le défilement année par année sur les calendriers - Closes #2182
by Tony CHEMIT (＠tchemit) 12 Dec '23

12 Dec '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b3b3c614 by Tony Chemit at 2023-12-12T17:16:34+01:00 Ajouter le défilement année par année sur les calendriers - Closes #2182 - - - - - 2 changed files: - client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/RunObserveListener.java Changes: ===================================== client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java ===================================== @@ -323,6 +323,8 @@ public class UIInitHelper { } }; picker.addPropertyChangeListener("date", listener); + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2182 + picker.getMonthView().setZoomable(true); } public static void init(CoordinatesEditor editor, CoordinateFormat coordinateFormat) { ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/RunObserveListener.java ===================================== @@ -133,6 +133,7 @@ public class RunObserveListener implements ApplicationRunnerListener, WithClient ConvertUtils.register(new FloatConverter(), Float.class); BusinessProjectI18nHelper.getI18nKeyPrefix(); + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2182 UIManager.put(CalendarHeaderHandler.uiControllerID, SpinningCalendarHeaderHandler.class.getName()); UIManager.put(SpinningCalendarHeaderHandler.ARROWS_SURROUND_MONTH, true); UIManager.put(SpinningCalendarHeaderHandler.FOCUSABLE_SPINNER_TEXT, true); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b3b3c6142d7e6fc908e386ef5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b3b3c6142d7e6fc908e386ef5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 10 commits: [toolkit-api-report] Translate using i18n locale in ComputeDynamicHeader
by Tony CHEMIT (＠tchemit) 12 Dec '23

12 Dec '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f8d06eeb by Tony Chemit at 2023-12-12T15:25:51+01:00 [toolkit-api-report] Translate using i18n locale in ComputeDynamicHeader - - - - - b2a3f036 by Tony Chemit at 2023-12-12T15:25:51+01:00 [toolkit-api-report] Rename ReportI18NNamedStringDefinition to ReportI18nNamedStringDefinition - - - - - f2a6b4bf by Tony Chemit at 2023-12-12T15:25:57+01:00 [toolkit-api-report] Improve ReportRequestExecutorI18nContext (translateRequest is now only two statements:)) - - - - - f6dfc42a by Tony Chemit at 2023-12-12T15:26:16+01:00 [toolkit-api-report & Client] Improve Columns renderers and init js (now cells have no breaking spaces ^^) - - - - - 11ce8a90 by Tony Chemit at 2023-12-12T15:26:16+01:00 [Client] Improve Report ui (keep the essential) - - - - - b38cc1da by Tony Chemit at 2023-12-12T15:26:16+01:00 [core-persistence-report] Fill english translations - - - - - 9079b210 by Tony Chemit at 2023-12-12T16:21:10+01:00 move HtmlExportModel to [toolkit-api-report] - - - - - 331ff42c by Tony Chemit at 2023-12-12T16:21:27+01:00 [toolkit-api-report] Improve i18n variables names and init of ReportRequestExecutorI18nContext - - - - - cd499ad6 by Tony Chemit at 2023-12-12T16:21:27+01:00 [core-persistence-report] Use new i18n variables names - - - - - 6ebc272e by Tony Chemit at 2023-12-12T16:31:49+01:00 Merge branch 'feature/report-++' into develop Fin de revue des reports - - - - - 30 changed files: - client/datasource/actions/src/main/i18n/getters/java.getter - client/datasource/actions/src/main/i18n/getters/jaxx.getter - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUI.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUI.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUI.jcss - 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/report/actions/ExportToHtml.java - client/runner/src/main/i18n/translations/client-runner_en_GB.properties - client/runner/src/main/i18n/translations/client-runner_es_ES.properties - client/runner/src/main/i18n/translations/client-runner_fr_FR.properties - core/persistence/report/src/main/resources/META-INF/report/default/ll/llCommonTripGearUseFeatures.ini - core/persistence/report/src/main/resources/META-INF/report/default/ll/llCommonTripGearUseFeatures.report - core/persistence/report/src/main/resources/META-INF/report/default/ll/llLanding.report - core/persistence/report/src/main/resources/META-INF/report/default/ll/llLogbookActivities.report - core/persistence/report/src/main/resources/META-INF/report/default/ll/llLogbookCatches.report - core/persistence/report/src/main/resources/META-INF/report/default/ll/llLogbookSamplesOnActivity.report - core/persistence/report/src/main/resources/META-INF/report/default/ll/llLogbookSamplesOnBoth.report - core/persistence/report/src/main/resources/META-INF/report/default/ll/llLogbookSamplesOnTrip.report - core/persistence/report/src/main/resources/META-INF/report/default/ps/psCommonTripGearUseFeatures.report - core/persistence/report/src/main/resources/META-INF/report/default/ps/psLocalmarketBatch.report - core/persistence/report/src/main/resources/META-INF/report/default/ps/psLocalmarketSample.report - core/persistence/report/src/main/resources/META-INF/report/default/ps/psLocalmarketSurvey.report - core/persistence/report/src/main/resources/META-INF/report/default/ps/psLogbookActivity.report - core/persistence/report/src/main/resources/META-INF/report/default/ps/psLogbookSampleMeasures.report - core/persistence/report/src/main/resources/META-INF/report/default/ps/psLogbookSampleSet.report - core/persistence/report/src/main/resources/META-INF/report/default/ps/psLogbookSampleSpeciesMeasures.report - core/persistence/report/src/main/resources/META-INF/report/default/ps/psLogbookSampleSpeciesMeasuresCount.report - core/persistence/report/src/main/resources/META-INF/report/default/ps/psLogbookTrip.report - core/persistence/report/src/main/resources/META-INF/report/default/ps/psLogbookWellPlan.report The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ec0be04451b436e088ae64be… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ec0be04451b436e088ae64be… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Add migration script to remove redundant TransmittingBuoy.country
by Tony CHEMIT (＠tchemit) 12 Dec '23

12 Dec '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e601d96b by Tony Chemit at 2023-12-11T09:15:48+01:00 Add migration script to remove redundant TransmittingBuoy.country - - - - - 80cb18dd by Tony Chemit at 2023-12-11T09:31:38+01:00 Add validation rule on TransmittingBuoyDto.country - - - - - 2bfd7c65 by Tony Chemit at 2023-12-11T10:13:20+01:00 Merge branch 'feature/issue-2821' into develop En prévision du peaufinage des forms Balise, effacer le Pays si le Navire est connu - See #2821 - - - - - ec0be044 by Tony Chemit at 2023-12-11T10:14:26+01:00 Improve Report tests - - - - - 23 changed files: - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/i18n/getters/validation-messages.getter - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/TransmittingBuoyDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/TransmittingBuoyDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/TransmittingBuoyDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/TransmittingBuoyDto-update-error-validation.xml - core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/logbook/TransmittingBuoyDto-create-error-validation.xml - core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/logbook/TransmittingBuoyDto-update-error-validation.xml - core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/observation/TransmittingBuoyDto-create-error-validation.xml - core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/observation/TransmittingBuoyDto-update-error-validation.xml - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_3.java - + core/persistence/migration/src/main/resources/db/migration/v9/9.3/02_issue-2821-common.sql - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/TransmittingBuoy/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/TransmittingBuoy/validation-update.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/TransmittingBuoy/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/TransmittingBuoy/validation-update.json - + core/services/client/src/test/java/fr/ird/observe/services/client/service/ReportsTest.java - core/services/i18n/src/main/i18n/translations/services_en_GB.properties - core/services/i18n/src/main/i18n/translations/services_es_ES.properties - core/services/i18n/src/main/i18n/translations/services_fr_FR.properties - core/services/local/src/test/java/fr/ird/observe/services/local/service/ReportServiceLocalReadTest.java - + core/services/local/src/test/java/fr/ird/observe/services/local/service/ReportsTest.java - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-dataResult-ps.json Changes: ===================================== core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json ===================================== @@ -11820,7 +11820,8 @@ { "name": "country", "comments": [ - "check if referential country is disabled (only if validation is strong)" + "check if referential country is disabled (only if validation is strong)", + "country must be null if vessel is filled" ] }, { @@ -11944,7 +11945,8 @@ { "name": "country", "comments": [ - "check if referential country is disabled (only if validation is strong)" + "check if referential country is disabled (only if validation is strong)", + "country must be null if vessel is filled" ] }, { @@ -14990,7 +14992,8 @@ { "name": "country", "comments": [ - "check if referential country is disabled (only if validation is strong)" + "check if referential country is disabled (only if validation is strong)", + "country must be null if vessel is filled" ] }, { @@ -15114,7 +15117,8 @@ { "name": "country", "comments": [ - "check if referential country is disabled (only if validation is strong)" + "check if referential country is disabled (only if validation is strong)", + "country must be null if vessel is filled" ] }, { ===================================== core/api/validation/src/main/i18n/getters/validation-messages.getter ===================================== @@ -58,6 +58,7 @@ observe.data.ps.Route.validation.duplicated.date observe.data.ps.SampleSpecies.validation.mismatch.measuredCount observe.data.ps.SampleSpecies.validation.mismatch.subSampleNumber observe.data.ps.TransmittingBuoy.validation.code +observe.data.ps.TransmittingBuoy.validation.country.not.required observe.data.ps.common.Trip.departureWellContentStatus.validation.notFilled observe.data.ps.common.Trip.departureWellContentStatus.validation.required observe.data.ps.common.Trip.landingWellContentStatus.validation.notFilled ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/TransmittingBuoyDto-create-error-validation.xml ===================================== @@ -62,6 +62,12 @@ <field-validator type="checkDisabledReferentialOnErrorScope"> <message/> </field-validator> + +  + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ country == null || vessel == null ]]></param> + <message>observe.data.ps.TransmittingBuoy.validation.country.not.required</message> + </field-validator> </field> <field name="homeId"> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/TransmittingBuoyDto-update-error-validation.xml ===================================== @@ -62,6 +62,12 @@ <field-validator type="checkDisabledReferentialOnErrorScope"> <message/> </field-validator> + +  + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ country == null || vessel == null ]]></param> + <message>observe.data.ps.TransmittingBuoy.validation.country.not.required</message> + </field-validator> </field> <field name="homeId"> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/TransmittingBuoyDto-create-error-validation.xml ===================================== @@ -62,6 +62,12 @@ <field-validator type="checkDisabledReferentialOnErrorScope"> <message/> </field-validator> + +  + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ country == null || vessel == null ]]></param> + <message>observe.data.ps.TransmittingBuoy.validation.country.not.required</message> + </field-validator> </field> <field name="homeId"> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/TransmittingBuoyDto-update-error-validation.xml ===================================== @@ -62,6 +62,12 @@ <field-validator type="checkDisabledReferentialOnErrorScope"> <message/> </field-validator> + +  + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ country == null || vessel == null ]]></param> + <message>observe.data.ps.TransmittingBuoy.validation.country.not.required</message> + </field-validator> </field> <field name="homeId"> ===================================== core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/logbook/TransmittingBuoyDto-create-error-validation.xml ===================================== @@ -31,4 +31,11 @@ <message>observe.data.ps.TransmittingBuoy.validation.code##${code}##${transmittingBuoyType.regex}</message> </field-validator> </field> + <field name="country"> +  + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ country == null || vessel == null ]]></param> + <message>observe.data.ps.TransmittingBuoy.validation.country.not.required</message> + </field-validator> + </field> </validators> ===================================== core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/logbook/TransmittingBuoyDto-update-error-validation.xml ===================================== @@ -31,4 +31,11 @@ <message>observe.data.ps.TransmittingBuoy.validation.code##${code}##${transmittingBuoyType.regex}</message> </field-validator> </field> + <field name="country"> +  + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ country == null || vessel == null ]]></param> + <message>observe.data.ps.TransmittingBuoy.validation.country.not.required</message> + </field-validator> + </field> </validators> ===================================== core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/observation/TransmittingBuoyDto-create-error-validation.xml ===================================== @@ -31,4 +31,11 @@ <message>observe.data.ps.TransmittingBuoy.validation.code##${code}##${transmittingBuoyType.regex}</message> </field-validator> </field> + <field name="country"> +  + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ country == null || vessel == null ]]></param> + <message>observe.data.ps.TransmittingBuoy.validation.country.not.required</message> + </field-validator> + </field> </validators> ===================================== core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/observation/TransmittingBuoyDto-update-error-validation.xml ===================================== @@ -31,4 +31,11 @@ <message>observe.data.ps.TransmittingBuoy.validation.code##${code}##${transmittingBuoyType.regex}</message> </field-validator> </field> + <field name="country"> +  + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ country == null || vessel == null ]]></param> + <message>observe.data.ps.TransmittingBuoy.validation.country.not.required</message> + </field-validator> + </field> </validators> ===================================== core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_3.java ===================================== @@ -49,6 +49,8 @@ public class DataSourceMigrationForVersion_9_3 extends ByMajorMigrationVersionRe if (withIds) { // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2044 executor.addScript("01", "issue-2044"); + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2821 + executor.addScript("02", "issue-2821"); } } ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.3/02_issue-2821-common.sql ===================================== @@ -0,0 +1,23 @@ +--- +-- #%L +-- ObServe Core :: Persistence :: Migration +-- %% +-- Copyright (C) 2008 - 2023 IRD, 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% +--- +UPDATE ps_observation.TransmittingBuoy SET country = NULL WHERE vessel IS NOT NULL; +UPDATE ps_logbook.TransmittingBuoy SET country = NULL WHERE vessel IS NOT NULL; \ No newline at end of file ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/TransmittingBuoy/validation-create.json ===================================== @@ -17,7 +17,8 @@ }, "country": { "errors": [ - "check if referential country is disabled (only if validation is strong)" + "check if referential country is disabled (only if validation is strong)", + "country must be null if vessel is filled" ], "warnings": [ "check if referential country is disabled (only if validation is not strong)" ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/TransmittingBuoy/validation-update.json ===================================== @@ -17,7 +17,8 @@ }, "country": { "errors": [ - "check if referential country is disabled (only if validation is strong)" + "check if referential country is disabled (only if validation is strong)", + "country must be null if vessel is filled" ], "warnings": [ "check if referential country is disabled (only if validation is not strong)" ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/TransmittingBuoy/validation-create.json ===================================== @@ -17,7 +17,8 @@ }, "country": { "errors": [ - "check if referential country is disabled (only if validation is strong)" + "check if referential country is disabled (only if validation is strong)", + "country must be null if vessel is filled" ], "warnings": [ "check if referential country is disabled (only if validation is not strong)" ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/TransmittingBuoy/validation-update.json ===================================== @@ -17,7 +17,8 @@ }, "country": { "errors": [ - "check if referential country is disabled (only if validation is strong)" + "check if referential country is disabled (only if validation is strong)", + "country must be null if vessel is filled" ], "warnings": [ "check if referential country is disabled (only if validation is not strong)" ===================================== core/services/client/src/test/java/fr/ird/observe/services/client/service/ReportsTest.java ===================================== @@ -0,0 +1,59 @@ +package fr.ird.observe.services.client.service; + +/*- + * #%L + * ObServe Core :: Services :: Client + * %% + * Copyright (C) 2008 - 2023 IRD, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.services.service.ReportService; +import fr.ird.observe.services.service.ReportServiceFixtures; +import org.junit.Test; +import org.junit.runners.Parameterized; + +import java.util.Set; + +/** + * Created at 11/12/2023. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.3.0 + */ +public class ReportsTest extends ServiceClientTestSupportRead<ReportService> { + + protected static final ReportServiceFixtures fixtures = new ReportServiceFixtures(); + + @Parameterized.Parameter + public String reportId; + + public ReportsTest() { + super(ReportService.class); + } + + @Parameterized.Parameters(name = "{0}") + public static Set<String> data() { + return ReportServiceFixtures.getReports().keySet(); + } + + @Test + public void tesReport() { + ReportService service = getService(); + fixtures.executeReport(service, reportId); + } +} ===================================== core/services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -932,6 +932,7 @@ observe.data.ps.Route.validation.invalid.time=Observation time can't be after th observe.data.ps.SampleSpecies.validation.mismatch.measuredCount=Measure count (%s) must be the sum of frequencies count (%s) observe.data.ps.SampleSpecies.validation.mismatch.subSampleNumber=The sub sample number must be strictly positive if the sample is a « super sample ». observe.data.ps.TransmittingBuoy.validation.code=The buoy identifier (%s) does not respect the following regular expression «%s». +observe.data.ps.TransmittingBuoy.validation.country.not.required=Country not required if vessel is filled. observe.data.ps.common.Trip.action.move.all=Move all observe.data.ps.common.Trip.action.move.all.choose.parent.message=Select target trip observe.data.ps.common.Trip.action.move.all.choose.parent.title=Move data to another trip ===================================== core/services/i18n/src/main/i18n/translations/services_es_ES.properties ===================================== @@ -932,6 +932,7 @@ observe.data.ps.Route.validation.invalid.time=La hora de la observación de la a observe.data.ps.SampleSpecies.validation.mismatch.measuredCount=Measure count (%s) must be the sum of frequencies count (%s) observe.data.ps.SampleSpecies.validation.mismatch.subSampleNumber=The sub sample number must be strictly positive if the sample is a « super sample ». \#TODO observe.data.ps.TransmittingBuoy.validation.code=El identificador de boya ingresado (%s) no respeta la sintaxis definida por la expresión regular “%s”. +observe.data.ps.TransmittingBuoy.validation.country.not.required=Country not required if vessel is filled. \#TODO observe.data.ps.common.Trip.action.move.all=Move all observe.data.ps.common.Trip.action.move.all.choose.parent.message=Select target trip observe.data.ps.common.Trip.action.move.all.choose.parent.title=Move data to another trip ===================================== core/services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -932,6 +932,7 @@ observe.data.ps.Route.validation.invalid.time=L'heure d'observation d'une activi observe.data.ps.SampleSpecies.validation.mismatch.measuredCount=Le nombre mesuré (%s) doit valoir la somme des effectifs de fréquences (%s) observe.data.ps.SampleSpecies.validation.mismatch.subSampleNumber=Le numéro de sous-échantillon doit être strictement positif si l'échantillon est un « super échantillon ». observe.data.ps.TransmittingBuoy.validation.code=L'identifiant de balise (%s) ne respecte pas la syntaxe définie via l'expression régulière «%s». +observe.data.ps.TransmittingBuoy.validation.country.not.required=Le pavillon ne doit pas être renseigné si le navire est renseigné. observe.data.ps.common.Trip.action.move.all=Déplacer des données observe.data.ps.common.Trip.action.move.all.choose.parent.message=À quelle marée voulez-vous associer les données sélectionnées ? observe.data.ps.common.Trip.action.move.all.choose.parent.title=Changer la marée des données sélectionnées ===================================== core/services/local/src/test/java/fr/ird/observe/services/local/service/ReportServiceLocalReadTest.java ===================================== @@ -23,103 +23,17 @@ package fr.ird.observe.services.local.service; */ import fr.ird.observe.report.Report; -import fr.ird.observe.services.service.ReportService; -import org.junit.Ignore; +import fr.ird.observe.services.service.ReportServiceFixtures; import org.junit.Test; -import javax.annotation.Generated; import java.util.Map; -@Generated(value = "io.ultreia.java4all.http.maven.plugin.test.GenerateApiImplMojo", date = "Mon Nov 14 16:20:02 CET 2022") public class ReportServiceLocalReadTest extends GeneratedReportServiceLocalReadTest { @Test public void loadDefault() { - ReportService service = getService(); - Map<String, Report> reports = fixtures.getReports(); + Map<String, Report> reports = ReportServiceFixtures.getReports(); fixtures.assertReports(reports); } - //FIXME Generate a method for each report - @Ignore - @Test - public void executeReportLlLanding() { - ReportService service = getService(); - fixtures.executeReport(service, "llLanding"); - } - @Ignore - @Test - public void executeReportLlLogbookActivities() { - ReportService service = getService(); - fixtures.executeReport(service, "llLogbookActivities"); - } - - @Ignore - @Test - public void executeReportLlLogbookCatches() { - ReportService service = getService(); - fixtures.executeReport(service, "llLogbookCatches"); - } - @Ignore - @Test - public void executeReportLlLogbookSamplesOnActivity() { - ReportService service = getService(); - fixtures.executeReport(service, "llLogbookSamplesOnActivity"); - } - - @Test - @Ignore - public void executeReportPsObservationLengthsDistribution() { - ReportService service = getService(); - fixtures.executeReport(service, "psObservationLengthsDistribution"); - } - - @Test - @Ignore - public void executeReportPsObservationCatchTotalCountByGroupPerSpeciesFate() { - ReportService service = getService(); - fixtures.executeReport(service, "psObservationCatchTotalCountByGroupPerSpeciesFate"); - } - - @Test - @Ignore - public void executeReportPsObservationCatchWeightByGroupPerSpeciesFate() { - ReportService service = getService(); - fixtures.executeReport(service, "psObservationCatchWeightByGroupPerSpeciesFate"); - } - - @Test - @Ignore - public void executeReportPsObservationCatchWeightByGroupPerReasonForDiscard() { - ReportService service = getService(); - fixtures.executeReport(service, "psObservationCatchWeightByGroupPerReasonForDiscard"); - } - - @Test - @Ignore - public void executeReportPsObservationCatchTotalCountByGroupPerReasonForDiscard() { - ReportService service = getService(); - fixtures.executeReport(service, "psObservationCatchTotalCountByGroupPerReasonForDiscard"); - } - - @Test - @Ignore - public void executeReportPsObservationCatchWeightByGroupAndSpeciesFateDiscardPerAssociation() { - ReportService service = getService(); - fixtures.executeReport(service, "psObservationCatchWeightByGroupAndSpeciesFateDiscardPerAssociation"); - } - - @Test - @Ignore - public void executeReportPsObservationCatchTotalCountByGroupAndSpeciesFateDiscardPerAssociation() { - ReportService service = getService(); - fixtures.executeReport(service, "psObservationCatchTotalCountByGroupAndSpeciesFateDiscardPerAssociation"); - } - - @Test - @Ignore - public void executeReportPsLogbookWellPlanCheck() { - ReportService service = getService(); - fixtures.executeReport(service, "psLogbookWellPlanCheck"); - } } ===================================== core/services/local/src/test/java/fr/ird/observe/services/local/service/ReportsTest.java ===================================== @@ -0,0 +1,61 @@ +package fr.ird.observe.services.local.service; + +/*- + * #%L + * ObServe Core :: Services :: Local + * %% + * Copyright (C) 2008 - 2023 IRD, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.services.service.ReportService; +import fr.ird.observe.services.service.ReportServiceFixtures; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +import java.util.Set; + +/** + * Created at 11/12/2023. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.3.0 + */ +(a)RunWith(Parameterized.class) +public class ReportsTest extends ServiceLocalTestSupportRead<ReportService> { + + protected static final ReportServiceFixtures fixtures = new ReportServiceFixtures(); + + @Parameterized.Parameter + public String reportId; + + public ReportsTest() { + super(ReportService.class); + } + + @Parameterized.Parameters(name = "{0}") + public static Set<String> data() { + return ReportServiceFixtures.getReports().keySet(); + } + + @Test + public void tesReport() { + ReportService service = getService(); + fixtures.executeReport(service, reportId); + } +} ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-dataResult-ps.json ===================================== @@ -954,6 +954,11 @@ "lastUpdateDate": "2021-02-09T09:41:09.117Z" }, "messages": [ + { + "fieldName": "country", + "scope": "ERROR", + "message": "Le pavillon ne doit pas être renseigné si le navire est renseigné." + }, { "fieldName": "transmittingBuoyType", "scope": "WARNING", @@ -4531,6 +4536,35 @@ "topiaVersion": 8, "lastUpdateDate": "2021-03-28T20:24:25.360Z" }, + "children": [ + { + "datum": { + "text": " DCP Abandonné (sans balise, non détruit, non coulé)", + "type": "fr.ird.observe.dto.data.ps.logbook.FloatingObjectDto", + "id": "fr.ird.data.ps.logbook.FloatingObject#1616955224271#0.8748844202241", + "topiaVersion": 3, + "lastUpdateDate": "2021-03-28T20:15:12.010Z" + }, + "children": [ + { + "datum": { + "text": "Marine Instrument (ou Nautical) modèle indéterminé##Mise à l'eau##12##sd", + "type": "fr.ird.observe.dto.data.ps.logbook.TransmittingBuoyDto", + "id": "fr.ird.data.ps.logbook.TransmittingBuoy#1616955224272#0.1758599871793043", + "topiaVersion": 1, + "lastUpdateDate": "2021-03-28T20:13:44.266Z" + }, + "messages": [ + { + "fieldName": "country", + "scope": "ERROR", + "message": "Le pavillon ne doit pas être renseigné si le navire est renseigné." + } + ] + } + ] + } + ], "messages": [ { "fieldName": "schoolType", View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/012de8f4bdd12e2ba9a6244e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/012de8f4bdd12e2ba9a6244e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/9.3.0-RC-1
by Tony CHEMIT (＠tchemit) 08 Dec '23

08 Dec '23

Tony CHEMIT deleted branch release/9.3.0-RC-1 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.3.0-RC-1
by Tony CHEMIT (＠tchemit) 08 Dec '23

08 Dec '23

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

1 0

[Git][ultreiaio/ird-observe][release/9.3.0-RC-1] [jgitflow-maven-plugin]updating poms for branch'release/9.3.0-RC-1' with...
by Tony CHEMIT (＠tchemit) 08 Dec '23

08 Dec '23

Tony CHEMIT pushed to branch release/9.3.0-RC-1 at ultreiaio / ird-observe Commits: b0492b5a by Tony Chemit at 2023-12-08T16:05:22+01:00 [jgitflow-maven-plugin]updating poms for branch'release/9.3.0-RC-1' with non-snapshot versions[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto-consolidation/pom.xml - core/api/dto-decoration/pom.xml - core/api/dto-validation/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/avdth/pom.xml - core/persistence/consolidation/pom.xml - core/persistence/decoration/pom.xml - core/persistence/java/pom.xml - core/persistence/migration/pom.xml - core/persistence/pom.xml - core/persistence/report/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b0492b5a5e12cdaf06537e6ed… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b0492b5a5e12cdaf06537e6ed… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master] 131 commits: [jgitflow-maven-plugin]updating poms for 9.2.2-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 08 Dec '23

08 Dec '23

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: cd4f3685 by Tony Chemit at 2023-11-14T16:52:18+01:00 [jgitflow-maven-plugin]updating poms for 9.2.2-SNAPSHOT development[skip ci] - - - - - ce079ce4 by Tony Chemit at 2023-11-14T17:11:57+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 550888fb by Tony Chemit at 2023-11-14T17:11:58+01:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 90eab29a by Tony Chemit at 2023-11-14T17:11:59+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 7e3962e1 by Tony Chemit at 2023-11-15T12:00:25+01:00 Move to version 9.3.0 - - - - - 38a62dbb by Tony Chemit at 2023-11-17T12:14:33+01:00 Ajout de la fonctionnalité d'export html dans l'interface graphique - - - - - 939468ef by Tony Chemit at 2023-11-17T12:15:13+01:00 Ajout des templates pour générer l'export html - - - - - 3e9dac14 by Tony Chemit at 2023-11-17T12:17:49+01:00 Merge branch 'feature/issue_2755' into develop Sur les tableaux de synthèse, ajouter un export HTML - Closes #2755 - - - - - eafab6dc by Tony Chemit at 2023-11-21T10:30:11+01:00 Sur le plan de cuves, empêcher la saisie multiple d'une même activité sur une même cuve - Closes #2717 - - - - - f71ab184 by Tony Chemit at 2023-11-21T11:12:44+01:00 importDirectory must not be final and transient to be persisted... - - - - - 78740869 by Tony Chemit at 2023-11-21T11:18:05+01:00 add backupsDirectory (only used for automatic backups) - - - - - 52092051 by Tony Chemit at 2023-11-21T11:18:37+01:00 fix dumpFile initial value in initFromConfig method - - - - - 0c44c3a8 by Tony Chemit at 2023-11-21T11:30:41+01:00 persist backupDirectory when performing a backup - - - - - 8416c255 by Tony Chemit at 2023-11-21T11:52:18+01:00 Merge branch 'feature/issue-2804' into develop Les assistants d'ouverture ou sauvergade de sql.gz ne retrouvent jamais le dernier répertoire utilisé - Closes #2804 - - - - - cf138579 by Tony Chemit at 2023-11-21T13:15:38+01:00 fix how to make line (on ll we have no text, and for ps we have points always with text (but text can also be null)) - - - - - 998e6449 by Tony Chemit at 2023-11-21T13:17:02+01:00 adapt ps logbook lines (use the same layer to display day and night points (but night ones have no text) - - - - - f5d24778 by Tony Chemit at 2023-11-21T13:43:49+01:00 Merge branch 'feature/issue-2756' into develop La distinction jour/nuit sur la carte est peu pertinente pour les données logbook - See #2756 - - - - - 3e2f7791 by Tony Chemit at 2023-11-21T16:13:01+01:00 use plain line style - See #2756 - - - - - 284c10f6 by Tony Chemit at 2023-11-21T16:14:51+01:00 add new options in TripMapConfigDto (only used by TripMapContentBuilder) - - - - - 1c2772ec by Tony Chemit at 2023-11-21T16:16:00+01:00 add new options in TripMapUI and use them to update add new options in TripMapConfigDto and rebuild map model - - - - - 580b9080 by Tony Chemit at 2023-11-21T16:17:38+01:00 Merge branch 'feature/issue-2363' into develop Ajouter une option pour afficher/masquer la trace entre les activités de la carte - See #2363 - - - - - 777cba00 by Tony Chemit at 2023-11-22T10:36:58+01:00 sort items in legend - - - - - 10adf5d7 by Tony Chemit at 2023-11-22T10:37:48+01:00 add new entries in TripMapPointType - - - - - 1fc0533e by Tony Chemit at 2023-11-22T10:40:30+01:00 get logbook activities with sampling and use new entries of TripMapPointType in TripMapBuilder - - - - - 5cd87f5f by Tony Chemit at 2023-11-22T10:41:07+01:00 add new configuration option for logbook activities with sampling (default is yellow) - - - - - dc72c092 by Tony Chemit at 2023-11-22T10:41:48+01:00 update TripMapContentBuilder and ps style to use new type of point (with sampling) - - - - - 0fa755fe by Tony Chemit at 2023-11-22T12:45:05+01:00 add suppressWarning for services with generics and AutoService annotation usage - - - - - 6a0e6978 by Tony Chemit at 2023-11-22T12:45:50+01:00 change shortcut (Alt + Fxx is used under linux by X) - - - - - 29e47618 by Tony Chemit at 2023-11-22T12:46:41+01:00 Merge branch 'feature/issue-2549' into develop Mettre en exergue sur la carte les calées qui ont été échantillonnées - See - - - - - 41742eaf by Tony Chemit at 2023-11-22T12:56:55+01:00 add suppressWarning for services with generics and AutoService annotation usage - - - - - a36cd49b by Tony Chemit at 2023-11-22T14:01:21+01:00 fix french I18n legendBottom and legendTop are reversed.... - - - - - ea70e2f2 by Tony Chemit at 2023-11-22T14:01:22+01:00 add validCount and notValidCount in ObserveMapPaneLegendItem (o be able to compute real label at runtime) - - - - - c5c1314f by Tony Chemit at 2023-11-22T14:15:59+01:00 add addPointCount option in ObserveMapPane and use it to compute legend label - - - - - f261cfc6 by Tony Chemit at 2023-11-22T14:15:59+01:00 add AddPointCount action to switch addPointCount option - - - - - 70eb8a1c by Tony Chemit at 2023-11-22T14:17:17+01:00 Merge branch 'feature/issue-2805' into develop Ajouter une option pour voir le nombre de points dans la légende - Closes #2805 - - - - - c86477a7 by Tony Chemit at 2023-11-22T15:37:45+01:00 add validCount and notValidCount in ObserveMapPaneLegendItem (to be able to compute real label at runtime via the getLabel method) - See #2805 - - - - - d72c14b2 by Tony Chemit at 2023-11-22T17:45:06+01:00 Pouvoir sélectionner/déselectionner les lignes et les points dans la carte - Closes #2806 - - - - - 576a6a8c by Tony Chemit at 2023-11-23T13:44:28+01:00 Move persistence model back to 9.2 (we don't need a migration at this time) and update pom - - - - - 58a78780 by Tony Chemit at 2023-11-23T13:58:02+01:00 update pom - - - - - 5171ad36 by Tony Chemit at 2023-11-25T13:40:12+01:00 update pom change pom dependencies coordinates - - - - - b474e869 by Tony Chemit at 2023-11-25T13:40:12+01:00 Remove never used code - - - - - b009e471 by Tony Chemit at 2023-11-25T13:40:12+01:00 fix on service should be PUT but was POST... - - - - - e810ab41 by Tony Chemit at 2023-11-25T13:40:12+01:00 Update http library API and improve timeout tuning - - - - - 40a629ff by Tony Chemit at 2023-11-25T13:40:12+01:00 add missing annotations - - - - - 8fbbb17f by Tony Chemit at 2023-11-25T14:47:48+01:00 Upgrade to fileupload2 - - - - - bc7ebe50 by Tony Chemit at 2023-11-25T14:47:48+01:00 update pom - - - - - bdc2aff0 by Tony Chemit at 2023-11-25T14:48:58+01:00 Merge branch 'feature/issue-2605' into develop Mettre à jour la libraire apache http-client - Closes #2605 - - - - - 16bd168a by Tony Chemit at 2023-11-25T14:57:31+01:00 Supprimer le module server-configuration-tool (il ne sert pas) - Closes #2807 - - - - - 5c5514d0 by Tony Chemit at 2023-11-27T17:14:48+01:00 Add a new hook when loading a dto for from and validation (we will use it in Validation interceptor to load on dto some properties used for validation) - - - - - 9fba01ae by Tony Chemit at 2023-11-27T17:14:48+01:00 Add new entity method Activity.isCoordinateRequired to compute this value - - - - - 98639a6a by Tony Chemit at 2023-11-27T17:14:48+01:00 Add new dto method Activity.isCoordinateRequired to get value computed on entity - - - - - 251c5d0b by Tony Chemit at 2023-11-27T17:16:08+01:00 load Activity.coordinateRequired property to dto (when validation is required) - - - - - f58e962c by Tony Chemit at 2023-11-27T17:16:20+01:00 Add validation rule on ActivityDto coordinates (not null except if !coordinateRequired) - - - - - 15719d0c by Tony Chemit at 2023-11-27T17:16:20+01:00 Use new hook loadDtoFroValidation in EntityInterceptor (so now we can have exact same behaviour than in application forms (but need to double check any overrides)) - - - - - e3c8ed67 by Tony Chemit at 2023-11-27T17:17:58+01:00 Merge branch 'feature/issue-2663' into develop Contrôle de validation position si opération sur objet != perte/fin transmission/fin balise - Closes #2663 - - - - - 09239859 by Tony Chemit at 2023-11-28T12:38:48+01:00 update pom - - - - - d60f1b41 by Tony Chemit at 2023-11-28T12:42:29+01:00 Mettre tous les traits en fin (width=1)- Closes #2756 - - - - - c7a40264 by Tony Chemit at 2023-11-28T16:39:21+01:00 Remove report legacy API and migration. - - - - - 5fc26ffc by Tony Chemit at 2023-11-28T16:39:50+01:00 update pom - - - - - 156a852f by Tony Chemit at 2023-11-28T16:39:51+01:00 add method I18nDecoratorHelper.newTimeFormat - - - - - 6d909796 by Tony Chemit at 2023-11-28T16:39:51+01:00 add cellValueFormatter on ReportRequestExecutor to format date and time (pass it to the DataMatrix) - - - - - e77b6111 by Tony Chemit at 2023-11-28T16:39:51+01:00 update reports to remove any date and time transformations in requests (this will be done after) - - - - - 7d39513a by Tony Chemit at 2023-11-28T16:39:51+01:00 update reports fixtures - - - - - 9686faf4 by Tony Chemit at 2023-11-28T16:45:27+01:00 Merge branch 'feature/issue-2812' into develop Normalisation des dates et heures dans les rapports - Closes #2812 - - - - - ee03d54b by Tony Chemit at 2023-11-28T17:19:37+01:00 avoid re-entrant code in listener - - - - - b5b89df8 by Tony Chemit at 2023-11-28T17:20:29+01:00 Do not enable change mode action if not one selected data - - - - - b3f7a158 by Tony Chemit at 2023-11-28T17:33:20+01:00 On list ui, always select first item at end open - - - - - c4dec149 by Tony Chemit at 2023-11-28T17:34:08+01:00 On list ui, show configuration actions in navigation context menu even if model is not editable (may have the goto editing child action enabled here) - - - - - cfc0c2f3 by Tony Chemit at 2023-11-28T17:34:26+01:00 Merge branch 'feature/issue-2810' into develop LL observations, en sélection multiple d'activités, la fonction 'Rouvrir la donnée de type activité' ne devrait pas être disponible - Closes #2810 - - - - - 43df8143 by Tony Chemit at 2023-11-30T12:59:58+01:00 update pom - - - - - 4e4fab22 by Tony Chemit at 2023-11-30T14:33:12+01:00 on Report action, let's select all data for local data source - See #281x ? - - - - - ad1a88c8 by Tony Chemit at 2023-11-30T14:33:14+01:00 add AutoNext mechanism on admin tab when tab state change to success, add it on consolidate tab :) - See #281x ? - - - - - bf5d8d8a by Tony Chemit at 2023-11-30T14:33:25+01:00 use TopiaPersistenceContext instead of TopiaDaoSupplier in DefaultReportRequestExecutor to be able to use findById method and use ReportDefinition instead of Report parameter in method TopiaPersistenceContext.newReportRequestExecutor - - - - - df4266dd by Tony Chemit at 2023-11-30T14:33:25+01:00 add method ReportRequestExecutor.getReferentialLabel method and implements it. - - - - - 7248bb0d by Tony Chemit at 2023-11-30T14:33:25+01:00 introduce ColumnRendererDefinition and add some in ReportDefinition - - - - - b2021fca by Tony Chemit at 2023-11-30T15:12:09+01:00 introduce ColumnRendererConsumer and ColumnRendererParameters API - - - - - 8515cd4f by Tony Chemit at 2023-11-30T15:12:39+01:00 implements first ColumnRendererConsumers - - - - - b9ec8221 by Tony Chemit at 2023-11-30T15:12:39+01:00 add method ReportService.initColumnRendererParameters - - - - - 8fc495ce by Tony Chemit at 2023-11-30T15:12:39+01:00 test new API in fixtures - - - - - 6d61b859 by Tony Chemit at 2023-11-30T15:12:39+01:00 add first cell renderers in report definitions :) - - - - - ae59a5f8 by Tony Chemit at 2023-11-30T15:12:39+01:00 adapt Report ui action API to load column renderers of selected report and offers them to HtmlExportModel. - - - - - 498756f4 by Tony Chemit at 2023-11-30T15:45:34+01:00 adapt Report html template at last - - - - - 1b79ed66 by Tony Chemit at 2023-11-30T15:46:12+01:00 Merge branch 'feature/issue-2811' into develop Définir les règles de mise en forme conditionnelle sur les tableaux de synthèse - See #2811 - - - - - fb599bfe by Tony Chemit at 2023-12-01T08:48:22+01:00 Move to persistence model 9.3 - - - - - 6124147c by Tony Chemit at 2023-12-01T09:08:13+01:00 add persistence migration code - - - - - 8f934f33 by Tony Chemit at 2023-12-01T09:33:05+01:00 Do not disable TransmittingBuoy.country - - - - - 6587e1f5 by Tony Chemit at 2023-12-01T09:33:32+01:00 Rename I18n label TransmittingBuoy.country to flagCountry - - - - - 125b581f by Tony Chemit at 2023-12-01T10:29:02+01:00 keep protected unknown TransmittingBuoyOwnership id - - - - - 15552adc by Tony Chemit at 2023-12-01T10:49:53+01:00 add listener on TransmittingBuoyOwnership to enable/disable vessel or country - - - - - 2e651502 by Tony Chemit at 2023-12-01T10:50:26+01:00 remove commented code (from v7) - - - - - c2557d28 by Tony Chemit at 2023-12-01T10:50:48+01:00 Merge branch 'feature/issue-2044' into develop Peaufinage du form Balise : disponibilité des champs Appartenance, Pays et Navire - Closes #2044 - - - - - d8b081ff by Tony Chemit at 2023-12-01T15:35:26+01:00 Review SubtractColum to a better null management - - - - - a88911d9 by Tony Chemit at 2023-12-01T15:54:38+01:00 Review first ColumnRendererConsumer (add null management + improve the code) - - - - - 44de672d by Tony Chemit at 2023-12-01T15:54:38+01:00 Rename html export configuration tab to metadata - - - - - 3f0ecbae by Tony Chemit at 2023-12-01T15:55:24+01:00 Improve report html export (now fill the hole cell :)) - - - - - bbeeac87 by Tony Chemit at 2023-12-01T16:06:32+01:00 Merge branch 'feature/issue-2811' into develop Définir les règles de mise en forme conditionnelle sur les tableaux de synthèse - Closes #2811 - - - - - 7e08d2ef by Tony Chemit at 2023-12-01T16:08:17+01:00 Add client configuration option skipConsolidateStepForReport - Closes #281x ? - - - - - ba11dbb3 by Tony Chemit at 2023-12-05T11:39:23+01:00 Improve report html export - final touch - Closes #2811 Add DataMatrix gson adapter (to reduce format) introduce ColumnRendererConsumer and ColumnRendererParameters API (add gson adapter) - - - - - - 568bf70f by Tony Chemit at 2023-12-05T12:04:17+01:00 update pom - - - - - 14a57d2a by Tony Chemit at 2023-12-05T12:11:45+01:00 Le service init.information de l'API retourne les informations sur la base cible, alors qu'on ne devrait que retourner son nom - Closes #2817 - - - - - e9eb4688 by Tony Chemit at 2023-12-05T12:22:29+01:00 VesselActivity sur création d'activity par l'importeur AVDTH - Closes #2814 - - - - - cf3e20b0 by Tony Chemit at 2023-12-05T12:37:28+01:00 Improve report html export - final touch - Closes #2811 - - - - - 8735d717 by Tony Chemit at 2023-12-06T14:29:14+01:00 [toolkit-api-report] Introduce WithRequest and ReportRequestExecutorI18nContext to be able to translate anything in hql requests and in some parameters - - - - - bd80057f by Tony Chemit at 2023-12-06T14:29:14+01:00 [toolkit-persistence] Adapt DefaultReportRequestExecutor to use new i18n API - - - - - 51a80bb7 by Tony Chemit at 2023-12-06T14:29:14+01:00 [core-persistence-report] Implements ReportI18nKeysProducer to add default i18n mapping used in embedded reports and adapt reports definition file (using new i18n API) [core-services-i18n] update then i18n bundle - - - - - 892a74e7 by Tony Chemit at 2023-12-06T14:29:14+01:00 [core-services-test] Update report fixtures - - - - - 1a8b3696 by Tony Chemit at 2023-12-06T14:29:14+01:00 [toolkit-api-report] Introduce a way to translate report meta-data (such as name, description, columnsHeader and rowsHeader) - - - - - 6f106303 by Tony Chemit at 2023-12-06T14:29:14+01:00 [client-datasource-actions] Use new I18n API in Report on ui and export template - - - - - 74dea2b0 by Tony Chemit at 2023-12-06T14:29:14+01:00 [client-datasource-actions] Use reportDefinition id instead of his name to compute reportRenderers - - - - - b3ffff3f by Tony Chemit at 2023-12-06T14:29:14+01:00 [core-persistence-report] Add new properties in report definition file to fill english and spanish translations - - - - - 28a8c734 by Tony Chemit at 2023-12-06T14:29:14+01:00 [client-datasource-actions] Use now a separated file for report html export css style - - - - - 22dcf3c7 by Tony Chemit at 2023-12-06T14:30:41+01:00 Merge branch 'feature/issue-2599' into develop Rendre le fichier de définition des rapports multilingue - See #2599 - - - - - defe4bce by Tony Chemit at 2023-12-07T17:58:18+01:00 [toolkit-api-report] Fix new json adapter (See #2599) - - - - - f7e26769 by Tony Chemit at 2023-12-07T17:58:23+01:00 Correction de la condition de création d'activités ficitives sur l'import avdth - - - - - 2551e5e5 by Tony Chemit at 2023-12-08T11:43:43+01:00 Add nice method in MojoRunnable in execute a simple Runnable - - - - - 04e62ee0 by Tony Chemit at 2023-12-08T11:43:47+01:00 add SuppressWarnings - - - - - d5392cdd by Tony Chemit at 2023-12-08T11:43:52+01:00 [core-persistence-report] fix ReportI18nKeys keys - See #2599 - - - - - c2f1fbed by Tony Chemit at 2023-12-08T11:44:04+01:00 [toolkit-api-report] Review builder, now we are loading a file per report, for detection, use a generated file with mapping of embedded reports - - - - - de0e255d by Tony Chemit at 2023-12-08T11:44:04+01:00 [toolkit-maven-plugin] Add mojo to generate the embedded reports list file - - - - - 7ce2337c by Tony Chemit at 2023-12-08T11:44:04+01:00 [core-persistence-report] Split reports (one file per report) + generate reports list file - - - - - 64e02e7d by Tony Chemit at 2023-12-08T11:44:04+01:00 [core-services-test] Use the DefaultByClassPathReportDefinitionBuilder in services tests - - - - - b00a6359 by Tony Chemit at 2023-12-08T11:44:04+01:00 [client] Remove reportFile configuration option and now use directly the reportDirectory - - - - - d597c79b by Tony Chemit at 2023-12-08T11:45:04+01:00 Merge branch 'feature/issue-2962' into develop Séparer le fichier des reports en plusieurs fichiers - Closes #2962 - - - - - a5ffcc7d by Tony Chemit at 2023-12-08T15:01:06+01:00 [toolkit-api-report] Review i18n API - - - - - f5dbc4d4 by Tony Chemit at 2023-12-08T15:23:47+01:00 [core-persistence-report] include i18n in each report definition - - - - - 94819d99 by Tony Chemit at 2023-12-08T15:23:47+01:00 [i18n] clean it - - - - - 6ca418c5 by Tony Chemit at 2023-12-08T15:23:55+01:00 Merge branch 'feature/issue-2599' into develop Rendre le fichier de définition des rapports multilingue - See #2599 - - - - - e6513e5c by Tony Chemit at 2023-12-08T15:59:03+01:00 improve HighlightIfEquals18nReferentialValue (add warning if not error, nor ok) - see #2811 - - - - - 300332c3 by Tony Chemit at 2023-12-08T16:04:18+01:00 Move to version 9.3.0-RC-1-SNAPSHOT - - - - - b0492b5a by Tony Chemit at 2023-12-08T16:05:22+01:00 [jgitflow-maven-plugin]updating poms for branch'release/9.3.0-RC-1' with non-snapshot versions[skip ci] - - - - - 735b3ecd by Tony Chemit at 2023-12-08T16:26:13+01:00 [jgitflow-maven-plugin]merging 'release/9.3.0-RC-1' into 'master' - - - - - 30 changed files: - client/configuration/pom.xml - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientResources.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/SeineBycatchObservedSystemConfigConverter.java - client/core/pom.xml - client/core/src/main/java/fr/ird/observe/client/datasource/h2/backup/LocalDatabaseBackupTaskSupport.java - client/core/src/main/java/fr/ird/observe/client/datasource/h2/server/H2ServerBodyContent.java - client/core/src/main/java/fr/ird/observe/client/datasource/presets/RemotePresetsBodyContent.java - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigBodyContent.java - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/core/src/main/java/fr/ird/observe/client/main/body/NoBodyContent.java - client/core/src/main/resources/observe-ui.properties - client/datasource/actions/pom.xml - client/datasource/actions/src/main/i18n/getters/java.getter - + client/datasource/actions/src/main/i18n/templates/reportHtmlExport_en_GB.ftl - + client/datasource/actions/src/main/i18n/templates/reportHtmlExport_es_ES.ftl - + client/datasource/actions/src/main/i18n/templates/reportHtmlExport_fr_FR.ftl - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIBodyContent.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/ObserveKeyStrokesActions.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateUIHandler.java - 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/HtmlExportModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUI.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUIHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9213109789f45e636eaaaa37… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9213109789f45e636eaaaa37… You're receiving this email because of your account on gitlab.com.

1 0