October 2022 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][master] 23 commits: [jgitflow-maven-plugin]updating poms for 9.0.14-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 18 Oct '22

18 Oct '22

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: cce8d5aa by Tony Chemit at 2022-10-11T17:35:50+02:00 [jgitflow-maven-plugin]updating poms for 9.0.14-SNAPSHOT development[skip ci] - - - - - f25396ed by Tony Chemit at 2022-10-11T18:04:34+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - a27bf363 by Tony Chemit at 2022-10-11T18:04:35+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 3ec2c248 by Tony Chemit at 2022-10-11T18:04:37+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 9ab0916b by Tony Chemit at 2022-10-12T11:48:27+02:00 Le form composition détaillée LL observations ne fonctionne plus en mode serveur uniquement - Closes #2460 - - - - - bd8cf0f3 by Tony Chemit at 2022-10-17T13:01:36+02:00 Ajout d'une information sur la syntaxe des templates LL - Closes #2466 - - - - - 73b07685 by Tony Chemit at 2022-10-17T13:01:36+02:00 Imperfection d'affichage dans la liste déroulante des templates de génération LL - Closes #2464 - - - - - ea55eec7 by Tony Chemit at 2022-10-17T13:01:36+02:00 I18n key fix Validateur de template de génération LL - Closes #2465 - - - - - 378ce590 by Tony Chemit at 2022-10-17T13:59:11+02:00 Lorsqu'un template de composition détaillé LL est invalide, l'UI permet malgré tout d'exécuter la génération, qui produit une erreur - Closes #2463 - - - - - f773b97b by Tony Chemit at 2022-10-17T13:59:11+02:00 Remove duplicated code - - - - - ae528a49 by Tony Chemit at 2022-10-17T13:59:11+02:00 Move ui validator to the ui module - - - - - edc948a8 by Tony Chemit at 2022-10-17T14:23:45+02:00 Rajouter le bouton de réinitialisation sur le champs heure de début de coulissage - Closes #2467 - - - - - 3f1487c4 by Tony Chemit at 2022-10-17T15:22:02+02:00 Libellés des heures jalon des calées - Closes #2461 - - - - - bbdc8adf by Tony Chemit at 2022-10-17T16:43:40+02:00 update pom - - - - - 891eedfb by Tony Chemit at 2022-10-17T17:26:50+02:00 Mesures sur captures LL observations non affichées dans l'UI - Closes #2469 - - - - - 301bdea8 by Tony Chemit at 2022-10-17T18:09:34+02:00 Ajout d'une information sur la syntaxe des templates LL - Closes #2466 - - - - - f99fa7ff by Tony Chemit at 2022-10-18T03:56:06+02:00 Agrandir la zone de texte Source sur les référentiels taille-poids et taille-taille - Closes #2474 - - - - - 97437906 by Tony Chemit at 2022-10-18T08:22:36+02:00 Restaurer la possibilité d'afficher les relations taille-poids et taille-taille par code FAO - Closes #2473 - - - - - 686530bb by Tony Chemit at 2022-10-18T09:49:15+02:00 update pom - - - - - 27355e1c by Tony Chemit at 2022-10-18T13:54:08+02:00 Passer le flag saisie en 'non autorisée' sur le statut de collecte '999 - Inconnu'- Closes #2451 - - - - - 5d2f4767 by Tony Chemit at 2022-10-18T14:02:01+02:00 Update changelog for v.9.0.14 [skip CI] - - - - - 8d9c9f23 by Tony Chemit at 2022-10-18T14:03:03+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.14' with non-snapshot versions[skip ci] - - - - - a029cbbc by Tony Chemit at 2022-10-18T14:24:17+02:00 [jgitflow-maven-plugin]merging 'release/9.0.14' into 'master' - - - - - 30 changed files: - CHANGELOG.md - client/configuration/pom.xml - client/core/pom.xml - client/core/src/main/java/fr/ird/observe/client/datasource/validation/ContentMessageTableModel.java - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/LengthLengthParameterUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/LengthWeightParameterUI.jaxx - + client/datasource/editor/ll/.mvn/i18n/parse-validation-messages - client/datasource/editor/ll/pom.xml - 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/i18n/getters/validation-messages.getter - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIInitializer.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/GenerateAll.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/LonglineCompositionTableModel.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/section/SectionTableModel.java - core/api/validation/src/main/filtered-resources/fr/ird/observe/dto/data/ll/observation/SetDetailCompositionUIDto-update-error-validation.xml → client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIModelStates-update-error-validation.xml - client/datasource/editor/pom.xml - + client/datasource/editor/ps/.mvn/i18n/parse-validation-messages - client/datasource/editor/ps/pom.xml - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - + client/datasource/editor/ps/src/main/i18n/getters/validation-messages.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetUI.jcss The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f5bf6b1b0a71c456845498ee… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f5bf6b1b0a71c456845498ee… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/9.0.14' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) 18 Oct '22

18 Oct '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8d9c9f23 by Tony Chemit at 2022-10-18T14:03:03+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.14' with non-snapshot versions[skip ci] - - - - - a029cbbc by Tony Chemit at 2022-10-18T14:24:17+02:00 [jgitflow-maven-plugin]merging 'release/9.0.14' into 'master' - - - - - 5c3c5179 by Tony Chemit at 2022-10-18T14:24:22+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 910301ee by Tony Chemit at 2022-10-18T14:24:24+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 92c33c9e by Tony Chemit at 2022-10-18T14:24:25+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b5fbc547dc4526a6e7efec9f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b5fbc547dc4526a6e7efec9f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/9.0.14
by Tony CHEMIT (＠tchemit) 18 Oct '22

18 Oct '22

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

1 0

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 9.0.15-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 18 Oct '22

18 Oct '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b5fbc547 by Tony Chemit at 2022-10-18T14:02:39+02:00 [jgitflow-maven-plugin]updating poms for 9.0.15-SNAPSHOT development[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/java/pom.xml - core/persistence/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml - core/pom.xml - core/services/client/pom.xml - core/services/i18n/pom.xml - core/services/local/pom.xml - core/services/pom.xml - core/services/test/pom.xml - model/pom.xml - observe/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b5fbc547dc4526a6e7efec9f5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b5fbc547dc4526a6e7efec9f5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Update changelog for v.9.0.14 [skip CI]
by Tony CHEMIT (＠tchemit) 18 Oct '22

18 Oct '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5d2f4767 by Tony Chemit at 2022-10-18T14:02:01+02:00 Update changelog for v.9.0.14 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,31 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2022-10-11 17:34. + * Last generated at 2022-10-18 14:00. + +## Version [9.0.14](https://gitlab.com/ultreiaio/ird-observe/-/milestones/240) + +**Closed at 2022-10-18.** + +### Download +* [Client (observe-9.0.14-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) +* [Serveur (observe-9.0.14.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/…) +* [Serveur (observe-9.0.14-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) + +### Issues + * [[Type::Anomalie 2460]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2460) **Le form composition détaillée LL observations ne fonctionne plus en mode serveur uniquement** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2461]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2461) **Libellés des heures jalon des calées** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2462]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2462) **Clés de libellés non traduites** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2463]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2463) **Lorsqu'un template de composition détaillé LL est invalide, l'UI permet malgré tout d'exécuter la génération, qui produit une erreur** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2464]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2464) **Imperfection d'affichage dans la liste déroulante des templates de génération LL** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2465]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2465) **Validateur de template de génération LL** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2468]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2468) **Problème JSON en consultation mode serveur du schéma détaillé de palangre** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2469]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2469) **Mesures sur captures LL observations non affichées dans l'UI** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2473]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2473) **Restaurer la possibilité d'afficher les relations taille-poids et taille-taille par code FAO** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2451]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2451) **Passer le flag saisie en 'non autorisée' sur le statut de collecte '999 - Inconnu'** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2466]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2466) **Ajout d'une information sur la syntaxe des templates LL** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2467]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2467) **Rajouter le bouton de réinitialisation sur le champs heure de début de coulissage** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2474]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2474) **Agrandir la zone de texte Source sur les référentiels taille-poids et taille-taille** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) ## Version [9.0.13](https://gitlab.com/ultreiaio/ird-observe/-/milestones/239) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/5d2f4767c5661f8d079d15b3a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/5d2f4767c5661f8d079d15b3a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Passer le flag saisie en 'non autorisée' sur le statut de collecte '999 - Inconnu'- Closes #2451
by Tony CHEMIT (＠tchemit) 18 Oct '22

