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

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: Les informations sur la source de données ne peuvent pa être affichées - Closes #1186
by Tony CHEMIT 31 Dec '18

31 Dec '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 5492b59e by tchemit at 2018-12-31T20:52:40Z Les informations sur la source de données ne peuvent pa être affichées - Closes #1186 - - - - - defa2ca0 by tchemit at 2018-12-31T21:22:19Z Déplacement de marée intempestif dans l'arbre - Closes #1189 - - - - - 5 changed files: - client-core/src/main/i18n/templates/dataSourceInformation_en_GB.ftl - client-core/src/main/i18n/templates/dataSourceInformation_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceInformation_fr_FR.ftl - persistence/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java - persistence/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java Changes: ===================================== client-core/src/main/i18n/templates/dataSourceInformation_en_GB.ftl ===================================== @@ -36,7 +36,7 @@ <#else> <li>Web service url: ${configuration.serverUrl}</li> <li>User: ${configuration.login}</li> - <#if configuration.optionalDatabaseName.present??> + <#if configuration.withDatabaseName()> <li>Database alias: ${configuration.optionalDatabaseName.get()}</li> </#if> </#if> ===================================== client-core/src/main/i18n/templates/dataSourceInformation_es_ES.ftl ===================================== @@ -36,7 +36,7 @@ <#else> <li>URL del servicio web: ${configuration.serverUrl}</li> <li>Usuario: ${configuration.login}</li> - <#if configuration.optionalDatabaseName.present??> + <#if configuration.withDatabaseName()> <li>Alias de la base: ${configuration.optionalDatabaseName.get()}</li> </#if> </#if> ===================================== client-core/src/main/i18n/templates/dataSourceInformation_fr_FR.ftl ===================================== @@ -36,7 +36,7 @@ <#else> <li>URL du service web : ${configuration.serverUrl}</li> <li>Utilisateur : ${configuration.login}</li> - <#if configuration.optionalDatabaseName.present??> + <#if configuration.withDatabaseName()> <li>Alias de la base : ${configuration.optionalDatabaseName.get()}</li> </#if> </#if> ===================================== persistence/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java ===================================== @@ -48,8 +48,9 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl public int findPositionByProgramId(String programId, String tripId) { int result = 0; - //FIXME Bien vérifier que cela fonctionne - List<TripLongline> list = forProgramEquals(topiaDaoSupplier.getDao(Program.class).forTopiaIdEquals(programId).findUnique()).findAll(); + List<TripLongline> list = forProgramEquals(topiaDaoSupplier.getDao(Program.class).forTopiaIdEquals(programId).findUnique()) + .setOrderByArguments(TripLongline.PROPERTY_START_DATE + " ASC") + .findAll(); for (TripLongline e : list) { if (tripId.equals(e.getTopiaId())) { return result; ===================================== persistence/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java ===================================== @@ -50,8 +50,9 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { public int findPositionByProgramId(String programId, String tripId) { int result = 0; - //FIXME Bien vérifier que cela fonctionne - List<TripSeine> list = forProgramEquals(topiaDaoSupplier.getDao(Program.class).forTopiaIdEquals(programId).findUnique()).findAll(); + List<TripSeine> list = forProgramEquals(topiaDaoSupplier.getDao(Program.class).forTopiaIdEquals(programId).findUnique()) + .setOrderByArguments(TripSeine.PROPERTY_START_DATE + " ASC") + .findAll(); for (TripSeine e : list) { if (tripId.equals(e.getTopiaId())) { return result; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/9171243371ca8f725b03ed3cc8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/9171243371ca8f725b03ed3cc8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [V8][DATA MODEL] Ajout de champs - Closes #1185
by Tony CHEMIT 30 Dec '18

