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

[Git][ultreiaio/ird-observe][develop-7.x] Add SpeciesGroupRelease referentials (See #612)
by Tony CHEMIT May 31, 2017

May 31, 2017

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 7ea61b56 by Tony CHEMIT at 2017-05-31T21:41:59+02:00 Add SpeciesGroupRelease referentials (See #612) - - - - - 30 changed files: - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupReleaseModeDto-ui-create-error-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupReleaseModeDto-ui-create-warning-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupReleaseModeDto-ui-update-error-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupReleaseModeDto-ui-update-warning-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupReleaseStateDto-ui-create-error-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupReleaseStateDto-ui-create-warning-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupReleaseStateDto-ui-update-error-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupReleaseStateDto-ui-update-warning-validation.xml - application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIModel.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/SpeciesGroupReleaseModeUI.jaxx - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/SpeciesGroupReleaseModeUIHandler.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/SpeciesGroupReleaseModeUIModel.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/SpeciesGroupReleaseStateUI.jaxx - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/SpeciesGroupReleaseStateUIHandler.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/SpeciesGroupReleaseStateUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/SpeciesGroupUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/SpeciesGroupUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/SpeciesGroupUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/SpeciesGroupUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/SpeciesListUIHandler.java - application-swing/src/main/resources/i18n/application-swing_en_GB.properties - application-swing/src/main/resources/i18n/application-swing_es_ES.properties - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties - persistence/src/main/java/fr/ird/observe/persistence/Entities.java - persistence/src/main/java/fr/ird/observe/persistence/migration/AbstractObserveMigrationCallBack.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7ea61b56ad8abd1a6d3c2db6c81… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7ea61b56ad8abd1a6d3c2db6c81… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Remove dcp fields (See #711)
by Tony CHEMIT May 31, 2017

May 31, 2017

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 2012c764 by Tony CHEMIT at 2017-05-31T14:58:04+02:00 Remove dcp fields (See #711) - - - - - 16 changed files: - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-error-validation.xml - − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-warning-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-error-validation.xml - − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-warning-validation.xml - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIModel.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0.java - + persistence/src/main/resources/db/migration/6.901/04_remove_dcp_fields_H2.sql - + persistence/src/main/resources/db/migration/6.901/04_remove_dcp_fields_PG.sql - persistence/src/main/xmi/observe-seine.zargo - services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectBinder.java - services-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-error-validation.xml - − services-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-warning-validation.xml - services/src/main/xmi/observe-services-dto-seine.zargo Changes: ===================================== application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-error-validation.xml ===================================== --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-error-validation.xml @@ -60,16 +60,6 @@ </field> - <field name="daysAtSeaCount"> - -  - <field-validator type="int" short-circuit="true"> - <param name="min">0</param> - <message>validator.ui.floatingObject.positive.daysAtSeaCount</message> - </field-validator> - - </field> - <field name="comment">  ===================================== application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-warning-validation.xml deleted ===================================== --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-warning-validation.xml +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="daysAtSeaCount"> - -  - <field-validator type="required" short-circuit="true"> - <message>validator.ui.floatingObject.null.daysAtSeaCount</message> - </field-validator> - - </field> - -</validators> ===================================== application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-error-validation.xml ===================================== --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-error-validation.xml @@ -60,16 +60,6 @@ </field> - <field name="daysAtSeaCount"> - -  - <field-validator type="int" short-circuit="true"> - <param name="min">0</param> - <message>validator.ui.floatingObject.positive.daysAtSeaCount</message> - </field-validator> - - </field> - <field name="comment">  ===================================== application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-warning-validation.xml deleted ===================================== --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-warning-validation.xml +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="daysAtSeaCount"> - -  - <field-validator type="required" short-circuit="true"> - <message>validator.ui.floatingObject.null.daysAtSeaCount</message> - </field-validator> - - </field> - -</validators> ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx @@ -86,14 +86,6 @@ </cell> </row> <row> - <cell anchor='west'> - <JLabel id='daysAtSeaCountLabel'/> - </cell> - <cell anchor='east' weightx="1"> - <NumberEditor id='daysAtSeaCount' constructorParams='this' styleClass="int6"/> - </cell> - </row> - <row> <cell columns='2' fill="both" weighty="0.7"> <JComment id="comment"/> </cell> ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss @@ -72,18 +72,6 @@ BeanComboBox { selectedItem:{bean.getObjectType()}; } -#daysAtSeaCountLabel { - text:"observe.common.daysAtSeaCount"; - labelFor:{daysAtSeaCount}; -} - -#daysAtSeaCount { - bean:{bean}; - property:{FloatingObjectDto.PROPERTY_DAYS_AT_SEA_COUNT}; - numberValue:{bean.getDaysAtSeaCount()}; - showReset:true; -} - #comment { title:"observe.common.comment.floatingObject"; } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java @@ -207,8 +207,7 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto, getTypeI18nKey(FloatingObjectDto.class), t("observe.content.floatingObject.message.updating")); } - super.startEditUI(FloatingObjectUI.BINDING_DAYS_AT_SEA_COUNT_NUMBER_VALUE, - FloatingObjectUI.BINDING_OBJECT_TYPE_SELECTED_ITEM, + super.startEditUI(FloatingObjectUI.BINDING_OBJECT_TYPE_SELECTED_ITEM, FloatingObjectUI.BINDING_COMMENT_MODEL); contentUIModel.setModified(create); } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIModel.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIModel.java @@ -72,7 +72,6 @@ public class FloatingObjectUIModel extends ContentUIModel<FloatingObjectDto> { public static final Set<String> GENERAL_TAB_PROPERTIES = ImmutableSet.<String>builder().add(FloatingObjectDto.PROPERTY_OBJECT_OPERATION, FloatingObjectDto.PROPERTY_OBJECT_TYPE, - FloatingObjectDto.PROPERTY_DAYS_AT_SEA_COUNT, FloatingObjectDto.PROPERTY_COMMENT).build(); static final Set<String> MATERIALS_TAB_PROPERTIES = ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0.java @@ -49,6 +49,7 @@ public class DataSourceMigrationForVersion_7_0 extends AbstractObserveMigrationC addScript("01", "add_object_operation", queries); addScript("02", "add_object_material", queries); addScript("03", "add_floating_object_part", queries); + addScript("04", "remove_dcp_fields", queries); } public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_7_0 { ===================================== persistence/src/main/resources/db/migration/6.901/04_remove_dcp_fields_H2.sql ===================================== --- /dev/null +++ b/persistence/src/main/resources/db/migration/6.901/04_remove_dcp_fields_H2.sql @@ -0,0 +1,23 @@ +--- +-- #%L +-- ObServe :: Persistence +-- %% +-- Copyright (C) 2008 - 2017 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% +--- +ALTER TABLE observe_seine.FloatingObject DROP COLUMN DAYSATSEACOUNT; + ===================================== persistence/src/main/resources/db/migration/6.901/04_remove_dcp_fields_PG.sql ===================================== --- /dev/null +++ b/persistence/src/main/resources/db/migration/6.901/04_remove_dcp_fields_PG.sql @@ -0,0 +1,23 @@ +--- +-- #%L +-- ObServe :: Persistence +-- %% +-- Copyright (C) 2008 - 2017 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% +--- +ALTER TABLE observe_seine.FloatingObject DROP COLUMN DAYSATSEACOUNT; + ===================================== persistence/src/main/xmi/observe-seine.zargo ===================================== Binary files a/persistence/src/main/xmi/observe-seine.zargo and b/persistence/src/main/xmi/observe-seine.zargo differ ===================================== services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectBinder.java ===================================== --- a/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectBinder.java @@ -48,7 +48,6 @@ public class FloatingObjectBinder extends DataBinderSupport<FloatingObject, Floa copyDtoDataFieldsToEntity(dto, entity); - entity.setDaysAtSeaCount(dto.getDaysAtSeaCount()); entity.setObjectOperation(toEntity(dto.getObjectOperation(), ObjectOperation.class)); entity.setObjectType(toEntity(dto.getObjectType(), ObjectType.class)); @@ -59,7 +58,6 @@ public class FloatingObjectBinder extends DataBinderSupport<FloatingObject, Floa copyEntityDataFieldsToDto(entity, dto); - dto.setDaysAtSeaCount(entity.getDaysAtSeaCount()); dto.setObjectOperation(toReferentialReference(referentialLocale, entity.getObjectOperation(), ObjectOperationDto.class)); dto.setObjectType(toReferentialReference(referentialLocale, entity.getObjectType(), ObjectTypeDto.class)); ===================================== services-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-error-validation.xml ===================================== --- a/services-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-error-validation.xml +++ b/services-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-error-validation.xml @@ -60,16 +60,6 @@ </field> - <field name="daysAtSeaCount"> - -  - <field-validator type="int" short-circuit="true"> - <param name="min">0</param> - <message>validator.service.floatingObject.positive.daysAtSeaCount</message> - </field-validator> - - </field> - <field name="comment">  ===================================== services-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-warning-validation.xml deleted ===================================== --- a/services-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-warning-validation.xml +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="daysAtSeaCount"> - -  - <field-validator type="required" short-circuit="true"> - <message>validator.service.floatingObject.null.daysAtSeaCount</message> - </field-validator> - - </field> - -</validators> ===================================== services/src/main/xmi/observe-services-dto-seine.zargo ===================================== Binary files a/services/src/main/xmi/observe-services-dto-seine.zargo and b/services/src/main/xmi/observe-services-dto-seine.zargo differ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2012c7642c50068912170643966… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2012c7642c50068912170643966… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Add FloatingObjectPart ui (See #577)
by Tony CHEMIT May 31, 2017

May 31, 2017

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 5e9ebeec by Tony CHEMIT at 2017-05-31T14:38:42+02:00 Add FloatingObjectPart ui (See #577) - - - - - 30 changed files: - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectPartsTreeNode.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java - application-swing/src/main/resources/i18n/application-swing_en_GB.properties - application-swing/src/main/resources/i18n/application-swing_es_ES.properties - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties - persistence/src/main/resources/db/migration/6.901/02_add_object_material-H2.sql - persistence/src/main/resources/db/migration/6.901/02_add_object_material-PG.sql - persistence/src/main/resources/db/migration/6.901/03_add_floating_object_part-H2.sql - persistence/src/main/resources/db/migration/6.901/03_add_floating_object_part-PG.sql - persistence/src/main/xmi/observe.ini - services-binder/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java - services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectPartBinder.java - services-topia/pom.xml - services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceTopia.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java - services-topia/src/test/java/fr/ird/observe/services/topia/DataSourcesForTestManager.java - services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopiaTest.java - services-topia/src/test/java/fr/ird/observe/services/topia/service/sql/MigrateTestsDatabases.java - services/src/main/java/fr/ird/observe/services/ObserveDataReferenceSets.java - services/src/main/java/fr/ird/observe/services/dto/seine/ObjectMaterialHierarchyDto.java - test/src/main/resources/db/6.901/dataForTestLongline.sql.gz - test/src/main/resources/db/6.901/dataForTestSeine.sql.gz - test/src/main/resources/db/6.901/empty_h2.sql.gz The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/5e9ebeecb0fac37c3c946e3b17f… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/5e9ebeecb0fac37c3c946e3b17f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: Add FloatingObjectPart ui (See #577)
by Tony CHEMIT May 31, 2017

May 31, 2017

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 3613ab49 by Tony CHEMIT at 2017-05-31T13:28:34+02:00 Add FloatingObjectPart ui (See #577) - - - - - cbb8bafd by Tony CHEMIT at 2017-05-31T13:51:25+02:00 improve migrate db test - - - - - 30 changed files: - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectPartsModel.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectPartsTreeModel.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectPartsTreeNode.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java - application-swing/src/main/resources/i18n/application-swing_en_GB.properties - application-swing/src/main/resources/i18n/application-swing_es_ES.properties - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties - persistence/src/main/resources/db/migration/6.901/02_add_object_material-H2.sql - persistence/src/main/resources/db/migration/6.901/02_add_object_material-PG.sql - persistence/src/main/resources/db/migration/6.901/03_add_floating_object_part-H2.sql - persistence/src/main/resources/db/migration/6.901/03_add_floating_object_part-PG.sql - persistence/src/main/xmi/observe.ini - services-binder/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java - services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectPartBinder.java - services-topia/pom.xml - services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceTopia.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java - services-topia/src/test/java/fr/ird/observe/services/topia/DataSourcesForTestManager.java - services-topia/src/test/java/fr/ird/observe/services/topia/service/sql/MigrateTestsDatabases.java - services/src/main/java/fr/ird/observe/services/ObserveDataReferenceSets.java - services/src/main/java/fr/ird/observe/services/dto/seine/ObjectMaterialHierarchyDto.java - test/src/main/resources/db/6.901/dataForTestLongline.sql.gz - test/src/main/resources/db/6.901/dataForTestSeine.sql.gz The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/de4b8d40d21b6c449d80a3aae0… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/de4b8d40d21b6c449d80a3aae0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Add FloatingObjectPart data (See #577)
by Tony CHEMIT May 30, 2017

May 30, 2017

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: de4b8d40 by Tony CHEMIT at 2017-05-30T20:58:37+02:00 Add FloatingObjectPart data (See #577) - - - - - 30 changed files: - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties - application-web/src/main/filtered-resources/mapping - application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/FloatingObjectServiceController.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0.java - persistence/src/main/resources/db/migration/6.901/01_add_object_operation2-H2.sql → persistence/src/main/resources/db/migration/6.901/01_add_object_operation-H2.sql - persistence/src/main/resources/db/migration/6.901/01_add_object_operation2-PG.sql → persistence/src/main/resources/db/migration/6.901/01_add_object_operation-PG.sql - persistence/src/main/resources/db/migration/6.901/04_create_object_material-H2.sql → persistence/src/main/resources/db/migration/6.901/02_add_object_material-H2.sql - persistence/src/main/resources/db/migration/6.901/04_create_object_material-PG.sql → persistence/src/main/resources/db/migration/6.901/02_add_object_material-PG.sql - − persistence/src/main/resources/db/migration/6.901/02_fill_object_operation-H2.sql - − persistence/src/main/resources/db/migration/6.901/02_fill_object_operation-PG.sql - persistence/src/main/resources/db/migration/6.901/03_patch_object_operation-H2.sql → persistence/src/main/resources/db/migration/6.901/03_add_floating_object_part-H2.sql - persistence/src/main/resources/db/migration/6.901/03_patch_object_operation-PG.sql → persistence/src/main/resources/db/migration/6.901/03_add_floating_object_part-PG.sql - persistence/src/main/xmi/observe-seine.zargo - services-binder/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java - + services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectPartBinder.java - services-binder/src/test/java/fr/ird/observe/services/binder/BinderEngineMetadataTest.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java - + services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopiaTest.java - services-topia/src/test/java/fr/ird/observe/services/topia/service/sql/MigrateTestsDatabases.java - services/src/main/java/fr/ird/observe/services/ObserveDataReferenceSets.java - services/src/main/java/fr/ird/observe/services/ObserveFormRequests.java - + services/src/main/java/fr/ird/observe/services/dto/seine/ObjectMaterialHierarchyDto.java - services/src/main/java/fr/ird/observe/services/service/data/seine/FloatingObjectService.java - services/src/main/xmi/observe-services-dto-seine.zargo - services/src/main/xmi/observe-services-dto.ini - test/src/main/resources/db/6.901/dataForTestLongline.sql.gz - test/src/main/resources/db/6.901/dataForTestSeine.sql.gz The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/de4b8d40d21b6c449d80a3aae0b… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/de4b8d40d21b6c449d80a3aae0b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 4 commits: transformation de ObjectOperation et suppression de ObjectFate
by Tony CHEMIT May 29, 2017

May 29, 2017

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: c6160018 by Tony CHEMIT at 2017-05-28T12:26:06+02:00 transformation de ObjectOperation et suppression de ObjectFate - - - - - 3e3ee29e by Tony CHEMIT at 2017-05-29T04:37:28+02:00 Fix migrate dbs - - - - - 71d3978f by Tony CHEMIT at 2017-05-29T13:58:27+02:00 Add ObjectMaterial referential (See #577) - - - - - 69735fe4 by Tony CHEMIT at 2017-05-29T14:00:47+02:00 Merge branch 'feature/577' into develop-7.x - - - - - 30 changed files: - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-ui-create-error-validation.xml → application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-ui-create-warning-validation.xml → application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialDto-ui-create-warning-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-ui-update-error-validation.xml → application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-ui-update-warning-validation.xml → application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialDto-ui-update-warning-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-warning-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-warning-validation.xml - application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectFateUI.jaxx → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectMaterialUI.jaxx - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectMaterialUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectFateUIHandler.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectMaterialUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectFateUIModel.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectMaterialUIModel.java - application-swing/src/main/resources/i18n/application-swing_en_GB.properties - application-swing/src/main/resources/i18n/application-swing_es_ES.properties - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties - persistence/src/main/java/fr/ird/observe/persistence/Entities.java - + persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0.java - + persistence/src/main/resources/db/migration/6.901/01_add_object_operation2-H2.sql - + persistence/src/main/resources/db/migration/6.901/01_add_object_operation2-PG.sql - + persistence/src/main/resources/db/migration/6.901/02_fill_object_operation-H2.sql - + persistence/src/main/resources/db/migration/6.901/02_fill_object_operation-PG.sql - + persistence/src/main/resources/db/migration/6.901/03_patch_object_operation-H2.sql - + persistence/src/main/resources/db/migration/6.901/03_patch_object_operation-PG.sql - + persistence/src/main/resources/db/migration/6.901/04_create_object_material-H2.sql The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/e92b11905087d1aa6d8ed3c4da… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/e92b11905087d1aa6d8ed3c4da… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch feature/577
by Tony CHEMIT May 29, 2017

May 29, 2017

Tony CHEMIT deleted branch feature/577 at ultreiaio / ird-observe --- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/577] Add ObjectMaterial referential (See #577)
by Tony CHEMIT May 29, 2017

May 29, 2017

Tony CHEMIT pushed to branch feature/577 at ultreiaio / ird-observe Commits: 71d3978f by Tony CHEMIT at 2017-05-29T13:58:27+02:00 Add ObjectMaterial referential (See #577) - - - - - 30 changed files: - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialDto-ui-create-error-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialDto-ui-create-warning-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialDto-ui-update-error-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialDto-ui-update-warning-validation.xml - application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectMaterialUI.jaxx - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectMaterialUI.jcss - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectMaterialUIHandler.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectMaterialUIModel.java - application-swing/src/main/resources/i18n/application-swing_en_GB.properties - application-swing/src/main/resources/i18n/application-swing_es_ES.properties - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties - persistence/src/main/java/fr/ird/observe/persistence/Entities.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0.java - persistence/src/main/resources/db/migration/6.901/03_patch_object_operation-H2.sql - persistence/src/main/resources/db/migration/6.901/03_patch_object_operation-PG.sql - + persistence/src/main/resources/db/migration/6.901/04_create_object_material-H2.sql - + persistence/src/main/resources/db/migration/6.901/04_create_object_material-PG.sql - persistence/src/main/xmi/observe-seine.zargo - persistence/src/main/xmi/observe.ini - pom.xml - services-binder/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java - + services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectMaterialBinder.java - services-binder/src/test/java/fr/ird/observe/services/binder/BinderEngineMetadataTest.java - services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopiaTest.java - + services-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectMaterial-service-error-validation.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/71d3978f0b5a81c3a007520aee0… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/71d3978f0b5a81c3a007520aee0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/577] 3 commits: Fix migrate dbs
by Tony CHEMIT May 29, 2017

May 29, 2017

Tony CHEMIT pushed to branch feature/577 at ultreiaio / ird-observe Commits: 3e3ee29e by Tony CHEMIT at 2017-05-29T04:37:28+02:00 Fix migrate dbs - - - - - c8e4ae9b by Tony CHEMIT at 2017-05-29T04:38:19+02:00 Add ObjectMaterial referential (See #577) - - - - - 80c8772e by Tony CHEMIT at 2017-05-29T04:39:30+02:00 update headers - - - - - 30 changed files: - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialDto-ui-create-error-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialDto-ui-create-warning-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialDto-ui-update-error-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialDto-ui-update-warning-validation.xml - application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectMaterialUI.jaxx - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectMaterialUIHandler.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectMaterialUIModel.java - persistence/src/main/java/fr/ird/observe/persistence/Entities.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0.java - persistence/src/main/resources/db/migration/6.901/03_patch_object_operation-H2.sql - persistence/src/main/resources/db/migration/6.901/03_patch_object_operation-PG.sql - + persistence/src/main/resources/db/migration/6.901/04_create_object_material-H2.sql - + persistence/src/main/resources/db/migration/6.901/04_create_object_material-PG.sql - persistence/src/main/xmi/observe-seine.zargo - persistence/src/main/xmi/observe.ini - pom.xml - services-binder/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java - + services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectMaterialBinder.java - services-binder/src/test/java/fr/ird/observe/services/binder/BinderEngineMetadataTest.java - services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopiaTest.java - services-topia/src/test/java/fr/ird/observe/services/topia/service/sql/MigrateTestsDatabases.java - + services-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectMaterial-service-error-validation.xml - + services-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectMaterial-service-warning-validation.xml - services-validation/src/test/java/fr/ird/observe/services/topia/validation/BeanValidatorDetectorTest.java - services/src/main/java/fr/ird/observe/services/ObserveFormRequests.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/c6160018db4fd1a1b1d4ca1dd3… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/c6160018db4fd1a1b1d4ca1dd3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch feature/577
by Tony CHEMIT May 28, 2017

May 28, 2017

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

1 0