18 Oct '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 27355e1c by Tony Chemit at 2022-10-18T13:54:08+02:00 Passer le flag saisie en 'non autorisée' sur le statut de collecte '999 - Inconnu'- Closes #2451 - - - - - 3 changed files: - core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java - core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/common/TripReader.java - core/persistence/resources/src/main/resources/db/migration/v9/9.0/02_1_fill-table-ps_common_acquisitionstatus-common.sql Changes: ===================================== core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java ===================================== @@ -117,7 +117,7 @@ public class ImportReferentialContext { private Fate fate1; private Fate fate2; private AcquisitionStatus acquisitionStatus1; - private AcquisitionStatus acquisitionStatus99; + private AcquisitionStatus acquisitionStatus999; private TransmittingBuoyType transmittingBuoyType98; private TransmittingBuoyOperation transmittingBuoyOperation1; private ObjectMaterial objectMaterialFOB; @@ -175,7 +175,7 @@ public class ImportReferentialContext { Map<String, AcquisitionStatus> acquisitionStatus = Maps.uniqueIndex(referential.getAcquisitionStatus(), AcquisitionStatus::getId); acquisitionStatus1 = acquisitionStatus.get("fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#001"); // 1 - acquisitionStatus99 = acquisitionStatus.get("fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#999"); //99 + acquisitionStatus999 = acquisitionStatus.get("fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#999"); //99 // landing landingCategories = Maps.uniqueIndex(referential.getWeightCategory(), WeightCategory::getCode); @@ -451,8 +451,8 @@ public class ImportReferentialContext { return acquisitionStatus1; } - public AcquisitionStatus getAcquisitionStatus99() { - return acquisitionStatus99; + public AcquisitionStatus getAcquisitionStatus999() { + return acquisitionStatus999; } public WellContentStatus getWellContentStatus(String code) { ===================================== core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/common/TripReader.java ===================================== @@ -117,7 +117,7 @@ public class TripReader extends DataReader<Trip> { @Override public Trip read(ImportDataContext dataContext, ResultSet resultSet) throws SQLException { Trip entity = newEntity(Trip.SPI); - AcquisitionStatus notFilledAcquisitionStatus = dataContext.getAcquisitionStatus99(); + AcquisitionStatus notFilledAcquisitionStatus = dataContext.getAcquisitionStatus999(); entity.setObservationsAcquisitionStatus(notFilledAcquisitionStatus); entity.setTargetWellsSamplingAcquisitionStatus(notFilledAcquisitionStatus); entity.setLandingAcquisitionStatus(notFilledAcquisitionStatus); ===================================== core/persistence/resources/src/main/resources/db/migration/v9/9.0/02_1_fill-table-ps_common_acquisitionstatus-common.sql ===================================== @@ -27,6 +27,6 @@ INSERT INTO ps_common.Acquisitionstatus(topiaid, topiaversion, topiacreatedate, INSERT INTO ps_common.Acquisitionstatus(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, observation, logbook, targetWellsSampling, landing, localMarket, localMarketWellsSampling, localMarketSurveySampling, advancedSampling, fieldEnabler, label1, label2, label3) values ('fr.ird.referential.ps.common.AcquisitionStatus#${REFERENTIAL_PREFIX}006' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, '6' , true, false, true, false, true, true, true, true, false, 'Not done, insufficient human resources' , 'Non réalisé, ressources humaines insuffisantes' , 'Not done, insufficient human resources TODO' ); INSERT INTO ps_common.Acquisitionstatus(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, observation, logbook, targetWellsSampling, landing, localMarket, localMarketWellsSampling, localMarketSurveySampling, advancedSampling, fieldEnabler, label1, label2, label3) values ('fr.ird.referential.ps.common.AcquisitionStatus#${REFERENTIAL_PREFIX}007' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false,'7' , false, true, false, true, false, false, false, false, false, 'Not done, documents not provided by company', 'Non réalisé, documents non fournis par l''''armement', 'Not done, documents not provided by company TODO'); INSERT INTO ps_common.Acquisitionstatus(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, observation, logbook, targetWellsSampling, landing, localMarket, localMarketWellsSampling, localMarketSurveySampling, advancedSampling, fieldEnabler, label1, label2, label3) values ('fr.ird.referential.ps.common.AcquisitionStatus#${REFERENTIAL_PREFIX}099' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, '99' , true, true, true, true, true, true, true, true, false, 'Not done, reason unknown' , 'Non réalisé, raison inconnue' , 'Not done, reason unknown TODO' ); -INSERT INTO ps_common.Acquisitionstatus(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, observation, logbook, targetWellsSampling, landing, localMarket, localMarketWellsSampling, localMarketSurveySampling, advancedSampling, fieldEnabler, label1, label2, label3) values ('fr.ird.referential.ps.common.AcquisitionStatus#${REFERENTIAL_PREFIX}999' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, '999', true, true, true, true, true, true, true, true, true, 'Status unknown' , 'Statut inconnu' , 'Status unknown TODO' ); +INSERT INTO ps_common.Acquisitionstatus(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, observation, logbook, targetWellsSampling, landing, localMarket, localMarketWellsSampling, localMarketSurveySampling, advancedSampling, fieldEnabler, label1, label2, label3) values ('fr.ird.referential.ps.common.AcquisitionStatus#${REFERENTIAL_PREFIX}999' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, '999', true, true, true, true, true, true, true, true, false, 'Status unknown' , 'Statut inconnu' , 'Status unknown TODO' ); INSERT INTO common.LastUpdateDate(topiaId, topiaversion, topiacreatedate, type , lastUpdateDate) values ('${LAST_UPDATE_PREFIX}2032', 0, ${CURRENT_DATE}, 'fr.ird.observe.entities.referential.ps.common.AcquisitionStatus', ${CURRENT_TIMESTAMP}); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/27355e1c3fddea5eac39cfaf1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/27355e1c3fddea5eac39cfaf1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Agrandir la zone de texte Source sur les référentiels taille-poids et taille-taille - Closes #2474
by Tony CHEMIT (＠tchemit) 18 Oct '22

