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

[Git][ultreiaio/ird-observe][develop] 4 commits: Missing some fields on ShipOwner form
by Tony CHEMIT Aug. 4, 2019

Aug. 4, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 864e14da by tchemit at 2019-08-04T23:12:22Z Missing some fields on ShipOwner form - - - - - 68ea268f by tchemit at 2019-08-04T23:15:05Z Missing some labels on form - - - - - 9b9e8247 by tchemit at 2019-08-04T23:15:06Z Ajout d'une méthode pour récupérer les clef naturels sur un référentiel - - - - - 8815c15f by tchemit at 2019-08-04T23:15:06Z [UI][REFERENTIEL] Icône 'Toutes les clés métier de ce référentiel' - Closes #1371 - - - - - 30 changed files: - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/ref/ShowReferentialUniqueKeyUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/CountryUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/FpaZoneUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/GearCaracteristicUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/GearUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/HarbourUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/LengthLengthParameterUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/LengthLengthParameterUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/LengthWeightParameterUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/LengthWeightParameterUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/OrganismUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/PersonUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/ProgramUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/ShipOwnerUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/ShipOwnerUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/SpeciesUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/VesselSizeCategoryUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/VesselUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/WindUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ll/observation/MaturityStatusUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ll/observation/SensorBrandUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/common/SpeciesFateUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/common/VesselActivityUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/observation/ObjectMaterialUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/observation/ObservedSystemUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/observation/WeightCategoryUIModel.java - dto/src/main/models/Observe-01-referential-common.model The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f25d6134cc6706063ec854a199… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f25d6134cc6706063ec854a199… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: [CARTO] Petits ajustement sur la carte - Closes #1368
by Tony CHEMIT Aug. 4, 2019

Aug. 4, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b32ca653 by tchemit at 2019-08-04T15:27:37Z [CARTO] Petits ajustement sur la carte - Closes #1368 - - - - - f25d6134 by tchemit at 2019-08-04T15:27:39Z [SERVEUR] observe-server.conf / observeweb.host - Closes #1369 - - - - - 6 changed files: - client-core/src/main/map/ps-style.xml - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - server-configuration/src/main/config/Server.ini - server-core/src/main/java/fr/ird/observe/server/controller/v1/DataSourceServiceRestApi.java Changes: ===================================== client-core/src/main/map/ps-style.xml ===================================== @@ -138,7 +138,7 @@ <CssParameter name="stroke-width">1</CssParameter> </Stroke> </Mark> - <Size>8</Size> + <Size>4</Size> </Graphic> </PointSymbolizer> </Rule> @@ -183,7 +183,7 @@ <PointSymbolizer> <Graphic> <Mark> - <WellKnownName>ttf://Serif#U+2B1F</WellKnownName> + <WellKnownName>ttf://Serif#U+002B</WellKnownName> <Fill> <CssParameter name="fill">#00FF00</CssParameter> </Fill> @@ -192,7 +192,7 @@ <CssParameter name="stroke-width">1</CssParameter> </Stroke> </Mark> - <Size>16</Size> + <Size>12</Size> </Graphic> </PointSymbolizer> </Rule> ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -673,13 +673,13 @@ observe.constant.StorageStep.ROLES=Security observe.constant.StorageStep.ROLES.description=Apply security on database roles observe.constant.StorageStep.SELECT_DATA=Data selection observe.constant.StorageStep.SELECT_DATA.description=Select data to export in backup -observe.constant.TripMapPointType.llActivityLogbook=Logbook - Activity (Other) +observe.constant.TripMapPointType.llActivityLogbook=Logbook - Other activity observe.constant.TripMapPointType.llActivityLogbookInHarbour=Logbook - At Harbour observe.constant.TripMapPointType.llActivityLogbookWithHaulingEnd=Logbook - Hauling end observe.constant.TripMapPointType.llActivityLogbookWithHaulingStart=Logbook - Hauling start observe.constant.TripMapPointType.llActivityLogbookWithSettingEnd=Logbook - Setting end observe.constant.TripMapPointType.llActivityLogbookWithSettingStart=Logbook - Setting start -observe.constant.TripMapPointType.llActivityObs=Observation - Activity (Other) +observe.constant.TripMapPointType.llActivityObs=Observation - Other activity observe.constant.TripMapPointType.llActivityObsInHarbour=Observation - At Harbour observe.constant.TripMapPointType.llActivityObsWithHaulingEnd=Observation - Hauling end observe.constant.TripMapPointType.llActivityObsWithHaulingStart=Observation - Hauling start @@ -687,7 +687,7 @@ observe.constant.TripMapPointType.llActivityObsWithSettingEnd=Observation - Sett observe.constant.TripMapPointType.llActivityObsWithSettingStart=Observation - Setting start observe.constant.TripMapPointType.llTripDepartureHarbour=Harbour departure observe.constant.TripMapPointType.llTripLandingHarbour=Harbour landing -observe.constant.TripMapPointType.psActivityObs=Activity (Other) +observe.constant.TripMapPointType.psActivityObs=Other activity observe.constant.TripMapPointType.psActivityObsInHarbour=In harbour observe.constant.TripMapPointType.psActivityObsWithFreeSchoolType=Free School type observe.constant.TripMapPointType.psActivityObsWithObjectSchoolType=Object School type @@ -723,7 +723,7 @@ observe.content.map.legend.logbook.setting=Logbook - setting observe.content.map.legend.obs.hauling=Observation - Hauling observe.content.map.legend.obs.setting=Observation - setting observe.content.map.legend.setting=setting -observe.content.map.legend.tripBetweenTwoDays=Trip between two days +observe.content.map.legend.tripBetweenTwoDays=Night trip observe.content.map.legend.tripDay=Day trip observe.content.map.miles=miles observe.content.map.north=North ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -673,13 +673,13 @@ observe.constant.StorageStep.ROLES=Seguridad observe.constant.StorageStep.ROLES.description=Configuración de la seguridad observe.constant.StorageStep.SELECT_DATA=Selección de datos observe.constant.StorageStep.SELECT_DATA.description=Seleccionar los datos a exportar en la copia de seguridad -observe.constant.TripMapPointType.llActivityLogbook=Logbook - Actividad (Other) \#TODO +observe.constant.TripMapPointType.llActivityLogbook=Logbook - Otro Actividad observe.constant.TripMapPointType.llActivityLogbookInHarbour=Logbook - En el puerto observe.constant.TripMapPointType.llActivityLogbookWithHaulingEnd=Logbook - Fin de arrastre observe.constant.TripMapPointType.llActivityLogbookWithHaulingStart=Logbook - Inicio de arrastre observe.constant.TripMapPointType.llActivityLogbookWithSettingEnd=Logbook - Fin de calada observe.constant.TripMapPointType.llActivityLogbookWithSettingStart=Logbook - Inicio de calada -observe.constant.TripMapPointType.llActivityObs=Observation - Actividad (Other) \#TODO +observe.constant.TripMapPointType.llActivityObs=Observation - Otro Actividad observe.constant.TripMapPointType.llActivityObsInHarbour=Observation - En el puerto observe.constant.TripMapPointType.llActivityObsWithHaulingEnd=Observation - Fin de arrastre observe.constant.TripMapPointType.llActivityObsWithHaulingStart=Observation - Inicio de arrastre @@ -687,7 +687,7 @@ observe.constant.TripMapPointType.llActivityObsWithSettingEnd=Observation - Fin observe.constant.TripMapPointType.llActivityObsWithSettingStart=Observation - Inicio de calada observe.constant.TripMapPointType.llTripDepartureHarbour=Puerto de salida observe.constant.TripMapPointType.llTripLandingHarbour=Puerto de llegada -observe.constant.TripMapPointType.psActivityObs=Actividad (Other) \#TODO +observe.constant.TripMapPointType.psActivityObs=Otro Actividad observe.constant.TripMapPointType.psActivityObsInHarbour=En puerto observe.constant.TripMapPointType.psActivityObsWithFreeSchoolType=Banco libre observe.constant.TripMapPointType.psActivityObsWithObjectSchoolType=Banco a objeto @@ -723,7 +723,7 @@ observe.content.map.legend.logbook.setting=Logbook - Calada observe.content.map.legend.obs.hauling=Observation - Arrastre observe.content.map.legend.obs.setting=Observation - Calada observe.content.map.legend.setting=Calada -observe.content.map.legend.tripBetweenTwoDays=Trayecto entre dos días +observe.content.map.legend.tripBetweenTwoDays=Trayecto del noche observe.content.map.legend.tripDay=Trayecto del día observe.content.map.miles=milles observe.content.map.north=Norte ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -673,13 +673,13 @@ observe.constant.StorageStep.ROLES=Sécurité observe.constant.StorageStep.ROLES.description=Mise en place de la sécurité observe.constant.StorageStep.SELECT_DATA=Sélection données observe.constant.StorageStep.SELECT_DATA.description=Sélectionner les données à exporter dans la sauvegarde -observe.constant.TripMapPointType.llActivityLogbook=Livre de bord - Activité (autre) +observe.constant.TripMapPointType.llActivityLogbook=Livre de bord - Autre Activité observe.constant.TripMapPointType.llActivityLogbookInHarbour=Livre de bord - Au port observe.constant.TripMapPointType.llActivityLogbookWithHaulingEnd=Livre de bord - Fin de virage observe.constant.TripMapPointType.llActivityLogbookWithHaulingStart=Livre de bord - Début de virage observe.constant.TripMapPointType.llActivityLogbookWithSettingEnd=Livre de bord - Fin de filage observe.constant.TripMapPointType.llActivityLogbookWithSettingStart=Livre de bord - Début de filage -observe.constant.TripMapPointType.llActivityObs=Observation - Activité (autre) +observe.constant.TripMapPointType.llActivityObs=Observation - autre activité observe.constant.TripMapPointType.llActivityObsInHarbour=Observation - Au port observe.constant.TripMapPointType.llActivityObsWithHaulingEnd=Observation - Fin de virage observe.constant.TripMapPointType.llActivityObsWithHaulingStart=Observation - Début de virage @@ -687,7 +687,7 @@ observe.constant.TripMapPointType.llActivityObsWithSettingEnd=Observation - Fin observe.constant.TripMapPointType.llActivityObsWithSettingStart=Observation - Début de filage observe.constant.TripMapPointType.llTripDepartureHarbour=Port de départ observe.constant.TripMapPointType.llTripLandingHarbour=Port d'arrivée -observe.constant.TripMapPointType.psActivityObs=Activité (autre) +observe.constant.TripMapPointType.psActivityObs=Autre activité observe.constant.TripMapPointType.psActivityObsInHarbour=Au port observe.constant.TripMapPointType.psActivityObsWithFreeSchoolType=Banc libre observe.constant.TripMapPointType.psActivityObsWithObjectSchoolType=Banc objet @@ -723,8 +723,8 @@ observe.content.map.legend.logbook.setting=Livre de bord - Filage observe.content.map.legend.obs.hauling=Observation - Virage observe.content.map.legend.obs.setting=Observation - Filage observe.content.map.legend.setting=Filage -observe.content.map.legend.tripBetweenTwoDays=Trajet entre deux jours -observe.content.map.legend.tripDay=Trajet d'une journée +observe.content.map.legend.tripBetweenTwoDays=Trajet de nuit +observe.content.map.legend.tripDay=Trajet de jour observe.content.map.miles=milles observe.content.map.north=Nord observe.content.map.showLogbook=Voir les données Livre de bord ===================================== server-configuration/src/main/config/Server.ini ===================================== @@ -28,20 +28,6 @@ type = string defaultValue = changeme final = true -[option host] -description = observeweb.host.description -key = observeweb.host -type = url -defaultValue = http://localhost:8080 -final = true - -[option apiUrl] -description = observeweb.apiUrl.description -key = observeweb.apiUrl -type = url -defaultValue = ${observeweb.host}/${observeweb.contextPath}/api/v1 -final = true - [option modelVersion] description = observe.model.version key = observeweb.model.version ===================================== server-core/src/main/java/fr/ird/observe/server/controller/v1/DataSourceServiceRestApi.java ===================================== @@ -44,6 +44,7 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; import java.io.File; +import java.net.URL; import java.util.LinkedHashSet; import java.util.Optional; import java.util.Set; @@ -71,7 +72,7 @@ public class DataSourceServiceRestApi extends GeneratedDataSourceServiceRestApi ObserveDataSourceConnection observeDataSourceConnection = getAnonymousService(dataSourceConfigurationTopia).create(dataSourceConfigurationTopia, dataSourceCreateConfiguration); String authenticationToken = registerDataSourceConfiguration(dataSourceConfigurationTopia, observeDataSourceConnection); - return createDataSourceConnection(observeDataSourceConnection, authenticationToken); + return createDataSourceConnection(((ObserveDataSourceConnectionRest)dataSourceConfiguration).getServerUrl(), observeDataSourceConnection, authenticationToken); } @@ -83,7 +84,7 @@ public class DataSourceServiceRestApi extends GeneratedDataSourceServiceRestApi ObserveDataSourceConnection observeDataSourceConnection = getAnonymousService(dataSourceConfigurationTopia).open(dataSourceConfigurationTopia); String authenticationToken = registerDataSourceConfiguration(dataSourceConfigurationTopia, observeDataSourceConnection); - return createDataSourceConnection(observeDataSourceConnection, authenticationToken); + return createDataSourceConnection(((ObserveDataSourceConfigurationRest)dataSourceConfiguration).getServerUrl(),observeDataSourceConnection, authenticationToken); } @@ -155,10 +156,10 @@ public class DataSourceServiceRestApi extends GeneratedDataSourceServiceRestApi } - protected ObserveDataSourceConnectionRest createDataSourceConnection(ObserveDataSourceConnection observeDataSourceConnection, String authenticationToken) { + protected ObserveDataSourceConnectionRest createDataSourceConnection(URL serverUrl, ObserveDataSourceConnection observeDataSourceConnection, String authenticationToken) { return new ObserveDataSourceConnectionRest( - getApplicationConfiguration().getApiUrl(), + serverUrl, authenticationToken, observeDataSourceConnection.canReadReferential(), observeDataSourceConnection.canWriteReferential(), View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/699b0511028de38f9ccd78bd8d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/699b0511028de38f9ccd78bd8d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [SERVEUR] observe-server.conf / observeweb.host - Closes #1369
by Tony CHEMIT Aug. 4, 2019

