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

[Git][ultreiaio/ird-observe][develop] Meilleure disposition pour l'onglet carte - closes #1721
by Tony CHEMIT 31 Dec '20

31 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9c8ca5a9 by Tony Chemit at 2020-12-31T10:26:13+01:00 Meilleure disposition pour l'onglet carte - closes #1721 Plus nettoyage code sur TripUIModel (suppression états inutiles). Debut de correction de #1654 - - - - - 9 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/mode/ChangeMode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripUIHelper.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripUIModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUIModel.java - models/dto/src/main/java/fr/ird/observe/dto/data/ps/common/TripDto.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIHandler.java ===================================== @@ -319,6 +319,7 @@ public abstract class ContentUIHandler<U extends ContentUI> implements ObserveSe public final void fixFormSize() { // we want to see the hole form on screen ui.setMinimumSize(ui.getPreferredSize()); + getDataSourceEditor().updateContentSize(); } /** ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/mode/ChangeMode.java ===================================== @@ -46,7 +46,6 @@ import org.apache.logging.log4j.Logger; import javax.swing.Icon; import javax.swing.JComponent; import javax.swing.KeyStroke; -import javax.swing.SwingUtilities; import javax.swing.tree.TreeNode; import java.awt.event.ActionEvent; import java.util.Objects; @@ -253,15 +252,12 @@ public class ChangeMode<U extends ContentUI> extends ContentUIActionSupport<U> { public void rebuildEditableZone(U ui) { ui.getHandler().getDataSourceEditor().getMessageView().setVisible(true); - SwingUtilities.invokeLater(ui.getHandler()::fixFormSize); - getDataSourceEditor().updateContentSize(); + ui.getHandler().fixFormSize(); } protected void rebuildNotEditableZone(U ui) { ui.getHandler().getDataSourceEditor().getMessageView().setVisible(false); ui.getHandler().fixFormSize(); - getDataSourceEditor().updateContentSize(); - SwingUtilities.invokeLater(ui.getHandler()::fixFormSize); } protected void rebuildFocus(U ui, ContentMode mode) { ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripUIHelper.java ===================================== @@ -116,6 +116,7 @@ public class TripUIHelper<D extends DataDto, U extends ContentOpenableUI<D, U> & TripMapUI tripMap1 = ui.getTripMap(); if (selectedComponent.getSelectedComponent().equals(tripMap1)) { ui.getActions().setVisible(false); + ui.getHandler().getDataSourceEditor().getMessageView().setVisible(false); if (ui.isBuildMap()) { try { buildTripMap(); @@ -125,6 +126,9 @@ public class TripUIHelper<D extends DataDto, U extends ContentOpenableUI<D, U> & } } else { ui.getActions().setVisible(true); + ui.getHandler().getDataSourceEditor().getMessageView().setVisible(true); + ui.getHandler().fixFormSize(); + } } ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripUIHandler.java ===================================== @@ -37,6 +37,7 @@ import java.util.Objects; import static io.ultreia.java4all.i18n.I18n.t; /** + * FIXME:Focus tab0 ui.getTripType(), tab1 ui.getTripMap().getZoomIt() * Created on 8/27/14. * * @author Tony Chemit - dev(a)tchemit.fr @@ -74,38 +75,6 @@ class TripUIHandler extends GeneratedTripUIHandler { .install(ui.getSave()); } - // @Override -// protected ContentOpenableUILayoutFocusTraversalPolicy<TripUI> createFocusTraversalPolicy() { -// return new ContentOpenableUILayoutFocusTraversalPolicy<TripUI>() { -// -//// @Override -//// protected Component getFirstComponentForEdit(Container aContainer) { -//// TripUI ui = getUi(); -//// switch (ui.getMainTabbedPane().getSelectedIndex()) { -//// case 0: -//// return ui.getTripType(); -//// case 1: -//// return ui.getTripMap().getZoomIt(); -//// } -//// return ui.getTripType(); -//// } -// -// @Override -// protected Component getLastComponentForEdit(Container aContainer) { -// TripUI ui = getUi(); -// switch (ui.getMainTabbedPane().getSelectedIndex()) { -// case 0: -// return ui.getToggleConfigure(); -// case 1: -// return ui.getTripMap().getExportPng(); -// } -// //TODO-Focus -// return null; -// } -// -// }; -// } - @Override public void onOpenForm(Form<?> form) { tripUIHelper.onOpenModel(getModel().getStates().getSelectedId()); ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripUIModel.java ===================================== @@ -31,8 +31,6 @@ import fr.ird.observe.dto.data.ll.common.TripDto; import fr.ird.observe.dto.form.Form; import fr.ird.observe.services.ObserveServicesProvider; import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import java.beans.PropertyChangeListener; import java.beans.PropertyVetoException; @@ -47,8 +45,6 @@ import java.beans.PropertyVetoException; @GenerateJavaBeanDefinition public class TripUIModel extends GeneratedTripUIModel { - private static final Logger log = LogManager.getLogger(TripUIModel.class); - public TripUIModel(TripUINavigationNode source) { super(source); } ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.jcss ===================================== @@ -21,7 +21,7 @@ */ #ocean { - enabled:{!states.isUpdatingMode() || model.isRouteEmpty()}; + enabled:{!states.isUpdatingMode() || bean.isRouteEmpty()}; } #formsUrl { ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUIHandler.java ===================================== @@ -21,20 +21,13 @@ */ package fr.ird.observe.client.datasource.editor.ps.data.common; -import fr.ird.observe.client.datasource.editor.api.content.actions.create.CreateNewOpenableUI; import fr.ird.observe.client.datasource.editor.api.content.data.TripUIHelper; -import fr.ird.observe.client.datasource.editor.api.content.data.open.ContentOpenableUIModelStates; -import fr.ird.observe.client.datasource.editor.ps.data.PsTripActionHelper; -import fr.ird.observe.client.datasource.editor.ps.data.observation.ActivityListUINavigationNode; import fr.ird.observe.dto.data.ps.common.TripDto; -import fr.ird.observe.dto.data.ps.observation.ActivityDto; import fr.ird.observe.dto.form.Form; -import javax.swing.JMenuItem; - -import static fr.ird.observe.client.datasource.editor.api.content.actions.InsertMenuAction.PROPERTY_NAME_UPDATING_MODE_AND_NOT_MODIFIED; - /** + * FIXME:Focus tab0 ui.getCaptain(), tab1 ui.getTripMap().getZoomIt() + * * @author Tony Chemit - dev(a)tchemit.fr * @since 1.0 */ @@ -53,59 +46,6 @@ class TripUIHandler extends GeneratedTripUIHandler { ui.getLandingHarbour().getIndexes().setSelectedButton(1); } - @Override - protected void installCreateNewAction() { - super.installCreateNewAction(); - JMenuItem editor = CreateNewOpenableUI.installAction(ui, - ActivityListUINavigationNode.class, - n -> ((TripUINavigationNode) n).getRouteListUINavigationNode().getRouteUINavigationNode(ui.getModel().getClientUIContext().getObserveEditModel().getPs().getObservationRoute().getId()).getActivityListUINavigationNode(), - PsTripActionHelper.createNewObservationActionPredicate(ui, ActivityDto.class)); - ui.getModel().addPropertyChangeListener("routeOpen", evt -> { - if (!evt.getPropertyName().equals("routeOpen") || !evt.getPropertyName().equals(PROPERTY_NAME_UPDATING_MODE_AND_NOT_MODIFIED)) { - return; - } - TripUIModel source = (TripUIModel) evt.getSource(); - editor.setEnabled(source.isRouteOpen() && source.getStates().isUpdatingMode() && !source.getStates().isModified()); - }); - - ui.getModel().getStates().addPropertyChangeListener(PROPERTY_NAME_UPDATING_MODE_AND_NOT_MODIFIED, evt -> { - ContentOpenableUIModelStates<?> source = (ContentOpenableUIModelStates<?>) evt.getSource(); - editor.setEnabled(getModel().isRouteOpen() && source.isUpdatingMode() && !source.isModified()); - }); - } - -// @Override -// protected ContentOpenableUILayoutFocusTraversalPolicy<TripUI> createFocusTraversalPolicy() { -// return new ContentOpenableUILayoutFocusTraversalPolicy<TripUI>() { -// -//// @Override -//// protected Component getFirstComponentForEdit(Container aContainer) { -//// switch (ui.getMainTabbedPane().getSelectedIndex()) { -//// case 0: -//// return ui.getCaptain(); -//// case 1: -//// return ui.getTripMap().getZoomIt(); -//// } -//// return null; -//// } -// -// @Override -// protected Component getLastComponentForEdit(Container aContainer) { -// TripUI ui = getUi(); -// if (!ui.getCreate().isEnabled()) { -// return ui.getDelete(); -// } -// return ui.getCreate(); -// } -// }; -// } - -// @Override -// protected Form<TripDto> onOpenForm() { -// tripUIHelper.onOpenModel(getModel().getStates().getSelectedId()); -// return super.onOpenForm(); -// } - @Override public void onOpenForm(Form<?> form) { tripUIHelper.onOpenModel(getModel().getStates().getSelectedId()); @@ -117,18 +57,5 @@ class TripUIHandler extends GeneratedTripUIHandler { super.onOpenAfterOpenModel(); tripUIHelper.onOpenAfterOpenModel(); } - -// @Override -// public void startEditUI() { -// super.startEditUI(); -// ui.getOcean().setEnabled(getModel().getStates().getBean().getRouteSize() == 0); -// ui.getAddActivity().setEnabled(ui.getAddRoute().isEnabled() && ui.getModel().getClientUIContext().getObserveEditModel().getPs().getObservationRoute().isEnabled()); -// } - -// @Override -// public void stopEditUI() { -// super.stopEditUI(); -// ui.getAddActivity().setEnabled(false); -// } } ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUIModel.java ===================================== @@ -29,8 +29,6 @@ import fr.ird.observe.dto.data.ps.common.TripDto; import fr.ird.observe.dto.form.Form; import fr.ird.observe.services.ObserveServicesProvider; import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.nuiton.util.DateUtil; import java.util.Date; @@ -44,12 +42,6 @@ import java.util.Date; @GenerateJavaBeanDefinition public class TripUIModel extends GeneratedTripUIModel { - public static final String PROPERTY_ROUTE_OPEN = "routeOpen"; - public static final String PROPERTY_ROUTE_EMPTY = "routeEmpty"; - private static final Logger log = LogManager.getLogger(TripUIModel.class); - private boolean routeOpen; - private boolean routeEmpty; - public TripUIModel(TripUINavigationNode source) { super(source); } @@ -62,28 +54,6 @@ public class TripUIModel extends GeneratedTripUIModel { referenceCache.addReferentialFilter(TripDto.PROPERTY_VESSEL, ReferencesFilterHelper.newSubVesselList(clientConfig.getVesselTypeSeineCommonTripId())); } - public boolean isRouteOpen() { - return routeOpen; - } - - public void setRouteOpen(boolean routeOpen) { - this.routeOpen = routeOpen; - firePropertyChange(PROPERTY_ROUTE_OPEN, routeOpen); - } - - public boolean isRouteEmpty() { - return routeEmpty; - } - - public void setRouteEmpty(boolean routeEmpty) { - this.routeEmpty = routeEmpty; - firePropertyChange(PROPERTY_ROUTE_EMPTY, routeEmpty); - } - - // FIXME in context -// public String getText(TripUINavigationNode node) { -// return super.getText(node) + (node.isPersisted() ? String.format(" (%d)", node.getData().getRouteSize()) : ""); -// } @Override public void openForm(Form<TripDto> form) { super.openForm(form); @@ -91,23 +61,16 @@ public class TripUIModel extends GeneratedTripUIModel { if (getStates().isUpdatingMode() && getStates().getBean().getEndDate() == null) { Date date = DateUtil.getEndOfDay(new Date()); getStates().getBean().setEndDate(date); - log.debug(getPrefix() + "date fin " + date); } - setRouteOpen(getClientUIContext().getObserveEditModel().getPs().getObservationRoute().isEnabled()); - setRouteEmpty(getStates().getBean().isRouteEmpty()); } @Override public TripDto getBeanToSave() { TripDto bean = super.getBeanToSave(); - // on force toujours la date a etre sans heure, minute,... + // on force toujours la date a être sans heure, minute,... Date startDate = DateUtil.getDay(bean.getStartDate()); - log.debug("startDate = " + startDate); bean.setStartDate(startDate); - - Date endDate = bean.getEndDate(); - log.debug("endDate = " + endDate); return bean; } } ===================================== models/dto/src/main/java/fr/ird/observe/dto/data/ps/common/TripDto.java ===================================== @@ -27,6 +27,7 @@ import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition; import org.nuiton.util.DateUtil; import java.util.Date; +import java.util.LinkedHashSet; import java.util.Objects; import java.util.Optional; @@ -41,11 +42,19 @@ public class TripDto extends GeneratedTripDto { Optional<RouteStubDto> optional = getRoute().stream() .filter(r -> Objects.equals(r.getDate(), date) && !Objects.equals(r.getId(), routeId)) .findFirst(); - return !optional.isPresent(); + return optional.isEmpty(); } @Override public void setStartDate(Date startDate) { super.setStartDate(startDate == null ? null : DateUtil.getDay(startDate)); } + + @Override + public void setRoute(LinkedHashSet<RouteStubDto> route) { + boolean oldValue = isRouteEmpty(); + super.setRoute(route); + //FIXME:Dto should be generated by dto template + firePropertyChange("routeEmpty",oldValue, isRouteEmpty()); + } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9c8ca5a91d9d3d5cffb90df4c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9c8ca5a91d9d3d5cffb90df4c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: La dernière SNAPSHOT 8.0.3 semble instable - closes #1718
by Tony CHEMIT 31 Dec '20