30 Dec '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5d0a76c8 by tchemit at 2018-12-30T10:35:36Z [V8][DATA MODEL] Ajout de champs - Closes #1185 - - - - - 30 changed files: - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/add/AddActivityLonglineLogbookSampleUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/ActivityLonglineLogbookUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/ActivityLonglineLogbookUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/ActivityLonglineLogbookUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/ActivityLonglineLogbookUIModel.java - dto/src/main/java/fr/ird/observe/dto/data/ll/logbook/ActivityLonglineLogbookDto.java - dto/src/main/java/fr/ird/observe/dto/data/ll/logbook/ActivityLonglineLogbookReference.java - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java - dto/src/main/models/Observe-31-data-ll-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/binder/data/ll/logbook/ActivityLonglineLogbookEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/logbook/ActivityLonglineLogbookStubEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/entities/data/ll/logbook/ActivityLonglineLogbookImpl.java - persistence/src/main/java/fr/ird/observe/entities/data/ll/logbook/ActivityLonglineLogbookTopiaDao.java - persistence/src/main/java/fr/ird/observe/entities/data/ll/logbook/ActivityLonglineLogbooks.java - persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_7_2.java - persistence/src/main/models/Observe-00-common.model - persistence/src/main/models/Observe-01-referential-common.model - persistence/src/main/models/Observe-30-data-ll-observation.model - persistence/src/main/models/Observe-31-data-ll-logbook.model - persistence/src/main/models/Observe-35-data-ll-common.model - + persistence/src/main/resources/db/migration/7.2/10_add_home_id-common.sql - + persistence/src/main/resources/db/migration/7.2/11_alter_ll_logbook_activity-H2.sql - + persistence/src/main/resources/db/migration/7.2/11_alter_ll_logbook_activity-PG.sql - server-core/src/main/filtered-resources/mapping - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/ActivityLonglineLogbookSampleServiceLocal.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/5d0a76c839ce922e82c31279f38… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/5d0a76c839ce922e82c31279f38… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: update db tests
by Tony CHEMIT 28 Dec '18

28 Dec '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7a656883 by tchemit at 2018-12-23T11:55:38Z update db tests - - - - - 0b5002e7 by tchemit at 2018-12-23T11:56:26Z V8- réusinage des pauqetages de services - - - - - ffcb5feb by tchemit at 2018-12-23T12:50:22Z update pom - - - - - e8cea52f by tchemit at 2018-12-23T14:27:35Z TODO Report add ObjectMaterial - - - - - 223bcc9e by tchemit at 2018-12-23T14:30:19Z Ajouter un générateur d'id sur LL-Trip - Closes #1172 - - - - - 30 changed files: - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-core/src/main/i18n/getters/java.getter - client-core/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/ChooseRelatedObservedActivityUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/GenerateTripLonglineHomeIdUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/ActivityLonglinePairingModel.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/ActivityLonglinePairingUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/tree/ActivityLonglinePairingTreeTable.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/tree/node/ActivityLonglinePairingActivityNode.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/tree/node/ActivityLonglinePairingTripNode.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/common/TripLonglineUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/common/TripLonglineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/ActivityLonglineLogbookUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapContentBuilder.java - 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 - pom.xml - server-core/src/main/filtered-resources/mapping - services-client/src/test/java/fr/ird/observe/services/client/service/seine/TripSeineGearUseServiceClientTest.java → services-client/src/test/java/fr/ird/observe/services/client/service/data/ps/common/TripSeineGearUseServiceClientTest.java - services-client/src/test/java/fr/ird/observe/services/client/service/seine/TripSeineServiceClientTest.java → services-client/src/test/java/fr/ird/observe/services/client/service/data/ps/common/TripSeineServiceClientTest.java - services-client/src/test/java/fr/ird/observe/services/client/service/ReferenceValuesSetServiceClientTest.java → services-client/src/test/java/fr/ird/observe/services/client/service/referential/ReferenceValuesSetServiceClientTest.java - services-client/src/test/java/fr/ird/observe/services/client/service/ReferentialServiceClientTest.java → services-client/src/test/java/fr/ird/observe/services/client/service/referential/ReferentialServiceClientTest.java - services-local/pom.xml - services-local/src/main/java/fr/ird/observe/services/local/service/data/NavigationServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/TripManagementServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/TripMapDtoFactory.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/2db9b951092df7c01bfeda8663… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/2db9b951092df7c01bfeda8663… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Un type d'objet flottant (28) n'est pas pris en compte par la migration - Closes #1188
by Tony CHEMIT 21 Dec '18