Aug. 4, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 699b0511 by tchemit at 2019-08-04T14:48:45Z [SERVEUR] observe-server.conf / observeweb.host - Closes #1369 - - - - - 2 changed files: - server-configuration/src/main/config/Server.ini - server-core/src/main/java/fr/ird/observe/server/controller/v1/DataSourceServiceRestApi.java Changes: ===================================== server-configuration/src/main/config/Server.ini ===================================== @@ -28,20 +28,6 @@ type = string defaultValue = changeme final = true -[option host] -description = observeweb.host.description -key = observeweb.host -type = url -defaultValue = http://localhost:8080 -final = true - -[option apiUrl] -description = observeweb.apiUrl.description -key = observeweb.apiUrl -type = url -defaultValue = ${observeweb.host}/${observeweb.contextPath}/api/v1 -final = true - [option modelVersion] description = observe.model.version key = observeweb.model.version ===================================== server-core/src/main/java/fr/ird/observe/server/controller/v1/DataSourceServiceRestApi.java ===================================== @@ -44,6 +44,7 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; import java.io.File; +import java.net.URL; import java.util.LinkedHashSet; import java.util.Optional; import java.util.Set; @@ -71,7 +72,7 @@ public class DataSourceServiceRestApi extends GeneratedDataSourceServiceRestApi ObserveDataSourceConnection observeDataSourceConnection = getAnonymousService(dataSourceConfigurationTopia).create(dataSourceConfigurationTopia, dataSourceCreateConfiguration); String authenticationToken = registerDataSourceConfiguration(dataSourceConfigurationTopia, observeDataSourceConnection); - return createDataSourceConnection(observeDataSourceConnection, authenticationToken); + return createDataSourceConnection(((ObserveDataSourceConnectionRest)dataSourceConfiguration).getServerUrl(), observeDataSourceConnection, authenticationToken); } @@ -83,7 +84,7 @@ public class DataSourceServiceRestApi extends GeneratedDataSourceServiceRestApi ObserveDataSourceConnection observeDataSourceConnection = getAnonymousService(dataSourceConfigurationTopia).open(dataSourceConfigurationTopia); String authenticationToken = registerDataSourceConfiguration(dataSourceConfigurationTopia, observeDataSourceConnection); - return createDataSourceConnection(observeDataSourceConnection, authenticationToken); + return createDataSourceConnection(((ObserveDataSourceConfigurationRest)dataSourceConfiguration).getServerUrl(),observeDataSourceConnection, authenticationToken); } @@ -155,10 +156,10 @@ public class DataSourceServiceRestApi extends GeneratedDataSourceServiceRestApi } - protected ObserveDataSourceConnectionRest createDataSourceConnection(ObserveDataSourceConnection observeDataSourceConnection, String authenticationToken) { + protected ObserveDataSourceConnectionRest createDataSourceConnection(URL serverUrl, ObserveDataSourceConnection observeDataSourceConnection, String authenticationToken) { return new ObserveDataSourceConnectionRest( - getApplicationConfiguration().getApiUrl(), + serverUrl, authenticationToken, observeDataSourceConnection.canReadReferential(), observeDataSourceConnection.canWriteReferential(), View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/699b0511028de38f9ccd78bd8da… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/699b0511028de38f9ccd78bd8da… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: Realign LL model - See #1332
by Tony CHEMIT Aug. 4, 2019

Aug. 4, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a79209c2 by tchemit at 2019-08-04T14:21:17Z Realign LL model - See #1332 - - - - - 42865344 by tchemit at 2019-08-04T14:21:19Z update changelog [skip ci] - - - - - fe790840 by tchemit at 2019-08-04T14:21:19Z when sanitize is not ok, let's just continue - - - - - 781fcc31 by tchemit at 2019-08-04T14:21:19Z [UI][REFERENTIEL] L'icône 'voir toutes les utilisations de ce référentiel' ne fonctionne pas - Closes #1370 - - - - - e4fc487d by tchemit at 2019-08-04T14:21:19Z [CARTO] Petits ajustement sur la carte - Closes #1368 - - - - - 13 changed files: - .mvn/gitlab-cache/milestones/370039-issues.json - .mvn/gitlab-cache/milestones/532584-issues.json - .mvn/gitlab-cache/milestones/595831-issues.json - .mvn/gitlab-cache/milestones/647608-issues.json - .mvn/gitlab-cache/milestones/921497-issues.json - .mvn/gitlab-cache/milestones/921497.json - .mvn/gitlab-cache/milestones/925832-issues.json - .mvn/gitlab-cache/milestones/925832.json - + .mvn/gitlab-cache/milestones/958566-artifacts.json - + .mvn/gitlab-cache/milestones/958566-issues.json - + .mvn/gitlab-cache/milestones/958566.json - CHANGELOG.md - client-core/src/main/i18n/getters/java.getter The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/e77468af641db3f78aebcd3a09… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/e77468af641db3f78aebcd3a09… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: when sanitize is not ok, let's just continue
by Tony CHEMIT Aug. 3, 2019

