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

Commits:

• ef671e2f
  by Tony CHEMIT at 2017-08-02T13:33:52+02:00

  Correction du nom d'un champs sur FloatingObject + ne pas pouvoir éditer l'opération de l'objet est mode modification (See #809)
  

• f015dc52
  by Tony CHEMIT at 2017-08-02T13:36:24+02:00

  Ajout de la consolidation des dcp (See #810) - début d'implantation
  

30 changed files:

• client/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateUIHandler.java
• client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java
• client/src/main/java/fr/ird/observe/client/ui/content/ObserveFocusManager.java
• client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUI.jaxx
• client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUI.jcss
• client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIHandler.java
• client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIModel.java
• client/src/main/java/fr/ird/observe/client/ui/content/open/ContentOpenableUIHandler.java
• client/src/main/resources/i18n/client_en_GB.properties
• client/src/main/resources/i18n/client_es_ES.properties
• client/src/main/resources/i18n/client_fr_FR.properties
• common/pom.xml
• + common/src/main/java/fr/ird/observe/common/constants/seine/DcpComputedValue.java
• common/src/main/resources/i18n/common_en_GB.properties
• common/src/main/resources/i18n/common_es_ES.properties
• common/src/main/resources/i18n/common_fr_FR.properties
• persistence/src/main/models/Observe.model
• persistence/src/main/resources/db/migration/6.901/08_add_floating_object_fields-common.sql
• services-rest/src/test/java/fr/ird/observe/services/rest/service/actions/consolidate/ConsolidateDataServiceRestTest.java
• services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngine.java
• services-topia/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectBinder.java
• services-topia/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectMaterialBinder.java
• services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java
• services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java
• + services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidationActivitySeineDataContext.java
• services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopiaTest.java
• services/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResult.java
• services/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataRequest.java
• services/src/main/models/Observe.model
• services/src/main/resources/i18n/services_es_ES.properties

The diff was not included because it is too large.