21 Dec '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 522576bc by tchemit at 2018-12-21T04:18:54Z Un type d'objet flottant (28) n'est pas pris en compte par la migration - Closes #1188 - - - - - d58fbfd1 by tchemit at 2018-12-21T04:34:49Z Move persistence to entities - - - - - 2db9b951 by tchemit at 2018-12-21T04:35:34Z Conformité des topiaid de floatingobjectpart - Closes #1191 - - - - - 30 changed files: - CONTRIBUTING.md - persistence/pom.xml - persistence/src/main/java/fr/ird/observe/persistence/AbstractObserveTopiaDao.java → persistence/src/main/java/fr/ird/observe/entities/AbstractObserveTopiaDao.java - persistence/src/main/java/fr/ird/observe/persistence/Entities.java → persistence/src/main/java/fr/ird/observe/entities/Entities.java - persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaApplicationContext.java → persistence/src/main/java/fr/ird/observe/entities/ObserveTopiaApplicationContext.java - persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaConfiguration.java → persistence/src/main/java/fr/ird/observe/entities/ObserveTopiaConfiguration.java - persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaConfigurationFactory.java → persistence/src/main/java/fr/ird/observe/entities/ObserveTopiaConfigurationFactory.java - persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaIdFactory.java → persistence/src/main/java/fr/ird/observe/entities/ObserveTopiaIdFactory.java - persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaPersistenceContext.java → persistence/src/main/java/fr/ird/observe/entities/ObserveTopiaPersistenceContext.java - persistence/src/main/java/fr/ird/observe/entities/data/ll/logbook/ActivityLonglineLogbookImpl.java - persistence/src/main/java/fr/ird/observe/entities/data/ll/logbook/SetLonglineLogbookImpl.java - persistence/src/main/java/fr/ird/observe/entities/data/ll/observation/ActivityLonglineObsImpl.java - persistence/src/main/java/fr/ird/observe/entities/data/ll/observation/SetLonglineObsImpl.java - persistence/src/main/java/fr/ird/observe/entities/data/ps/observation/ActivitySeineImpl.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_5_0.java → persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_0.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_0.java → persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_6_0.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_1.java → persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_6_1.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_2.java → persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_6_2.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_3.java → persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_6_3.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_4.java → persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_6_4.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_5.java → persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_6_5.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_6.java → persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_6_6.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0.java → persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_7_0.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_1.java → persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_7_1.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_2.java → persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_7_2.java - persistence/src/main/java/fr/ird/observe/persistence/migration/ObserveTopiaMigrationServiceAskUserToMigrate.java → persistence/src/main/java/fr/ird/observe/entities/migration/ObserveTopiaMigrationServiceAskUserToMigrate.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_1.java → persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_1.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_10.java → persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_10.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_11.java → persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_11.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_12.java → persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_12.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/324560db1c7c84739342237897… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/324560db1c7c84739342237897… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.x] 3 commits: v9 - Module 6 - Ajout du modèle PS - Marché local
by Tony CHEMIT 21 Dec '18

21 Dec '18

Tony CHEMIT pushed to branch develop-9.x at ultreiaio / ird-observe Commits: 3f8f8af1 by tchemit at 2018-12-19T23:59:25Z v9 - Module 6 - Ajout du modèle PS - Marché local - - - - - 47ed8f5b by tchemit at 2018-12-20T00:01:51Z v9 - Module 6 - Ajout du modèle PS - Marché local - Survey - - - - - 6f87d233 by tchemit at 2018-12-21T04:17:48Z Stash V9 Last - - - - - 30 changed files: - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/add/AddSampleSpeciesSeineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/delete/DeleteLocalMarketSurveyUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/delete/DeleteSampleSeineUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/delete/DeleteSampleSpeciesSeineUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/move/MoveMultipleSampleUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/move/MoveSingleSampleUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveLocalMarketSurveyUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveSampleSeineUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveSampleSpeciesSeineUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineLocalMarketReferentialAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineLogbookSampleAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/localmarket/SurveyPartUI.jaxx - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/localmarket/SurveyPartUI.jcss - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/localmarket/SurveyPartUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/localmarket/SurveyPartUIModel.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/localmarket/SurveyUI.jaxx - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/localmarket/SurveyUI.jcss - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/localmarket/SurveyUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/localmarket/SurveyUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesSizeUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/localmarket/PackagingUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/localmarket/PackagingUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/localmarket/PackagingUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ps/localmarket/SampleSeineNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ps/localmarket/SurveySeineNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ps/localmarket/TripSeineBatchNavigationNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ps/localmarket/TripSeineLocalMarketNavigationNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ps/localmarket/TripSeineSampleNavigationNode.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/a2737c41259a9d0b52fe1645f3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/a2737c41259a9d0b52fe1645f3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: Un type d'objet flottant (28) n'est pas pris en compte par la migration - Closes #1188
by Tony CHEMIT 21 Dec '18

