September 2020 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop-8.x] Merge back from v8.1.0.
by Tony CHEMIT Sept. 30, 2020

Sept. 30, 2020

Tony CHEMIT pushed to branch develop-8.x at ultreiaio / ird-observe Commits: 24fe226b by Tony Chemit at 2020-09-30T14:38:47+02:00 Merge back from v8.1.0. Need serious tests - - - - - 30 changed files: - client-core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client-core/src/main/java/fr/ird/observe/client/util/DtoIconHelper.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/FloatingObjectUIModel.java - common-dto/src/main/java/fr/ird/observe/dto/WithStartEndDate.java - common-dto/src/main/java/fr/ird/observe/dto/reference/DtoReferenceAware.java - common-dto/src/main/java/fr/ird/observe/dto/referential/differential/Differential.java - common-dto/src/main/java/fr/ird/observe/navigation/tree/MultipleReferenceContainerNode.java - common-persistence/pom.xml - common-persistence/src/main/java/fr/ird/observe/entities/ObserveTopiaConfigurationFactory.java - common-persistence/src/main/java/fr/ird/observe/entities/ObserveTopiaPersistenceContextConstructorParameter.java - common-persistence/src/main/java/fr/ird/observe/spi/context/DtoEntityContext.java - common-persistence/src/main/java/fr/ird/observe/spi/context/ReferentialDtoEntityContext.java - + common-service/src/main/java/fr/ird/observe/services/service/sql/SqlStatements.java - dto/src/main/java/fr/ird/observe/dto/data/ps/common/TripDto.java - dto/src/main/java/fr/ird/observe/dto/data/ps/consolidate/ConsolidateTripDataResult.java - dto/src/main/java/fr/ird/observe/dto/data/ps/consolidate/dcp/FloatingObjectConsolidateEngine.java - dto/src/main/java/fr/ird/observe/dto/data/ps/consolidate/ConsolidateActivityDataResult.java → dto/src/main/java/fr/ird/observe/dto/data/ps/observation/consolidate/ConsolidateActivityDataResult.java - dto/src/main/java/fr/ird/observe/dto/data/ps/consolidate/ConsolidateFloatingObjectRequest.java → dto/src/main/java/fr/ird/observe/dto/data/ps/observation/consolidate/ConsolidateFloatingObjectRequest.java - dto/src/main/java/fr/ird/observe/dto/data/ps/consolidate/NonTargetCatchModification.java → dto/src/main/java/fr/ird/observe/dto/data/ps/observation/consolidate/NonTargetCatchModification.java - dto/src/main/java/fr/ird/observe/dto/data/ps/consolidate/NonTargetLengthModification.java → dto/src/main/java/fr/ird/observe/dto/data/ps/observation/consolidate/NonTargetLengthModification.java - dto/src/main/java/fr/ird/observe/dto/data/ps/consolidate/TargetLengthModification.java → dto/src/main/java/fr/ird/observe/dto/data/ps/observation/consolidate/TargetLengthModification.java - dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java - dto/src/main/java/fr/ird/observe/dto/decoration/decorators/NonTargetCatchDecorator.java → dto/src/main/java/fr/ird/observe/dto/decoration/decorators/ps/observation/NonTargetCatchDecorator.java - dto/src/main/java/fr/ird/observe/dto/decoration/decorators/NonTargetLengthDecorator.java → dto/src/main/java/fr/ird/observe/dto/decoration/decorators/ps/observation/NonTargetLengthDecorator.java - dto/src/main/java/fr/ird/observe/dto/decoration/decorators/TargetCatchDecorator.java → dto/src/main/java/fr/ird/observe/dto/decoration/decorators/ps/observation/TargetCatchDecorator.java - dto/src/main/java/fr/ird/observe/dto/decoration/init/DataPsObservationModelDecoratorInitializer.java - dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java - persistence/src/main/java/fr/ird/observe/entities/ObserveTopiaMetadataModelSupport.java → dto/src/test/java/fr/ird/observe/dto/ObserveDtoFixtures.java - dto/src/test/java/fr/ird/observe/dto/report/ReportBuilderTest.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/24fe226beda3973b828cc9b2f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/24fe226beda3973b828cc9b2f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-8.x] 10 commits: fix computation of showData on ContentTableUIModel
by Tony CHEMIT Sept. 30, 2020

Sept. 30, 2020