18 Oct '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f99fa7ff by Tony Chemit at 2022-10-18T03:56:06+02:00 Agrandir la zone de texte Source sur les référentiels taille-poids et taille-taille - Closes #2474 - - - - - 97437906 by Tony Chemit at 2022-10-18T08:22:36+02:00 Restaurer la possibilité d'afficher les relations taille-poids et taille-taille par code FAO - Closes #2473 - - - - - 686530bb by Tony Chemit at 2022-10-18T09:49:15+02:00 update pom - - - - - 20 changed files: - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/LengthLengthParameterUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/LengthWeightParameterUI.jaxx - core/api/dto/src/main/java/fr/ird/observe/dto/referential/common/LengthFormulaSupportDto.java - + core/api/dto/src/main/java/fr/ird/observe/dto/referential/common/LengthLengthParameterReference.java - + core/api/dto/src/main/java/fr/ird/observe/dto/referential/common/LengthWeightParameterReference.java - core/api/dto/src/main/java/fr/ird/observe/spi/decoration/ObserveDefaultDecoratorRenderer.java - core/api/dto/src/main/java/fr/ird/observe/spi/decoration/ObserveDtoDecoratorRenderer.java - core/api/dto/src/main/java/fr/ird/observe/spi/decoration/ObserveDtoReferenceDecoratorRenderer.java - core/api/dto/src/main/java/fr/ird/observe/spi/decoration/ObserveI18nLabelsBuilder.java - core/api/services/src/main/resources/META-INF/i18n/Observe-labels.properties - core/persistence/java/src/main/java/fr/ird/observe/entities/referential/common/LengthLengthParameterImpl.java - core/persistence/java/src/main/java/fr/ird/observe/entities/referential/common/LengthWeightParameterImpl.java - core/persistence/java/src/main/java/fr/ird/observe/spi/decoration/ObserveEntityDecoratorRenderer.java - model/src/main/models/Observe/dto/00-common.model - model/src/main/models/Observe/dto/01-referential-common.model - model/src/main/models/Observe/dto/class/decorator.properties - pom.xml - toolkit/api/src/main/java/fr/ird/observe/dto/referential/WithFormula.java - + toolkit/api/src/main/java/fr/ird/observe/dto/referential/WithSpeciesFaoCode.java - toolkit/api/src/test/java/fr/ird/observe/dto/referential/FormulaHelperTest.java Changes: ===================================== client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/LengthLengthParameterUI.jaxx ===================================== @@ -49,7 +49,7 @@ <LengthLengthParameterDto id='bean'/> <Table id="editView" insets="0" fill="both"> <row> - <cell anchor="north" weightx="1"> + <cell anchor="north" weightx="1" weighty="1"> <JTabbedPane id='mainTabbedPane'> <tab id='generalTab' i18nProperty=""> <Table id='editTable' styleClass="caracteristic" addToContainer="true" forceOverride="3"> @@ -168,10 +168,5 @@ </JTabbedPane> </cell> </row> - <row> - <cell columns="2" weighty="1"> - <JLabel styleClass="skipI18n"/> - </cell> - </row> </Table> </fr.ird.observe.client.datasource.editor.api.content.referential.ContentReferentialUI> ===================================== client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/LengthWeightParameterUI.jaxx ===================================== @@ -67,7 +67,7 @@ public void decorateUniqueKeyTable(JTable table, TableCellRenderer renderer, JSc ]]></script> <Table id="editView" insets="0" fill="both"> <row> - <cell anchor="north" weightx="1"> + <cell anchor="north" weightx="1" weighty="1"> <JTabbedPane id='mainTabbedPane'> <tab id='generalTab' i18nProperty=""> <Table id='editTable' styleClass="caracteristic" addToContainer="true" forceOverride="3"> @@ -187,12 +187,6 @@ public void decorateUniqueKeyTable(JTable table, TableCellRenderer renderer, JSc <NumberEditor id='meanWeight' styleClass="float2"/> </cell> </row> - <row> - <cell> - <javax.swing.Box.Filler id='filler' - constructorParams='UIHelper.newMinDimension(), UIHelper.newMinDimension(), UIHelper.newMaxXDimension()'/> - </cell> - </row> </Table> </cell> </row> @@ -206,10 +200,5 @@ public void decorateUniqueKeyTable(JTable table, TableCellRenderer renderer, JSc </JTabbedPane> </cell> </row> - <row> - <cell columns="2" weighty="1"> - <JLabel styleClass="skipI18n"/> - </cell> - </row> </Table> </fr.ird.observe.client.datasource.editor.api.content.referential.ContentReferentialUI> ===================================== core/api/dto/src/main/java/fr/ird/observe/dto/referential/common/LengthFormulaSupportDto.java ===================================== @@ -32,6 +32,16 @@ public abstract class LengthFormulaSupportDto extends GeneratedLengthFormulaSupp private Map<String, Double> coefficientsValues; + @Override + public String getSpeciesFaoCode() { + return getSpecies() == null ? null : getSpecies().getFaoCode(); + } + + @Override + public SpeciesReference getSpeciesLabel() { + return (SpeciesReference) super.getSpeciesLabel(); + } + @Override public final void setCoefficients(String coefficients) { super.setCoefficients(coefficients); ===================================== core/api/dto/src/main/java/fr/ird/observe/dto/referential/common/LengthLengthParameterReference.java ===================================== @@ -0,0 +1,45 @@ +package fr.ird.observe.dto.referential.common; + +/*- + * #%L + * ObServe Core :: API :: Dto + * %% + * Copyright (C) 2008 - 2022 IRD, 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% + */ + +import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition; + +/** + * Created on 18/10/2022. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.0.14 + */ +@GenerateJavaBeanDefinition +public class LengthLengthParameterReference extends GeneratedLengthLengthParameterReference { + + @Override + public String getSpeciesFaoCode() { + return getSpecies() == null ? null : getSpecies().getFaoCode(); + } + + @Override + public SpeciesReference getSpeciesLabel() { + return (SpeciesReference) super.getSpeciesLabel(); + } +} ===================================== core/api/dto/src/main/java/fr/ird/observe/dto/referential/common/LengthWeightParameterReference.java ===================================== @@ -0,0 +1,45 @@ +package fr.ird.observe.dto.referential.common; + +/*- + * #%L + * ObServe Core :: API :: Dto + * %% + * Copyright (C) 2008 - 2022 IRD, 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% + */ + +import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition; + +/** + * Created on 18/10/2022. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.0.14 + */ +@GenerateJavaBeanDefinition +public class LengthWeightParameterReference extends GeneratedLengthWeightParameterReference { + + @Override + public String getSpeciesFaoCode() { + return getSpecies() == null ? null : getSpecies().getFaoCode(); + } + + @Override + public SpeciesReference getSpeciesLabel() { + return (SpeciesReference) super.getSpeciesLabel(); + } +} ===================================== core/api/dto/src/main/java/fr/ird/observe/spi/decoration/ObserveDefaultDecoratorRenderer.java ===================================== @@ -41,6 +41,13 @@ public interface ObserveDefaultDecoratorRenderer { return String.format("%s - %s - %s", faoCode, scientificLabel, label); } + default String speciesSimpleLabel(String scientificLabel, String label) { + if ("xx".equals(scientificLabel)) { + return String.format("%s", label); + } + return String.format("%s (%s)", scientificLabel, label); + } + default String fieldEnabler(Locale locale, boolean fieldEnabler) { return fieldEnabler ? I18n.l(locale, "observe.referential.ps.common.AcquisitionStatus.fieldEnabled") : I18n.l(locale, "observe.referential.ps.common.AcquisitionStatus.fieldDisabled"); } ===================================== core/api/dto/src/main/java/fr/ird/observe/spi/decoration/ObserveDtoDecoratorRenderer.java ===================================== @@ -49,4 +49,13 @@ public class ObserveDtoDecoratorRenderer<O extends BusinessDto> extends DtoDecor String label = label(locale, species); return speciesLabel(faoCode, scientificLabel, label); } + + public String speciesSimpleLabel(Locale locale, SpeciesReference species) { + if (species == null) { + return onNullValue(locale, null); + } + String scientificLabel = species.getScientificLabel(); + String label = label(locale, species); + return speciesSimpleLabel(scientificLabel, label); + } } ===================================== core/api/dto/src/main/java/fr/ird/observe/spi/decoration/ObserveDtoReferenceDecoratorRenderer.java ===================================== @@ -49,4 +49,13 @@ public class ObserveDtoReferenceDecoratorRenderer<O extends DtoReference> extend String label = label(locale, species); return speciesLabel(faoCode, scientificLabel, label); } + + public String speciesSimpleLabel(Locale locale, SpeciesReference species) { + if (species == null) { + return onNullValue(locale, null); + } + String scientificLabel = species.getScientificLabel(); + String label = label(locale, species); + return speciesSimpleLabel(scientificLabel, label); + } } ===================================== core/api/dto/src/main/java/fr/ird/observe/spi/decoration/ObserveI18nLabelsBuilder.java ===================================== @@ -47,6 +47,7 @@ import fr.ird.observe.dto.referential.MinMaxWeightAware; import fr.ird.observe.dto.referential.ReferentialDto; import fr.ird.observe.dto.referential.WithFormula; import fr.ird.observe.dto.referential.WithI18n; +import fr.ird.observe.dto.referential.WithSpeciesFaoCode; import fr.ird.observe.dto.referential.common.SpeciesDto; import fr.ird.observe.dto.referential.common.VesselSizeCategoryDto; import io.ultreia.java4all.i18n.spi.bean.BeanPropertyI18nKeyProducerSupport; @@ -144,6 +145,7 @@ import static io.ultreia.java4all.i18n.I18n.n; @RegisterI18nLabel(target = BusinessDto.class, properties = {"homeId"}), @RegisterI18nLabel(target = OpenableDto.class, offers = {"action.close.tip", "action.create.tip", "action.editable.tip", "action.notEditable.tip", "action.reopen.tip", "action.update.tip"}), @RegisterI18nLabel(target = WithStartEndDate.class, properties = {"startDate", "endDate", "validityRangeLabel"}), + @RegisterI18nLabel(target = WithSpeciesFaoCode.class, properties = {"speciesFaoCode", "speciesLabel"}), @RegisterI18nLabel(target = WithDataFile.class, properties = {"dataLocation", "dataLocation.tip", "data", "hasData.short", "hasData", "action.deleteDataFile", "action.deleteDataFile.tip", "action.exportDataFile", "action.exportDataFile.filter", "action.exportDataFile.tip", "action.importData", "action.importDataFile", "action.importDataFile.tip", "action.replace.data.file.message", "choose.title.exportDataFile", "choose.title.importData", "delete.data.file.message"}), @RegisterI18nLabel(target = LonglineElementAware.class, properties = {"haulingIdentifier", "haulingIdentifier.short", "settingIdentifier", "settingIdentifier.short"}), @RegisterI18nLabel(target = InlineDataDto.class, offers = {"action.add", "action.add.tip", "action.delete", "action.delete.message", "action.delete.tip"}), ===================================== core/api/services/src/main/resources/META-INF/i18n/Observe-labels.properties ===================================== @@ -20,7 +20,7 @@ # #L% ### #Generated by org.nuiton.i18n.plugin.GenerateI18nLabelsMojo -#Mon Oct 17 14:55:03 CEST 2022 +#Tue Oct 18 08:15:15 CEST 2022 observe.Business.createDate=observe.Common.createDate observe.Business.homeId=observe.Common.homeId observe.Business.id=observe.Common.id @@ -1816,6 +1816,8 @@ observe.referential.Referential.status=observe.Common.status observe.referential.Referential.uri=observe.Common.uri observe.referential.Referential.version=observe.Common.version observe.referential.WithFormula.endDate=observe.Common.endDate +observe.referential.WithFormula.speciesFaoCode=observe.Common.speciesFaoCode +observe.referential.WithFormula.speciesLabel=observe.Common.speciesLabel observe.referential.WithFormula.startDate=observe.Common.startDate observe.referential.WithFormula.validityRangeLabel=observe.Common.validityRangeLabel observe.referential.WithI18n.label1=observe.Common.label1 @@ -1826,6 +1828,8 @@ observe.referential.WithI18n.label5=observe.Common.label5 observe.referential.WithI18n.label6=observe.Common.label6 observe.referential.WithI18n.label7=observe.Common.label7 observe.referential.WithI18n.label8=observe.Common.label8 +observe.referential.WithSpeciesFaoCode.speciesFaoCode=observe.Common.speciesFaoCode +observe.referential.WithSpeciesFaoCode.speciesLabel=observe.Common.speciesLabel observe.referential.common.Country.code=observe.referential.Referential.code observe.referential.common.Country.codeAndHomeId=observe.referential.Referential.codeAndHomeId observe.referential.common.Country.createDate=observe.Common.createDate @@ -1996,6 +2000,8 @@ observe.referential.common.LengthFormulaSupport.otherTab=observe.Common.otherTab observe.referential.common.LengthFormulaSupport.sex=observe.Common.sex observe.referential.common.LengthFormulaSupport.source=observe.referential.WithFormula.source observe.referential.common.LengthFormulaSupport.species=observe.Common.species +observe.referential.common.LengthFormulaSupport.speciesFaoCode=observe.Common.speciesFaoCode +observe.referential.common.LengthFormulaSupport.speciesLabel=observe.Common.speciesLabel observe.referential.common.LengthFormulaSupport.startDate=observe.Common.startDate observe.referential.common.LengthFormulaSupport.status=observe.Common.status observe.referential.common.LengthFormulaSupport.uri=observe.Common.uri @@ -2019,6 +2025,8 @@ observe.referential.common.LengthLengthParameter.otherTab=observe.Common.otherTa observe.referential.common.LengthLengthParameter.sex=observe.Common.sex observe.referential.common.LengthLengthParameter.source=observe.referential.WithFormula.source observe.referential.common.LengthLengthParameter.species=observe.Common.species +observe.referential.common.LengthLengthParameter.speciesFaoCode=observe.Common.speciesFaoCode +observe.referential.common.LengthLengthParameter.speciesLabel=observe.Common.speciesLabel observe.referential.common.LengthLengthParameter.startDate=observe.Common.startDate observe.referential.common.LengthLengthParameter.status=observe.Common.status observe.referential.common.LengthLengthParameter.uri=observe.Common.uri @@ -2063,6 +2071,8 @@ observe.referential.common.LengthWeightParameter.sex=observe.Common.sex observe.referential.common.LengthWeightParameter.sizeMeasureType=observe.Common.sizeMeasureType observe.referential.common.LengthWeightParameter.source=observe.referential.WithFormula.source observe.referential.common.LengthWeightParameter.species=observe.Common.species +observe.referential.common.LengthWeightParameter.speciesFaoCode=observe.Common.speciesFaoCode +observe.referential.common.LengthWeightParameter.speciesLabel=observe.Common.speciesLabel observe.referential.common.LengthWeightParameter.startDate=observe.Common.startDate observe.referential.common.LengthWeightParameter.status=observe.Common.status observe.referential.common.LengthWeightParameter.uri=observe.Common.uri ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/referential/common/LengthLengthParameterImpl.java ===================================== @@ -39,6 +39,16 @@ public class LengthLengthParameterImpl extends LengthLengthParameterAbstract { private Boolean formulaOneValid; private Boolean formulaTwoValid; + @Override + public String getSpeciesFaoCode() { + return getSpecies() == null ? null : getSpecies().getFaoCode(); + } + + @Override + public Species getSpeciesLabel() { + return (Species) super.getSpeciesLabel(); + } + @Override public void setInputOutputFormula(String inputOutputFormula) { super.setInputOutputFormula(inputOutputFormula); ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/referential/common/LengthWeightParameterImpl.java ===================================== @@ -32,6 +32,16 @@ public class LengthWeightParameterImpl extends LengthWeightParameterAbstract { private Boolean formulaOneValid; private Boolean formulaTwoValid; + @Override + public String getSpeciesFaoCode() { + return getSpecies() == null ? null : getSpecies().getFaoCode(); + } + + @Override + public Species getSpeciesLabel() { + return (Species) super.getSpeciesLabel(); + } + @Override public void setLengthWeightFormula(String value) { super.setLengthWeightFormula(value); ===================================== core/persistence/java/src/main/java/fr/ird/observe/spi/decoration/ObserveEntityDecoratorRenderer.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.spi.decoration; * #L% */ +import fr.ird.observe.dto.CommonDto; import fr.ird.observe.entities.Entity; import fr.ird.observe.entities.referential.common.Species; @@ -49,4 +50,15 @@ public class ObserveEntityDecoratorRenderer<O extends Entity> extends EntityDeco String label = label(locale, species); return speciesLabel(faoCode, scientificLabel, label); } + + public String speciesSimpleLabel(Locale locale, CommonDto source) { + Species species = (Species) source; + if (species == null) { + return onNullValue(locale, null); + } + String scientificLabel = species.getScientificLabel(); + String label = label(locale, species); + return speciesSimpleLabel(scientificLabel, label); + } + } ===================================== model/src/main/models/Observe/dto/00-common.model ===================================== @@ -24,6 +24,8 @@ interface referential.WithI18n interface WithStartEndDate > DtoAndReferenceAware +interface referential.WithSpeciesFaoCode > DtoAndReferenceAware + interface WithAtLeastOneSelected atLeastOneSelected() boolean ===================================== model/src/main/models/Observe/dto/01-referential-common.model ===================================== @@ -1,6 +1,6 @@ package fr.ird.observe.dto.referential.common -interface referential.WithFormula > WithStartEndDate +interface referential.WithFormula > WithStartEndDate, referential.WithSpeciesFaoCode interface referential.common.GearCharacteristicTypeAware > DtoAndReferenceAware ===================================== model/src/main/models/Observe/dto/class/decorator.properties ===================================== @@ -100,8 +100,8 @@ presets.RemoteDataSourceConfiguration=${name} presets.ServerDataSourceConfiguration=${name} referential.common.FpaZone=${code}##${this::label} referential.common.Harbour=${this::label}##${code}##${locode} -referential.common.LengthLengthParameter=${species/faoCode}##${species::label}##$(observe.Common.ocean) ${ocean::labelOrUnknown}##$(observe.Common.sex) ${sex::label}##${this::validityRangeLabel}##${inputSizeMeasureType::labelOrUnknown}##${outputSizeMeasureType::labelOrUnknown} -referential.common.LengthWeightParameter=${species/faoCode}##${species::label}##$(observe.Common.ocean) ${ocean::labelOrUnknown}##$(observe.Common.sex) ${sex::label}##${this::validityRangeLabel}##${sizeMeasureType::labelOrUnknown} +referential.common.LengthLengthParameter=${speciesFaoCode}##${speciesLabel::speciesSimpleLabel}##$(observe.Common.ocean) ${ocean::labelOrUnknown}##$(observe.Common.sex) ${sex::label}##${this::validityRangeLabel}##${inputSizeMeasureType::labelOrUnknown}##${outputSizeMeasureType::labelOrUnknown} +referential.common.LengthWeightParameter=${speciesFaoCode}##${speciesLabel::speciesSimpleLabel}##$(observe.Common.ocean) ${ocean::labelOrUnknown}##$(observe.Common.sex) ${sex::label}##${this::validityRangeLabel}##${sizeMeasureType::labelOrUnknown} referential.common.Person=${lastName}##${firstName} referential.common.ShipOwner=${code}##${label} referential.common.Species=${faoCode}##${scientificLabel}##${this::label} ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2022.91</version> + <version>2022.92</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/referential/WithFormula.java ===================================== @@ -36,7 +36,7 @@ import java.util.Set; * @author Tony Chemit - dev(a)tchemit.fr * @since 6.0 */ -public interface WithFormula extends WithStartEndDate { +public interface WithFormula extends WithStartEndDate, WithSpeciesFaoCode { String PROPERTY_OCEAN = "ocean"; String PROPERTY_SPECIES = "species"; ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/referential/WithSpeciesFaoCode.java ===================================== @@ -0,0 +1,43 @@ +package fr.ird.observe.dto.referential; + +/*- + * #%L + * ObServe Toolkit :: API + * %% + * Copyright (C) 2008 - 2022 IRD, 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% + */ + +import fr.ird.observe.dto.CommonDto; +import fr.ird.observe.dto.DtoAndReferenceAware; + +/** + * Created on 18/10/2022. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.0.14 + */ +public interface WithSpeciesFaoCode extends DtoAndReferenceAware { + + CommonDto getSpecies(); + + default CommonDto getSpeciesLabel() { + return getSpecies(); + } + + String getSpeciesFaoCode(); +} ===================================== toolkit/api/src/test/java/fr/ird/observe/dto/referential/FormulaHelperTest.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.dto.referential; * #L% */ +import fr.ird.observe.dto.CommonDto; import org.junit.Assert; import org.junit.Test; @@ -40,6 +41,15 @@ public class FormulaHelperTest { public void testComputeValue() { WithFormula formula = new WithFormula() { + @Override + public String getSpeciesFaoCode() { + return null; + } + + @Override + public CommonDto getSpecies() { + return null; + } @Override public Date getStartDate() { @@ -135,7 +145,7 @@ public class FormulaHelperTest { Float weight = FormulaHelper.computeValue(formula, "a * Math.pow(L, b)", null, "L", 84.0f); Assert.assertNotNull(weight); - Float excepted = (float) (Math.pow(84.0, 2.78) * 3.8e-5); + float excepted = (float) (Math.pow(84.0, 2.78) * 3.8e-5); Assert.assertEquals(excepted, weight, 2); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/301bdea8caa63ad6213e935d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/301bdea8caa63ad6213e935d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: Rajouter le bouton de réinitialisation sur le champs heure de début de coulissage - Closes #2467
by Tony CHEMIT (＠tchemit) 17 Oct '22