31 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: bab39d40 by Tony Chemit at 2020-12-31T09:48:48+01:00 La dernière SNAPSHOT 8.0.3 semble instable - closes #1718 - - - - - e9fc2489 by Tony Chemit at 2020-12-31T09:48:48+01:00 Remontée des messages d'erreur serveur vers le client - closes #1637 - - - - - 8debafba by Tony Chemit at 2020-12-31T09:48:48+01:00 fix trip vessel validator on create mode - - - - - 6 changed files: - client/core/src/main/java/fr/ird/observe/client/datasource/api/DataSourceReferenceProvider.java - pom.xml - server/core/src/main/filtered-resources/mapping - services/local-impl/src/main/java/fr/ird/observe/services/local/service/ReferenceServiceLocalSupport.java - services/validation-spi/src/main/java/fr/ird/observe/validation/validators/TripVesselDtoValidator.java - toolkit/service/src/main/java/fr/ird/observe/services/service/ReferenceService.java Changes: ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/api/DataSourceReferenceProvider.java ===================================== @@ -101,11 +101,11 @@ public class DataSourceReferenceProvider { } public final <R extends DataDtoReference> DataDtoReferenceSet<R> getDataReferences(Class<R> referenceType) { - return dataSource.getReferenceService().loadData(referenceType); + return dataSource.getReferenceService().loadAllData(referenceType); } public final <R extends ReferentialDtoReference> ReferentialDtoReferenceSet<R> getReferentialReferences(Class<R> referenceType) { - return dataSource.getReferenceService().loadReferential(referenceType); + return dataSource.getReferenceService().loadAllReferential(referenceType); } public <R extends ReferentialDtoReference> R loadOrCreateReferentialReference(Class<R> referenceType, String id) { ===================================== pom.xml ===================================== @@ -162,7 +162,7 @@    - + <lib.version.java4all.http>1.0.25</lib.version.java4all.http>  <license.licenseName>gpl_v3</license.licenseName> ===================================== server/core/src/main/filtered-resources/mapping ===================================== @@ -69,12 +69,12 @@ POST /api/v1/LastUpdateDateService/updateDataLastUpdateDates POST /api/v1/LastUpdateDateService/updateReferentialLastUpdateDates v1.LastUpdateDateServiceRestApi.updateReferentialLastUpdateDates GET /api/v1/PingService/getModelVersion v1.PingServiceRestApi.getModelVersion GET /api/v1/PingService/getServerVersion v1.PingServiceRestApi.getServerVersion -GET /api/v1/ReferenceService/loadData v1.ReferenceServiceRestApi.loadData +GET /api/v1/ReferenceService/loadAllData v1.ReferenceServiceRestApi.loadAllData +GET /api/v1/ReferenceService/loadAllReferential v1.ReferenceServiceRestApi.loadAllReferential GET /api/v1/ReferenceService/loadData v1.ReferenceServiceRestApi.loadData GET /api/v1/ReferenceService/loadOrCreateData v1.ReferenceServiceRestApi.loadOrCreateData GET /api/v1/ReferenceService/loadOrCreateReferential v1.ReferenceServiceRestApi.loadOrCreateReferential GET /api/v1/ReferenceService/loadReferential v1.ReferenceServiceRestApi.loadReferential -GET /api/v1/ReferenceService/loadReferential v1.ReferenceServiceRestApi.loadReferential POST /api/v1/actions/report/ReportService/executeReport v1.actions.report.ReportServiceRestApi.executeReport POST /api/v1/actions/report/ReportService/populateVariables v1.actions.report.ReportServiceRestApi.populateVariables POST /api/v1/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService/applySqlRequests v1.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeLocalServiceRestApi.applySqlRequests ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/ReferenceServiceLocalSupport.java ===================================== @@ -57,13 +57,12 @@ class ReferenceServiceLocalSupport extends ObserveServiceLocal implements Refere } @Override - public <R extends DataDtoReference> DataDtoReferenceSet<R> loadData(Class<R> type) { - + public <R extends DataDtoReference> DataDtoReferenceSet<R> loadAllData(Class<R> type) { return loadData0(type); } @Override - public <R extends ReferentialDtoReference> ReferentialDtoReferenceSet<R> loadReferential(Class<R> type) { + public <R extends ReferentialDtoReference> ReferentialDtoReferenceSet<R> loadAllReferential(Class<R> type) { return loadReferential0(type); } ===================================== services/validation-spi/src/main/java/fr/ird/observe/validation/validators/TripVesselDtoValidator.java ===================================== @@ -70,6 +70,10 @@ public class TripVesselDtoValidator extends FieldValidatorSupport { Date startDate = (Date) getFieldValue("startDate", object); Date endDate = (Date) getFieldValue("endDate", object); String id = (String) getFieldValue("id", object); + if (id==null) { + // object not persisted, no ide, can't do the math + return; + } validate(object, id, vessel, startDate, endDate); } @@ -80,7 +84,6 @@ public class TripVesselDtoValidator extends FieldValidatorSupport { vessel.getId(), startDate, endDate); - if (matchingTrips.size() > 0) { addFieldError(getFieldName(), object); } ===================================== toolkit/service/src/main/java/fr/ird/observe/services/service/ReferenceService.java ===================================== @@ -49,7 +49,7 @@ public interface ReferenceService extends ObserveService { @Get @MethodCredential(Permission.READ_DATA) - <R extends DataDtoReference> DataDtoReferenceSet<R> loadData(Class<R> type); + <R extends DataDtoReference> DataDtoReferenceSet<R> loadAllData(Class<R> type); @Get @MethodCredential(Permission.READ_REFERENTIAL) @@ -61,6 +61,6 @@ public interface ReferenceService extends ObserveService { @Get @MethodCredential(Permission.READ_REFERENTIAL) - <R extends ReferentialDtoReference> ReferentialDtoReferenceSet<R> loadReferential(Class<R> type); + <R extends ReferentialDtoReference> ReferentialDtoReferenceSet<R> loadAllReferential(Class<R> type); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/462cfa41a16f96b86cceb02f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/462cfa41a16f96b86cceb02f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: La carto ne tolère pas le 'Port à corriger' - closes #1719
by Tony CHEMIT 31 Dec '20