Tony CHEMIT pushed to branch develop-8.x at ultreiaio / ird-observe Commits: dcbd6522 by Tony Chemit at 2020-09-29T19:44:17+02:00 fix computation of showData on ContentTableUIModel - - - - - 59b79983 by Tony Chemit at 2020-09-29T19:44:52+02:00 template better generate on none main dto - - - - - a31872d6 by Tony Chemit at 2020-09-29T19:44:56+02:00 change one maven module order - - - - - 12245930 by Tony Chemit at 2020-09-29T19:45:01+02:00 avoid nasty swing NPE - - - - - b352de85 by Tony Chemit at 2020-09-29T19:45:30+02:00 Ajouter un nouveau bouton sur le formulaire d'une ligne sélectionnée dans un écran de type table créer/enregister ET nouveau - Closes #1613 - - - - - 4b44fc8b by Tony Chemit at 2020-09-29T19:58:47+02:00 Stash on ListCreate action - - - - - 94fb62b7 by Tony Chemit at 2020-09-29T20:05:41+02:00 Nouveau texte de popup pour le cas 'Vous devez mettre à jour le form marée avant de pouvoir saisir le livre de bord' - See #1605 - - - - - 6ceff472 by Tony Chemit at 2020-09-30T08:56:49+02:00 Review DtoEntityContext and add on it TopiaEntitySqlDescriptor - - - - - 54c8bfaf by Tony Chemit at 2020-09-30T08:57:07+02:00 Move ObserveTopiaConfigurationFactory and ObserveTopiaApplicationContextFactory to his native module (nothing to do with services-local, persistence is the proper place to be (or common-persistence))... - - - - - 198186f3 by Tony Chemit at 2020-09-30T08:57:14+02:00 update pom - - - - - 30 changed files: - client-core/src/main/java/fr/ird/observe/client/util/ObserveKeyStrokesSupport.java - client-datasource-editor-api/src/main/i18n/getters/java.getter - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/list/actions/Create.java → client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/list/actions/CreateSupport.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUI.jaxx - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUI.jcss - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUIHandler.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUIModel.java - + client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/actions/SaveAndNewEntry.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/menu/actions/SelectLonglineLandingAction.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/NavigationTreeCellRenderer.java - client-datasource-editor-common/pom.xml - client-datasource-editor-common/src/main/i18n/getters/java.getter - + client-datasource-editor-common/src/main/i18n/templates/askToFillTripLogbook_en_GB.ftl - + client-datasource-editor-common/src/main/i18n/templates/askToFillTripLogbook_es_ES.ftl - + client-datasource-editor-common/src/main/i18n/templates/askToFillTripLogbook_fr_FR.ftl - + client-datasource-editor-common/src/main/i18n/templates/askToFillTripObservations_en_GB.ftl - + client-datasource-editor-common/src/main/i18n/templates/askToFillTripObservations_es_ES.ftl - + client-datasource-editor-common/src/main/i18n/templates/askToFillTripObservations_fr_FR.ftl - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/data/TripActionHelper.java - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/data/TripUI.java - client-datasource-editor-ll/src/main/i18n/getters/java.getter - client-datasource-editor-ll/src/main/i18n/getters/jaxx.getter - + client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/CreateSupport.java - + client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/LlTripActionHelper.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/TripListUI.jcss - + client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/actions/TripListCreate.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/landing/LandingListUI.jcss - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/landing/LandingUI.jcss - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/landing/actions/LandingListUICreate.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/landing/actions/LandingListUIMove.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/adc4972ee74d25739a38b484… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/adc4972ee74d25739a38b484… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Update .gitlab-ci.yml
by Tony CHEMIT Sept. 29, 2020

Sept. 29, 2020

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b17adf8a by Tony CHEMIT at 2020-09-29T17:43:27+00:00 Update .gitlab-ci.yml - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -101,7 +101,7 @@ trigger-make-stage: .automatic: &automatic only: - develop - - develop-x + - develop-* except: - triggers @@ -155,7 +155,7 @@ release-deploy-demo: .manual: &manual only: - develop - - develop-x + - develop-* when: manual create-docker: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b17adf8a004302d462c3c8507… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b17adf8a004302d462c3c8507… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-8.x] fix ci jobs
by Tony CHEMIT Sept. 29, 2020

Sept. 29, 2020

Tony CHEMIT pushed to branch develop-8.x at ultreiaio / ird-observe Commits: adc4972e by Tony Chemit at 2020-09-29T19:42:31+02:00 fix ci jobs - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -101,7 +101,7 @@ trigger-make-stage: .automatic: &automatic only: - develop - - develop-x + - develop-* except: - triggers @@ -155,7 +155,7 @@ release-deploy-demo: .manual: &manual only: - develop - - develop-x + - develop-* when: manual create-docker: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/adc4972ee74d25739a38b4849… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/adc4972ee74d25739a38b4849… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-8.x] Realign code to version 8 (maven 8.0.1-SNAPSHOT) (model 8.0)
by Tony CHEMIT Sept. 29, 2020