17 Oct '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: edc948a8 by Tony Chemit at 2022-10-17T14:23:45+02:00 Rajouter le bouton de réinitialisation sur le champs heure de début de coulissage - Closes #2467 - - - - - 3f1487c4 by Tony Chemit at 2022-10-17T15:22:02+02:00 Libellés des heures jalon des calées - Closes #2461 - - - - - bbdc8adf by Tony Chemit at 2022-10-17T16:43:40+02:00 update pom - - - - - 891eedfb by Tony Chemit at 2022-10-17T17:26:50+02:00 Mesures sur captures LL observations non affichées dans l'UI - Closes #2469 - - - - - 301bdea8 by Tony Chemit at 2022-10-17T18:09:34+02:00 Ajout d'une information sur la syntaxe des templates LL - Closes #2466 - - - - - 16 changed files: - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jcss - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetUI.jcss - client/runner/src/main/i18n/translations/client-runner_en_GB.properties - client/runner/src/main/i18n/translations/client-runner_es_ES.properties - client/runner/src/main/i18n/translations/client-runner_fr_FR.properties - core/api/services/src/main/i18n/getters/labels.getter - core/api/services/src/main/resources/META-INF/i18n/Observe-labels.properties - core/api/validation/src/main/i18n/getters/eugene.getter - core/services/i18n/src/main/i18n/translations/services_en_GB.properties - core/services/i18n/src/main/i18n/translations/services_es_ES.properties - core/services/i18n/src/main/i18n/translations/services_fr_FR.properties - model/src/main/models/Observe/dto/class/i18nOverrideLabels.properties - pom.xml Changes: ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIHandler.java ===================================== @@ -342,7 +342,7 @@ public class SetCatchUIHandler extends GeneratedSetCatchUIHandler { ui.getFoodAndSexualTab().setEnabled(newValue); ui.getSizeMeasuresTab().setEnabled(newValue); ui.getWeightMeasuresTab().setEnabled(newValue); - boolean enableInlineModels = newValue && ui.getModel().getStates().isEditing(); + boolean enableInlineModels = newValue && (ui.getModel().getStates().isReadingMode() || ui.getModel().getStates().isEditing()); getTableModel().inlineModels().keySet().forEach(i -> { i.setEditable(enableInlineModels); if (!enableInlineModels) { ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jaxx ===================================== @@ -134,13 +134,13 @@ <Table id='generateTabForm' fill='both' insets='1'>  <row> - <cell anchor='west' fill="both"> + <cell anchor='west'> <BeanCheckBox id='canGenerate' beanScope="states"/> </cell> </row> <row> - <cell fill="both"> - <JTextPane id='templateInformation' styleClass="italic"/> + <cell anchor='west' fill="both"> + <JLabel id='templateInformation' styleClass="information"/> </cell> </row>  ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jcss ===================================== @@ -41,13 +41,6 @@ selected:{states.isCanGenerate()}; } -#templateInformation { - editable:false; - focusable:false; - contentType:"text/html"; - font-size:11; -} - #sectionTemplatesTableModel { editable: {states.isCanGenerate()}; } ===================================== client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter ===================================== @@ -211,6 +211,9 @@ observe.data.ps.observation.SchoolEstimate.meanWeight observe.data.ps.observation.SchoolEstimate.species observe.data.ps.observation.SchoolEstimate.totalWeight observe.data.ps.observation.Set.currentMeasureDepth +observe.data.ps.observation.Set.endTimeStamp +observe.data.ps.observation.Set.haulingEndTimeStamp +observe.data.ps.observation.Set.haulingStartTimeStamp observe.data.ps.observation.Set.maxGearDepth observe.data.ps.observation.Set.measurementsTab observe.data.ps.observation.Set.message.information.schoolType @@ -218,6 +221,7 @@ observe.data.ps.observation.Set.schoolMeanDepth observe.data.ps.observation.Set.schoolThickness observe.data.ps.observation.Set.schoolTopDepth observe.data.ps.observation.Set.sonarUsedAvantSet +observe.data.ps.observation.Set.startTime observe.data.ps.observation.TransmittingBuoy.code observe.referential.ps.common.AcquisitionStatus.advancedSampling observe.referential.ps.common.AcquisitionStatus.atLeastOneSelected ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetUI.jcss ===================================== @@ -34,6 +34,7 @@ #haulingStartTimeStamp { propertyDayDate: {SetDto.PROPERTY_HAULING_START_DATE}; propertyTimeDate: {SetDto.PROPERTY_HAULING_START_TIME}; + showReset:true; } #haulingEndTimeStamp { ===================================== client/runner/src/main/i18n/translations/client-runner_en_GB.properties ===================================== @@ -229,7 +229,7 @@ observe.data.Data.type=<html><body>Data of type <i>%s</i> observe.data.ll.common.Trip.departureLandingHarbour=Departure / Landing Port observe.data.ll.common.Trip.homeIdErsId=HomeId / ERS Id observe.data.ll.common.Trip.startEndDate=Start / end date -observe.data.ll.observation.SetDetailComposition.templateInformation=<html><body><p>Templates must conform to syntax 'L1/L2/L3/Ln\:u' where <p/><ul><li>L1..Ln are floatlines length</li><li>u the selected length unit (among values\: m km nm or fmt)</li></ul> +observe.data.ll.observation.SetDetailComposition.templateInformation=<html><body>Templates must conform to syntax <strong><code>L1/L2/L3/Ln\:u</code></strong> where <ul><li>L1..Ln are floatlines length</li><li>u is the selected length unit (among values\: <code>m km nm</code> or <code>fmt</code>)</li></ul> observe.data.ll.observation.SetDetailComposition.validation.invalid.templates=Templates are not valid, see tooltip on error cells observe.data.message.will.delete.sub.data=If you confirm save, some data could be deleted\!\n\nFollowing data need to be removed\: observe.data.message.will.delete.sub.data.type=Object %1$s (id %2$s) ===================================== client/runner/src/main/i18n/translations/client-runner_es_ES.properties ===================================== @@ -229,7 +229,7 @@ observe.data.Data.type=<html><body>Dato de tipo <i>%s</i> observe.data.ll.common.Trip.departureLandingHarbour=Departure / Landing harbour observe.data.ll.common.Trip.homeIdErsId=HomeId / ERS Id observe.data.ll.common.Trip.startEndDate=Date de début / fin -observe.data.ll.observation.SetDetailComposition.templateInformation=<html><body><p>Templates must conform to syntax 'L1/L2/L3/Ln\:u' where <p/><ul><li>L1..Ln are floatlines length</li><li>u the selected length unit (among values\: m km nm or fmt)</li></ul>\#TODO +observe.data.ll.observation.SetDetailComposition.templateInformation=<html><body>Templates must conform to syntax <strong><code>L1/L2/L3/Ln\:u</code></strong> where <ul><li>L1..Ln are floatlines length</li><li>u is the selected length unit (among values\: <code>m km nm</code> or <code>fmt</code>)</li></ul>\#TODO observe.data.ll.observation.SetDetailComposition.validation.invalid.templates=Templates are not valid, see tooltip on error cells observe.data.message.will.delete.sub.data=If you confirm save, following data will be deleted\!\: observe.data.message.will.delete.sub.data.type=Objet %1$s (identifiant %2$s) ===================================== client/runner/src/main/i18n/translations/client-runner_fr_FR.properties ===================================== @@ -229,7 +229,7 @@ observe.data.Data.type=<html><body>Donnée de type <i>%s</i> observe.data.ll.common.Trip.departureLandingHarbour=Port de départ / d'arrivée observe.data.ll.common.Trip.homeIdErsId=Identifiant / Id ERS observe.data.ll.common.Trip.startEndDate=Date de début / fin -observe.data.ll.observation.SetDetailComposition.templateInformation=<html><body><p>Les patrons doivent se conformer à la syntaxe 'L1/L2/L3/Ln\:u' où </p><ul><li><strong>L1..Ln</strong> sont les longueurs des orins</li><li><strong>u</strong> l'unité de longueur sélectionée (valeurs possibles \: m km nm ou fmt) +observe.data.ll.observation.SetDetailComposition.templateInformation=<html><body>Les patrons doivent se conformer à la syntaxe <strong><code>L1/L2/L3/Ln\:u</code></strong> où <ul><li><strong>L1..Ln</strong> sont les longueurs des orins</li><li><strong>u</strong> est l'unité de longueur sélectionnée (valeurs possibles \: <code>m km nm</code> ou <code>fmt</code>) observe.data.ll.observation.SetDetailComposition.validation.invalid.templates=Les templates ne sont pas valides, passer en revue les cellules en erreur observe.data.message.will.delete.sub.data=En confirmant la sauvegarde les données suivantes seront supprimées \: observe.data.message.will.delete.sub.data.type=Objet %1$s (identifiant %2$s) ===================================== core/api/services/src/main/i18n/getters/labels.getter ===================================== @@ -1146,6 +1146,9 @@ observe.data.ps.observation.SchoolEstimate.type observe.data.ps.observation.Set.action.add observe.data.ps.observation.Set.action.add.tip observe.data.ps.observation.Set.currentMeasureDepth +observe.data.ps.observation.Set.endTimeStamp +observe.data.ps.observation.Set.haulingEndTimeStamp +observe.data.ps.observation.Set.haulingStartTimeStamp observe.data.ps.observation.Set.maxGearDepth observe.data.ps.observation.Set.measurementsTab observe.data.ps.observation.Set.message.information.schoolType @@ -1155,6 +1158,7 @@ observe.data.ps.observation.Set.schoolThickness observe.data.ps.observation.Set.schoolTopDepth observe.data.ps.observation.Set.schoolType.not.fill observe.data.ps.observation.Set.sonarUsedAvantSet +observe.data.ps.observation.Set.startTime observe.data.ps.observation.Set.title observe.data.ps.observation.Set.type observe.data.ps.observation.SetCatch.type ===================================== core/api/services/src/main/resources/META-INF/i18n/Observe-labels.properties ===================================== @@ -20,7 +20,7 @@ # #L% ### #Generated by org.nuiton.i18n.plugin.GenerateI18nLabelsMojo -#Wed Sep 07 13:23:50 CEST 2022 +#Mon Oct 17 14:55:03 CEST 2022 observe.Business.createDate=observe.Common.createDate observe.Business.homeId=observe.Common.homeId observe.Business.id=observe.Common.id @@ -1742,17 +1742,13 @@ observe.data.ps.observation.Set.currentDirection=observe.Common.currentDirection observe.data.ps.observation.Set.currentSpeed=observe.Common.currentSpeed observe.data.ps.observation.Set.endDate=observe.Common.endDate observe.data.ps.observation.Set.endTime=observe.Common.endTime -observe.data.ps.observation.Set.endTimeStamp=observe.Common.endTimeStamp observe.data.ps.observation.Set.generalTab=observe.Common.generalTab -observe.data.ps.observation.Set.haulingEndTimeStamp=observe.Common.haulingEndTimeStamp -observe.data.ps.observation.Set.haulingStartTimeStamp=observe.Common.haulingStartTimeStamp observe.data.ps.observation.Set.homeId=observe.Common.homeId observe.data.ps.observation.Set.id=observe.Common.id observe.data.ps.observation.Set.label=observe.Common.label observe.data.ps.observation.Set.lastUpdateDate=observe.Common.lastUpdateDate observe.data.ps.observation.Set.reasonForNullSet=observe.Common.reasonForNullSet observe.data.ps.observation.Set.schoolType=observe.Common.schoolType -observe.data.ps.observation.Set.startTime=observe.Common.startTime observe.data.ps.observation.Set.supportVesselName=observe.Common.supportVesselName observe.data.ps.observation.Set.version=observe.Common.version observe.data.ps.observation.SetCatch.comment=observe.Common.comment ===================================== core/api/validation/src/main/i18n/getters/eugene.getter ===================================== @@ -327,10 +327,12 @@ observe.data.ps.observation.SchoolEstimate.totalWeight observe.data.ps.observation.Set.currentMeasureDepth observe.data.ps.observation.Set.haulingEndDate observe.data.ps.observation.Set.haulingEndTime +observe.data.ps.observation.Set.haulingStartTimeStamp observe.data.ps.observation.Set.maxGearDepth observe.data.ps.observation.Set.schoolMeanDepth observe.data.ps.observation.Set.schoolThickness observe.data.ps.observation.Set.schoolTopDepth +observe.data.ps.observation.Set.startTime observe.data.ps.observation.SetCatch.catches observe.data.ps.observation.SetSchoolEstimate.schoolEstimate observe.data.ps.observation.TransmittingBuoy.code ===================================== core/services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -1372,8 +1372,11 @@ observe.data.ps.observation.Set.action.add=Add a Set observe.data.ps.observation.Set.action.add.tip=Add the set to the activity observe.data.ps.observation.Set.catchesStat=Count of catches observe.data.ps.observation.Set.currentMeasureDepth=Current measure depth (m) +observe.data.ps.observation.Set.endTimeStamp=Set end observe.data.ps.observation.Set.haulingEndDate=Hauling end date observe.data.ps.observation.Set.haulingEndTime=Hauling end time +observe.data.ps.observation.Set.haulingEndTimeStamp=Hauling end +observe.data.ps.observation.Set.haulingStartTimeStamp=Hauling start observe.data.ps.observation.Set.maxGearDepth=Max gear depth (m) observe.data.ps.observation.Set.measurementsTab=Measurements observe.data.ps.observation.Set.message.information.schoolType=School type @@ -1386,6 +1389,7 @@ observe.data.ps.observation.Set.schoolThickness=School thickness (m) observe.data.ps.observation.Set.schoolTopDepth=School top depth (m) observe.data.ps.observation.Set.schoolType.not.fill=Not filled observe.data.ps.observation.Set.sonarUsedAvantSet=Usage of sonar +observe.data.ps.observation.Set.startTime=Set start observe.data.ps.observation.Set.title=Set observe.data.ps.observation.Set.type=Set observe.data.ps.observation.Set.validation.endDate.after.haulingEndDate=End date (%2$s) must be after pursing date (%1$s). ===================================== core/services/i18n/src/main/i18n/translations/services_es_ES.properties ===================================== @@ -1372,8 +1372,11 @@ observe.data.ps.observation.Set.action.add=Añadir un lance observe.data.ps.observation.Set.action.add.tip=Añadir el lance de la actividad observe.data.ps.observation.Set.catchesStat=Count of catches observe.data.ps.observation.Set.currentMeasureDepth=Profundidad de corriente (m) +observe.data.ps.observation.Set.endTimeStamp=Set end observe.data.ps.observation.Set.haulingEndDate=Fecha de fin de calado de la red observe.data.ps.observation.Set.haulingEndTime=Hora de fin de calado de la red +observe.data.ps.observation.Set.haulingEndTimeStamp=Hauling end +observe.data.ps.observation.Set.haulingStartTimeStamp=Hauling start observe.data.ps.observation.Set.maxGearDepth=Profundidad de cierre del arte (m) observe.data.ps.observation.Set.measurementsTab=Parámetros observe.data.ps.observation.Set.message.information.schoolType=Tipo de banco calculado a partir de los sistemas observados de su actividad. @@ -1386,6 +1389,7 @@ observe.data.ps.observation.Set.schoolThickness=Esperor del banco (m) observe.data.ps.observation.Set.schoolTopDepth=Profundidad comienzo (m) observe.data.ps.observation.Set.schoolType.not.fill=vacío observe.data.ps.observation.Set.sonarUsedAvantSet=Utilización del sonar antes del lance +observe.data.ps.observation.Set.startTime=Set start observe.data.ps.observation.Set.title=Lance observe.data.ps.observation.Set.type=Lance observe.data.ps.observation.Set.validation.endDate.after.haulingEndDate=El día de fin (%2$s) debe ser superior o igual a la dia de final de recogida de la jareta (%1$s). ===================================== core/services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -1372,8 +1372,11 @@ observe.data.ps.observation.Set.action.add=Ajouter la calée observe.data.ps.observation.Set.action.add.tip=Ajouter la calée de l'activité observe.data.ps.observation.Set.catchesStat=Nombre de captures observe.data.ps.observation.Set.currentMeasureDepth=Profondeur de mesure du courant (m) +observe.data.ps.observation.Set.endTimeStamp=Fin de calée observe.data.ps.observation.Set.haulingEndDate=Date de fin coulissage observe.data.ps.observation.Set.haulingEndTime=Heure de fin coulissage +observe.data.ps.observation.Set.haulingEndTimeStamp=Fin de coulissage +observe.data.ps.observation.Set.haulingStartTimeStamp=Début de coulissage observe.data.ps.observation.Set.maxGearDepth=Profondeur maximum (m) observe.data.ps.observation.Set.measurementsTab=Mesures observe.data.ps.observation.Set.message.information.schoolType=Type de banc @@ -1386,6 +1389,7 @@ observe.data.ps.observation.Set.schoolThickness=Épaisseur du banc (m) observe.data.ps.observation.Set.schoolTopDepth=Profondeur sommet (m) observe.data.ps.observation.Set.schoolType.not.fill=Non renseigné observe.data.ps.observation.Set.sonarUsedAvantSet=Utilisation du sonar +observe.data.ps.observation.Set.startTime=Début de calée observe.data.ps.observation.Set.title=Calée observe.data.ps.observation.Set.type=Calée observe.data.ps.observation.Set.validation.endDate.after.haulingEndDate=La date de fin (%2$s) doit être supérieure ou égal à la date de fin de coulissage (%1$s). ===================================== model/src/main/models/Observe/dto/class/i18nOverrideLabels.properties ===================================== @@ -24,4 +24,5 @@ data.ll.landing.Landing=vessel data.ps.localmarket.Sample=well data.ps.logbook.Catch=weightMeasureMethod.validation.required data.ps.observation.SchoolEstimate=species +data.ps.observation.Set=startTime,haulingStartTimeStamp,haulingEndTimeStamp,endTimeStamp referential.common.Species=codeAndHomeId ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2022.90</version> + <version>2022.91</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ae528a494d77b7382a639360… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ae528a494d77b7382a639360… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Lorsqu'un template de composition détaillé LL est invalide, l'UI permet malgré...
by Tony CHEMIT (＠tchemit) 17 Oct '22