Aug. 3, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: acb996e9 by tchemit at 2019-08-03T15:30:55Z when sanitize is not ok, let's just continue - - - - - e77468af by tchemit at 2019-08-03T18:26:21Z [UI][REFERENTIEL] L'icône 'voir toutes les utilisations de ce référentiel' ne fonctionne pas - Closes #1370 - - - - - 17 changed files: - client-core/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/usage/UsageUIHandlerSupport.java - dto/src/main/i18n/getters/eugene.getter - dto/src/main/i18n/getters/java.getter - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java - dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java - dto/src/main/java/fr/ird/observe/dto/decoration/decorators/NonTargetLengthDecorator.java - dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java - dto/src/main/models/Observe-20-data-ps-observation.model - dto/src/main/models/Observe-25-data-ps.model - dto/src/main/models/Observe-35-data-ll.model - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - + services-client/src/main/java/fr/ird/observe/services/client/usage/UsageServiceClient.java - services-local/src/main/java/fr/ird/observe/services/local/service/usage/UsageServiceLocal.java - test/src/main/resources/fixtures/global.properties Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java ===================================== @@ -358,16 +358,20 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext im } public void sanitizeIds(ProgressModel progressModel, DtoModelNavigationAggregateModel navigationSelectModel) { - for (DtoModelNavigationModel<?> navigationModel : navigationSelectModel.getModels()) { - for (DtoModelNavigationNode node : navigationModel.getNodesWithIds()) { - if (node.isEnabled()) { - ImmutableSet<String> safeIds = ObserveSwingDataSource.MAIN.getNavigationService().retainExistingIds(ImmutableSet.of(node.getId())); - if (safeIds.isEmpty()) { - node.setId(null); + try { + for (DtoModelNavigationModel<?> navigationModel : navigationSelectModel.getModels()) { + for (DtoModelNavigationNode node : navigationModel.getNodesWithIds()) { + if (node.isEnabled()) { + ImmutableSet<String> safeIds = ObserveSwingDataSource.MAIN.getNavigationService().retainExistingIds(ImmutableSet.of(node.getId())); + if (safeIds.isEmpty()) { + node.setId(null); + } } + progressModel.incrementsCurrentStep(); } - progressModel.incrementsCurrentStep(); } + } catch (Exception e) { + log.error("Could not sanitizeIds", e); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/usage/UsageUIHandlerSupport.java ===================================== @@ -165,7 +165,7 @@ public abstract class UsageUIHandlerSupport<D extends ReferentialDto, R extends long count = result.getCount().get(dtoType); DtoUsageCountRequest<D> request = result.getRequest(); - SingletonSupplier<Collection<RR>> factory = SingletonSupplier.of(() -> usageService.find(request, dtoType)); + SingletonSupplier<Collection<RR>> factory = SingletonSupplier.of(() -> usageService.find(request, referenceType)); DtoUsageUIModel<T, RR> model = new DtoUsageUIModel<>(dtoType, referenceType, count, factory); ===================================== dto/src/main/i18n/getters/eugene.getter ===================================== @@ -1,4 +1,5 @@ observe.data.ll.common.GearUseFeatures.type +observe.data.ll.common.GearUseFeaturesMeasurement.type observe.data.ll.common.Trip.type observe.data.ll.landing.Landing.type observe.data.ll.landing.LandingPart.type @@ -27,6 +28,7 @@ observe.data.ll.observation.SizeMeasure.type observe.data.ll.observation.Tdr.type observe.data.ll.observation.WeightMeasure.type observe.data.ps.common.GearUseFeatures.type +observe.data.ps.common.GearUseFeaturesMeasurement.type observe.data.ps.common.Trip.type observe.data.ps.observation.Activity.type observe.data.ps.observation.FloatingObject.type ===================================== dto/src/main/i18n/getters/java.getter ===================================== @@ -40,8 +40,8 @@ observe.data.Data.traceCutOff observe.data.Data.vessel observe.data.Data.weightMeasureMethod observe.data.ll.logbook.Set.type -observe.data.ll.logbook.SetLonglineDetailComposition.type -observe.data.ll.logbook.SetLonglineGlobalComposition.type +observe.data.ll.logbook.SetDetailComposition.type +observe.data.ll.logbook.SetGlobalComposition.type observe.data.ll.observation.Set.type observe.data.ps.observation.Set.type observe.referential.I18nReferential.label ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java ===================================== @@ -27,6 +27,8 @@ import fr.ird.observe.dto.ObserveModelInitializer; import fr.ird.observe.dto.ObserveModelInitializerRunner; import fr.ird.observe.dto.data.DataDto; import fr.ird.observe.dto.data.ll.common.GearUseFeaturesDto; +import fr.ird.observe.dto.data.ll.common.GearUseFeaturesMeasurementDto; +import fr.ird.observe.dto.data.ll.common.GearUseFeaturesMeasurementReference; import fr.ird.observe.dto.data.ll.common.GearUseFeaturesReference; import fr.ird.observe.dto.data.ll.common.TripReference; import fr.ird.observe.dto.data.ll.landing.LandingDto; @@ -327,8 +329,8 @@ public class DecoratorService extends DecoratorProvider { @Override public void initLlObservationActivityDto() { registerDataAndDataReferenceDecorator(ActivityDto.class, ActivityReference.class, - "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${VesselActivity/label}$s", - "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${VesselActivityLabel}$s", + "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${vesselActivity/label}$s", + "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${vesselActivityLabel}$s", " - "); registerObserveDecorator(TripActivityDto.class, "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$t", " - "); @@ -337,8 +339,8 @@ public class DecoratorService extends DecoratorProvider { @Override public void initLlLogbookActivityDto() { registerDataAndDataReferenceDecorator(fr.ird.observe.dto.data.ll.logbook.ActivityDto.class, fr.ird.observe.dto.data.ll.logbook.ActivityReference.class, - "${startTimeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${VesselActivity/label}$s", - "${startTimeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${VesselActivityLabel}$s", + "${startTimeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${vesselActivity/label}$s", + "${startTimeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${vesselActivityLabel}$s", " - "); } @@ -470,6 +472,8 @@ public class DecoratorService extends DecoratorProvider { @Override public void initLlCommonGearUseFeaturesMeasurementDto() { + registerDataAndDataReferenceDecorator(GearUseFeaturesMeasurementDto.class, GearUseFeaturesMeasurementReference.class, "${gearCaracteristic/label}$s##${measurementValue}$s", + "${gearCaracteristicLabel}$s##${measurementValue}$s"); } @Override @@ -551,8 +555,8 @@ public class DecoratorService extends DecoratorProvider { @Override public void initLlObservationSizeMeasureDto() { - registerDataAndDataReferenceDecorator(SizeMeasureDto.class, SizeMeasureReference.class, "${sizeType/label}$s##${size}$s", - "${sizeTypeLabel}$s##${size}$s"); + registerDataAndDataReferenceDecorator(SizeMeasureDto.class, SizeMeasureReference.class, "${sizeMeasureType/label}$s##${size}$s", + "${sizeMeasureTypeLabel}$s##${size}$s"); } @Override @@ -1013,6 +1017,8 @@ public class DecoratorService extends DecoratorProvider { @Override public void initPsCommonGearUseFeaturesMeasurementDto() { + registerDataAndDataReferenceDecorator(fr.ird.observe.dto.data.ps.common.GearUseFeaturesMeasurementDto.class, fr.ird.observe.dto.data.ps.common.GearUseFeaturesMeasurementReference.class, "${gearCaracteristic/label}$s##${measurementValue}$s", + "${gearCaracteristicLabel}$s##${measurementValue}$s"); } @Override @@ -1037,7 +1043,7 @@ public class DecoratorService extends DecoratorProvider { public void initPsObservationNonTargetLengthDto() { registerDecorator(new NonTargetLengthDecorator()); - registerDataReferenceDecorator(NonTargetLengthReference.class, "${speciesLabel}$s##${length}$f##${sexLabel}$s"); + registerDataReferenceDecorator(NonTargetLengthReference.class, "${speciesLabel}$s##${length}$s##${sexLabel}$s"); } @Override ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java ===================================== @@ -92,8 +92,8 @@ public class ObserveI18nLabelsBuilder extends BeanPropertyI18nKeyProducerSupport n("observe.referential.Referential.uri"); n("observe.referential.Referential.needComment"); n("observe.referential.Referential.validityDateRange"); - n("observe.data.ll.logbook.SetLonglineGlobalComposition.type"); - n("observe.data.ll.logbook.SetLonglineDetailComposition.type"); + n("observe.data.ll.logbook.SetGlobalComposition.type"); + n("observe.data.ll.logbook.SetDetailComposition.type"); n("observe.referential.WithFormula.equation"); n("observe.referential.WithFormula.coefficients"); ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/decorators/NonTargetLengthDecorator.java ===================================== @@ -36,7 +36,7 @@ public class NonTargetLengthDecorator extends ObserveDecorator<NonTargetLengthDt public NonTargetLengthDecorator() throws IllegalArgumentException, NullPointerException { super(NonTargetLengthDto.class, - "${species/scientificLabel}$s##${length}$f##${sex}$s" + "${species/scientificLabel}$s##${length}$s##${sex}$s" ); } ===================================== dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java ===================================== @@ -158,8 +158,6 @@ import fr.ird.observe.dto.referential.ps.observation.WeightCategoryDto; public class DtoModelClasses { public static final ImmutableSet<Class<? extends DataDto>> ENTITY_DATA_WITH_NO_BINDER_TYPES = ImmutableSet.<Class<? extends DataDto>>builder() - .add(fr.ird.observe.dto.data.ps.common.GearUseFeaturesMeasurementDto.class) - .add(GearUseFeaturesMeasurementDto.class) .add(NonTargetSampleDto.class) .add(TargetSampleDto.class) .build(); ===================================== dto/src/main/models/Observe-20-data-ps-observation.model ===================================== @@ -104,7 +104,7 @@ data.ps.observation.NonTargetSample > data.Commentable | form=data.ps.observatio nonTargetLength + {*} data.ps.observation.NonTargetLength | ordered speciesFate {*:*} fr.ird.observe.dto.referential.ps.common.SpeciesFateReference -data.ps.observation.ObjectObservedSpecies > data.Data | references=speciesLabel,speciesStatusLabel +data.ps.observation.ObjectObservedSpecies > data.Data | references=speciesLabel,speciesStatusLabel,count count + {*:1} Integer statut + {*:1} Integer speciesStatus {*:1} fr.ird.observe.dto.referential.ps.observation.SpeciesStatusReference ===================================== dto/src/main/models/Observe-25-data-ps.model ===================================== @@ -1,6 +1,6 @@ package fr.ird.observe.dto.data.ps.common | form=self -data.ps.common.GearUseFeaturesMeasurement > data.Data +data.ps.common.GearUseFeaturesMeasurement > data.Data | references=measurementValue,gearCaracteristicLabel measurementValue + {*:1} String gearCaracteristic {*:1} fr.ird.observe.dto.referential.common.GearCaracteristicReference ===================================== dto/src/main/models/Observe-35-data-ll.model ===================================== @@ -6,7 +6,7 @@ usedInTrip + {*:1} Boolean gearUseFeaturesMeasurement + {*} data.ll.common.GearUseFeaturesMeasurement | ordered gear {*:1} fr.ird.observe.dto.referential.common.GearReference -data.ll.common.GearUseFeaturesMeasurement > data.Data +data.ll.common.GearUseFeaturesMeasurement > data.Data | references=measurementValue,gearCaracteristicLabel measurementValue + {*:1} String gearCaracteristic {*:1} fr.ird.observe.dto.referential.common.GearCaracteristicReference ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -813,6 +813,7 @@ observe.data.ll.common.GearUseFeatures.title=Gears observe.data.ll.common.GearUseFeatures.type=Gear uses features observe.data.ll.common.GearUseFeatures.types=Gear uses features observe.data.ll.common.GearUseFeatures.usedInTrip=Used in trip +observe.data.ll.common.GearUseFeaturesMeasurement.type=Measurement type observe.data.ll.common.GearUseFeaturesMeasurementLongline.title=Gear uses feature measurements observe.data.ll.common.Trip.activityObs=Activity observe.data.ll.common.Trip.availableData=Available data @@ -1227,6 +1228,7 @@ observe.data.ll.logbook.Set.type=Set observe.data.ll.logbook.Set.types=Sets observe.data.ll.logbook.Set.weightedSnap=Weighted snap observe.data.ll.logbook.Set.weightedSwivel=Weighted swivel +observe.data.ll.logbook.SetDetailComposition.type=Detailed composition observe.data.ll.logbook.SetGlobalComposition.availableMitigationType=Available mitigations observe.data.ll.logbook.SetGlobalComposition.baitsComposition=Baits composition observe.data.ll.logbook.SetGlobalComposition.baitsCompositionProportionSum=Baits composition proportion sum @@ -1244,17 +1246,9 @@ observe.data.ll.logbook.SetGlobalComposition.hooksCompositionTab=Hooks observe.data.ll.logbook.SetGlobalComposition.mitigationTypeTab=Mitigation observe.data.ll.logbook.SetGlobalComposition.selectedMitigationType=Selected mitigations observe.data.ll.logbook.SetGlobalComposition.title=Global composition +observe.data.ll.logbook.SetGlobalComposition.type=Global composition observe.data.ll.logbook.SetLogbook.action.goToOpen.short=Logbook - Open set observe.data.ll.logbook.SetLogbook.action.goToOpen.tip=Go to open set (Logbook) -observe.data.ll.logbook.SetLonglineDetailComposition.type=Detailed composition -observe.data.ll.logbook.SetLonglineGlobalComposition.availableMitigationType=Available mitigations -observe.data.ll.logbook.SetLonglineGlobalComposition.baitsCompositionTab=Baits -observe.data.ll.logbook.SetLonglineGlobalComposition.branchlinesCompositionTab=Branchlines -observe.data.ll.logbook.SetLonglineGlobalComposition.floatlinesCompositionTab=Floatlines -observe.data.ll.logbook.SetLonglineGlobalComposition.hooksCompositionTab=Hooks -observe.data.ll.logbook.SetLonglineGlobalComposition.mitigationTypeTab=Mitigation -observe.data.ll.logbook.SetLonglineGlobalComposition.selectedMitigationType=Selected mitigations -observe.data.ll.logbook.SetLonglineGlobalComposition.type=Global composition observe.data.ll.logbook.TripSampleList.action.close.tip=Close the opened sample observe.data.ll.logbook.TripSampleList.action.create=Next sample observe.data.ll.logbook.TripSampleList.action.create.tip=create next sample @@ -1798,6 +1792,7 @@ observe.data.ps.common.GearUseFeatures.type=Gear uses features observe.data.ps.common.GearUseFeatures.types=Gear uses features observe.data.ps.common.GearUseFeatures.usedInTrip=Used in trip observe.data.ps.common.GearUseFeaturesMeasurement.title=Gear uses feature measurements +observe.data.ps.common.GearUseFeaturesMeasurement.type=Measurement type observe.data.ps.common.Trip.action.close.tip=Close the opened maree observe.data.ps.common.Trip.action.closeAndCreate=Next trip observe.data.ps.common.Trip.action.closeAndCreate.tip=close current trip and create a new one ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -813,6 +813,7 @@ observe.data.ll.common.GearUseFeatures.title=Equipos observe.data.ll.common.GearUseFeatures.type=Equipamiento observe.data.ll.common.GearUseFeatures.types=Equipamientos observe.data.ll.common.GearUseFeatures.usedInTrip=Utilizado en la marea +observe.data.ll.common.GearUseFeaturesMeasurement.type=Tipo observe.data.ll.common.GearUseFeaturesMeasurementLongline.title=Medidas observe.data.ll.common.Trip.activityObs=Actividad observe.data.ll.common.Trip.availableData=Données disponibles @@ -1227,6 +1228,7 @@ observe.data.ll.logbook.Set.type=Operación de pesca observe.data.ll.logbook.Set.types=Operaciones de pesca observe.data.ll.logbook.Set.weightedSnap=Snap lesté observe.data.ll.logbook.Set.weightedSwivel=Émerillon lesté +observe.data.ll.logbook.SetDetailComposition.type=Composición detallada observe.data.ll.logbook.SetGlobalComposition.availableMitigationType=Atenuaciónes disponibles observe.data.ll.logbook.SetGlobalComposition.baitsComposition=Cebo observe.data.ll.logbook.SetGlobalComposition.baitsCompositionProportionSum=Suma de los proporciónes de cebo (%) @@ -1244,17 +1246,9 @@ observe.data.ll.logbook.SetGlobalComposition.hooksCompositionTab=Anzuelos observe.data.ll.logbook.SetGlobalComposition.mitigationTypeTab=Atenuaciónes observe.data.ll.logbook.SetGlobalComposition.selectedMitigationType=Atenuaciónes seleccionadas observe.data.ll.logbook.SetGlobalComposition.title=Composición global del palangre +observe.data.ll.logbook.SetGlobalComposition.type=Composición global observe.data.ll.logbook.SetLogbook.action.goToOpen.short=Logbook - Open set \#TODO observe.data.ll.logbook.SetLogbook.action.goToOpen.tip=Go to open set (Logbook) \#TODO -observe.data.ll.logbook.SetLonglineDetailComposition.type=Composición detallada -observe.data.ll.logbook.SetLonglineGlobalComposition.availableMitigationType=Atenuaciónes disponibles -observe.data.ll.logbook.SetLonglineGlobalComposition.baitsCompositionTab=Cebos -observe.data.ll.logbook.SetLonglineGlobalComposition.branchlinesCompositionTab=Arponcillos -observe.data.ll.logbook.SetLonglineGlobalComposition.floatlinesCompositionTab=Orinques -observe.data.ll.logbook.SetLonglineGlobalComposition.hooksCompositionTab=Anzuelos -observe.data.ll.logbook.SetLonglineGlobalComposition.mitigationTypeTab=Atenuaciónes -observe.data.ll.logbook.SetLonglineGlobalComposition.selectedMitigationType=Atenuaciónes seleccionadas -observe.data.ll.logbook.SetLonglineGlobalComposition.type=Composición global observe.data.ll.logbook.TripSampleList.action.close.tip=Close the opened sample observe.data.ll.logbook.TripSampleList.action.create=Next sample observe.data.ll.logbook.TripSampleList.action.create.tip=Create next sample @@ -1798,6 +1792,7 @@ observe.data.ps.common.GearUseFeatures.type=Equipamiento observe.data.ps.common.GearUseFeatures.types=Equipamientos observe.data.ps.common.GearUseFeatures.usedInTrip=Utilizado en la marea observe.data.ps.common.GearUseFeaturesMeasurement.title=Medidas +observe.data.ps.common.GearUseFeaturesMeasurement.type=Tipo observe.data.ps.common.Trip.action.close.tip=Cierre de la marea abierta observe.data.ps.common.Trip.action.closeAndCreate=Marea siguiente observe.data.ps.common.Trip.action.closeAndCreate.tip=Cierre de la marea actual y creación de una nueva ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -813,6 +813,7 @@ observe.data.ll.common.GearUseFeatures.title=Équipements observe.data.ll.common.GearUseFeatures.type=Équipement observe.data.ll.common.GearUseFeatures.types=Équipements observe.data.ll.common.GearUseFeatures.usedInTrip=Utilisé dans la marée +observe.data.ll.common.GearUseFeaturesMeasurement.type=Type de mesure observe.data.ll.common.GearUseFeaturesMeasurementLongline.title=Mesures observe.data.ll.common.Trip.activityObs=Activité observe.data.ll.common.Trip.availableData=Données disponibles @@ -1227,6 +1228,7 @@ observe.data.ll.logbook.Set.type=Opération de pêche observe.data.ll.logbook.Set.types=Opérations de pêche observe.data.ll.logbook.Set.weightedSnap=Snap lesté observe.data.ll.logbook.Set.weightedSwivel=Émerillon lesté +observe.data.ll.logbook.SetDetailComposition.type=Composition détaillée observe.data.ll.logbook.SetGlobalComposition.availableMitigationType=Atténuations disponibles observe.data.ll.logbook.SetGlobalComposition.baitsComposition=Appâts observe.data.ll.logbook.SetGlobalComposition.baitsCompositionProportionSum=Somme des proportions d'appâts (%) @@ -1244,17 +1246,9 @@ observe.data.ll.logbook.SetGlobalComposition.hooksCompositionTab=Hameçons observe.data.ll.logbook.SetGlobalComposition.mitigationTypeTab=Atténuations observe.data.ll.logbook.SetGlobalComposition.selectedMitigationType=Atténuations sélectionnées observe.data.ll.logbook.SetGlobalComposition.title=Composition globale de la palangre +observe.data.ll.logbook.SetGlobalComposition.type=Composition globale observe.data.ll.logbook.SetLogbook.action.goToOpen.short=Livre de bord - Calée ouverte observe.data.ll.logbook.SetLogbook.action.goToOpen.tip=Accéder à la calée ouverte (Livre de bord) -observe.data.ll.logbook.SetLonglineDetailComposition.type=Composition détaillée -observe.data.ll.logbook.SetLonglineGlobalComposition.availableMitigationType=Atténuations disponibles -observe.data.ll.logbook.SetLonglineGlobalComposition.baitsCompositionTab=Appâts -observe.data.ll.logbook.SetLonglineGlobalComposition.branchlinesCompositionTab=Avançons -observe.data.ll.logbook.SetLonglineGlobalComposition.floatlinesCompositionTab=Orins -observe.data.ll.logbook.SetLonglineGlobalComposition.hooksCompositionTab=Hameçons -observe.data.ll.logbook.SetLonglineGlobalComposition.mitigationTypeTab=Atténuations -observe.data.ll.logbook.SetLonglineGlobalComposition.selectedMitigationType=Atténuations sélectionnées -observe.data.ll.logbook.SetLonglineGlobalComposition.type=Composition globale observe.data.ll.logbook.TripSampleList.action.close.tip=Clôturer l'échantillon ouverte observe.data.ll.logbook.TripSampleList.action.create=Échantillon suivant observe.data.ll.logbook.TripSampleList.action.create.tip=Créer l’échantillon suivant @@ -1798,6 +1792,7 @@ observe.data.ps.common.GearUseFeatures.type=Équipement observe.data.ps.common.GearUseFeatures.types=Équipements observe.data.ps.common.GearUseFeatures.usedInTrip=Utilisé dans la marée observe.data.ps.common.GearUseFeaturesMeasurement.title=Mesures +observe.data.ps.common.GearUseFeaturesMeasurement.type=Type de mesure observe.data.ps.common.Trip.action.close.tip=Clôturer la marée ouverte observe.data.ps.common.Trip.action.closeAndCreate=Marée suivante observe.data.ps.common.Trip.action.closeAndCreate.tip=Clôturer la marée courante et en créer une nouvelle ===================================== services-client/src/main/java/fr/ird/observe/services/client/usage/UsageServiceClient.java ===================================== @@ -0,0 +1,47 @@ +package fr.ird.observe.services.client.usage; + +/*- + * #%L + * ObServe :: Services client implementation + * %% + * Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import com.google.common.collect.ImmutableSet; +import fr.ird.observe.dto.IdDto; +import fr.ird.observe.dto.reference.DtoReference; +import fr.ird.observe.dto.referential.ReferentialDto; +import fr.ird.observe.services.service.usage.DtoUsageCountRequest; +import org.apache.http.HttpStatus; + +import java.util.concurrent.TimeUnit; + +public class UsageServiceClient extends GeneratedUsageServiceClient { + + @Override + public <D extends ReferentialDto, T extends IdDto, R extends DtoReference<T, R>> ImmutableSet<R> find(DtoUsageCountRequest<D> request, Class<R> targetType) { + return executeRequest(create("find") + .addParameter("request", gson().toJson(request)) + .addParameter("targetType", targetType) + .addAuthToken() + .useMultiPartForm() + .setTimeout(TimeUnit.MINUTES, 1) + .post(), HttpStatus.SC_OK).toImmutableSet(targetType); + } + +} ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/usage/UsageServiceLocal.java ===================================== @@ -43,7 +43,7 @@ import fr.ird.observe.services.service.usage.UsageService; import fr.ird.observe.spi.DbModelHelper; import fr.ird.observe.spi.DtoModelHelper; import fr.ird.observe.spi.context.DataEntityContext; -import fr.ird.observe.spi.context.DtoEntityContext; +import fr.ird.observe.spi.context.ReferenceEntityContext; import fr.ird.observe.spi.context.ReferentialEntityContext; import fr.ird.observe.spi.map.ImmutableTypedMap; import org.nuiton.topia.persistence.TopiaEntity; @@ -75,12 +75,12 @@ public class UsageServiceLocal extends ObserveServiceLocal implements UsageServi } @Override - public <D extends ReferentialDto, T extends IdDto, R extends DtoReference<T, R>> ImmutableSet<R> find(DtoUsageCountRequest<D> request, Class<T> targetType) { + public <D extends ReferentialDto, T extends IdDto, R extends DtoReference<T, R>> ImmutableSet<R> find(DtoUsageCountRequest<D> request, Class<R> targetType) { ObserveReferentialEntity entity = loadEntity(request.getDtoType(), request.getId()); TopiaUsageSupport topiaUsageSupport = serviceContext.getTopiaPersistenceContext().getTopiaUsageSupport(); - DtoEntityContext<T, R, ObserveEntity> entityContext = DbModelHelper.fromDto(targetType); + ReferenceEntityContext<T, R, ObserveEntity> entityContext = DbModelHelper.fromReference(targetType); Class<ObserveEntity> entityType = entityContext.toEntityType(); List<ObserveEntity> compositions = topiaUsageSupport.findReverseComposition(entity, entityType); ===================================== test/src/main/resources/fixtures/global.properties ===================================== @@ -31,7 +31,7 @@ SET_SEINE_ID=fr.ird.data.ps.observation.Set#1359573677233#0.016313003525718517 GEAR_USE_FEATURES_SEINE_ID=fr.ird.data.ps.common.GearUseFeatures#1440486230661#0.42614931015885216 GEAR_USE_FEATURES_SEINE_ID_1=fr.ird.data.ps.common.GearUseFeatures#1440486230661#0.42614931015885216 SPECIES_GROUP_ID=fr.ird.referential.common.SpeciesGroup#1239832683689#0.7120116158620075 -REFERENCE_DATA_COUNT=44 +REFERENCE_DATA_COUNT=46 DATA_FORM_COUNT=59 VALIDATORS_COUNT=87 VALIDATOR_CREATE_DATA_COUNT=7 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/7e15a83e094f7c832cb39910a8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/7e15a83e094f7c832cb39910a8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Realign LL model - See #1332
by Tony CHEMIT Aug. 3, 2019