21 Dec '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: f664945e by tchemit at 2018-12-21T03:25:02Z Un type d'objet flottant (28) n'est pas pris en compte par la migration - Closes #1188 - - - - - 91712433 by tchemit at 2018-12-21T04:03:32Z Conformité des topiaid de floatingobjectpart - See #1191 - - - - - 2 changed files: - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_2.java - persistence/src/main/resources/db/migration/6.1/09_fill_object_material-common.sql Changes: ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_2.java ===================================== @@ -171,7 +171,7 @@ public class DataSourceMigrationForVersion_6_2 extends MigrationVersionResource int materialIndex = 0; Set<String> materialIds = materialIdsForTypeId.get(typeId); for (String materialId : materialIds) { - String topiaId = idFactory.newTopiaId(FloatingObjectPart.class, idFactory.getRandomPart(dcpId) + materialIndex++); + String topiaId = idFactory.newTopiaId(FloatingObjectPart.class, idFactory.getRandomPart(idFactory.getRandomPart(dcpId)) + materialIndex++); executor.writeSql(String.format(INSERT_FLOATING_OBJECT_PART, topiaId, materialId, dcpId, whenArriving, whenLeaving)); } } ===================================== persistence/src/main/resources/db/migration/6.1/09_fill_object_material-common.sql ===================================== @@ -23,7 +23,7 @@ INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.3',0, '2018-11-12','2018-11-12 17:27:06.06232','',null, 'FOB',null, 1, false, null, null, false, false, 'FOB','FOB','FOB',null, null, null, null, null, true, true, null); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.1',0, '2018-11-12','2018-11-12 17:27:06.06232','1',null, 'FAD','fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.3',1, false, null, null, null, null, 'FAD','FAD','FAD',null, null, null, null, null, false, false, null); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2',1, '2018-11-12','2018-11-12 17:27:06.06232','1-1',null, 'DFAD','fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.1',1, false, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', null, null, 'DFAD (drifting FAD)','DFAD (FAD dérivant)','DFAD (FAD a la deriva)',null, null, null, null, null, true, false, null); -INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3',1, '2018-11-12','2018-11-12 17:27:06.06232','1-1-1','22*, 23*',null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2',1, false, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', null, null, 'Raft','Radeau','Parrilla',null, null, null, null, null, true, false, null); +INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3',1, '2018-11-12','2018-11-12 17:27:06.06232','1-1-1','22*, 23*, 28*',null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2',1, false, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', null, null, 'Raft','Radeau','Parrilla',null, null, null, null, null, true, false, null); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6',0, '2018-11-12','2018-11-12 17:27:06.06232','1-1-1-1',null, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3',1, false, null, null, null, null, 'Frame','Chassis','Estructura',null, null, null, null, null, true, false, null); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.7',0, '2018-11-12','2018-11-12 17:27:06.06232','1-1-1-1-1','6, 15, 25',null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6',1, false, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', true, null, 'Vegetal, canes,bamboo','Végétal, tiges,bambou','Bambú, cañas',null, null, null, null, null, false, false, null); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.8',0, '2018-11-12','2018-11-12 17:27:06.06232','1-1-1-1-2','20, 21*,26',null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6',1, false, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, null, 'Metallic or PVC','Métal ou PVC','Metállica ó PVC',null, null, null, null, null, false, false, null); @@ -92,6 +92,8 @@ INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.74',1, '2018-11-12','2018-11-12 17:27:06.06232','4-6',null, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68',1, false, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#2', null, null, 'Size of largest mesh','Taille de la maille la plus grande (en mm)','Talla de la malla más grandes (en mm)',null, null, null, null, null, false, false, 'x >= 5 && x <= 1000'); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.75',1, '2018-11-12','2018-11-12 17:27:06.06232','4-7',null, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68',1, false, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#3', null, null, 'FOB identifier','Identifiant du FOB','Identificador del FOB',null, null, null, null, null, false, false, 'x.length() >= 3 && x.length() <= 64'); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.76',1, '2018-11-12','2018-11-12 17:27:06.06232','4-8',null, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68',1, false, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#2', null, null, 'Number of FOBs entangled','Nombre de FOBs emmêlés','Numero de FOBs enmallados',null, null, null, null, null, false, false, 'x >= 2 && x <= 100'); +INSERT INTO observe_seine.objectmaterial( topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, selectable, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#1464000000000#0.004009', 1, '2018-12-13', '2018-12-13 16:00:00', '4-9', '28*', null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68', 1, FALSE, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', null, null, 'Submerged or half-submerged', 'Submergé ou partiellement submergé', 'Sumergido o parcialmente sumergido', null, null, null, null, null, true, FALSE, FALSE, null); + INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77',0, '2018-11-12','2018-11-12 17:27:06.06232','6',null, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.3',0, false, null, null, null, null, 'Legacy codes','Anciens codes','Códigos antiguos',null, null, null, null, null, true, false, null); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.78',0, '2018-11-12','2018-11-12 17:27:06.06232','6-1','99',null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77',0, false, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', null, null, 'Other, unknown','Autre, inconnu','Otro, desconocido',null, null, null, null, null, false, false, null); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.79',0, '2018-11-12','2018-11-12 17:27:06.06232','6-2','14','ALOG','fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77',0, false, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', null, null, 'One of the previous (10, 11, 12, 13) tagged','Un des antérieurs (10, 11, 12, 13) balisé','Una de los anterior (10, 11, 12, 13) con Baliza',null, null, null, null, null, false, false, null); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/285a3f13a8dbe8216208ceb37c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/285a3f13a8dbe8216208ceb37c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.x] v9 - Module 6 - Ajout du modèle PS - Marché local (pas fini...)
by Tony CHEMIT 19 Dec '18