17 Oct '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 378ce590 by Tony Chemit at 2022-10-17T13:59:11+02:00 Lorsqu'un template de composition détaillé LL est invalide, l'UI permet malgré tout d'exécuter la génération, qui produit une erreur - Closes #2463 - - - - - f773b97b by Tony Chemit at 2022-10-17T13:59:11+02:00 Remove duplicated code - - - - - ae528a49 by Tony Chemit at 2022-10-17T13:59:11+02:00 Move ui validator to the ui module - - - - - 8 changed files: - client/core/src/main/java/fr/ird/observe/client/datasource/validation/ContentMessageTableModel.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/LonglineCompositionTableModel.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/section/SectionTableModel.java - + client/datasource/editor/ps/.mvn/i18n/parse-validation-messages - + client/datasource/editor/ps/src/main/i18n/getters/validation-messages.getter - + client/datasource/editor/ps/src/main/resources/fr/ird/observe/dto/data/ps/dcp/FloatingObjectPreset-create-error-validation.xml - core/api/validation/src/main/filtered-resources/fr/ird/observe/dto/data/ps/dcp/FloatingObjectPreset-create-warning-validation.xml → client/datasource/editor/ps/src/main/resources/fr/ird/observe/dto/data/ps/dcp/FloatingObjectPreset-create-warning-validation.xml Changes: ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/validation/ContentMessageTableModel.java ===================================== @@ -23,14 +23,10 @@ package fr.ird.observe.client.datasource.validation; */ import org.nuiton.jaxx.validator.swing.SwingValidator; -import org.nuiton.jaxx.validator.swing.SwingValidatorMessage; import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel; import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JComponent; -import java.util.Collection; -import java.util.Collections; -import java.util.function.Predicate; /** * Created on 07/12/2020. @@ -75,23 +71,4 @@ public class ContentMessageTableModel extends SwingValidatorMessageTableModel { super.removeMessages(editor, scope); } } - - public void removeMessages(Predicate<SwingValidatorMessage> predicate) { - for (int i = getRowCount() - 1; i > -1; i--) { - SwingValidatorMessage error = data.get(i); - if (predicate.test(error)) { - // remove the message - data.remove(i); - fireTableRowsDeleted(i, i); - } - } - } - - public <M extends SwingValidatorMessage> void addMessages(Collection<M> messages) { - data.addAll(messages); - // resort datas - Collections.sort(data); - // notify - fireTableDataChanged(); - } } ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIHandler.java ===================================== @@ -37,7 +37,6 @@ import fr.ird.observe.dto.data.ll.observation.SectionTemplateDto; import fr.ird.observe.dto.data.ll.observation.SetDetailCompositionDto; import fr.ird.observe.dto.form.Form; import io.ultreia.java4all.i18n.I18n; -import io.ultreia.java4all.jaxx.widgets.combobox.FilterableComboBox; import io.ultreia.java4all.lang.Strings; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -273,11 +272,10 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition if (previousIndex == 0) { if (getModel().getStates().isCanGenerate()) { // update section templates list - List<SectionTemplateDto> sectionTemplates = getModel().getStates().getSectionTemplatesTableModel().getNotEmptyData(); - @SuppressWarnings("unchecked") FilterableComboBox<SectionTemplateDto> comboBox = (FilterableComboBox<SectionTemplateDto>) getUi().getSectionsTable().getClientProperty(SECTION_TEMPLATES_EDITOR); - comboBox.setData(sectionTemplates); - //2014-FIXME See why templates are not well reselect in cell editor - //2014-FIXME See cell editor does not loose focus and empty selection when losing focus + List<SectionTemplateDto> sectionTemplates = getModel().getStates().getSectionTemplatesTableModel().getValidData(); + getModel().getStates().getSectionsTableModel().setSectionTemplates(sectionTemplates.isEmpty() ? null : sectionTemplates); + } else { + getModel().getStates().getSectionsTableModel().setSectionTemplates(null); } } break; ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/LonglineCompositionTableModel.java ===================================== @@ -129,10 +129,6 @@ public abstract class LonglineCompositionTableModel<D extends ObserveDto & JavaB return model.getStates().isGenerateHaulingIds(); } - protected boolean isCanGenerate() { - return model.getStates().isCanGenerate(); - } - @Override public void fireTableDataChanged() { // rearrange ids when data has changed ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/section/SectionTableModel.java ===================================== @@ -29,16 +29,20 @@ import fr.ird.observe.client.datasource.editor.ll.data.observation.composition.b import fr.ird.observe.dto.data.ll.observation.BasketDto; import fr.ird.observe.dto.data.ll.observation.SectionDto; import fr.ird.observe.dto.data.ll.observation.SectionTemplateDto; +import io.ultreia.java4all.jaxx.widgets.combobox.FilterableComboBox; +import io.ultreia.java4all.jaxx.widgets.combobox.FilterableComboBoxCellEditor; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import javax.swing.event.TableModelListener; import java.beans.PropertyChangeListener; import java.util.ArrayList; +import java.util.Collections; import java.util.Date; import java.util.LinkedHashSet; import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; /** * Created on 12/11/14. @@ -53,6 +57,14 @@ public class SectionTableModel extends LonglineCompositionTableModel<SectionDto> private static final Logger log = LogManager.getLogger(SectionTableModel.class); private FilterableComboBoxCellEditor sectionTemplateEditor; private SetDetailCompositionUIValidationHelper validationHelper; + /** + * All section templates available (may be changed when selecting another section (to just get the possible compliant one (matching basket count) + */ + private List<SectionTemplateDto> sectionTemplates; + /** + * Available section templates for the selected section (all are compliant with the section basket count) + */ + private List<SectionTemplateDto> availableSectionTemplates; public SectionTableModel(SetDetailCompositionUIModel model) { super(model); @@ -150,7 +162,7 @@ public class SectionTableModel extends LonglineCompositionTableModel<SectionDto> break; case 2: // can change template if in generate mode - result = isCanGenerate(); + result = isCanUseTemplate(); break; default: throw new IllegalStateException("Can't come here"); @@ -159,6 +171,10 @@ public class SectionTableModel extends LonglineCompositionTableModel<SectionDto> return result; } + protected boolean isCanUseTemplate() { + return getModel().getStates().isCanGenerate() && availableSectionTemplates != null && !availableSectionTemplates.isEmpty(); + } + public void init() { validationHelper = getModel().getStates().getValidationHelper(); PropertyChangeListener selectedSectionChanged = evt -> { @@ -228,6 +244,7 @@ public class SectionTableModel extends LonglineCompositionTableModel<SectionDto> } finally { validationHelper.setObjectValueAdjusting(false); } + initSectionTemplates(newSection); } public void setSectionTemplateEditor(FilterableComboBoxCellEditor sectionTemplateEditor) { @@ -265,4 +282,25 @@ public class SectionTableModel extends LonglineCompositionTableModel<SectionDto> validationHelper.whenBasketChanged(); } } + + public void setSectionTemplates(List<SectionTemplateDto> sectionTemplates) { + this.sectionTemplates = sectionTemplates; + SectionDto selectedRow = getSelectedRow(); + initSectionTemplates(selectedRow); + } + + private void initSectionTemplates(SectionDto section) { + if (sectionTemplates != null) { + if (section == null) { + availableSectionTemplates = Collections.emptyList(); + } else { + int basketSize = section.getBasketSize(); + availableSectionTemplates = sectionTemplates.stream().filter(t -> t.isCompliantWithBasketCount(basketSize)).collect(Collectors.toList()); + } + @SuppressWarnings("unchecked") FilterableComboBox<SectionTemplateDto> comboBox = (FilterableComboBox<SectionTemplateDto>) sectionTemplateEditor.getComponent(); + comboBox.setData(availableSectionTemplates); + //2014-FIXME See why templates are not well reselect in cell editor + //2014-FIXME See cell editor does not loose focus and empty selection when losing focus + } + } } ===================================== client/datasource/editor/ps/.mvn/i18n/parse-validation-messages ===================================== ===================================== client/datasource/editor/ps/src/main/i18n/getters/validation-messages.getter ===================================== @@ -0,0 +1,4 @@ +observe.data.ps.logbook.Route.validation.date.after.currentPsCommonTrip.startDate +observe.data.ps.logbook.Route.validation.date.before.currentPsCommonTrip.endDate +observe.referential.Referential.validation.label1.untranslated +observe.referential.Referential.validation.label3.untranslated ===================================== client/datasource/editor/ps/src/main/resources/fr/ird/observe/dto/data/ps/dcp/FloatingObjectPreset-create-error-validation.xml ===================================== @@ -0,0 +1,43 @@ +<?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="label1"> + <field-validator type="mandatoryString" short-circuit="true"> + <message/> + </field-validator> + </field> + <field name="label2"> + <field-validator type="mandatoryString" short-circuit="true"> + <message/> + </field-validator> + </field> + <field name="label3"> + <field-validator type="mandatoryString" short-circuit="true"> + <message/> + </field-validator> + </field> +</validators> ===================================== core/api/validation/src/main/filtered-resources/fr/ird/observe/dto/data/ps/dcp/FloatingObjectPreset-create-warning-validation.xml → client/datasource/editor/ps/src/main/resources/fr/ird/observe/dto/data/ps/dcp/FloatingObjectPreset-create-warning-validation.xml ===================================== @@ -1,21 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE validators PUBLIC + --> + +<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/955367edacd2f28401994fe6… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/955367edacd2f28401994fe6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: Ajout d'une information sur la syntaxe des templates LL - Closes #2466
by Tony CHEMIT (＠tchemit) 17 Oct '22