31 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e54f4ddf by Tony Chemit at 2020-12-31T09:01:59+01:00 La carto ne tolère pas le 'Port à corriger' - closes #1719 - - - - - 146c5eba by Tony Chemit at 2020-12-31T09:03:11+01:00 La dernière SNAPSHOT 8.0.3 semble instable - closes #1718 - - - - - 462cfa41 by Tony Chemit at 2020-12-31T09:11:18+01:00 Remontée des messages d'erreur serveur vers le client - closes #1637 - - - - - 5 changed files: - client/core/src/main/java/fr/ird/observe/client/datasource/api/DataSourceReferenceProvider.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripMapContentBuilder.java - pom.xml - services/local-impl/src/main/java/fr/ird/observe/services/local/service/ReferenceServiceLocalSupport.java - toolkit/service/src/main/java/fr/ird/observe/services/service/ReferenceService.java Changes: ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/api/DataSourceReferenceProvider.java ===================================== @@ -101,11 +101,11 @@ public class DataSourceReferenceProvider { } public final <R extends DataDtoReference> DataDtoReferenceSet<R> getDataReferences(Class<R> referenceType) { - return dataSource.getReferenceService().loadData(referenceType); + return dataSource.getReferenceService().loadAllData(referenceType); } public final <R extends ReferentialDtoReference> ReferentialDtoReferenceSet<R> getReferentialReferences(Class<R> referenceType) { - return dataSource.getReferenceService().loadReferential(referenceType); + return dataSource.getReferenceService().loadAllReferential(referenceType); } public <R extends ReferentialDtoReference> R loadOrCreateReferentialReference(Class<R> referenceType, String id) { ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripMapContentBuilder.java ===================================== @@ -92,6 +92,9 @@ public class TripMapContentBuilder extends fr.ird.observe.client.datasource.edit List<Coordinate> coordinatesByDay = new LinkedList<>(); TripMapPoint previousPoint = null; for (TripMapPoint point : tripMapPoints) { + if (!point.isValid()) { + continue; + } Coordinate coordinate = create(point); if (previousPoint != null && !DateUtils.isSameDay(previousPoint.getTime(), point.getTime())) { // changing day ===================================== pom.xml ===================================== @@ -162,7 +162,7 @@    - + <lib.version.java4all.http>1.0.25</lib.version.java4all.http>  <license.licenseName>gpl_v3</license.licenseName> ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/ReferenceServiceLocalSupport.java ===================================== @@ -57,13 +57,12 @@ class ReferenceServiceLocalSupport extends ObserveServiceLocal implements Refere } @Override - public <R extends DataDtoReference> DataDtoReferenceSet<R> loadData(Class<R> type) { - + public <R extends DataDtoReference> DataDtoReferenceSet<R> loadAllData(Class<R> type) { return loadData0(type); } @Override - public <R extends ReferentialDtoReference> ReferentialDtoReferenceSet<R> loadReferential(Class<R> type) { + public <R extends ReferentialDtoReference> ReferentialDtoReferenceSet<R> loadAllReferential(Class<R> type) { return loadReferential0(type); } ===================================== toolkit/service/src/main/java/fr/ird/observe/services/service/ReferenceService.java ===================================== @@ -49,7 +49,7 @@ public interface ReferenceService extends ObserveService { @Get @MethodCredential(Permission.READ_DATA) - <R extends DataDtoReference> DataDtoReferenceSet<R> loadData(Class<R> type); + <R extends DataDtoReference> DataDtoReferenceSet<R> loadAllData(Class<R> type); @Get @MethodCredential(Permission.READ_REFERENTIAL) @@ -61,6 +61,6 @@ public interface ReferenceService extends ObserveService { @Get @MethodCredential(Permission.READ_REFERENTIAL) - <R extends ReferentialDtoReference> ReferentialDtoReferenceSet<R> loadReferential(Class<R> type); + <R extends ReferentialDtoReference> ReferentialDtoReferenceSet<R> loadAllReferential(Class<R> type); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8784925f1a42b43f81a41a5b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8784925f1a42b43f81a41a5b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Fix NavigationService Rest APi . be better to use
by Tony CHEMIT 30 Dec '20