19 Dec '18

Tony CHEMIT pushed to branch develop-9.x at ultreiaio / ird-observe Commits: a2737c41 by tchemit at 2018-12-19T04:45:22Z v9 - Module 6 - Ajout du modèle PS - Marché local (pas fini...) - - - - - 30 changed files: - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineLocalMarketReferentialAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/localmarket/TripSeineBatchUI.jaxx - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/localmarket/TripSeineBatchUI.jcss - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/localmarket/TripSeineBatchUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/localmarket/TripSeineBatchUIModel.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/localmarket/TripSeineSampleListUI.jaxx - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/localmarket/TripSeineSampleListUI.jcss - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/localmarket/TripSeineSampleListUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/localmarket/TripSeineSampleListUIModel.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/localmarket/TripSeineSurveyListUI.jaxx - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/localmarket/TripSeineSurveyListUI.jcss - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/localmarket/TripSeineSurveyListUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/localmarket/TripSeineSurveyListUIModel.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/localmarket/PackagingTypeUI.jaxx - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/localmarket/PackagingTypeUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/localmarket/PackagingTypeUIModel.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/localmarket/PackagingUI.jaxx - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/localmarket/PackagingUI.jcss - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/localmarket/PackagingUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/localmarket/PackagingUIModel.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/localmarket/ReferenceHomeSeineLocalMarketUI.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/localmarket/ReferenceHomeSeineLocalMarketUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a2737c41259a9d0b52fe1645f36… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a2737c41259a9d0b52fe1645f36… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.x] v9 - Module 6 - Ajout du modèle PS - Marché local (pas fini...)
by Tony CHEMIT 19 Dec '18

19 Dec '18