Sept. 29, 2020

Tony CHEMIT pushed to branch develop-8.x at ultreiaio / ird-observe Commits: ee595065 by Tony Chemit at 2020-09-29T19:40:24+02:00 Realign code to version 8 (maven 8.0.1-SNAPSHOT) (model 8.0) - - - - - 30 changed files: - .mvn/pom.gitflow.develop - .mvn/pom.gitflow.master - client-configuration/.mvn/pom.gitflow.develop - client-configuration/.mvn/pom.gitflow.master - client-configuration/pom.xml - client-core/.mvn/pom.gitflow.develop - client-core/.mvn/pom.gitflow.master - client-core/pom.xml - client-datasource-actions/.mvn/pom.gitflow.develop - client-datasource-actions/.mvn/pom.gitflow.master - client-datasource-actions/pom.xml - client-datasource-editor-api/.mvn/pom.gitflow.develop - client-datasource-editor-api/.mvn/pom.gitflow.master - client-datasource-editor-api/pom.xml - client-datasource-editor-common/.mvn/pom.gitflow.develop - client-datasource-editor-common/.mvn/pom.gitflow.master - client-datasource-editor-common/pom.xml - client-datasource-editor-ll/.mvn/pom.gitflow.develop - client-datasource-editor-ll/.mvn/pom.gitflow.master - client-datasource-editor-ll/pom.xml - client-datasource-editor-ps/.mvn/pom.gitflow.develop - client-datasource-editor-ps/.mvn/pom.gitflow.master - client-datasource-editor-ps/pom.xml - client-runner/.mvn/pom.gitflow.develop - client-runner/.mvn/pom.gitflow.master - client-runner/pom.xml - common-dto/.mvn/pom.gitflow.develop - common-dto/.mvn/pom.gitflow.master - common-dto/pom.xml - common-persistence/.mvn/pom.gitflow.develop The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/ee59506545496582a336140b0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/ee59506545496582a336140b0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch develop-8.x
by Tony CHEMIT Sept. 29, 2020

Sept. 29, 2020

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

1 0