30 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8784925f by Tony Chemit at 2020-12-30T22:23:57+01:00 Fix NavigationService Rest APi . be better to use - - - - - 8 changed files: - models/dto/src/main/java/fr/ird/observe/dto/data/TripAware.java - server/core/src/main/java/fr/ird/observe/server/ObserveWebApplicationContext.java - server/core/src/main/java/fr/ird/observe/server/injector/DateInjector.java - services/client-impl/src/main/java/fr/ird/observe/services/client/ObserveServiceFactoryClient.java - toolkit/dto/src/main/java/fr/ird/observe/gson/DtoReferenceAdapter.java - + toolkit/dto/src/main/java/fr/ird/observe/gson/GSonTypedContract.java - + toolkit/dto/src/main/java/fr/ird/observe/gson/GSonTypedContractAdapter.java - toolkit/dto/src/main/java/fr/ird/observe/gson/MultimapAdapterSupport.java Changes: ===================================== models/dto/src/main/java/fr/ird/observe/dto/data/TripAware.java ===================================== @@ -25,6 +25,7 @@ package fr.ird.observe.dto.data; import fr.ird.observe.dto.WithStartEndDate; import fr.ird.observe.dto.referential.common.ProgramReference; import fr.ird.observe.dto.referential.common.VesselReference; +import fr.ird.observe.gson.GSonTypedContract; import java.util.Comparator; import java.util.Date; @@ -37,10 +38,9 @@ import java.util.stream.Collectors; * * @author Tony Chemit - dev(a)tchemit.fr */ -public interface TripAware extends WithStartEndDate { +public interface TripAware extends WithStartEndDate, GSonTypedContract { String PROPERTY_OBSERVATIONS_AVAILABILITY = "observationsAvailability"; - String PROPERTY_LOGBOOK_AVAILABILITY = "logbookAvailability"; Predicate<String> IS_SEINE_ID = TripAware::isSeineId; Predicate<String> IS_LONGLINE_ID = TripAware::isLonglineId; ===================================== server/core/src/main/java/fr/ird/observe/server/ObserveWebApplicationContext.java ===================================== @@ -24,6 +24,8 @@ package fr.ird.observe.server; import com.google.common.collect.ImmutableList; import com.google.gson.GsonBuilder; +import fr.ird.observe.dto.data.TripAware; +import fr.ird.observe.gson.GSonTypedContractAdapter; import fr.ird.observe.gson.ObserveDataSourceConfigurationAdapter; import fr.ird.observe.gson.ObserveDtoGsonSupplier; import fr.ird.observe.server.configuration.ServerConfig; @@ -149,7 +151,10 @@ public class ObserveWebApplicationContext extends ApplicationContext { @Override protected GsonBuilder getGsonBuilder(boolean prettyPrint) { return super.getGsonBuilder(prettyPrint) - .registerTypeAdapter(ObserveDataSourceConfiguration.class, new ObserveDataSourceConfigurationAdapter()); + .registerTypeAdapter(ObserveDataSourceConfiguration.class, new ObserveDataSourceConfigurationAdapter()) + .registerTypeAdapter(TripAware.class, new GSonTypedContractAdapter<TripAware>(){ + + }); } }; ===================================== server/core/src/main/java/fr/ird/observe/server/injector/DateInjector.java ===================================== @@ -51,7 +51,7 @@ public class DateInjector implements ExecutorParametersInjectorHandler.Injector public Object getValue(Mapping mapping, Call call, String name, Class<?> type, Type generic) { Date result = null; - if (type.equals(Date.class)) { + if (type.equals(Date.class) && call.getParameterTree().getObject()!=null) { Call.ParameterTree parameterTree = call.getParameterTree().getObject().get(name); ===================================== services/client-impl/src/main/java/fr/ird/observe/services/client/ObserveServiceFactoryClient.java ===================================== @@ -23,6 +23,8 @@ package fr.ird.observe.services.client; */ import com.google.gson.GsonBuilder; +import fr.ird.observe.dto.data.TripAware; +import fr.ird.observe.gson.GSonTypedContractAdapter; import fr.ird.observe.gson.ObserveDataSourceConfigurationAdapter; import fr.ird.observe.gson.ObserveDataSourceConnectionAdapter; import fr.ird.observe.gson.ObserveDtoGsonSupplier; @@ -59,7 +61,8 @@ public class ObserveServiceFactoryClient extends ObserveServiceFactorySupport im return super.getGsonBuilder(prettyPrint) .registerTypeAdapter(ObserveDataSourceConnection.class, new ObserveDataSourceConnectionAdapter()) - .registerTypeAdapter(ObserveDataSourceConfiguration.class, new ObserveDataSourceConfigurationAdapter()); + .registerTypeAdapter(ObserveDataSourceConfiguration.class, new ObserveDataSourceConfigurationAdapter()) + .registerTypeAdapter(TripAware.class, new GSonTypedContractAdapter<>()); } }); ===================================== toolkit/dto/src/main/java/fr/ird/observe/gson/DtoReferenceAdapter.java ===================================== @@ -34,6 +34,7 @@ import fr.ird.observe.dto.reference.DtoReference; import java.lang.reflect.Type; /** + * FIXME Replace this by {@link GSonTypedContract} * Created on 06/09/2020. * * @author Tony Chemit - dev(a)tchemit.fr ===================================== toolkit/dto/src/main/java/fr/ird/observe/gson/GSonTypedContract.java ===================================== @@ -0,0 +1,34 @@ +package fr.ird.observe.gson; + +/*- + * #%L + * ObServe Toolkit :: Dto + * %% + * Copyright (C) 2008 - 2020 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% + */ + +/** + * Add this contract on any contract to be able to serialize and deserialize with Gson, the adapter will do the math. + * <p> + * Created on 30/12/2020. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 8.0.3 + */ +public interface GSonTypedContract { +} ===================================== toolkit/dto/src/main/java/fr/ird/observe/gson/GSonTypedContractAdapter.java ===================================== @@ -0,0 +1,59 @@ +package fr.ird.observe.gson; + +/*- + * #%L + * ObServe Toolkit :: Dto + * %% + * Copyright (C) 2008 - 2020 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.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParseException; +import com.google.gson.JsonSerializationContext; +import com.google.gson.JsonSerializer; + +import java.lang.reflect.Type; +import java.util.Map; + +/** + * Created on 30/12/2020. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 8.0.3 + */ +public class GSonTypedContractAdapter<O extends GSonTypedContract> implements JsonSerializer<O>, JsonDeserializer<O> { + + @Override + public JsonElement serialize(O src, Type typeOfSrc, JsonSerializationContext context) { + JsonObject result = new JsonObject(); + result.add("type", context.serialize(src.getClass())); + result.add("data", context.serialize(src)); + return result; + } + + @Override + public O deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { + JsonObject jsonObject = json.getAsJsonObject(); + Class<O> type = context.deserialize(jsonObject.get("type"), Class.class); + return context.deserialize(jsonObject.get("data"), type); + } + +} ===================================== toolkit/dto/src/main/java/fr/ird/observe/gson/MultimapAdapterSupport.java ===================================== @@ -25,9 +25,11 @@ package fr.ird.observe.gson; import com.google.common.collect.Multimap; import com.google.common.reflect.TypeParameter; import com.google.common.reflect.TypeToken; +import com.google.gson.JsonArray; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; +import com.google.gson.JsonObject; import com.google.gson.JsonParseException; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; @@ -35,6 +37,8 @@ import com.google.gson.JsonSerializer; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.Collection; +import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -63,18 +67,56 @@ public abstract class MultimapAdapterSupport<M extends Multimap> implements Json Type valueType = actualTypeArguments[1]; Type type2 = multimapOf(TypeToken.of(keyType), TypeToken.of(valueType)).getType(); - Map map = context.deserialize(json, type2); M result = createMultimap(); - for (Object key : map.keySet()) { - List multimapValues = (List) map.get(key); - result.putAll(key, multimapValues); + if (!json.isJsonArray()) { + + Map map = context.deserialize(json, type2); + + for (Object key : map.keySet()) { + List multimapValues = (List) map.get(key); + result.putAll(key, multimapValues); + } + } else { + JsonArray asJsonArray = json.getAsJsonArray(); + Iterator<JsonElement> iterator = asJsonArray.iterator(); + while (iterator.hasNext()) { + JsonObject entryObject = (JsonObject) iterator.next(); + Object key = context.deserialize(entryObject.get("key"), keyType); + JsonArray valuesArray = (JsonArray) entryObject.get("value"); + Iterator<JsonElement> valuesIterator = valuesArray.iterator(); + List entryValues = new LinkedList(); + while (valuesIterator.hasNext()) { + JsonElement value = valuesIterator.next(); + entryValues.add(context.deserialize(value, valueType)); + } + result.putAll(key, entryValues); + } } return result; } @Override - public JsonElement serialize(M src, Type typeOfSrc, JsonSerializationContext context) { - return context.serialize(src.asMap()); + public JsonElement serialize(M src, Type type, JsonSerializationContext context) { + Type[] actualTypeArguments = ((ParameterizedType) type).getActualTypeArguments(); + Type keyType = actualTypeArguments[0]; + Type valueType = actualTypeArguments[1]; + + JsonArray result = new JsonArray(); + for (Object o : src.asMap().entrySet()) { + Map.Entry entry = (Map.Entry) o; + Object key = entry.getKey(); + Collection<?> value = (Collection<?>) entry.getValue(); + JsonObject entryObject = new JsonObject(); + entryObject.add("key", context.serialize(key)); + JsonArray valuesObject = new JsonArray(); + for (Object o1 : value) { + valuesObject.add(context.serialize(o1, valueType)); + } + entryObject.add("value", valuesObject); + result.add(entryObject); + } + + return result; } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8784925f1a42b43f81a41a5b6… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8784925f1a42b43f81a41a5b6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] LL Trip : erreur d'enregistrement - Closes #1715
by Tony CHEMIT 30 Dec '20

30 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 44aee866 by Tony Chemit at 2020-12-30T19:06:51+01:00 LL Trip : erreur d'enregistrement - Closes #1715 * Revue de l'API de sauvegarde * Génération de l'action de sauvegarde - - - - - 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/content/actions/save/SaveAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/save/SaveAdapter.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/save/SaveConsumer.java - − client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/save/SaveExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/save/SaveRequest.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/save/SaveUIAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/actions/SaveEditUIAdapter.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/actions/SaveContentEditUIAdapter.java - − client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/actions/SaveEdit.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/actions/SaveOpenableUIAdapter.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/actions/SaveContentOpenableUIAdapter.java - − client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/actions/SaveOpenable.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/actions/SaveSimpleUIAdapter.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/actions/SaveContentSimpleUIAdapter.java - − client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/actions/SaveSimple.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/SaveTableUIAdapter.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/SaveContentTableUIAdapter.java - − client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/SaveTable.java - 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/actions/ReferentialSaveAdapter.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/content/referential/actions/SaveReferential.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/ActivityUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/ActivityUIHandler.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/CapabilityDescriptor.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/44aee866e7648eaf785bdaf51… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/44aee866e7648eaf785bdaf51… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Peaufinage de la table common.program - Closes #1712
by Tony CHEMIT 30 Dec '20

30 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4a856a8b by Tony Chemit at 2020-12-30T11:22:13+01:00 Peaufinage de la table common.program - Closes #1712 - - - - - 7 changed files: - models/persistence/src/main/resources/db/migration/8.0/30_common_fill-common.sql - models/persistence/src/test/resources/fixtures/persistence/count-referential-common.properties - models/persistence/src/test/resources/fixtures/persistence/entity-tables-count-referential.properties - tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz - tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz - tests/test/src/main/resources/db/8.0/referentiel.sql.gz - tests/test/src/main/resources/fixtures/global.properties Changes: ===================================== models/persistence/src/main/resources/db/migration/8.0/30_common_fill-common.sql ===================================== @@ -110,6 +110,8 @@ INSERT INTO common.Person(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate INSERT INTO common.Person(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.referential.common.Person#666#24' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, true, 'Savy', 'Vincent', 'fr.ird.referential.common.Country#1239832675593#0.3601938043845213'); INSERT INTO common.Person(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.referential.common.Person#666#25' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, true, 'Perikanan', 'Pengawas', 'fr.ird.referential.common.Country#1239832675593#0.3601938043845213'); +INSERT INTO common.program(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, label4, label5, label6, label7, label8, organism, nontargetobservation, targetdiscardsobservation, samplesobservation, objectsobservation, detailedactivitiesobservation, mammalsobservation, birdsobservation, baitobservation, startdate, enddate, comment, geartype) VALUES ('fr.ird.referential.common.Program#1609292987444#0.2779633795557708', 1, '2020-12-30 01:41:23.965', '2020-12-30 01:49:47.515', '50', null, null, FALSE, 1, 'FINSS', 'FINSS', 'FINSS', null, null, null, null, null, 'fr.ird.referential.common.Organism#1267835067241#0.06632537553306939', 1, 1, 1, 0, 0, 0, 0, 0, '2020-05-17 00:00:00', '2021-12-31 00:00:00', null, 1); + UPDATE common.Wind SET LABEL2='Calme (Calme)', LABEL1='Calm', LABEL3='Calma (Despejado)' WHERE CODE='0'; UPDATE common.Wind SET LABEL2='Très légère brise (Calme, ridée)', LABEL1='Light air',LABEL3='Ventolina (Pequeñas olas, pero sin espuma)' WHERE CODE='1'; UPDATE common.Wind SET LABEL2='Légère brise (Belle, vaguelettes)', LABEL1='Light breeze', LABEL3='Flojito (Crestas de apariencia vítrea, sin romper)' WHERE CODE='2'; ===================================== models/persistence/src/test/resources/fixtures/persistence/count-referential-common.properties ===================================== @@ -36,7 +36,7 @@ common.ocean=3 common.ocean_species=500 common.organism=9 common.person=537 -common.program=27 +common.program=28 common.shipowner=27 common.sex=5 common.sizemeasuretype=16 ===================================== models/persistence/src/test/resources/fixtures/persistence/entity-tables-count-referential.properties ===================================== @@ -32,7 +32,7 @@ fr.ird.observe.entities.referential.common.LengthWeightParameter=361 fr.ird.observe.entities.referential.common.Ocean=3 fr.ird.observe.entities.referential.common.Organism=9 fr.ird.observe.entities.referential.common.Person=537 -fr.ird.observe.entities.referential.common.Program=27 +fr.ird.observe.entities.referential.common.Program=28 fr.ird.observe.entities.referential.common.Sex=5 fr.ird.observe.entities.referential.common.ShipOwner=27 fr.ird.observe.entities.referential.common.SizeMeasureType=16 ===================================== tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz and b/tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz and b/tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/referentiel.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/referentiel.sql.gz and b/tests/test/src/main/resources/db/8.0/referentiel.sql.gz differ ===================================== tests/test/src/main/resources/fixtures/global.properties ===================================== @@ -35,5 +35,5 @@ SPECIES_GROUP_ID=fr.ird.referential.common.SpeciesGroup#1239832683689#0.71201161 # for fr.ird.observe.spi.DbModelHelperTest REFERENCE_DATA_COUNT=52 # for fr.ird.observe.services.local.service.referential.differential.DifferentialModelTest -REFERENTIAL_COUNT=3030 +REFERENTIAL_COUNT=3031 ENTITIES_LIMIT_SIZE=100 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4a856a8bf5393c39badea40bb… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4a856a8bf5393c39badea40bb… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Améliorer les performances lors du changement de l'arbre de navigation - See #1655
by Tony CHEMIT 29 Dec '20

29 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6a818a1d by Tony Chemit at 2020-12-29T16:46:05+01:00 Améliorer les performances lors du changement de l'arbre de navigation - See #1655 Mise en page de l'arbre sur le référentiel manageur - Closes #1707 - - - - - 30 changed files: - client/configuration/src/main/java/fr/ird/observe/client/configuration/NavigationTreeConfig.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUINavigationHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUINavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUINavigationNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ReferentialHomeUINavigationCapability.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ReferentialHomeUINavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ReferentialHomeUINavigationNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/selection/RootSelectionTreeNodeProvider.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/selection/SelectionTreeModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/selection/nodes/RootSelectionTreeNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationTreeModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/NavigationConfigUIToggleShowActionSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/NavigationNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationCapability.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationTreeNodeProvider.java - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/CommonRootSelectionTreeNodeProvider.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/LlRootNavigationTreeNodeProvider.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/LlRootSelectionTreeNodeProvider.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUIModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/PsRootNavigationTreeNodeProvider.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/PsRootSelectionTreeNodeProvider.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/helper/ContentUINavigationNodeHelper.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/referential/GenerateContentReferentialUI.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/referential/GenerateReferentialHomeUI.java - models/dto/src/main/java/fr/ird/observe/dto/data/navigation/NavigationResult.java - models/dto/src/main/java/fr/ird/observe/dto/data/navigation/NavigationRequest.java → models/persistence/src/main/java/fr/ird/observe/entities/LastUpdateDateTopiaDao.java - services/api/src/main/java/fr/ird/observe/services/service/data/NavigationService.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/NavigationServiceLocalSupport.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/6a818a1d001381c9259fd3d00… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/6a818a1d001381c9259fd3d00… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Peaufinage de la table common.country - Closes #1708
by Tony CHEMIT 29 Dec '20

29 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1b7dd1d4 by Tony Chemit at 2020-12-29T12:27:39+01:00 Peaufinage de la table common.country - Closes #1708 - - - - - 7 changed files: - models/persistence/src/main/resources/db/migration/8.0/30_common_fill-common.sql - models/persistence/src/test/resources/fixtures/persistence/count-referential-common.properties - models/persistence/src/test/resources/fixtures/persistence/entity-tables-count-referential.properties - tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz - tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz - tests/test/src/main/resources/db/8.0/referentiel.sql.gz - tests/test/src/main/resources/fixtures/global.properties Changes: ===================================== models/persistence/src/main/resources/db/migration/8.0/30_common_fill-common.sql ===================================== @@ -66,6 +66,9 @@ INSERT INTO common.WeightMeasureMethod(topiaId, topiaVersion, topiaCreateDate, l INSERT INTO common.WeightMeasureMethod(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, label1, label2, label3) values ('fr.ird.referential.common.WeightMeasureMethod#666#03' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'Visual estimate', 'Estimation visuelle', 'Estimación visual'); INSERT INTO common.WeightMeasureMethod(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, label1, label2, label3) values ('fr.ird.referential.common.WeightMeasureMethod#666#04' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'Estimate with sounder', 'Estimation au sondeur', 'Estimación con la ecosonda'); +INSERT INTO common.country(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, label4, label5, label6, label7, label8, iso2code, iso3code) VALUES ('fr.ird.referential.common.Country#1609197326325#0.9797981297337345', 1, '2020-12-28 23:13:40.571', '2020-12-28 23:15:26.372', '92', null, null, 'f', 1, 'Philippines', 'Philippines', 'Filipinas', null, null, null, null, null, 'PH', 'PHL'); +INSERT INTO common.country(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, label4, label5, label6, label7, label8, iso2code, iso3code) VALUES ('fr.ird.referential.common.Country#1609197447702#0.5128194152482344', 1, '2020-12-28 23:16:24.312', '2020-12-28 23:17:27.702', '93', null, null, 'f', 1, 'Oman', 'Oman', 'Omán', null, null, null, null, null, 'OM', 'OMN'); + UPDATE common.country SET iso2code = 'MR', iso3code = 'MRT', topiaVersion = topiaVersion + 1, lastUpdateDate = '2019-01-15 00:00:00.0' WHERE topiaId = 'fr.ird.referential.common.Country#1464000000000#0.00054'; UPDATE common.country SET iso2code = 'PR', iso3code = 'PRI', topiaVersion = topiaVersion + 1, lastUpdateDate = '2019-01-15 00:00:00.0' WHERE topiaId = 'fr.ird.referential.common.Country#1464000000000#0.00076'; ===================================== models/persistence/src/test/resources/fixtures/persistence/count-referential-common.properties ===================================== @@ -20,7 +20,7 @@ # #L% ### # suppress inspection "SpellCheckingInspection" for whole file -common.country=72 +common.country=74 common.dataquality=5 common.fpazone=42 common.gear=26 ===================================== models/persistence/src/test/resources/fixtures/persistence/entity-tables-count-referential.properties ===================================== @@ -19,7 +19,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -fr.ird.observe.entities.referential.common.Country=72 +fr.ird.observe.entities.referential.common.Country=74 fr.ird.observe.entities.referential.common.DataQuality=5 fr.ird.observe.entities.referential.common.FpaZone=42 fr.ird.observe.entities.referential.common.Gear=26 ===================================== tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz and b/tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz and b/tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/referentiel.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/referentiel.sql.gz and b/tests/test/src/main/resources/db/8.0/referentiel.sql.gz differ ===================================== tests/test/src/main/resources/fixtures/global.properties ===================================== @@ -35,5 +35,5 @@ SPECIES_GROUP_ID=fr.ird.referential.common.SpeciesGroup#1239832683689#0.71201161 # for fr.ird.observe.spi.DbModelHelperTest REFERENCE_DATA_COUNT=52 # for fr.ird.observe.services.local.service.referential.differential.DifferentialModelTest -REFERENTIAL_COUNT=3028 +REFERENTIAL_COUNT=3030 ENTITIES_LIMIT_SIZE=100 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/1b7dd1d4bdd169d16763e405d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/1b7dd1d4bdd169d16763e405d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Peaufinage de la table ll_common.onboardprocessing - Closes #1705
by Tony CHEMIT 29 Dec '20

29 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 78d97ddc by Tony Chemit at 2020-12-29T12:04:50+01:00 Peaufinage de la table ll_common.onboardprocessing - Closes #1705 - - - - - 4 changed files: - models/persistence/src/main/resources/db/migration/8.0/60_ll_common_fill-common.sql - tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz - tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz - tests/test/src/main/resources/db/8.0/referentiel.sql.gz Changes: ===================================== models/persistence/src/main/resources/db/migration/8.0/60_ll_common_fill-common.sql ===================================== @@ -57,11 +57,11 @@ INSERT INTO ll_common.TripType(topiaId, topiaVersion, topiaCreateDate, lastUpdat INSERT INTO ll_common.catchfate(topiaid, topiaversion, topiacreatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate, homeid)VALUES ('fr.ird.referential.ll.common.CatchFate#1602461782467#0.352029166184366', 3, '2020-10-12 00:16:22', 'LOST', 0, null, 'Lost (FINSS migration)', 'Perdu (migration FINSS)', 'Lost (FINSS migration) #TODO', null, null, null, null, null, 'f', '2020-10-12 00:16:22', null); -INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#01' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'WL', 'Whole fish', 'Poisson entier', 'Poisson entier #TODO'); -INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#02' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'H', 'Headed', 'Etêté', 'Etêté #TODO'); -INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#03' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'HG', 'Headed and gutted', 'Etêté et vidé', 'Etêté et vidé #TODO'); -INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#04' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'GG', 'Gilled and gutted', 'Vidé et sans branchies', 'Vidé et sans branchies #TODO'); -INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#05' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'L', 'Loins', 'Longes', 'Longes #TODO'); +INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.1' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'WL', 'Whole fish', 'Poisson entier', 'Poisson entier #TODO'); +INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.2' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'H', 'Headed', 'Etêté', 'Etêté #TODO'); +INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.3' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'HG', 'Headed and gutted', 'Etêté et vidé', 'Etêté et vidé #TODO'); +INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.4' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'GG', 'Gilled and gutted', 'Vidé et sans branchies', 'Vidé et sans branchies #TODO'); +INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.5' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'L', 'Loins', 'Longes', 'Longes #TODO'); INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.16', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'UNK', 1, 'f', null, 'Unknown', 'Inconnu', 'Unknown #TODO', null, null, null, null, null, null); INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.17', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'GUT', 1, 'f', null, 'Gutted', 'Vidé', 'Gutted #TODO', null, null, null, null, null, null); INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.18', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'FIN', 1, 'f', null, 'Finned', 'Aileron coupé', 'Finned #TODO', null, null, null, null, null, null); ===================================== tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz and b/tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz and b/tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/referentiel.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/referentiel.sql.gz and b/tests/test/src/main/resources/db/8.0/referentiel.sql.gz differ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/78d97ddc45e82fe14fda4c125… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/78d97ddc45e82fe14fda4c125… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Peaufinage de la table ll_common.catchefate - Closes #1706
by Tony CHEMIT 28 Dec '20

28 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2425906c by Tony Chemit at 2020-12-28T19:48:11+01:00 Peaufinage de la table ll_common.catchefate - Closes #1706 - - - - - a94627d5 by Tony Chemit at 2020-12-28T20:18:51+01:00 Peaufinage de la table ll_common.onboardprocessing - Closes #1705 - - - - - 8 changed files: - models/persistence/src/main/resources/db/migration/8.0/60_ll_common_fill-common.sql - models/persistence/src/test/resources/fixtures/persistence/count-referential-longline.properties - models/persistence/src/test/resources/fixtures/persistence/entity-tables-count-referential.properties - services/local-impl/src/test/resources/fixtures/validate-service-referential.properties - tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz - tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz - tests/test/src/main/resources/db/8.0/referentiel.sql.gz - tests/test/src/main/resources/fixtures/global.properties Changes: ===================================== models/persistence/src/main/resources/db/migration/8.0/60_ll_common_fill-common.sql ===================================== @@ -52,25 +52,34 @@ INSERT INTO ll_common.vesselActivity(topiaId, topiaVersion, topiaCreateDate, cod INSERT INTO ll_common.vesselActivity(topiaId, topiaVersion, topiaCreateDate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needComment, lastUpdateDate) VALUES ('fr.ird.referential.ll.common.VesselActivity#1464000000000#0.14', 0, '2018-12-12', 'SEARCH', 1, null, 'Search', 'Recherche', 'Search #TODO', null, null, null, null, null, FALSE, '2018-12-12 17:00:00'); INSERT INTO ll_common.vesselActivity(topiaId, topiaVersion, topiaCreateDate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needComment, lastUpdateDate) VALUES ('fr.ird.referential.ll.common.VesselActivity#1464000000000#0.15', 0, '2018-12-12', 'TRANSIT', 1, null, 'Transit', 'Transit', 'Transit #TODO', null, null, null, null, null, FALSE, '2018-12-12 17:00:00'); -INSERT INTO ll_common.TripType(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.TripType#666#01' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'SC', 'Scientific trip', 'Marée scientifique', 'Marea experimental'); -INSERT INTO ll_common.TripType(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.TripType#666#02' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'CM', 'Commercial trip', 'Marée de pêche commerciale', 'Marea commercial'); +INSERT INTO ll_common.TripType(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.TripType#1464000000000#01' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'SC', 'Scientific trip', 'Marée scientifique', 'Marea experimental'); +INSERT INTO ll_common.TripType(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.TripType#1464000000000#02' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'CM', 'Commercial trip', 'Marée de pêche commerciale', 'Marea commercial'); +INSERT INTO ll_common.catchfate(topiaid, topiaversion, topiacreatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate, homeid)VALUES ('fr.ird.referential.ll.common.CatchFate#1602461782467#0.352029166184366', 3, '2020-10-12 00:16:22', 'LOST', 0, null, 'Lost (FINSS migration)', 'Perdu (migration FINSS)', 'Lost (FINSS migration) #TODO', null, null, null, null, null, 'f', '2020-10-12 00:16:22', null); -INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.OnBoardProcessing#666#01' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'WL', 'Whole fish', 'Poisson entier', 'Poisson entier #TODO'); -INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.OnBoardProcessing#666#02' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'H', 'Headed', 'Etêté', 'Etêté #TODO'); -INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.OnBoardProcessing#666#03' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'HG', 'Headed and gutted', 'Etêté et vidé', 'Etêté et vidé #TODO'); -INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.OnBoardProcessing#666#04' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'GG', 'Gilled and gutted', 'Vidé et sans branchies', 'Vidé et sans branchies #TODO'); -INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.OnBoardProcessing#666#05' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'L', 'Loins', 'Longes', 'Longes #TODO'); +INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#01' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'WL', 'Whole fish', 'Poisson entier', 'Poisson entier #TODO'); +INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#02' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'H', 'Headed', 'Etêté', 'Etêté #TODO'); +INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#03' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'HG', 'Headed and gutted', 'Etêté et vidé', 'Etêté et vidé #TODO'); +INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#04' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'GG', 'Gilled and gutted', 'Vidé et sans branchies', 'Vidé et sans branchies #TODO'); +INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#05' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'L', 'Loins', 'Longes', 'Longes #TODO'); +INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.16', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'UNK', 1, 'f', null, 'Unknown', 'Inconnu', 'Unknown #TODO', null, null, null, null, null, null); +INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.17', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'GUT', 1, 'f', null, 'Gutted', 'Vidé', 'Gutted #TODO', null, null, null, null, null, null); +INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.18', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'FIN', 1, 'f', null, 'Finned', 'Aileron coupé', 'Finned #TODO', null, null, null, null, null, null); +INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.19', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'SUMMEAT', 1, 'f', null, 'Total Meat Retained for all species', 'Chair conservée pour toutes les espèces', 'Total Meat Retained for all species #TODO', null, null, null, null, null, null); +INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.20', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'DOGFD', 1, 'f', null, 'Fish used for animal feed', 'Alimentation pour animal', 'Fish used for animal feed #TODO', null, null, null, null, null, null); +INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.21', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'DR', 1, 'f', null, 'Dried', 'Séché', 'Dried #TODO', null, null, null, null, null, null); +INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.22', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'FILLET', 1, 'f', null, 'Filleted', 'Filet', 'Filleted #TODO', null, null, null, null, null, null); +INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.23', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'GIL', 1, 'f', null, 'Gilled', 'Sans branchies', 'Gilled #TODO', null, null, null, null, null, null); INSERT INTO ll_common.linetype (topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.LineType#1239832686157#0.9', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'UNK', 'Unknown', 'Inconnu', 'Desconocido'); UPDATE ll_common.trip SET observationsAvailability = TRUE; -- SC : Sc + Obs -UPDATE ll_common.trip SET tripType ='fr.ird.referential.ll.common.TripType#666#01', observationMethod = 'fr.ird.referential.ll.common.ObservationMethod#1239832686136#0.2' WHERE observationMethod = 'fr.ird.referential.ll.common.ObservationMethod#1239832686136#0.3'; +UPDATE ll_common.trip SET tripType ='fr.ird.referential.ll.common.TripType#1464000000000#01', observationMethod = 'fr.ird.referential.ll.common.ObservationMethod#1239832686136#0.2' WHERE observationMethod = 'fr.ird.referential.ll.common.ObservationMethod#1239832686136#0.3'; -- OB : Co + Obs -UPDATE ll_common.trip SET tripType ='fr.ird.referential.ll.common.TripType#666#02' WHERE observationMethod = 'fr.ird.referential.ll.common.ObservationMethod#1239832686136#0.2'; +UPDATE ll_common.trip SET tripType ='fr.ird.referential.ll.common.TripType#1464000000000#02' WHERE observationMethod = 'fr.ird.referential.ll.common.ObservationMethod#1239832686136#0.2'; -- SR : Com + Auto -UPDATE ll_common.trip SET tripType ='fr.ird.referential.ll.common.TripType#666#02' WHERE observationMethod = 'fr.ird.referential.ll.common.ObservationMethod#1239832686136#0.1'; +UPDATE ll_common.trip SET tripType ='fr.ird.referential.ll.common.TripType#1464000000000#02' WHERE observationMethod = 'fr.ird.referential.ll.common.ObservationMethod#1239832686136#0.1'; UPDATE ll_common.trip SET topiaVersion = topiaVersion + 1; UPDATE ll_common.observationMethod SET code = 'SR', topiaVersion = topiaVersion + 1 WHERE topiaId='fr.ird.referential.ll.common..ObservationMethod#1239832686136#0.1'; ===================================== models/persistence/src/test/resources/fixtures/persistence/count-referential-longline.properties ===================================== @@ -23,7 +23,7 @@ ll_observation.baithaulingstatus=5 ll_common.baitsettingstatus=5 ll_common.baittype=16 -ll_common.catchfate=5 +ll_common.catchfate=6 ll_observation.encountertype=12 ll_common.healthstatus=6 ll_observation.hookposition=13 @@ -47,6 +47,6 @@ ll_common.weightcategory=0 ll_landing.company=30 ll_landing.datasource=20 ll_common.triptype=2 -ll_common.onboardprocessing=5 +ll_common.onboardprocessing=13 ll_landing.conservation=3 ll_common.weightdeterminationmethod=0 ===================================== models/persistence/src/test/resources/fixtures/persistence/entity-tables-count-referential.properties ===================================== @@ -48,7 +48,7 @@ fr.ird.observe.entities.referential.common.WeightMeasureType=3 fr.ird.observe.entities.referential.common.Wind=13 fr.ird.observe.entities.referential.ll.common.BaitSettingStatus=5 fr.ird.observe.entities.referential.ll.common.BaitType=16 -fr.ird.observe.entities.referential.ll.common.CatchFate=5 +fr.ird.observe.entities.referential.ll.common.CatchFate=6 fr.ird.observe.entities.referential.ll.common.HealthStatus=6 fr.ird.observe.entities.referential.ll.common.HookSize=22 fr.ird.observe.entities.referential.ll.common.HookType=13 @@ -57,7 +57,7 @@ fr.ird.observe.entities.referential.ll.common.LightsticksType=2 fr.ird.observe.entities.referential.ll.common.LineType=9 fr.ird.observe.entities.referential.ll.common.MitigationType=15 fr.ird.observe.entities.referential.ll.common.ObservationMethod=2 -fr.ird.observe.entities.referential.ll.common.OnBoardProcessing=5 +fr.ird.observe.entities.referential.ll.common.OnBoardProcessing=13 fr.ird.observe.entities.referential.ll.common.SettingShape=6 fr.ird.observe.entities.referential.ll.common.TripType=2 fr.ird.observe.entities.referential.ll.common.VesselActivity=27 ===================================== services/local-impl/src/test/resources/fixtures/validate-service-referential.properties ===================================== @@ -64,7 +64,7 @@ MitigationTypeDto=1 VesselSizeCategoryDto=1 SizeMeasureTypeDto=3 ShipOwnerDto=3 -CatchFateDto=1 +CatchFateDto=2 GearCharacteristicTypeDto=2 GearCharacteristicDto=1 ReasonForDiscardDto=3 ===================================== tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz and b/tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz and b/tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/referentiel.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/referentiel.sql.gz and b/tests/test/src/main/resources/db/8.0/referentiel.sql.gz differ ===================================== tests/test/src/main/resources/fixtures/global.properties ===================================== @@ -35,5 +35,5 @@ SPECIES_GROUP_ID=fr.ird.referential.common.SpeciesGroup#1239832683689#0.71201161 # for fr.ird.observe.spi.DbModelHelperTest REFERENCE_DATA_COUNT=52 # for fr.ird.observe.services.local.service.referential.differential.DifferentialModelTest -REFERENTIAL_COUNT=3019 +REFERENTIAL_COUNT=3028 ENTITIES_LIMIT_SIZE=100 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9157663c0b07dc9aa39f09d0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9157663c0b07dc9aa39f09d0… You're receiving this email because of your account on gitlab.com.

1 0