Tony CHEMIT pushed to branch develop-9.x at ultreiaio / ird-observe Commits: 2aeedc5e by tchemit at 2018-12-19T04:17:14Z v9 - Module 6 - Ajout du modèle PS - Marché local (pas fini...) - - - - - 30 changed files: - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineLocalMarketReferentialAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/localmarket/TripSeineBatchUI.jaxx - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/localmarket/TripSeineBatchUI.jcss - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/localmarket/TripSeineBatchUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/localmarket/TripSeineBatchUIModel.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/localmarket/TripSeineSampleListUI.jaxx - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/localmarket/TripSeineSampleListUI.jcss - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/localmarket/TripSeineSampleListUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/localmarket/TripSeineSampleListUIModel.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/localmarket/TripSeineSurveyListUI.jaxx - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/localmarket/TripSeineSurveyListUI.jcss - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/localmarket/TripSeineSurveyListUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/localmarket/TripSeineSurveyListUIModel.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/localmarket/PackagingTypeUI.jaxx - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/localmarket/PackagingTypeUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/localmarket/PackagingTypeUIModel.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/localmarket/PackagingUI.jaxx - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/localmarket/PackagingUI.jcss - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/localmarket/PackagingUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/localmarket/PackagingUIModel.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/localmarket/ReferenceHomeSeineLocalMarketUI.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/localmarket/ReferenceHomeSeineLocalMarketUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2aeedc5e3527bab606998b9c8c7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2aeedc5e3527bab606998b9c8c7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.x] v9 - Module 5 - Ajout du modèle PS - Échantillonnage au port
by Tony CHEMIT 18 Dec '18

18 Dec '18

Tony CHEMIT pushed to branch develop-9.x at ultreiaio / ird-observe Commits: 2076853c by tchemit at 2018-12-18T21:23:43Z v9 - Module 5 - Ajout du modèle PS - Échantillonnage au port - - - - - 30 changed files: - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/edit/SaveEditDataUIActionSupport.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/add/AddSampleSpeciesSeineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/delete/DeleteSampleSeineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/delete/DeleteSampleSpeciesSeineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/move/MoveMultipleSampleUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/move/MoveSingleSampleUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveSampleSeineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveSampleSpeciesSeineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineLogbookSampleAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleListUI.jaxx - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleListUI.jcss - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleListUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleListUIModel.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesSizeUI.jaxx - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesSizeUI.jcss - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesSizeUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesSizeUIModel.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesUI.jaxx - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesUI.jcss - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesUIModel.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleUI.jaxx The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2076853cb710e13bee1be700986… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2076853cb710e13bee1be700986… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.x] 2 commits: v9 - Module 3 - Ajout du modèle PS - Débarquements
by Tony CHEMIT 17 Dec '18

17 Dec '18

Tony CHEMIT pushed to branch develop-9.x at ultreiaio / ird-observe Commits: 3efa737b by tchemit at 2018-12-17T15:22:54Z v9 - Module 3 - Ajout du modèle PS - Débarquements - - - - - 603812b7 by tchemit at 2018-12-17T17:22:41Z v9 - Module 4 - Ajout du modèle PS - Plan de cuves - - - - - 30 changed files: - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineLandingReferentialAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/landing/TripSeineLandingUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/landing/TripSeineLandingUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/landing/TripSeineLandingUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/dcp/FloatingObjectCreatePanel.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/wellplan/TripSeineWellPlanUI.jaxx - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/wellplan/TripSeineWellPlanUI.jcss - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/wellplan/TripSeineWellPlanUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/wellplan/TripSeineWellPlanUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/landing/ReferenceHomeSeineLandingUI.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/landing/ReferenceHomeSeineLandingUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ps/landing/TripSeineLandingNavigationNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/TripSeineWellPlanNavigationNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ps/wellplan/TripSeineWellPlanNavigationNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialListSeineLandingNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/TripSeineNavigationTreeNode.java - client-core/src/main/resources/observe-ui.properties - dto/src/main/i18n/getters/eugene.getter - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java - + dto/src/main/models/Observe-06-referential-ps-wellplan.model - + dto/src/main/models/Observe-23-data-ps-wellplan.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/pom.xml - persistence/src/main/java/fr/ird/observe/binder/data/ps/landing/LandingEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ps/landing/TripSeineLandingEntityDtoBinder.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/62c15606fd507d8dd33f367fe8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/62c15606fd507d8dd33f367fe8… You're receiving this email because of your account on gitlab.com.

1 0