Aug. 3, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 652889c2 by tchemit at 2019-08-03T14:10:08Z Realign LL model - See #1332 - - - - - 7e15a83e by tchemit at 2019-08-03T14:10:11Z update changelog [skip ci] - - - - - 13 changed files: - .mvn/gitlab-cache/milestones/370039-issues.json - .mvn/gitlab-cache/milestones/532584-issues.json - .mvn/gitlab-cache/milestones/595831-issues.json - .mvn/gitlab-cache/milestones/647608-issues.json - .mvn/gitlab-cache/milestones/921497-issues.json - .mvn/gitlab-cache/milestones/921497.json - .mvn/gitlab-cache/milestones/925832-issues.json - .mvn/gitlab-cache/milestones/925832.json - + .mvn/gitlab-cache/milestones/958566-artifacts.json - + .mvn/gitlab-cache/milestones/958566-issues.json - + .mvn/gitlab-cache/milestones/958566.json - CHANGELOG.md - client-core/src/main/i18n/getters/java.getter The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/d49ad9ff44ded2466bba8dd0c7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/d49ad9ff44ded2466bba8dd0c7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update changelog [skip ci]
by Tony CHEMIT Aug. 3, 2019

Aug. 3, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d49ad9ff by tchemit at 2019-08-03T11:39:35Z update changelog [skip ci] - - - - - 8 changed files: - .mvn/gitlab-cache/milestones/921497-issues.json - .mvn/gitlab-cache/milestones/921497.json - .mvn/gitlab-cache/milestones/925832-issues.json - .mvn/gitlab-cache/milestones/925832.json - + .mvn/gitlab-cache/milestones/958566-artifacts.json - + .mvn/gitlab-cache/milestones/958566-issues.json - + .mvn/gitlab-cache/milestones/958566.json - CHANGELOG.md Changes: ===================================== .mvn/gitlab-cache/milestones/921497-issues.json ===================================== @@ -1,4 +1,64 @@ [ + { + "id": 23264750, + "iid": 1372, + "projectId": 2722779, + "title": "[UI][REFERENTIEL] [Mode Serveur] La suppression de tous les référentiels ne fonctionne pas", + "description": "![image](/uploads/ba1c8fd106b29032af6895925eb1b72a/image.png)\n\n![image](/uploads/87ad3a2ee0a3954e7189fbbbc51c6e3b/image.png)\n\n![image](/uploads/45f7d5373072b28b795d601872658ab0/image.png)", + "labels": [ + "Anomalie", + "Haut", + "IRD-2018-01-V8" + ], + "milestone": { + "id": 921497, + "iid": 146, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-RC-4", + "description": "", + "startDate": "Jul 3, 2019 2:00:00 AM", + "state": "active" + }, + "assignees": [ + { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + } + ], + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "userNotesCount": 1, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "opened", + "updatedAt": "Jul 29, 2019 4:35:28 PM", + "createdAt": "Jul 29, 2019 3:31:02 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1372" + }, { "id": 23053896, "iid": 1364, @@ -16,9 +76,8 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", - "dueDate": "Jul 23, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "closed" + "state": "active" }, "assignees": [ { @@ -55,7 +114,7 @@ "totalTimeSpent": 0 }, "state": "closed", - "updatedAt": "Jul 23, 2019 3:14:02 PM", + "updatedAt": "Jul 24, 2019 5:34:20 PM", "createdAt": "Jul 22, 2019 5:07:03 PM", "closedAt": "Jul 23, 2019 3:14:01 PM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1364" @@ -79,9 +138,8 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", - "dueDate": "Jul 23, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "closed" + "state": "active" }, "assignees": [ { @@ -124,6 +182,66 @@ "closedAt": "Jul 19, 2019 2:12:06 PM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1359" }, + { + "id": 23263895, + "iid": 1370, + "projectId": 2722779, + "title": "[UI][REFERENTIEL] L\u0027icône \u0027voir toutes les utilisations de ce référentiel\u0027 ne fonctionne pas", + "description": "![image](/uploads/ffe1e25bfed63305fb9b65a5108fe62f/image.png)\n\nTesté sur \u0027Vessel\u0027, mais semble vrai pour tous les référentiels.\n\n```\nException in thread \"AWT-EventQueue-0\" io.ultreia.java4all.http.HResponseErrorException: wrong number of arguments\n at io.ultreia.java4all.http.HResponseBuilder.executeRequest(HResponseBuilder.java:131)\n at fr.ird.observe.services.client.ObserveServiceClientSupport.executeRequest(ObserveServiceClientSupport.java:62)\n at fr.ird.observe.services.client.usage.GeneratedUsageServiceClient.count(GeneratedUsageServiceClient.java:43)\n at fr.ird.observe.client.ui.actions.content.api.ref.ShowReferentialUsageUIAction.actionPerformed(ShowReferentialUsageUIAction.java:61)\n at fr.ird.observe.client.ui.actions.content.api.ref.AbstractReferentielContentUIAction.actionPerformed(AbstractReferentielContentUIAction.java:47)\n at fr.ird.observe.client.ui.actions.content.api.AbstractContentUIAction.actionPerformed(AbstractContentUIAction.java:76)\n at javax.swing.AbstractButton.fireActionPerformed(Unknown Source)\n at javax.swing.AbstractButton$Handler.actionPerformed(Unknown Source)\n at javax.swing.DefaultButtonModel.fireActionPerformed(Unknown Source)\n at javax.swing.DefaultButtonModel.setPressed(Unknown Source)\n at javax.swing.plaf.basic.BasicButtonListener.mouseReleased(Unknown Source)\n at java.awt.AWTEventMulticaster.mouseReleased(Unknown Source)\n at java.awt.AWTEventMulticaster.mouseReleased(Unknown Source)\n at java.awt.Component.processMouseEvent(Unknown Source)\n at javax.swing.JComponent.processMouseEvent(Unknown Source)\n at java.awt.Component.processEvent(Unknown Source)\n at java.awt.Container.processEvent(Unknown Source)\n at java.awt.Component.dispatchEventImpl(Unknown Source)\n at java.awt.Container.dispatchEventImpl(Unknown Source)\n at java.awt.Component.dispatchEvent(Unknown Source)\n at java.awt.LightweightDispatcher.retargetMouseEvent(Unknown Source)\n at java.awt.LightweightDispatcher.processMouseEvent(Unknown Source)\n at java.awt.LightweightDispatcher.dispatchEvent(Unknown Source)\n at java.awt.Container.dispatchEventImpl(Unknown Source)\n at java.awt.Window.dispatchEventImpl(Unknown Source)\n at java.awt.Component.dispatchEvent(Unknown Source)\n at java.awt.EventQueue.dispatchEventImpl(Unknown Source)\n at java.awt.EventQueue.access$500(Unknown Source)\n at java.awt.EventQueue$3.run(Unknown Source)\n at java.awt.EventQueue$3.run(Unknown Source)\n at java.security.AccessController.doPrivileged(Native Method)\n at java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(Unknown Source)\n at java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(Unknown Source)\n at java.awt.EventQueue$4.run(Unknown Source)\n at java.awt.EventQueue$4.run(Unknown Source)\n```", + "labels": [ + "Anomalie", + "IRD-2018-01-V8", + "Normal" + ], + "milestone": { + "id": 921497, + "iid": 146, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-RC-4", + "description": "", + "startDate": "Jul 3, 2019 2:00:00 AM", + "state": "active" + }, + "assignees": [ + { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + } + ], + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "userNotesCount": 0, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "opened", + "updatedAt": "Jul 29, 2019 3:10:40 PM", + "createdAt": "Jul 29, 2019 3:10:40 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1370" + }, { "id": 23054571, "iid": 1365, @@ -143,9 +261,8 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", - "dueDate": "Jul 23, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "closed" + "state": "active" }, "assignees": [ { @@ -182,7 +299,7 @@ "totalTimeSpent": 0 }, "state": "closed", - "updatedAt": "Jul 23, 2019 3:08:24 PM", + "updatedAt": "Jul 24, 2019 5:34:13 PM", "createdAt": "Jul 22, 2019 5:32:35 PM", "closedAt": "Jul 23, 2019 3:08:24 PM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1365" @@ -203,9 +320,8 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", - "dueDate": "Jul 23, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "closed" + "state": "active" }, "assignees": [ { @@ -242,7 +358,7 @@ "totalTimeSpent": 0 }, "state": "closed", - "updatedAt": "Jul 23, 2019 4:16:19 PM", + "updatedAt": "Jul 24, 2019 5:34:19 PM", "createdAt": "Jul 22, 2019 3:57:55 PM", "closedAt": "Jul 23, 2019 4:16:19 PM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1363" @@ -267,21 +383,28 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", - "dueDate": "Jul 23, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "closed" + "state": "active" }, "assignees": [ { - "_id": 1111318, - "_username": "pcauquil", - "_name": "Pascal Cauquil", + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", "_state": "active", "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" } ], "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { "_id": 1111318, "_username": "pcauquil", "_name": "Pascal Cauquil", @@ -289,6 +412,59 @@ "_external": false, "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" }, + "userNotesCount": 15, + "upVotes": 1, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "closed", + "updatedAt": "Jul 31, 2019 2:42:43 PM", + "createdAt": "Jul 18, 2019 3:17:25 PM", + "closedAt": "Jul 26, 2019 3:06:43 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1358" + }, + { + "id": 23264103, + "iid": 1371, + "projectId": 2722779, + "title": "[UI][REFERENTIEL] Icône \u0027Toutes les clés métier de ce référentiel\u0027", + "description": "Sur le référentiel Vessel, l\u0027icône \u0027Toutes les clés métier de ce référentiel\u0027 affiche un résultat qui ne semble pas correct :\n\n![image](/uploads/56b5bae413c8a70a082729162b49fc23/image.png)", + "labels": [ + "Anomalie", + "Bas", + "IRD-2018-01-V8" + ], + "milestone": { + "id": 921497, + "iid": 146, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-RC-4", + "description": "", + "startDate": "Jul 3, 2019 2:00:00 AM", + "state": "active" + }, + "assignees": [ + { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + } + ], + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, "author": { "_id": 1111318, "_username": "pcauquil", @@ -297,7 +473,7 @@ "_external": false, "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" }, - "userNotesCount": 4, + "userNotesCount": 0, "upVotes": 0, "downVotes": 0, "confidential": false, @@ -306,9 +482,68 @@ "totalTimeSpent": 0 }, "state": "opened", - "updatedAt": "Jul 23, 2019 1:34:39 PM", - "createdAt": "Jul 18, 2019 3:17:25 PM", - "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1358" + "updatedAt": "Jul 29, 2019 3:17:42 PM", + "createdAt": "Jul 29, 2019 3:17:42 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1371" + }, + { + "id": 23259297, + "iid": 1369, + "projectId": 2722779, + "title": "[SERVEUR] observe-server.conf / observeweb.host", + "description": "Le fichier observe-server.conf demande le paramètre observeweb.host, qui doit contenir l\u0027adresse (http ou https) du serveur.\n\nSi cette adresse est indiquée incorrectement, le test de connexion dans le gestionnaire connexions indique que la connexion est valide, mais la connexion échoue ensuite lors d\u0027une tentative de connexion réelle.\n\nSerait-il possible de se passer de ce paramètre ?\n\nSinon, serait-il possible que le test de connexion invalide le profil si jamais le observeweb.host n\u0027est pas correct ?", + "labels": [ + "Bas", + "IRD-2018-01-V8" + ], + "milestone": { + "id": 921497, + "iid": 146, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-RC-4", + "description": "", + "startDate": "Jul 3, 2019 2:00:00 AM", + "state": "active" + }, + "assignees": [ + { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + } + ], + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "userNotesCount": 0, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "opened", + "updatedAt": "Jul 29, 2019 1:05:44 PM", + "createdAt": "Jul 29, 2019 1:05:44 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1369" }, { "id": 23054929, @@ -328,9 +563,8 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", - "dueDate": "Jul 23, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "closed" + "state": "active" }, "assignees": [ { @@ -367,7 +601,7 @@ "totalTimeSpent": 0 }, "state": "closed", - "updatedAt": "Jul 23, 2019 2:56:33 PM", + "updatedAt": "Jul 24, 2019 5:34:13 PM", "createdAt": "Jul 22, 2019 5:46:41 PM", "closedAt": "Jul 23, 2019 2:56:33 PM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1366" @@ -390,9 +624,8 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", - "dueDate": "Jul 23, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "closed" + "state": "active" }, "assignees": [ { @@ -429,7 +662,7 @@ "totalTimeSpent": 0 }, "state": "closed", - "updatedAt": "Jul 23, 2019 2:29:21 PM", + "updatedAt": "Jul 24, 2019 5:34:13 PM", "createdAt": "Jul 22, 2019 11:58:44 AM", "closedAt": "Jul 23, 2019 2:29:21 PM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1362" @@ -453,9 +686,8 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", - "dueDate": "Jul 23, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "closed" + "state": "active" }, "assignees": [ { @@ -515,9 +747,8 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", - "dueDate": "Jul 23, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "closed" + "state": "active" }, "assignees": [ { @@ -558,6 +789,65 @@ "createdAt": "Feb 22, 2019 4:32:32 PM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1237" }, + { + "id": 23199140, + "iid": 1368, + "projectId": 2722779, + "title": "[CARTO] Petits ajustement sur la carte", + "description": "Ici #1343 nous avons introduit des nouveautés sur la carte.\n\nEn l\u0027état, avec la représentation de toutes les activités, la lisibilité est devenue moins bonne.\n\n![image](/uploads/954659fd21e4c8e3dc2c7097474be2c8/image.png)\n\nLégende senne :\n\n![image](/uploads/1f447e843867edf5623233de0907335a/image.png)\n\nRenommer comme suit :\n* \u0027Trajet de jour\u0027\n* \u0027Trajet de nuit\u0027\n* Reléguer \u0027Activité (autre)\u0027 en dernière ligne et renommer \u0027Autre activité\u0027\n\nSur la carte :\n* Utiliser une croix verticale pour le type banc objet (un \u0027+\u0027, pas un \u0027X\u0027, pour garder une différenciation avec la LL)\n* Utiliser un cercle de diamètre plus faible (moitié) pour tenter d\u0027améliorer la lisibilité\n* Sur les calées, n\u0027afficher que l\u0027icône dédiée à la calée, ne pas la superposer au cercle ![image](/uploads/cf9fa06ae5bcbf7be186c4c56ed218eb/image.png)\n\nSur les données LL, la carte reste correctement lisible, rien à signaler.", + "labels": [ + "Evolution", + "IRD-2018-01-V8" + ], + "milestone": { + "id": 921497, + "iid": 146, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-RC-4", + "description": "", + "startDate": "Jul 3, 2019 2:00:00 AM", + "state": "active" + }, + "assignees": [ + { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + } + ], + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "userNotesCount": 0, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "opened", + "updatedAt": "Jul 29, 2019 4:37:01 PM", + "createdAt": "Jul 26, 2019 3:50:33 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1368" + }, { "id": 22996216, "iid": 1361, @@ -575,9 +865,8 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", - "dueDate": "Jul 23, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "closed" + "state": "active" }, "assignees": [ { @@ -615,7 +904,7 @@ "totalTimeSpent": 0 }, "state": "closed", - "updatedAt": "Jul 23, 2019 2:05:18 PM", + "updatedAt": "Jul 24, 2019 5:34:13 PM", "createdAt": "Jul 19, 2019 2:23:16 PM", "closedAt": "Jul 23, 2019 2:04:52 PM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1361" @@ -637,9 +926,8 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", - "dueDate": "Jul 23, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "closed" + "state": "active" }, "assignees": [ { @@ -676,7 +964,7 @@ "totalTimeSpent": 0 }, "state": "closed", - "updatedAt": "Jul 19, 2019 3:00:17 PM", + "updatedAt": "Jul 24, 2019 5:34:13 PM", "createdAt": "Jul 19, 2019 2:11:22 PM", "closedAt": "Jul 19, 2019 3:00:17 PM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1360" @@ -697,9 +985,8 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", - "dueDate": "Jul 23, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "closed" + "state": "active" }, "assignees": [ { @@ -727,7 +1014,7 @@ "_external": false, "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" }, - "userNotesCount": 3, + "userNotesCount": 4, "upVotes": 0, "downVotes": 0, "confidential": false, @@ -736,7 +1023,7 @@ "totalTimeSpent": 0 }, "state": "opened", - "updatedAt": "Jul 2, 2019 9:42:02 AM", + "updatedAt": "Aug 2, 2019 4:54:07 PM", "createdAt": "Jun 12, 2019 3:44:04 PM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1332" }, @@ -757,9 +1044,8 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", - "dueDate": "Jul 23, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "closed" + "state": "active" }, "assignees": [ { ===================================== .mvn/gitlab-cache/milestones/921497.json ===================================== @@ -5,7 +5,6 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", - "dueDate": "Jul 23, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "closed" + "state": "active" } \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/925832-issues.json ===================================== @@ -19,8 +19,9 @@ "groupId": 0, "title": "7.1.0", "description": "", + "dueDate": "Aug 3, 2019 2:00:00 AM", "startDate": "Jul 6, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -80,8 +81,9 @@ "groupId": 0, "title": "7.1.0", "description": "", + "dueDate": "Aug 3, 2019 2:00:00 AM", "startDate": "Jul 6, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -109,7 +111,7 @@ "_external": false, "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" }, - "userNotesCount": 17, + "userNotesCount": 18, "upVotes": 0, "downVotes": 0, "confidential": true, @@ -118,9 +120,10 @@ "timeEstimate": 0, "totalTimeSpent": 0 }, - "state": "opened", - "updatedAt": "Jul 19, 2019 5:40:15 PM", + "state": "closed", + "updatedAt": "Aug 2, 2019 3:13:33 PM", "createdAt": "Jul 17, 2019 11:34:51 AM", + "closedAt": "Aug 2, 2019 3:13:33 PM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1355" }, { @@ -141,8 +144,9 @@ "groupId": 0, "title": "7.1.0", "description": "", + "dueDate": "Aug 3, 2019 2:00:00 AM", "startDate": "Jul 6, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -185,14 +189,15 @@ "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1352" }, { - "id": 22935042, - "iid": 1357, + "id": 23114641, + "iid": 1367, "projectId": 2722779, - "title": "Impossible de modifier le champs Species.wormsId", - "description": "", + "title": "[PS] Une espèce sans catégorie apparaît à tord dans le formulaire thons capturés", + "description": "Dans la liste d\u0027espèces 0 - PS -Thonidés (espèces cibles), nous avons rajouté une entrée \u0027TUS\u0027. Cette TUS est par ailleurs bien associée aux océans Atlantique et Indien, mais **il n\u0027existe pas de catégorie de poids y faisant référence.**\n\nTUS apparaît bien dans la liste des thon capturés :\n\n![image](/uploads/7c928dc10fc09912670ecc6741ec9848/image.png)\n\nMais n\u0027apparaît pas dans la liste des thon rejetés :\n\n![image](/uploads/0dfe633fe6e954ebd7eaa6c245a7c9f4/image.png)\n\nEn ajoutant une catégorie de poids, l\u0027espèce apparaît.\n\nIl est normal qu\u0027une espèce dépourvue de catégorie de poids ne soit pas proposée sur le formulaire \u0027thons rejetés\u0027 (puisqu\u0027une catégorie y est exigée), mais alors elle ne devrait pas être proposée non plus dans le formulaire \u0027thons capturés\u0027 dont le fonctionnement est identique.\n\nCi-joint une base pour tester : [obstuna-local-2019-07-24--13-26-55.sql.gz](/uploads/ad6198220f07b99583ba57fe6f42b96d/obstuna-local-2019-07-24--13-26-55.sql.gz)", "labels": [ "Anomalie", - "Contrat AZTI-2017" + "Bas", + "Senne" ], "milestone": { "id": 925832, @@ -201,8 +206,9 @@ "groupId": 0, "title": "7.1.0", "description": "", + "dueDate": "Aug 3, 2019 2:00:00 AM", "startDate": "Jul 6, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -223,14 +229,14 @@ "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" }, "author": { - "_id": 166231, - "_username": "tchemit", - "_name": "Tony CHEMIT", + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", "_state": "active", "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" }, - "userNotesCount": 1, + "userNotesCount": 2, "upVotes": 0, "downVotes": 0, "confidential": false, @@ -239,19 +245,20 @@ "totalTimeSpent": 0 }, "state": "closed", - "updatedAt": "Jul 17, 2019 5:37:54 PM", - "createdAt": "Jul 17, 2019 5:33:19 PM", - "closedAt": "Jul 17, 2019 5:37:54 PM", - "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1357" + "updatedAt": "Jul 25, 2019 10:26:52 AM", + "createdAt": "Jul 24, 2019 2:17:09 PM", + "closedAt": "Jul 24, 2019 6:38:23 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1367" }, { - "id": 22925947, - "iid": 1356, + "id": 22935042, + "iid": 1357, "projectId": 2722779, - "title": "[CALCULS] Une marée fait planter la procédure de calcul en mode serveur uniquement", - "description": "En mode serveur une base fait planter la procédure de calcul.\n\nLog serveur : [LengthWeightParameter-TG-raveloarison.log](/uploads/672cacd17eded3b0b4d166ffe705a0bd/LengthWeightParameter-TG-raveloarison.log)\n\nMarée exportée : [export-TG-raveloarison-20190717.sql.gz](/uploads/5cd1f0b0898cd719134b83410a824fa3/export-TG-raveloarison-20190717.sql.gz)\n\nÉtrangement le calcul se passe bien en mode connexion directe, ou s\u0027il est fait en base locale.\n\nIl faut noter que nous n\u0027avons plus aucune LWR sans sizemeasuretype.\n\nLe log mentionne *LengthWeightParameters.findLengthWeightParameter* dans la trace puis *Caused by: org.hibernate.AssertionFailure: bug adding collection twice*.\n\nSi jamais cela te parle...", + "title": "Impossible de modifier le champs Species.wormsId", + "description": "", "labels": [ - "Senne" + "Anomalie", + "Contrat AZTI-2017" ], "milestone": { "id": 925832, @@ -260,8 +267,9 @@ "groupId": 0, "title": "7.1.0", "description": "", + "dueDate": "Aug 3, 2019 2:00:00 AM", "startDate": "Jul 6, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -282,26 +290,26 @@ "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" }, "author": { - "_id": 1111318, - "_username": "pcauquil", - "_name": "Pascal Cauquil", + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", "_state": "active", "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" }, - "userNotesCount": 0, + "userNotesCount": 1, "upVotes": 0, "downVotes": 0, - "confidential": true, - "discussionLocked": true, + "confidential": false, "timeStats": { "timeEstimate": 0, "totalTimeSpent": 0 }, - "state": "opened", - "updatedAt": "Jul 17, 2019 3:05:09 PM", - "createdAt": "Jul 17, 2019 2:53:45 PM", - "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1356" + "state": "closed", + "updatedAt": "Jul 24, 2019 5:56:23 PM", + "createdAt": "Jul 17, 2019 5:33:19 PM", + "closedAt": "Jul 17, 2019 5:37:54 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1357" }, { "id": 22842169, @@ -321,8 +329,9 @@ "groupId": 0, "title": "7.1.0", "description": "", + "dueDate": "Aug 3, 2019 2:00:00 AM", "startDate": "Jul 6, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -359,7 +368,7 @@ "totalTimeSpent": 0 }, "state": "closed", - "updatedAt": "Jul 16, 2019 11:23:37 PM", + "updatedAt": "Jul 31, 2019 2:42:43 PM", "createdAt": "Jul 16, 2019 4:29:06 PM", "closedAt": "Jul 16, 2019 11:00:15 PM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1353" @@ -382,8 +391,9 @@ "groupId": 0, "title": "7.1.0", "description": "", + "dueDate": "Aug 3, 2019 2:00:00 AM", "startDate": "Jul 6, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { ===================================== .mvn/gitlab-cache/milestones/925832.json ===================================== @@ -5,6 +5,7 @@ "groupId": 0, "title": "7.1.0", "description": "", + "dueDate": "Aug 3, 2019 2:00:00 AM", "startDate": "Jul 6, 2019 2:00:00 AM", - "state": "active" + "state": "closed" } \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/958566-artifacts.json ===================================== @@ -0,0 +1 @@ +[] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/958566-issues.json ===================================== @@ -0,0 +1 @@ +[] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/958566.json ===================================== @@ -0,0 +1,10 @@ +{ + "id": 958566, + "iid": 148, + "projectId": 2722779, + "groupId": 0, + "title": "7.1.1", + "dueDate": "Aug 3, 2019 2:00:00 AM", + "startDate": "Aug 2, 2019 2:00:00 AM", + "state": "active" +} \ No newline at end of file ===================================== CHANGELOG.md ===================================== @@ -1,23 +1,7 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2019-07-23 16:32. - -## Version [8.0-RC-4](https://gitlab.com/ultreiaio/ird-observe/milestones/146) - -**Closed at 2019-07-23.** - -### Issues - * [[Anomalie 1359]](https://gitlab.com/ultreiaio/ird-observe/issues/1359) **Impossible de créer une activité LL logbook** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) - * [[Anomalie 1361]](https://gitlab.com/ultreiaio/ird-observe/issues/1361) **Impossible de supprimer une activité LL** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) - * [[Anomalie 1362]](https://gitlab.com/ultreiaio/ird-observe/issues/1362) **[LL] Activité logbook : petits ajustements** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) - * [[Evolution 1237]](https://gitlab.com/ultreiaio/ird-observe/issues/1237) **Rafraichissement de la page 'A propos'** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) - * [[Evolution 1299]](https://gitlab.com/ultreiaio/ird-observe/issues/1299) **[V8][V9] Pour l'algorithme d'appariement d'activités (LL comme PS), décider du comportement vis-à-vis de l'absence d'heures sur les activités (cas très fréquent sur les logbooks)** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) - * [[Evolution 1349]](https://gitlab.com/ultreiaio/ird-observe/issues/1349) **Renommer champs vessel.iattcid et vessel.ctoiid** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) - * [[Evolution 1358]](https://gitlab.com/ultreiaio/ird-observe/issues/1358) **Création de nouvelles icônes de navigation** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) - * [[Evolution 1360]](https://gitlab.com/ultreiaio/ird-observe/issues/1360) **Assouplir un contrôle de saisie** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) - * [[Evolution 1365]](https://gitlab.com/ultreiaio/ird-observe/issues/1365) **[LL][LOGBOOKS] Plage de taille d'un échantillon** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) - * [[Evolution 1366]](https://gitlab.com/ultreiaio/ird-observe/issues/1366) **[LL][LOGBOOKS] Echantillons, ajouter l'unité °** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * Last generated at 2019-08-03 13:38. ## Version [8.0-RC-3](https://gitlab.com/ultreiaio/ird-observe/milestones/143) @@ -215,6 +199,23 @@ Premier lot du contrat IRD-2018-01-V8 * [[Evolution 922]](https://gitlab.com/ultreiaio/ird-observe/issues/922) **Ajoute le référentiel observe_common.DataQuality sur les données existantes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 950]](https://gitlab.com/ultreiaio/ird-observe/issues/950) **Renommage de la classe seine.WeightCategory en seine.WeightCategorySeine** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) +## Version [7.1.0](https://gitlab.com/ultreiaio/ird-observe/milestones/147) + +**Closed at 2019-08-03.** + +### Download +* [Application (observe-7.1.0.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/7.…) +* [Serveur (observe-7.1.0.war)](http://repo1.maven.org/maven2/fr/ird/observe/observe/7.…) + +### Issues + * [[Anomalie 1350]](https://gitlab.com/ultreiaio/ird-observe/issues/1350) **[REF] Consolidation du réferentiel common.LengthWeightParameter** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) + * [[Anomalie 1352]](https://gitlab.com/ultreiaio/ird-observe/issues/1352) **Problème synchro avancée référentiel** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) + * [[Anomalie 1355]](https://gitlab.com/ultreiaio/ird-observe/issues/1355) **[REF] Erreur sur suppression d'espèce, appel de table inexistante** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1357]](https://gitlab.com/ultreiaio/ird-observe/issues/1357) **Impossible de modifier le champs Species.wormsId** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 1367]](https://gitlab.com/ultreiaio/ird-observe/issues/1367) **[PS] Une espèce sans catégorie apparaît à tord dans le formulaire thons capturés** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1351]](https://gitlab.com/ultreiaio/ird-observe/issues/1351) **[REF] Consolidation du réferentiel common.LengthLengthParameter** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Evolution 1353]](https://gitlab.com/ultreiaio/ird-observe/issues/1353) **Consolidation des champs techniques en base** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + ## Version [7.0.8](https://gitlab.com/ultreiaio/ird-observe/milestones/145) **Closed at 2019-07-06.** View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d49ad9ff44ded2466bba8dd0c75… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d49ad9ff44ded2466bba8dd0c75… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe :: Pom
by Tony CHEMIT Aug. 2, 2019

Aug. 2, 2019

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: bc918092 by 166231 at 2019-08-02T17:15:05Z Site checkin for project ObServe :: Pom - - - - - 8 changed files: - administration-web.html - architecture-logicielle.html - + img/logo-small.png - img/logo.png - img/logo_ird.png - index.html - install-serverPG.html - install.html Changes: ===================================== administration-web.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190714" /> + <meta name="Date-Revision-yyyymmdd" content="20190802" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Installation de lapplication web</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -18,8 +18,8 @@ <body class="topBarDisabled"> <div class="container-fluid"> <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo.png" alt="ObServe :: Pom"/></a></div> - <div class="pull-right"><a href="index.html" id="bannerRight"><img src="./img/logo_ird.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-right"></div> <div class="clear"><hr/></div> </div> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Installation de lapplication web</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-07-14</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-RC-3</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-08-02</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.1.0</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -101,8 +101,8 @@ <pre class="source"> /var/local/observeweb/{contextPath} |-- databases.yml # configuration des bases de données |-- log - | `-- observeweb-8.0-RC-3.log # logs de l'application - |-- observeweb-log4j.conf # configuration des logs + | `-- observeweb-7.1.0.log # logs de l'application + |-- observeweb-log4j2.xml # configuration des logs |-- temp # répertoire temporaire `-- users.yml # configuration des utilisateurs </pre></div></div> @@ -196,14 +196,6 @@ <div> <div> <pre class="source"> http://localhost:8080/observeweb/admin/resetAuthenticationTokens?adminApiKe… (ou la clef que vous avez configuré) -</pre></div></div> - -<p>Par défaut le proxy_ajp a un timeout de 5 minutes, il faut augmenter cette valeur sinon les appels dépassant ce temps seront rejettés.</p> -<p>Dans le fichier de configuration <tt>httpd.conf</tt> ajouter la ligne : (timeout de 1200 secondes = 20 minutes)</p> - -<div> -<div> -<pre class="source">ProxyTimeout 1200 </pre></div></div> </div> </div> ===================================== architecture-logicielle.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190714" /> + <meta name="Date-Revision-yyyymmdd" content="20190802" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Architecture logicielle dObServe</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -18,8 +18,8 @@ <body class="topBarDisabled"> <div class="container-fluid"> <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo.png" alt="ObServe :: Pom"/></a></div> - <div class="pull-right"><a href="index.html" id="bannerRight"><img src="./img/logo_ird.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-right"></div> <div class="clear"><hr/></div> </div> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Architecture logicielle dObServe</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-07-14</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-RC-3</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-08-02</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.1.0</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== img/logo-small.png ===================================== Binary files /dev/null and b/img/logo-small.png differ ===================================== img/logo.png ===================================== Binary files a/img/logo.png and b/img/logo.png differ ===================================== img/logo_ird.png ===================================== Binary files a/img/logo_ird.png and b/img/logo_ird.png differ ===================================== index.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190714" /> + <meta name="Date-Revision-yyyymmdd" content="20190802" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – ObServe</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -18,8 +18,8 @@ <body class="topBarDisabled"> <div class="container-fluid"> <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo.png" alt="ObServe :: Pom"/></a></div> - <div class="pull-right"><a href="index.html" id="bannerRight"><img src="./img/logo_ird.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-right"></div> <div class="clear"><hr/></div> </div> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">ObServe</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-07-14</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-RC-3</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-08-02</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.1.0</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== install-serverPG.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190714" /> + <meta name="Date-Revision-yyyymmdd" content="20190802" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Installation du serveur Obstuna</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -18,8 +18,8 @@ <body class="topBarDisabled"> <div class="container-fluid"> <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo.png" alt="ObServe :: Pom"/></a></div> - <div class="pull-right"><a href="index.html" id="bannerRight"><img src="./img/logo_ird.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-right"></div> <div class="clear"><hr/></div> </div> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Installation du serveur Obstuna</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-07-14</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-RC-3</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-08-02</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.1.0</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== install.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190714" /> + <meta name="Date-Revision-yyyymmdd" content="20190802" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Installation dObServe</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -18,8 +18,8 @@ <body class="topBarDisabled"> <div class="container-fluid"> <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo.png" alt="ObServe :: Pom"/></a></div> - <div class="pull-right"><a href="index.html" id="bannerRight"><img src="./img/logo_ird.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-right"></div> <div class="clear"><hr/></div> </div> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Installation dObServe</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-07-14</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-RC-3</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-08-02</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.1.0</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/bc918092a62c4892c3d17093703… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/bc918092a62c4892c3d17093703… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/7.1.0
by Tony CHEMIT Aug. 2, 2019

Aug. 2, 2019

Tony CHEMIT deleted branch release/7.1.0 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 v7.1.0
by Tony CHEMIT Aug. 2, 2019

Aug. 2, 2019

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

1 0

[Git][ultreiaio/ird-observe][release/7.1.0] [jgitflow-maven-plugin]updating poms for branch'release/7.1.0' with non-snapshot versions[skip ci]
by Tony CHEMIT Aug. 2, 2019

Aug. 2, 2019

Tony CHEMIT pushed to branch release/7.1.0 at ultreiaio / ird-observe Commits: 36c585a8 by tchemit at 2019-08-02T15:47:44Z [jgitflow-maven-plugin]updating poms for branch'release/7.1.0' with non-snapshot versions[skip ci] - - - - - 16 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.0</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.0</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.0</version> </parent> <artifactId>client-runner</artifactId> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.0</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.0</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.0</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.0</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.0</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.0</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server-core/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.0</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.0</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.0</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.0</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.0</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.0</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.0</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/36c585a8c938ee67eaf1f667e37… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/36c585a8c938ee67eaf1f667e37… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master-7.x] 14 commits: [jgitflow-maven-plugin]updating poms for 7.0.9-SNAPSHOT development[skip ci]
by Tony CHEMIT Aug. 2, 2019

Aug. 2, 2019

Tony CHEMIT pushed to branch master-7.x at ultreiaio / ird-observe Commits: 2c589426 by tchemit at 2019-07-06T13:59:08Z [jgitflow-maven-plugin]updating poms for 7.0.9-SNAPSHOT development[skip ci] - - - - - 326802cd by tchemit at 2019-07-06T14:05:41Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - e3ee2d26 by tchemit at 2019-07-06T14:05:41Z [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - ae2bfff9 by tchemit at 2019-07-06T14:05:42Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 5971fd79 by tchemit at 2019-07-16T10:33:56Z update pom - - - - - b89ed2cb by tchemit at 2019-07-16T13:37:58Z move to version 7.1.0 [skip ci] - - - - - 35286e05 by tchemit at 2019-07-16T14:58:30Z [REF] Consolidation du réferentiel common.LengthWeightParameter - Closes #1350 [REF] Consolidation du réferentiel common.LengthLengthParameter - Closes #1351 - - - - - c1536213 by tchemit at 2019-07-16T15:51:56Z Consolidation des champs techniques en base - closes #1353 - - - - - 38f8daf4 by tchemit at 2019-07-16T16:32:33Z Problème synchro avancée référentiel - Closes #1352 - - - - - 4357232a by tchemit at 2019-07-17T15:33:36Z Impossible de modifier le champs Species.wormsId - Closes #1357 - - - - - aaae338b by tchemit at 2019-07-24T16:38:15Z [PS] Une espèce sans catégorie apparaît à tord dans le formulaire thons capturés - Closes #1367 - - - - - 351b9b14 by tchemit at 2019-08-02T15:40:36Z update pom - - - - - 36c585a8 by tchemit at 2019-08-02T15:47:44Z [jgitflow-maven-plugin]updating poms for branch'release/7.1.0' with non-snapshot versions[skip ci] - - - - - a3eae48a by tchemit at 2019-08-02T16:24:46Z [jgitflow-maven-plugin]merging 'release/7.1.0' into 'master-7.x' - - - - - 30 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetCatchUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetDiscardCatchUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/SpeciesUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/SpeciesUI.jcss - client-runner/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - observe/pom.xml - persistence/pom.xml - + persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_1.java - persistence/src/main/models/Observe.model - + persistence/src/main/resources/db/migration/7.1/01_add_not_null_on_length_weight_parameters-common.sql - + persistence/src/main/resources/db/migration/7.1/02_add_not_null_on_length_length_parameters-common.sql - + persistence/src/main/resources/db/migration/7.1/03_add_not_null_on_technical_fields-common.sql - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java - services-local/src/test/java/fr/ird/observe/services/local/entity/LengthWeightParemetersTest.java - services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocalTest.java - services/pom.xml - services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeRequest.java - test/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/e219b6f1e87e4a0f9888ba1729… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/e219b6f1e87e4a0f9888ba1729… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/7.1.0' with non-snapshot versions[skip ci]
by Tony CHEMIT Aug. 2, 2019

Aug. 2, 2019

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 36c585a8 by tchemit at 2019-08-02T15:47:44Z [jgitflow-maven-plugin]updating poms for branch'release/7.1.0' with non-snapshot versions[skip ci] - - - - - a3eae48a by tchemit at 2019-08-02T16:24:46Z [jgitflow-maven-plugin]merging 'release/7.1.0' into 'master-7.x' - - - - - d938fdce by tchemit at 2019-08-02T16:24:48Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 356e1218 by tchemit at 2019-08-02T16:24:49Z [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - a7e1e285 by tchemit at 2019-08-02T16:24:49Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/9661a66adf015e66c1567c289b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/9661a66adf015e66c1567c289b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [jgitflow-maven-plugin]updating poms for 7.1.1-SNAPSHOT development[skip ci]
by Tony CHEMIT Aug. 2, 2019

Aug. 2, 2019

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 9661a66a by tchemit at 2019-08-02T15:42:00Z [jgitflow-maven-plugin]updating poms for 7.1.1-SNAPSHOT development[skip ci] - - - - - 16 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.1-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.1-SNAPSHOT</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.1-SNAPSHOT</version> </parent> <artifactId>client-runner</artifactId> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.1-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.1-SNAPSHOT</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.1-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.1-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.1-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server-core/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.1-SNAPSHOT</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.1-SNAPSHOT</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.1-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.1-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.1-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.1-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.1-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/9661a66adf015e66c1567c289bc… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/9661a66adf015e66c1567c289bc… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/7.1.0
by Tony CHEMIT Aug. 2, 2019

Aug. 2, 2019

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

1 0

[Git][ultreiaio/ird-observe][develop-7.x] update pom
by Tony CHEMIT Aug. 2, 2019

Aug. 2, 2019

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 351b9b14 by tchemit at 2019-08-02T15:40:36Z update pom - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.24</version> + <version>2019.8.28</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/351b9b14f53fcfb4535a9d9c399… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/351b9b14f53fcfb4535a9d9c399… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Realign LL model - See #1332
by Tony CHEMIT Aug. 2, 2019

Aug. 2, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 006d99f4 by tchemit at 2019-08-02T14:53:35Z Realign LL model - See #1332 - - - - - 5 changed files: - .mvn/gitlab-cache/milestones/370039-issues.json - .mvn/gitlab-cache/milestones/532584-issues.json - .mvn/gitlab-cache/milestones/595831-issues.json - .mvn/gitlab-cache/milestones/647608-issues.json - client-core/src/main/i18n/getters/java.getter The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/006d99f411c351eff15c3f9e774… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/006d99f411c351eff15c3f9e774… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Realign ll model (stash...)
by Tony CHEMIT Aug. 1, 2019

Aug. 1, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 66db68aa by tchemit at 2019-08-01T17:39:16Z Realign ll model (stash...) - - - - - 5 changed files: - .mvn/gitlab-cache/milestones/370039-issues.json - .mvn/gitlab-cache/milestones/532584-issues.json - .mvn/gitlab-cache/milestones/595831-issues.json - .mvn/gitlab-cache/milestones/647608-issues.json - client-core/src/main/i18n/getters/java.getter The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/66db68aa24190c544452e9ca252… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/66db68aa24190c544452e9ca252… You're receiving this email because of your account on gitlab.com.

1 0