17 Oct '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: bd8cf0f3 by Tony Chemit at 2022-10-17T13:01:36+02:00 Ajout d'une information sur la syntaxe des templates LL - Closes #2466 - - - - - 73b07685 by Tony Chemit at 2022-10-17T13:01:36+02:00 Imperfection d'affichage dans la liste déroulante des templates de génération LL - Closes #2464 - - - - - ea55eec7 by Tony Chemit at 2022-10-17T13:01:36+02:00 I18n key fix Validateur de template de génération LL - Closes #2465 - - - - - 64d00bf2 by Tony Chemit at 2022-10-17T13:01:36+02:00 Lorsqu'un template de composition détaillé LL est invalide, l'UI permet malgré tout d'exécuter la génération, qui produit une erreur - Closes #2463 - - - - - 571c23c3 by Tony Chemit at 2022-10-17T13:01:36+02:00 Remove duplicated code - - - - - 955367ed by Tony Chemit at 2022-10-17T13:01:36+02:00 Move ui validator to the ui module - - - - - 30 changed files: - client/core/src/main/java/fr/ird/observe/client/datasource/validation/ContentMessageTableModel.java - + client/datasource/editor/ll/.mvn/i18n/parse-validation-messages - 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/i18n/getters/validation-messages.getter - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIInitializer.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/GenerateAll.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/LonglineCompositionTableModel.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/section/SectionTableModel.java - core/api/validation/src/main/filtered-resources/fr/ird/observe/dto/data/ll/observation/SetDetailCompositionUIDto-update-error-validation.xml → client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIModelStates-update-error-validation.xml - + client/datasource/editor/ps/.mvn/i18n/parse-validation-messages - + client/datasource/editor/ps/src/main/i18n/getters/validation-messages.getter - core/api/validation/src/main/filtered-resources/fr/ird/observe/dto/data/ps/dcp/FloatingObjectPreset-create-error-validation.xml → client/datasource/editor/ps/src/main/resources/fr/ird/observe/dto/data/ps/dcp/FloatingObjectPreset-create-error-validation.xml - core/api/validation/src/main/filtered-resources/fr/ird/observe/dto/data/ps/dcp/FloatingObjectPreset-create-warning-validation.xml → client/datasource/editor/ps/src/main/resources/fr/ird/observe/dto/data/ps/dcp/FloatingObjectPreset-create-warning-validation.xml - client/runner/src/main/i18n/translations/client-runner_en_GB.properties - client/runner/src/main/i18n/translations/client-runner_es_ES.properties - client/runner/src/main/i18n/translations/client-runner_fr_FR.properties - core/api/dto/src/main/java/fr/ird/observe/dto/data/ll/observation/SectionTemplateDto.java - − core/api/dto/src/main/java/fr/ird/observe/dto/data/ll/observation/SetDetailCompositionUIDto.java - core/api/services/src/main/i18n/getters/labels.getter - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/i18n/getters/eugene.getter - core/api/validation/src/main/i18n/getters/validation-messages.getter - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SectionTemplateDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SectionTemplateDto-update-error-validation.xml - + core/api/validation/src/main/validation/fr/ird/observe/dto/data/ll/observation/SectionTemplateDto-create-error-validation.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9ab0916b911d305b77e81b01… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9ab0916b911d305b77e81b01… You're receiving this email because of your account on gitlab.com.

1 0