[Git][ultreiaio/ird-observe][develop] Try to fix a test on server :(
by Tony CHEMIT Sept. 29, 2020

Sept. 29, 2020

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a25f44c8 by Tony Chemit at 2020-09-29T14:23:05+02:00 Try to fix a test on server :( - - - - - 1 changed file: - persistence/src/test/java/fr/ird/observe/entities/referential/common/LengthWeightParametersTest.java Changes: ===================================== persistence/src/test/java/fr/ird/observe/entities/referential/common/LengthWeightParametersTest.java ===================================== @@ -236,7 +236,7 @@ public class LengthWeightParametersTest extends PersistenceTestSupport { Assert.assertNotNull("length weight parameter not found for species " + species.getFaoCode() + " - ocean " + ocean.getLabel1() + " - sex " + (sex == null ? "null" : sex.getLabel1()) + " at " + date, lengthWeightParameter); Assert.assertEquals("Expected sex is " + expectedSex.getLabel1() + " but the one found was " + lengthWeightParameter.getSex().getLabel1(), expectedSex, lengthWeightParameter.getSex()); if (lengthWeightParameter.getStartDate() != null) { - Date startDate = new Date(lengthWeightParameter.getStartDate().getTime()); + Date startDate = lengthWeightParameter.getStartDate(); Assert.assertEquals("Expected startDate is " + expectedStartDate + " but the one found was " + startDate, expectedStartDate, startDate); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a25f44c8bd7dc6d94d8244c6a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a25f44c8bd7dc6d94d8244c6a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update db tests
by Tony CHEMIT Sept. 29, 2020

Sept. 29, 2020

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4cd82da3 by Tony Chemit at 2020-09-29T14:03:47+02:00 update db tests - - - - - 3 changed files: - test/src/main/resources/db/8.1/dataForTestLongline.sql.gz - test/src/main/resources/db/8.1/dataForTestSeine.sql.gz - test/src/main/resources/db/8.1/referentiel.sql.gz Changes: ===================================== test/src/main/resources/db/8.1/dataForTestLongline.sql.gz ===================================== Binary files a/test/src/main/resources/db/8.1/dataForTestLongline.sql.gz and b/test/src/main/resources/db/8.1/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/8.1/dataForTestSeine.sql.gz ===================================== Binary files a/test/src/main/resources/db/8.1/dataForTestSeine.sql.gz and b/test/src/main/resources/db/8.1/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/8.1/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/8.1/referentiel.sql.gz and b/test/src/main/resources/db/8.1/referentiel.sql.gz differ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4cd82da3ce91e1bf58cb25a73… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4cd82da3ce91e1bf58cb25a73… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 120 commits: Réorganisation des données d’observation PS - Réorganisation des captures et...
by Tony CHEMIT Sept. 29, 2020

Sept. 29, 2020

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6a97b25f by Tony Chemit at 2020-09-27T22:20:36+02:00 Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - Closes #1254 (suppression des tables résiduelles) - - - - - 77fcc640 by Tony Chemit at 2020-09-27T22:20:38+02:00 Deplacer le réferentiel WeightCategory vers le schema ps_logbook - Closes #1594 - - - - - 66ddc9a0 by Tony Chemit at 2020-09-27T22:20:38+02:00 Ajout référentiel PS Logbook WellsState - See #1300 - - - - - 19731786 by Tony Chemit at 2020-09-27T22:20:38+02:00 [PS] Contenu des onglets spécifiques observations et logbooks et le formulaire marée - Closes #1300 - - - - - 54e659c1 by Tony Chemit at 2020-09-27T22:20:38+02:00 Add nice stream method - - - - - f6fa1da8 by Tony Chemit at 2020-09-27T22:20:38+02:00 Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - Closes #1254 Il manque des tables à supprimer. - - - - - 14c8dec3 by Tony Chemit at 2020-09-27T22:20:38+02:00 Ajout référentiel PS Logbook WellsState - See #1300 Correction d'un id Ajout d'une entrée inconnue - - - - - ffd71083 by Tony Chemit at 2020-09-27T22:20:38+02:00 [PS] Contenu des onglets spécifiques observations et logbooks et le formulaire marée - Closes #1300 Il manque generalComment dans la migration. - - - - - cb74173f by Tony Chemit at 2020-09-27T22:20:38+02:00 Make more validators skipable - - - - - babcf82a by Tony Chemit at 2020-09-27T22:20:38+02:00 Make plugin more quiet - - - - - 3cda7856 by Tony Chemit at 2020-09-27T22:20:38+02:00 Introduce DtoPropertyModification (maybe should be in java-bean project ?) - - - - - 13004cfd by Tony Chemit at 2020-09-27T22:20:38+02:00 Make tests from more recent databases - - - - - af13bc8e by Tony Chemit at 2020-09-27T22:20:38+02:00 Improve SPI API (remove type in toDto and toReference methods) - - - - - f0f66b0a by Tony Chemit at 2020-09-27T22:20:38+02:00 Let's move stuff from services to common-dto, common-service or dto : in services module just services declaration with no logic. - - - - - 4b47a6df by Tony Chemit at 2020-09-27T22:20:38+02:00 * Generate PS Logbook domain (PMD for ever) * Adapt and review Activity Pairing API - - - - - b9a6869e by Tony Chemit at 2020-09-27T22:20:38+02:00 * Add Editor action PS Activity Pairing - - - - - 67a2055c by Tony Chemit at 2020-09-27T22:20:38+02:00 La reprise sur erreur en mode serveur doit être revue - Closes #1596 - - - - - 9fa948f2 by Tony Chemit at 2020-09-27T22:20:38+02:00 Move module services to services-api - - - - - e7722e2e by Tony Chemit at 2020-09-27T22:20:38+02:00 clean pom - - - - - 41eae377 by Tony Chemit at 2020-09-27T22:20:38+02:00 increase apply security web service timeout (can be more than one minute) and realign the migrateData to same value (100 minutes instead of one thousand...) - - - - - 004a44be by Tony Chemit at 2020-09-27T22:20:38+02:00 clean file headers - - - - - 2df7415a by Tony Chemit at 2020-09-27T22:20:38+02:00 missing i18n key - - - - - e0e78b6e by Tony Chemit at 2020-09-27T22:22:10+02:00 Use new topia extension API See ultreiaio/topia-extension#42 See ultreiaio/topia-extension#43 See ultreiaio/topia-extension#44 Which permits (done on 8.1 but need to do it also on previous migration files) Figer tous les lastUpdate et topiaCreateDate dans les scripts de migration - See #1593 - - - - - 188788df by Tony Chemit at 2020-09-27T22:22:12+02:00 Review server timeout management (was pretty lame : bad unit and default timeout always applied after request specialized values :() - Now everything is back to normal. - - - - - 37ae5cf8 by Tony Chemit at 2020-09-27T22:22:12+02:00 Remove unused service method - - - - - 612453a2 by Tony Chemit at 2020-09-27T22:22:12+02:00 Add new tip on install doc - - - - - 8fff2208 by Tony Chemit at 2020-09-27T22:22:12+02:00 If contentUI can not be opened, avoid a silly NPE - - - - - c1bf48b2 by Tony Chemit at 2020-09-27T22:22:12+02:00 Let's display any bad exceptions (if any can be good :)) - - - - - aadd0b02 by Tony Chemit at 2020-09-27T22:22:12+02:00 Rename i18n keys - - - - - b67dfd07 by Tony Chemit at 2020-09-27T22:22:12+02:00 Clean at last entities user code (very oldish style...) - - - - - 0d6bb188 by Tony Chemit at 2020-09-27T22:22:12+02:00 Use last jaxx widgets API - - - - - 3668cd77 by Tony Chemit at 2020-09-27T22:22:12+02:00 Make TripMap APi neutral and let's put domain style file where it belongs - - - - - 7d7da4a6 by Tony Chemit at 2020-09-27T22:22:12+02:00 Fix some closing issues - - - - - d5b6bc1c by Tony Chemit at 2020-09-27T22:22:12+02:00 Fix veto actions on trips - - - - - f375b091 by Tony Chemit at 2020-09-27T22:22:12+02:00 More review on TripMap API - - - - - a5ba4af0 by Tony Chemit at 2020-09-27T22:22:12+02:00 Mise à jour du module cartographie avec les nouvelles données - See #1248 - - - - - 576a0268 by Tony Chemit at 2020-09-27T22:22:12+02:00 * Amélioration du nommage des SelectNode et utilisation des nœuds pour le modèle PS Logbook * Mis en commun du code de gestion des flux disponibles sur les marées * Mise en place des gardes fous de création de flux non disponibles sur le modèle PS - - - - - 2e5ae76d by Tony Chemit at 2020-09-27T22:22:12+02:00 Fix route validation expression - - - - - 9137f212 by Tony Chemit at 2020-09-27T22:22:12+02:00 Readd missing i18n keys while moving classes from modules... - - - - - 818b813d by Tony Chemit at 2020-09-27T22:22:12+02:00 Correction sur PS Logbook Catch - See #1257 Pouvoir enregister une capture sans catégorie commerciale - Closes #1375 - - - - - a87ff314 by Tony Chemit at 2020-09-27T22:22:12+02:00 Correction sur PS Logbook Activity - See #1256 - - - - - 90fb6286 by Tony Chemit at 2020-09-27T22:22:12+02:00 Correction sur PS Logbook FOB - See #1258 - - - - - 2a3a0cda by Tony Chemit at 2020-09-27T22:22:12+02:00 Rendre indépendante la consolidation des deux types de FOB - See #1258 - - - - - 90292442 by Tony Chemit at 2020-09-27T22:22:12+02:00 [LOGBOOK PS] Position bateau vs position balise - Closes #1297 - - - - - 752122ac by Tony Chemit at 2020-09-27T22:22:12+02:00 Clean services - - - - - bc1a9e73 by Tony Chemit at 2020-09-27T22:22:12+02:00 update pom - - - - - 486979bb by Tony Chemit at 2020-09-27T22:22:12+02:00 Have a new case to deal with (collection of data references) - - - - - b1f90a10 by Tony Chemit at 2020-09-27T22:22:12+02:00 Insertion des lots de débarquements - See #1259 - - - - - 2115aecb by Tony Chemit at 2020-09-27T22:22:12+02:00 Insertion du plan de cuves - See #1260 - - - - - 2d4cbda8 by Tony Chemit at 2020-09-27T22:22:12+02:00 Deal with relation nm of data references - - - - - 84c6396c by Tony Chemit at 2020-09-27T22:22:12+02:00 Let's clone nuiton-validator to fix it (no time to create a new project now...) - - - - - 13ebe7d9 by Tony Chemit at 2020-09-27T22:22:12+02:00 Nuiton-Validator : Fix ValidatorComparator (was based on simple name... need fully qualified name to deal with synonyms) - - - - - 9bcf2c16 by Tony Chemit at 2020-09-27T22:22:12+02:00 Insertion de l’échantillonnage au port - See #1261 - - - - - 5d24c83e by Tony Chemit at 2020-09-27T22:22:12+02:00 Add WellIdAware contract and his validator - - - - - 8ab053c1 by Tony Chemit at 2020-09-27T22:22:12+02:00 Fix Some menu shortcuts - - - - - f81aa5e8 by Tony Chemit at 2020-09-27T22:22:12+02:00 Fix how to save a entity list from a reference list (a first one here...) - - - - - 4903daa8 by Tony Chemit at 2020-09-27T22:22:12+02:00 Insertion de l’échantillonnage au port - See #1261 Finitions - - - - - 32c0513d by Tony Chemit at 2020-09-27T22:22:12+02:00 Insertion du suivi du marché local - See #1262 - - - - - ad851f01 by Tony Chemit at 2020-09-27T22:22:12+02:00 Lors de l'ouverture de l'application, si la base locale est déjà occupée par une autre application, message erroné - Closes #1598 - - - - - 527f4257 by Tony Chemit at 2020-09-27T22:22:12+02:00 Insertion des lots de débarquements - See #1259 Ajout des référentiels - - - - - 1aa6dd08 by Tony Chemit at 2020-09-27T22:22:12+02:00 Use the natural order of attributes declaration to generate the form definition, in ordre to have a deterministic order (some filters may need other ones) - - - - - 08742880 by Tony Chemit at 2020-09-27T22:22:12+02:00 Insertion du plan de cuves - See #1260 Meilleur filtrage des catégories de poids et espèces - - - - - 6cf2d4d2 by Tony Chemit at 2020-09-27T22:22:12+02:00 Begin of usage of TopiaMetadataModelPaths - - - - - d96d27d0 by Tony Chemit at 2020-09-27T22:23:27+02:00 [V9] Sur le formulaire PS/Observations/Captures faune associée, champ "Origine de l'information" - See #119 (Ajout de la propriété dans l'ui) Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - See #1254 (Revue de la migration) - - - - - d8269b8b by Tony Chemit at 2020-09-27T22:23:29+02:00 [V9] Sur le formulaire PS/Observations/Captures faune associée, champ "Origine de l'information" - See #119 (Ajout de la propriété dans l'ui) Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - See #1254 (Revue de la migration) - - - - - b42b3618 by Tony Chemit at 2020-09-27T22:23:29+02:00 Ajout de EntityPathsSelectorGenerator (A finir) - - - - - 43c07838 by Tony Chemit at 2020-09-27T22:23:29+02:00 Ps logbook Set rendre éditable le type de banc - - - - - a3050ae4 by Tony Chemit at 2020-09-27T22:23:35+02:00 Correction de la recherche d'un nœud éditable (si on a un double rebond sur le parent) - - - - - e86a4e64 by Tony Chemit at 2020-09-27T22:23:35+02:00 LocalMarket fix Sample comparator - - - - - e262d8d6 by Tony Chemit at 2020-09-27T22:23:35+02:00 LocalMarket make top node a trip type one to make possible - - - - - 9f2d1b50 by Tony Chemit at 2020-09-27T22:23:35+02:00 LocalMarket fix some i18n - - - - - ffb777fb by Tony Chemit at 2020-09-27T22:23:35+02:00 LocalMarket fix (but not good at all) migration script for relation nm on String (table is on public schema) - - - - - 7701e41e by Tony Chemit at 2020-09-27T22:23:35+02:00 LocalMarket fix Packaging filter on harbour - - - - - 304d7d53 by Tony Chemit at 2020-09-27T22:23:35+02:00 LocalMarket fix migration - - - - - 885c8abb by Tony Chemit at 2020-09-27T22:23:35+02:00 LocalMarket fix species list id to use - - - - - eceb0219 by Tony Chemit at 2020-09-27T22:23:35+02:00 LocalMarket fix referential i18n - - - - - da3ccd19 by Tony Chemit at 2020-09-27T22:23:35+02:00 LocalMarket fix migration - - - - - 417f7fa3 by Tony Chemit at 2020-09-27T22:23:35+02:00 LocalMarket fix default number on Survey and Sample - - - - - ea96e4ba by Tony Chemit at 2020-09-27T22:23:35+02:00 LocalMarket fix label and do not edit if no packaging found on landing harbour - - - - - 22d03541 by Tony Chemit at 2020-09-27T22:23:35+02:00 fix computation of showData on ContentTableUIModel - - - - - 2d6fd53c by Tony Chemit at 2020-09-27T22:23:35+02:00 Localmarket delete unused speciesList - - - - - 792a3438 by Tony Chemit at 2020-09-27T22:23:35+02:00 Localmarket, Landing, WellPlan, Logbook review SpeciesList to use with proper configuration - - - - - e34e557c by Tony Chemit at 2020-09-27T22:23:35+02:00 Localmarket Do not disabled data tabs on create mode - - - - - 4718d047 by Tony Chemit at 2020-09-27T22:23:35+02:00 Sample Delete Sample.subSampleNumber (not needed here!) - - - - - df3530bc by Tony Chemit at 2020-09-27T22:23:35+02:00 Localmarket review some validations and input in ui - - - - - 4d25f7e5 by Tony Chemit at 2020-09-27T22:23:35+02:00 Logbook review some validations and input in ui - - - - - 5e966d6f by Tony Chemit at 2020-09-27T22:23:35+02:00 Landing review some validations - - - - - ad2b6cdf by Tony Chemit at 2020-09-27T22:23:35+02:00 Wellplan review some validations - - - - - 097e2df0 by Tony Chemit at 2020-09-27T22:23:35+02:00 Localmarket review some validations - - - - - 9e4dc5ac by Tony Chemit at 2020-09-27T22:23:35+02:00 Localmarket use a configuration to get default sizeMeasureType Logbook use a configuration to get default sizeMeasureType - - - - - 113865f3 by Tony Chemit at 2020-09-27T22:23:35+02:00 Landing Use only species used in a weight category - - - - - d866e2a3 by Tony Chemit at 2020-09-27T22:23:35+02:00 Landing Use only species used in a weight category - - - - - 124809d5 by Tony Chemit at 2020-09-27T22:23:35+02:00 Logbook Delete Activity.observedSystemDistance + optimize i18n - - - - - 08d242f0 by Tony Chemit at 2020-09-27T22:23:35+02:00 Landing Rendre ordonnable Trip.landing - - - - - 9bab404f by Tony Chemit at 2020-09-27T22:23:35+02:00 Wellplan Rendre ordonnable Trip.wellplan - - - - - ea1e2e06 by Tony Chemit at 2020-09-27T22:23:35+02:00 Sample optimize service api to get set activities of the trip Wellplan optimize service api to get set activities of the trip - - - - - d9e71e2e by Tony Chemit at 2020-09-27T22:23:35+02:00 Wellplan suppression du schéma ps_wellplan et déplacement dans ps_logbook - - - - - b5859810 by Tony Chemit at 2020-09-27T22:23:35+02:00 Localmarket Ajout SamplePart.sizeClass, renommage Packaging.weight en meanWeight - - - - - 0390700c by Tony Chemit at 2020-09-27T22:23:35+02:00 Logbook Sample review subSampleNumber at save time - - - - - daee3f93 by Tony Chemit at 2020-09-27T22:23:35+02:00 template better generate on none main dto - - - - - eb872034 by Tony Chemit at 2020-09-27T22:23:35+02:00 Localmarket let's display edit batches for survey (on survey form) - - - - - 67eaaef5 by Tony Chemit at 2020-09-27T22:23:35+02:00 Localmarket improve Batch.origin layout on form - - - - - 3c8769e1 by Tony Chemit at 2020-09-27T22:23:35+02:00 change one maven module order - - - - - 1adb1bbc by Tony Chemit at 2020-09-27T22:23:35+02:00 avoid nasty swing NPE - - - - - ab3dcf67 by Tony Chemit at 2020-09-27T22:23:35+02:00 Localmarket Survey make validation works as a charm - - - - - 3b90a82a by Tony Chemit at 2020-09-27T22:23:35+02:00 Localmarket Sample make validation works as a charm - - - - - 6965bc1f by Tony Chemit at 2020-09-27T22:23:35+02:00 Localmarket Sample review well (just a simple String in database separated by comma) - - - - - a00dffcc by Tony Chemit at 2020-09-27T22:23:35+02:00 Ajouter un nouveau bouton sur le formulaire d'une ligne sélectionnée dans un écran de type table créer/enregister ET nouveau - Closes #1613 - - - - - 202b35a0 by Tony Chemit at 2020-09-27T22:23:35+02:00 Stash on ListCreate action - - - - - ad316b1a by Tony Chemit at 2020-09-27T22:23:35+02:00 Nouveau texte de popup pour le cas 'Vous devez mettre à jour le form marée avant de pouvoir saisir le livre de bord' - See #1605 - - - - - 152fd78e by Tony Chemit at 2020-09-27T22:23:35+02:00 Review DtoEntityContext and add on it TopiaEntitySqlDescriptor - - - - - 907f6ddd by Tony Chemit at 2020-09-27T22:23:35+02:00 Move ObserveTopiaConfigurationFactory and ObserveTopiaApplicationContextFactory to his native module (nothing to do with services-local, persistence is the proper place to be (or common-persistence))... - - - - - 05a41ea2 by Tony Chemit at 2020-09-27T22:23:35+02:00 update pom - - - - - 818ac81d by Tony Chemit at 2020-09-27T22:23:35+02:00 Move all persistence tests in his module (from services-local) Use new TopiaEntitySqlDescriptor (not still finished) - - - - - d9d66a9c by Tony Chemit at 2020-09-27T22:23:35+02:00 Use new TopiaEntitySqlModel api :) - - - - - 73ce7e4e by Tony Chemit at 2020-09-27T22:23:35+02:00 Move spi persistence tests to a more correct package + finish testing replication order - - - - - 6cd40e3a by Tony Chemit at 2020-09-27T22:23:35+02:00 Remove usage of services-script from topia Use new API - - - - - db9a839e by Tony Chemit at 2020-09-27T22:29:36+02:00 Update test database (need to externalize this stuff) - - - - - d136cee7 by Tony Chemit at 2020-09-29T12:22:57+02:00 Use last ToPIA API and improve tests fixtures - - - - - 5f5a88d7 by Tony Chemit at 2020-09-29T13:21:39+02:00 update last stable pom - - - - - 30 changed files: - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/i18n/getters/config.getter - client-configuration/src/main/java/fr/ird/observe/client/ObserveClientResourceManager.java - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/main/java/fr/ird/observe/client/configuration/NavigationTreeConfig.java - client-configuration/src/main/java/fr/ird/observe/client/configuration/SeineBycatchObservedSystemConfigConverter.java - client-configuration/src/main/resources/log4j2.xml - client-configuration/src/main/resources/observe-log4j2.xml - client-configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client-core/pom.xml - client-core/src/main/i18n/getters/java.getter - client-core/src/main/java/fr/ird/observe/client/action/api/ActionWithSteps.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ReloadApplicationAction.java - client-core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - − client-core/src/main/java/fr/ird/observe/client/util/BeanCheckBox.java - − client-core/src/main/java/fr/ird/observe/client/util/BeanDatePicker.java - − client-core/src/main/java/fr/ird/observe/client/util/BeanEnumEditor.java - − client-core/src/main/java/fr/ird/observe/client/util/BooleanEditor.java - client-core/src/main/java/fr/ird/observe/client/util/DtoIconHelper.java - client-core/src/main/java/fr/ird/observe/client/util/JaxxObjectInitializer.java - − client-core/src/main/java/fr/ird/observe/client/util/ObserveBooleanTableCellRenderer.java - client-core/src/main/java/fr/ird/observe/client/util/ObserveKeyStrokesSupport.java - client-core/src/main/java/fr/ird/observe/client/util/UIHelper.java - client-datasource-actions/pom.xml - client-datasource-actions/src/main/i18n/getters/java-enumeration.getter - client-datasource-actions/src/main/i18n/getters/java.getter - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminStep.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/AdminTabUIActionSupport.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2759c2b630843eedef2f3813… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2759c2b630843eedef2f3813… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Update askToFillTripObservations_es_ES.ftl
by Pascal Cauquil Sept. 21, 2020

Sept. 21, 2020

Pascal Cauquil pushed to branch develop at ultreiaio / ird-observe Commits: 2759c2b6 by Pascal Cauquil at 2020-09-21T13:48:52+00:00 Update askToFillTripObservations_es_ES.ftl - - - - - 1 changed file: - client-datasource-editor-common/src/main/i18n/templates/askToFillTripObservations_es_ES.ftl Changes: ===================================== client-datasource-editor-common/src/main/i18n/templates/askToFillTripObservations_es_ES.ftl ===================================== @@ -22,28 +22,26 @@ <html> <body> - Para poder acceder al observaciones (${dtoType}), primero se debe completar el formulario de marea: + Para poder registrar los datos de typo ${dtoType}, primero se debe completar el formulario de marea: <ul> - <li>La casilla observaciones debe estar marcada</li> - <li>Se debe seleccionar la identidad de la persona que registra los datos en el observaciones (observador/a u - otro/a) + <li>En la pestaña Características comunes, la casilla Observaciones debe estar marcada</li> + <li>La pestaña Observaciones se debe cumplimentar. </li> </ul> <hr/> - Haga click en Acceder al formulario de marea para añadir la identidad de la persona que registra los datos y - guardar. + Haga click en Acceder al formulario de marea para completar los datos y guardar. - La casilla observaciones se marcará automáticamente. + La casilla Observaciones se marcará automáticamente, y será redirigido a la pestaña Observaciones. + - Podrá entonces introducir - datos. + Podrá entonces introducir datos. </body> </html> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2759c2b630843eedef2f38137… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2759c2b630843eedef2f38137… You're receiving this email because of your account on gitlab.com.

1 0