Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

• d9a9dd0d
  by Tony Chemit at 2020-09-03T02:45:04+02:00

  Correction sur PS Logbook Activity - See #1256
  

• ba501eb9
  by Tony Chemit at 2020-09-03T02:45:04+02:00

  Correction sur PS Logbook FOB - See #1258
  

• 02b7176e
  by Tony Chemit at 2020-09-03T02:45:04+02:00

  Rendre indépendante la consolidation des deux types de FOB - See #1258
  

• 41bfbce6
  by Tony Chemit at 2020-09-03T04:04:56+02:00

  [LOGBOOK PS] Position bateau vs position balise  - Closes #1297
  

• 6b3c515f
  by Tony Chemit at 2020-09-03T04:05:44+02:00

  Clean services
  

30 changed files:

• client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/ActivityUI.jcss
• client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/ActivityUIHandler.java
• client-datasource-editor-ps/src/main/dcp-presets/ps/logbook/01-deployment-preset.yml
• client-datasource-editor-ps/src/main/dcp-presets/ps/logbook/02-removal-preset.yml
• client-datasource-editor-ps/src/main/dcp-presets/ps/logbook/03-update-preset.yml
• client-datasource-editor-ps/src/main/dcp-presets/ps/logbook/04-abandonned-preset.yml
• client-datasource-editor-ps/src/main/i18n/getters/jaxx.getter
• client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/logbook/ActivityUI.jaxx
• client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/logbook/ActivityUI.jcss
• client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/logbook/ActivityUIHandler.java
• client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/logbook/FloatingObjectUI.jaxx
• client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/logbook/actions/ActivityUIAddFloatingObject.java
• client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/FloatingObjectUI.jaxx
• client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/actions/ActivityUIAddFloatingObject.java
• client-runner/src/main/assembly/dist/scripts/postgresql/extra/03_create-postgis-3-activity-seine.sql
• dto/src/main/java/fr/ird/observe/dto/data/ps/dcp/FloatingObjectPreset.java
• dto/src/main/java/fr/ird/observe/dto/data/ps/logbook/FloatingObjectDto.java
• dto/src/main/java/fr/ird/observe/dto/data/ps/logbook/RouteDto.java
• dto/src/main/java/fr/ird/observe/dto/decoration/init/DataPSLogbookModelDecoratorInitializer.java
• dto/src/main/models/Observe-21-data-ps-logbook.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
• persistence/src/main/java/fr/ird/observe/entities/data/ps/logbook/FloatingObjectImpl.java
• persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_8_1.java
• persistence/src/main/models/Observe-21-data-ps-logbook.model
• persistence/src/main/resources/db/migration/8.1/08_ps_logbook_create_data_model-common.sql
• + persistence/src/main/resources/db/migration/8.1/09_ps_logbook_add_spatial_trigger-PG.sql
• server-core/src/main/filtered-resources/mapping
• services-api/src/main/java/fr/ird/observe/services/service/data/ps/ConsolidateDataService.java

The diff was not included because it is too large.