January 2023 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop-9.0.x] Update changelog for v.9.0.23 [skip CI]
by Tony CHEMIT (＠tchemit) 04 Jan '23

04 Jan '23

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: a4f58b74 by Tony Chemit at 2023-01-04T18:03:27+01:00 Update changelog for v.9.0.23 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,16 +1,32 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2022-12-12 19:31. + * Last generated at 2023-01-04 18:02. -## Version [9.1.0-RC-1](https://gitlab.com/ultreiaio/ird-observe/-/milestones/243) +## Version [9.0.23](https://gitlab.com/ultreiaio/ird-observe/-/milestones/253) -**Closed at 2022-11-25.** +**Closed at 2023-01-04.** +### Download +* [Client (observe-9.0.23-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) +* [Serveur (observe-9.0.23.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/…) +* [Serveur (observe-9.0.23-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) ### Issues - * [[Type::Evolution 2218]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2218) **tms_version va-t-elle rester dans le schéma public ?** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) - * [[Type::Evolution 2478]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2478) **Réusinage du plan de cuve** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2579]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2579) **Impossible de créer une route en 9.0.22** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2580]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2580) **Lors de la suppression gloable d'une capture utilisée sur le formulaire espèces sensibles, la demande de confirmation n'est pas proposée (mais elle l'est bien si l'espèce est utilisée dans un échantillon)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2581]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2581) **Imperfection de la validation sur une activité de pêche** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2582]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2582) **Après création d'une activité, le nœud captures n'apparaît pas** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2584]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2584) **Les activités ne sont pas disponibles lors de la création d'un échantillon (mais disponible en mode mis à jour)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2585]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2585) **Problème sur la sauvegarde d'un échantillon (si on lui associe des activités)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2587]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2587) **Si on quitte le formulaire marée modifié, aucune alerte n'est proposée pour enregistrer les modifications** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2589]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2589) **Sur un formulaire tableau modifié, la demande confirmation est demandée deux fois si la première fois, on dit annuler** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2591]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2591) **Mauvaise persistence des lots au niveau des sondages** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2592]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2592) **Sur le formulaire lot, le champs commentaire n'est pas lié à un commentaire de la marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2577]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2577) **Améliorer les variables dans les rapports pour proposer les variables suivantes en filtrant sur la variable précédente** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2578]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2578) **Revoir la syntaxe des rapports** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2586]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2586) **Amélioration du texte d'information quand on ne peut pas encore remplir le marché local** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Type::Evolution 2590]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2590) **Ajout sur le formulaire d'une information sur la saisie possible ou non du marché local à partir du port d'arrivée sélectionné** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [9.0.22](https://gitlab.com/ultreiaio/ird-observe/-/milestones/252) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a4f58b7468ccf53188522b757… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a4f58b7468ccf53188522b757… 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.23 [skip CI]
by Tony CHEMIT (＠tchemit) 04 Jan '23

04 Jan '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f7fe96e9 by Tony Chemit at 2023-01-04T18:03:38+01:00 Update changelog for v.9.0.23 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,16 +1,32 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2022-12-12 19:31. + * Last generated at 2023-01-04 18:02. -## Version [9.1.0-RC-1](https://gitlab.com/ultreiaio/ird-observe/-/milestones/243) +## Version [9.0.23](https://gitlab.com/ultreiaio/ird-observe/-/milestones/253) -**Closed at 2022-11-25.** +**Closed at 2023-01-04.** +### Download +* [Client (observe-9.0.23-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) +* [Serveur (observe-9.0.23.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/…) +* [Serveur (observe-9.0.23-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) ### Issues - * [[Type::Evolution 2218]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2218) **tms_version va-t-elle rester dans le schéma public ?** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) - * [[Type::Evolution 2478]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2478) **Réusinage du plan de cuve** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2579]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2579) **Impossible de créer une route en 9.0.22** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2580]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2580) **Lors de la suppression gloable d'une capture utilisée sur le formulaire espèces sensibles, la demande de confirmation n'est pas proposée (mais elle l'est bien si l'espèce est utilisée dans un échantillon)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2581]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2581) **Imperfection de la validation sur une activité de pêche** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2582]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2582) **Après création d'une activité, le nœud captures n'apparaît pas** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2584]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2584) **Les activités ne sont pas disponibles lors de la création d'un échantillon (mais disponible en mode mis à jour)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2585]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2585) **Problème sur la sauvegarde d'un échantillon (si on lui associe des activités)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2587]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2587) **Si on quitte le formulaire marée modifié, aucune alerte n'est proposée pour enregistrer les modifications** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2589]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2589) **Sur un formulaire tableau modifié, la demande confirmation est demandée deux fois si la première fois, on dit annuler** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2591]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2591) **Mauvaise persistence des lots au niveau des sondages** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2592]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2592) **Sur le formulaire lot, le champs commentaire n'est pas lié à un commentaire de la marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2577]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2577) **Améliorer les variables dans les rapports pour proposer les variables suivantes en filtrant sur la variable précédente** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2578]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2578) **Revoir la syntaxe des rapports** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2586]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2586) **Amélioration du texte d'information quand on ne peut pas encore remplir le marché local** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Type::Evolution 2590]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2590) **Ajout sur le formulaire d'une information sur la saisie possible ou non du marché local à partir du port d'arrivée sélectionné** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [9.0.22](https://gitlab.com/ultreiaio/ird-observe/-/milestones/252) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f7fe96e96019244798bc1f603… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f7fe96e96019244798bc1f603… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] 3 commits: Si on quitte le formulaire marée modifié, aucune alerte n'est proposée pour...
by Tony CHEMIT (＠tchemit) 04 Jan '23

04 Jan '23

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: e18a2ccd by Tony Chemit at 2023-01-04T17:28:06+01:00 Si on quitte le formulaire marée modifié, aucune alerte n'est proposée pour enregistrer les modifications - closes #2587 - - - - - b8e6082e by Tony Chemit at 2023-01-04T17:29:00+01:00 Sur un formulaire tableau modifié, la demande confirmation est demandée deux fois si la première fois, on dit annuler - closes #2589 - - - - - 09569172 by Tony Chemit at 2023-01-04T17:56:56+01:00 Sur le formulaire lot, le champs commentaire n'est pas lié à un commentaire de la marée - closes #2592 - - - - - 7 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIManager.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/open/ContentOpen.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/TripBatchUI.jaxx - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripBatchSpi.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIManager.java ===================================== @@ -90,7 +90,7 @@ public class ContentUIManager { // no content ui return true; } - log.info(String.format("[%s] Will close ui", ui.getClass().getSimpleName())); + log.info(String.format("%sWill close ui", ui.getModel().getPrefix())); boolean closed; try { closed = ui.close(); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIModelStates.java ===================================== @@ -170,7 +170,12 @@ public class ContentUIModelStates extends AbstractJavaBean implements Closeable, return Objects.requireNonNull(mode).getValidationContext(); } - public boolean canQuit() { + /** + * Test if we can qui the form. + * + * @return {@code null} if was canceled, {@code true} if form can be quit, {@code false} otherwise. + */ + public Boolean canQuit() { if (!isEnabled()) { // model disabled, no check return true; @@ -183,12 +188,8 @@ public class ContentUIModelStates extends AbstractJavaBean implements Closeable, // model in reading mode, no check return true; } - if (!isGlobalModified()) { - // model not modified, no check - return true; - } - // check model is valid - return isValid(); + // can quit only if model not modified + return !isGlobalModified(); } public boolean isEnabled() { ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/open/ContentOpen.java ===================================== @@ -339,7 +339,11 @@ public class ContentOpen { String prefix = ui.getModel().getPrefix(); log.info(String.format("%s Try to close content...", prefix)); ContentUIModelStates states = ui.getModel().getStates(); - boolean canQuit = states.canQuit(); + Boolean canQuit = states.canQuit(); + if (canQuit == null) { + // cancel + return Close.CANCEL; + } if (canQuit) { // simple close return Close.CLOSE; ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIModelStates.java ===================================== @@ -124,8 +124,14 @@ public class ContentTableUIModelStates<D extends DataDto, C extends ContainerChi } @Override - public boolean canQuit() { - return isReadingMode() || (getTableModel().isCanQuitEditingRow() && super.canQuit()); + public Boolean canQuit() { + if (isReadingMode()) { + return true; + } + if (!getTableModel().isCanQuitEditingRow()) { + return null; + } + return super.canQuit(); } public boolean isCanSaveRow() { ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUIModelStates.java ===================================== @@ -98,24 +98,6 @@ public abstract class ContentReferentialUIModelStates<D extends ReferentialDto, } } - @Override - public boolean canQuit() { - if (!isEnabled()) { - // model disabled, no check - return true; - } - if (!isEditing()) { - // model not editing, no check - return true; - } - if (isReadingMode()) { - // model in reading mode, no check - return true; - } - // can quit only if model not modified - return !isGlobalModified(); - } - public D getBeanToSave() { return getBean(); } ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/TripBatchUI.jaxx ===================================== @@ -123,7 +123,7 @@ <Table id='extraZone' fill='both' weightx='1' insets='0'> <row> <cell weighty='1'> - <BigTextEditor id="comment"/> + <BigTextEditor id="comment" title="observe.Common.logbookComment" styleClass="skipI18n"/> </cell> </row> </Table> ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripBatchSpi.java ===================================== @@ -24,6 +24,7 @@ package fr.ird.observe.entities.data.ps.common; import fr.ird.observe.dto.data.ps.localmarket.TripBatchDto; import fr.ird.observe.dto.form.Form; +import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.dto.referential.ps.localmarket.PackagingReference; import fr.ird.observe.entities.referential.common.Harbour; import fr.ird.observe.entities.referential.ps.localmarket.Packaging; @@ -42,6 +43,18 @@ public class TripBatchSpi extends GeneratedTripBatchSpi { form.getObject().setAvailablePackagings(availablePackaging); } + @Override + public void toDto(ReferentialLocale referentialLocale, Trip entity, TripBatchDto dto) { + super.toDto(referentialLocale, entity, dto); + dto.setComment(entity.getLogbookComment()); + } + + @Override + public void fromDto(ReferentialLocale referentialLocale, Trip entity, TripBatchDto dto) { + super.fromDto(referentialLocale, entity, dto); + entity.setLogbookComment(dto.getComment()); + } + protected LinkedHashSet<PackagingReference> getPackaging(ServiceContext context, Trip trip) { Harbour landingHarbour = trip.getLandingHarbour(); Date date = trip.getEndDate(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/49d90e71d88b41f2fcac5c9a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/49d90e71d88b41f2fcac5c9a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Si on quitte le formulaire marée modifié, aucune alerte n'est proposée pour...
by Tony CHEMIT (＠tchemit) 04 Jan '23

04 Jan '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 15478459 by Tony Chemit at 2023-01-04T18:00:44+01:00 Si on quitte le formulaire marée modifié, aucune alerte n'est proposée pour enregistrer les modifications - closes #2587 - - - - - c85f5be2 by Tony Chemit at 2023-01-04T18:00:48+01:00 Sur un formulaire tableau modifié, la demande confirmation est demandée deux fois si la première fois, on dit annuler - closes #2589 - - - - - 9943bc7b by Tony Chemit at 2023-01-04T18:00:51+01:00 Sur le formulaire lot, le champs commentaire n'est pas lié à un commentaire de la marée - closes #2592 - - - - - 7 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIManager.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/open/ContentOpen.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/TripBatchUI.jaxx - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripBatchSpi.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIManager.java ===================================== @@ -90,7 +90,7 @@ public class ContentUIManager { // no content ui return true; } - log.info(String.format("[%s] Will close ui", ui.getClass().getSimpleName())); + log.info(String.format("%sWill close ui", ui.getModel().getPrefix())); boolean closed; try { closed = ui.close(); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIModelStates.java ===================================== @@ -170,7 +170,12 @@ public class ContentUIModelStates extends AbstractJavaBean implements Closeable, return Objects.requireNonNull(mode).getValidationContext(); } - public boolean canQuit() { + /** + * Test if we can qui the form. + * + * @return {@code null} if was canceled, {@code true} if form can be quit, {@code false} otherwise. + */ + public Boolean canQuit() { if (!isEnabled()) { // model disabled, no check return true; @@ -183,12 +188,8 @@ public class ContentUIModelStates extends AbstractJavaBean implements Closeable, // model in reading mode, no check return true; } - if (!isGlobalModified()) { - // model not modified, no check - return true; - } - // check model is valid - return isValid(); + // can quit only if model not modified + return !isGlobalModified(); } public boolean isEnabled() { ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/open/ContentOpen.java ===================================== @@ -339,7 +339,11 @@ public class ContentOpen { String prefix = ui.getModel().getPrefix(); log.info(String.format("%s Try to close content...", prefix)); ContentUIModelStates states = ui.getModel().getStates(); - boolean canQuit = states.canQuit(); + Boolean canQuit = states.canQuit(); + if (canQuit == null) { + // cancel + return Close.CANCEL; + } if (canQuit) { // simple close return Close.CLOSE; ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIModelStates.java ===================================== @@ -124,8 +124,14 @@ public class ContentTableUIModelStates<D extends DataDto, C extends ContainerChi } @Override - public boolean canQuit() { - return isReadingMode() || (getTableModel().isCanQuitEditingRow() && super.canQuit()); + public Boolean canQuit() { + if (isReadingMode()) { + return true; + } + if (!getTableModel().isCanQuitEditingRow()) { + return null; + } + return super.canQuit(); } public boolean isCanSaveRow() { ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUIModelStates.java ===================================== @@ -98,24 +98,6 @@ public abstract class ContentReferentialUIModelStates<D extends ReferentialDto, } } - @Override - public boolean canQuit() { - if (!isEnabled()) { - // model disabled, no check - return true; - } - if (!isEditing()) { - // model not editing, no check - return true; - } - if (isReadingMode()) { - // model in reading mode, no check - return true; - } - // can quit only if model not modified - return !isGlobalModified(); - } - public D getBeanToSave() { return getBean(); } ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/TripBatchUI.jaxx ===================================== @@ -123,7 +123,7 @@ <Table id='extraZone' fill='both' weightx='1' insets='0'> <row> <cell weighty='1'> - <BigTextEditor id="comment"/> + <BigTextEditor id="comment" title="observe.Common.logbookComment" styleClass="skipI18n"/> </cell> </row> </Table> ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripBatchSpi.java ===================================== @@ -24,6 +24,7 @@ package fr.ird.observe.entities.data.ps.common; import fr.ird.observe.dto.data.ps.localmarket.TripBatchDto; import fr.ird.observe.dto.form.Form; +import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.dto.referential.ps.localmarket.PackagingReference; import fr.ird.observe.entities.referential.common.Harbour; import fr.ird.observe.entities.referential.ps.localmarket.Packaging; @@ -42,6 +43,18 @@ public class TripBatchSpi extends GeneratedTripBatchSpi { form.getObject().setAvailablePackagings(availablePackaging); } + @Override + public void toDto(ReferentialLocale referentialLocale, Trip entity, TripBatchDto dto) { + super.toDto(referentialLocale, entity, dto); + dto.setComment(entity.getLogbookComment()); + } + + @Override + public void fromDto(ReferentialLocale referentialLocale, Trip entity, TripBatchDto dto) { + super.fromDto(referentialLocale, entity, dto); + entity.setLogbookComment(dto.getComment()); + } + protected LinkedHashSet<PackagingReference> getPackaging(ServiceContext context, Trip trip) { Harbour landingHarbour = trip.getLandingHarbour(); Date date = trip.getEndDate(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0826aaa00847bbc7803947ba… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0826aaa00847bbc7803947ba… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] Mauvaise persistence des lots au niveau des sondages - closes #2591
by Tony CHEMIT (＠tchemit) 04 Jan '23

04 Jan '23

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 49d90e71 by Tony Chemit at 2023-01-04T17:03:48+01:00 Mauvaise persistence des lots au niveau des sondages - closes #2591 - - - - - 1 changed file: - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/localmarket/SurveySpi.java Changes: ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/localmarket/SurveySpi.java ===================================== @@ -65,19 +65,19 @@ public class SurveySpi extends GeneratedSurveySpi { // Get all batch ids associated to this survey Set<String> newBatchIds = dto.getBatches().stream().map(BatchReference::getId).collect(Collectors.toSet()); - Collection<Batch> oldLocalmarketBatch = parent.getLocalmarketBatch(); - // If no more associated to this survey, remove association - oldLocalmarketBatch.stream().filter(b -> newBatchIds.contains(b.getTopiaId())).forEach(b -> b.setSurvey(null)); - if (newBatchIds.isEmpty() && dto.isPersisted()) { - // may be some have been removed ? - oldLocalmarketBatch.stream().filter(b -> b.getSurvey() != null && dto.getId().equals(b.getSurvey().getTopiaId())).forEach(b -> b.setSurvey(null)); + Collection<Batch> localmarketBatches = parent.getLocalmarketBatch(); + if (dto.isPersisted()) { + // Remove from batches survey if equals to this one + String surveyId = dto.getId(); + localmarketBatches.stream() + .filter(b -> b.getSurvey() != null && surveyId.equals(b.getSurvey().getTopiaId())) + .forEach(b -> b.setSurvey(null)); } if (needCopy) { fromDto(context, entity, dto); } // Set new association on batches associated to this survey - Collection<Batch> newLocalmarketBatch = parent.getLocalmarketBatch(); - newLocalmarketBatch.stream().filter(b -> newBatchIds.contains(b.getTopiaId())).forEach(b -> b.setSurvey(entity)); + localmarketBatches.stream().filter(b -> newBatchIds.contains(b.getTopiaId())).forEach(b -> b.setSurvey(entity)); super.onSave(context, parent, entity, dto, false); } // View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/49d90e71d88b41f2fcac5c9a9… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/49d90e71d88b41f2fcac5c9a9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Mauvaise persistence des lots au niveau des sondages - closes #2591
by Tony CHEMIT (＠tchemit) 04 Jan '23

04 Jan '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0826aaa0 by Tony Chemit at 2023-01-04T17:04:00+01:00 Mauvaise persistence des lots au niveau des sondages - closes #2591 - - - - - 1 changed file: - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/localmarket/SurveySpi.java Changes: ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/localmarket/SurveySpi.java ===================================== @@ -65,19 +65,19 @@ public class SurveySpi extends GeneratedSurveySpi { // Get all batch ids associated to this survey Set<String> newBatchIds = dto.getBatches().stream().map(BatchReference::getId).collect(Collectors.toSet()); - Collection<Batch> oldLocalmarketBatch = parent.getLocalmarketBatch(); - // If no more associated to this survey, remove association - oldLocalmarketBatch.stream().filter(b -> newBatchIds.contains(b.getTopiaId())).forEach(b -> b.setSurvey(null)); - if (newBatchIds.isEmpty() && dto.isPersisted()) { - // may be some have been removed ? - oldLocalmarketBatch.stream().filter(b -> b.getSurvey() != null && dto.getId().equals(b.getSurvey().getTopiaId())).forEach(b -> b.setSurvey(null)); + Collection<Batch> localmarketBatches = parent.getLocalmarketBatch(); + if (dto.isPersisted()) { + // Remove from batches survey if equals to this one + String surveyId = dto.getId(); + localmarketBatches.stream() + .filter(b -> b.getSurvey() != null && surveyId.equals(b.getSurvey().getTopiaId())) + .forEach(b -> b.setSurvey(null)); } if (needCopy) { fromDto(context, entity, dto); } // Set new association on batches associated to this survey - Collection<Batch> newLocalmarketBatch = parent.getLocalmarketBatch(); - newLocalmarketBatch.stream().filter(b -> newBatchIds.contains(b.getTopiaId())).forEach(b -> b.setSurvey(entity)); + localmarketBatches.stream().filter(b -> newBatchIds.contains(b.getTopiaId())).forEach(b -> b.setSurvey(entity)); super.onSave(context, parent, entity, dto, false); } // View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0826aaa00847bbc7803947ba4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0826aaa00847bbc7803947ba4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Amélioration du texte d'information quand on ne peut pas encore remplir le...
by Tony CHEMIT (＠tchemit) 04 Jan '23

04 Jan '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3afb61ea by Tony Chemit at 2023-01-04T16:07:48+01:00 Amélioration du texte d'information quand on ne peut pas encore remplir le marché local - closes #2586 - - - - - 1dff0c00 by Tony Chemit at 2023-01-04T16:07:52+01:00 Ajout sur le formulaire d'une information sur la saisie possible ou non du marché local à partir du port d'arrivée sélectionné - closes #2590 - - - - - 14 changed files: - client/datasource/editor/ps/src/main/i18n/getters/java.getter - client/datasource/editor/ps/src/main/i18n/templates/checkPsTripLocalMarketAcquisitionStatus_en_GB.ftl - client/datasource/editor/ps/src/main/i18n/templates/checkPsTripLocalMarketAcquisitionStatus_es_ES.ftl - client/datasource/editor/ps/src/main/i18n/templates/checkPsTripLocalMarketAcquisitionStatus_fr_FR.ftl - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/predicates/CheckTripLocalMarketAcquisitionStatus.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/predicates/CheckTripSupport.java - core/api/dto-decoration/src/main/i18n/getters/labels.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/i18nLabels.properties Changes: ===================================== client/datasource/editor/ps/src/main/i18n/getters/java.getter ===================================== @@ -6,6 +6,8 @@ observe.Common.whenArriving observe.Common.whenLeaving observe.data.Activity.comment2 observe.data.message.will.delete.sub.data +observe.data.ps.common.Trip.landingHarbour.localMarketNotPossible +observe.data.ps.common.Trip.landingHarbour.localMarketPossible observe.data.ps.dcp.FloatingObjectPreset.action.add observe.data.ps.dcp.FloatingObjectPreset.action.add.tip observe.data.ps.dcp.FloatingObjectPreset.add.title ===================================== client/datasource/editor/ps/src/main/i18n/templates/checkPsTripLocalMarketAcquisitionStatus_en_GB.ftl ===================================== @@ -20,23 +20,35 @@ <html> <body> - To be able to acquire data of type ${dtoLabel}, the trip form must first be completed: + To acquire ${dtoLabel} data, the trip form must first be completed: <ul> - <li>The Local market collection must be filled with a value that indicate presence of data</li> - <li>The Logbook and associated data tab must be properly filled</li> + <li>The landing harbour must be filled in</li> + <li>This harbour must have packaging reference data associated with it</li> + <li>The tab named Logbook and associated data must be properly filled in</li> + <li>The field named Local market collection must be filled in with a value that indicates existence of data</li> </ul> <hr/> - Click on Access to trip form to fill properly the form and save.. + Click on Access to trip form to fill in properly the form and save. -The Local market collection widget will be focused in the proper tab. + + If landing harbour is not filled in, +<ul> + <li>Its widget will be focused in the proper tab, to enable you to fill in it</li> + <li>Once the landing harbour is provided, you need to fill in the tab named Local market collection in the proper tab</li> +</ul> + + + If landing harbour is filled in, but doesn't have packaging reference data associated associated with it, you will not be able to acquire local market data. + +In other cases, the field named Local market collection is focused in the proper tab. - You can then enter the data. + You can then acquire ${dtoLabel} data. </body> </html> ===================================== client/datasource/editor/ps/src/main/i18n/templates/checkPsTripLocalMarketAcquisitionStatus_es_ES.ftl ===================================== @@ -21,23 +21,35 @@ <body> <h1>#TODO</h1> - To be able to acquire data of type ${dtoLabel}, the trip form must first be completed: + To acquire ${dtoLabel} data, the trip form must first be completed: <ul> - <li>The Local market collection must be filled with a value that indicate presence of data</li> - <li>The Logbook and associated data tab must be properly filled</li> + <li>The landing harbour must be filled in</li> + <li>This harbour must have packaging reference data associated with it</li> + <li>The tab named Logbook and associated data must be properly filled in</li> + <li>The field named Local market collection must be filled in with a value that indicates existence of data</li> </ul> <hr/> - Click on Access to trip form to fill properly the form and save.. + Click on Access to trip form to fill in properly the form and save. -The Local market collection widget will be focused in the proper tab. + + If landing harbour is not filled in, +<ul> + <li>Its widget will be focused in the proper tab, to enable you to fill in it</li> + <li>Once the landing harbour is provided, you need to fill in the tab named Local market collection in the proper tab</li> +</ul> + + + If landing harbour is filled in, but doesn't have packaging reference data associated associated with it, you will not be able to acquire local market data. + +In other cases, the field named Local market collection is focused in the proper tab. - You can then enter the data. + You can then acquire ${dtoLabel} data. </body> </html> ===================================== client/datasource/editor/ps/src/main/i18n/templates/checkPsTripLocalMarketAcquisitionStatus_fr_FR.ftl ===================================== @@ -23,18 +23,30 @@ Pour pouvoir créer une donnée de type ${dtoLabel}, le formulaire marée doit d'abord être complété : <ul> - <li>La valeur du champs Collecte du marché local doit être renseignée avec une valeur reflétant l'existence de données</li> + <li>Le port d'arrivée doit être renseigné</li> + <li>Ce port doit disposer d'un référentiel de conditionnements</li> <li>L'onglet Livre de bord et données associées doit être renseigné</li> + <li>Le champ Collecte du marché local doit être renseigné avec une valeur attestant de l'existence de données</li> </ul> <hr/> - Cliquer sur Accéder au formulaire marée pour compléter ces données et enregistrer. + Cliquez sur Accéder au formulaire marée pour compléter ces données et enregistrer. - - Vous serez redirigé vers l'onglet à renseigner et le champs Collecte du marché local sera sélectionné. + + + Si le port d'arrivée n'est pas renseigné : +<ul> + <li>Vous serez redirigé vers l'onglet « Caractéristiques générales », et le champs Port d'arrivée sera sélectionné pour vous permettre de le saisir.</li> + <li>Une fois celui-ci renseigné, il vous faudra aller renseigner le champs Collecte du marché local sur l'onglet Livre de bord et données associées</li> +</ul> + + + Si le port d'arrivée est renseigné mais que celui-ci ne dispose pas d'un référentiel de conditionnements, il ne sera pas possible de saisir des données de marché local. + +Si le port d'arrivée est renseigné et dispose d'un référentiel de conditionnements, vous serez directement redirigé vers l'onglet Livre de bord et données associées, et le champ Collecte du marché local sera sélectionné pour vous permettre de le saisir. - Vous pourrez ensuite saisir la donnée souhaitée. +Vous pourrez ensuite saisir les données du ${dtoLabel}. </body> </html> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.jaxx ===================================== @@ -113,6 +113,11 @@ <FilterableComboBox id='landingHarbour' genericType='HarbourReference'/> </cell> </row> + <row> + <cell anchor='west' columns="2"> + <JLabel id='landingHarbourMessage' styleClass="skipI18n"/> + </cell> + </row> <row> <cell anchor='west'> <JLabel id='homeIdLabel'/> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.jcss ===================================== @@ -24,6 +24,11 @@ enabled:{!states.isUpdatingMode() || bean.isRouteObsEmpty()}; } +#landingHarbourMessage { + icon:{states.getLandingHarbourMessageIcon(states.isLocalmarketPossible())}; + text:{states.getLandingHarbourMessage(states.isLocalmarketPossible())}; +} + #formsUrl { openLinkTip:"observe.data.ps.common.Trip.action.openLinkFormsUrl.tip"; } ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUIModelStates.java ===================================== @@ -41,8 +41,11 @@ import fr.ird.observe.dto.referential.ps.logbook.WellContentStatusReference; import fr.ird.observe.navigation.id.Project; import fr.ird.observe.services.ObserveServicesProvider; import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition; +import io.ultreia.java4all.i18n.I18n; import io.ultreia.java4all.util.Dates; +import org.nuiton.jaxx.validator.swing.SwingValidatorUtil; +import javax.swing.Icon; import java.beans.PropertyChangeEvent; import java.util.Date; import java.util.Objects; @@ -133,6 +136,20 @@ public class TripUIModelStates extends GeneratedTripUIModelStates { firePropertyChange(PROPERTY_LOCALMARKET_POSSIBLE, oldValue, localmarketPossible); } + public Icon getLandingHarbourMessageIcon(boolean localmarketPossible) { + if (localmarketPossible) { + return SwingValidatorUtil.getInfoIcon(); + } + return SwingValidatorUtil.getErrorIcon(); + } + + public String getLandingHarbourMessage(boolean localmarketPossible) { + if (localmarketPossible) { + return I18n.t("observe.data.ps.common.Trip.landingHarbour.localMarketPossible"); + } + return I18n.t("observe.data.ps.common.Trip.landingHarbour.localMarketNotPossible"); + } + public void setDefaultObservationValues(boolean reset) { TripDto bean = getBean(); if (reset) { ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/predicates/CheckTripLocalMarketAcquisitionStatus.java ===================================== @@ -45,7 +45,13 @@ import java.util.Set; public class CheckTripLocalMarketAcquisitionStatus extends CheckTripSupport<U, D> { public CheckTripLocalMarketAcquisitionStatus() { - super(Set.of(TripLocalmarketDto.class, TripBatchDto.class), TripReference::isLocalmarketEnabled, TripUI::getLogbookTab, TripUI::getLocalMarketAcquisitionStatus); + super(Set.of(TripLocalmarketDto.class, TripBatchDto.class), + TripReference::isLocalmarketEnabled, + TripUI::getLogbookTab, + TripUI::getLocalMarketAcquisitionStatus, + r -> r.getStates().isLocalmarketPossible(), + TripUI::getGeneralTab, + TripUI::getLandingHarbour); } @Override ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/predicates/CheckTripSupport.java ===================================== @@ -49,16 +49,42 @@ public abstract class CheckTripSupport e private final Predicate<TripReference> tripPredicate; private TripUINavigationNode tripNode; - public CheckTripSupport(Set<Class<? extends DataDto>> acceptedTypes, Predicate<TripReference> tripPredicate, Function<TripUI, TabInfo> getTab, Function<TripUI, FilterableComboBox<?>> getCombo) { + public CheckTripSupport(Set<Class<? extends DataDto>> acceptedTypes, + Predicate<TripReference> tripPredicate, + Function<TripUI, TabInfo> getTab, + Function<TripUI, FilterableComboBox<?>> getCombo) { + super(acceptedTypes, TripUI.class, target -> SwingUtilities.invokeLater(() -> applyStrategy(target, getTab, getCombo))); + this.tripPredicate = Objects.requireNonNull(tripPredicate); + } + + public CheckTripSupport(Set<Class<? extends DataDto>> acceptedTypes, + Predicate<TripReference> tripPredicate, + Function<TripUI, TabInfo> getTab, + Function<TripUI, FilterableComboBox<?>> getCombo, + Predicate<TripUI> tripPredicate2, + Function<TripUI, TabInfo> getTab2, + Function<TripUI, FilterableComboBox<?>> getCombo2) { super(acceptedTypes, TripUI.class, target -> SwingUtilities.invokeLater(() -> { - TabInfo tabInfo = getTab.apply(target); - target.selectTab(tabInfo); - FilterableComboBox<?> comboBox = getCombo.apply(target); - SwingUtilities.invokeLater(comboBox.getCombobox()::requestFocusInWindow); + if (tripPredicate2.test(target)) { + // the second predicate is ok, use the first behaviour + applyStrategy(target, getTab, getCombo); + } else { + // the second predicate is ko, use the second behaviour + applyStrategy(target, getTab2, getCombo2); + } })); this.tripPredicate = Objects.requireNonNull(tripPredicate); } + private static void applyStrategy(TripUI target, + Function<TripUI, TabInfo> getTab, + Function<TripUI, FilterableComboBox<?>> getCombo) { + TabInfo tabInfo = getTab.apply(target); + target.selectTab(tabInfo); + FilterableComboBox<?> comboBox = getCombo.apply(target); + SwingUtilities.invokeLater(comboBox.getCombobox()::requestFocusInWindow); + } + @Override public final boolean checkCanCreate(U source, Class<D> dtoType) { TripReference reference = (TripReference) getTripNode(source).getCapability().getReference(); ===================================== core/api/dto-decoration/src/main/i18n/getters/labels.getter ===================================== @@ -776,6 +776,9 @@ observe.data.ps.common.Trip.departureWellContentStatus observe.data.ps.common.Trip.fishingTime observe.data.ps.common.Trip.landingAcquisitionStatus observe.data.ps.common.Trip.landingAcquisitionStatusLabel.tip +observe.data.ps.common.Trip.landingHarbour.localMarketNotPossible +observe.data.ps.common.Trip.landingHarbour.localMarketPossible +observe.data.ps.common.Trip.landingHarbour.requiredForLocalMarket observe.data.ps.common.Trip.landingTotalWeight observe.data.ps.common.Trip.landingWellContentStatus observe.data.ps.common.Trip.localMarketAcquisitionStatusLabel.tip ===================================== core/services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -916,6 +916,9 @@ observe.data.ps.common.Trip.fishingTime=Fishing time (h) observe.data.ps.common.Trip.gearUseFeaturesStat=Count of vessel equipment observe.data.ps.common.Trip.landingAcquisitionStatus=Landing sheet collection observe.data.ps.common.Trip.landingAcquisitionStatusLabel.tip=Only choices that indicate existence of data allow acquisition for landing +observe.data.ps.common.Trip.landingHarbour.localMarketNotPossible=Local market data can not be acquired using this landing harbour +observe.data.ps.common.Trip.landingHarbour.localMarketPossible=Local market data can be acquired using this landing harbour +observe.data.ps.common.Trip.landingHarbour.requiredForLocalMarket=The landing harbour is required to acquire local market data observe.data.ps.common.Trip.landingStat=Count of landing observe.data.ps.common.Trip.landingTotalWeight=Landing total weight (t) observe.data.ps.common.Trip.landingWellContentStatus=Landing well content status ===================================== core/services/i18n/src/main/i18n/translations/services_es_ES.properties ===================================== @@ -916,6 +916,9 @@ observe.data.ps.common.Trip.fishingTime=Heures de peche \#TODO observe.data.ps.common.Trip.gearUseFeaturesStat=Count of vessel equipment observe.data.ps.common.Trip.landingAcquisitionStatus=Landing sheet collection \#TODO observe.data.ps.common.Trip.landingAcquisitionStatusLabel.tip=Only choices that indicate existence of data allow acquisition for landing +observe.data.ps.common.Trip.landingHarbour.localMarketNotPossible=Local market data can not be acquired using this landing harbour \#TODO +observe.data.ps.common.Trip.landingHarbour.localMarketPossible=Local market data can be acquired using this landing harbour \#TODO +observe.data.ps.common.Trip.landingHarbour.requiredForLocalMarket=The landing harbour is required to acquire local market data \#TODO observe.data.ps.common.Trip.landingStat=Count of landing observe.data.ps.common.Trip.landingTotalWeight=Total débarqué (en t) \#TODO observe.data.ps.common.Trip.landingWellContentStatus=État de remplissage des cuves après débarquement \#TODO ===================================== core/services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -916,6 +916,9 @@ observe.data.ps.common.Trip.fishingTime=Heures de pêche observe.data.ps.common.Trip.gearUseFeaturesStat=Nombre d'équipements observe.data.ps.common.Trip.landingAcquisitionStatus=Collecte du bon de débarquement observe.data.ps.common.Trip.landingAcquisitionStatusLabel.tip=Seuls les choix reflétant l'existence des données permettront la collecte du bon de débarquement +observe.data.ps.common.Trip.landingHarbour.localMarketNotPossible=Il n'est pas possible de saisir des données du marché local avec le port d'arrivée sélectionné +observe.data.ps.common.Trip.landingHarbour.localMarketPossible=Il est possible de saisir des données du marché local avec le port d'arrivée sélectionné +observe.data.ps.common.Trip.landingHarbour.requiredForLocalMarket=Il faut renseigner un port d'arrivée pour permettre la saisie des données du marché local observe.data.ps.common.Trip.landingStat=Nombre de débarquements observe.data.ps.common.Trip.landingTotalWeight=Total débarqué (en t) observe.data.ps.common.Trip.landingWellContentStatus=État de remplissage des cuves après débarquement ===================================== model/src/main/models/Observe/dto/class/i18nLabels.properties ===================================== @@ -56,7 +56,7 @@ data.ll.observation.Tdr=basket,branchline,deploymentEnd,deploymentStart,fishingE data.ll.observation.WeightMeasure=weight,weightMeasureType data.ps.common.GearUseFeatures=comment,gear,gearUseFeaturesMeasurement,number,usedInTrip data.ps.common.GearUseFeaturesMeasurement=gearCharacteristic,measurementValue -data.ps.common.Trip=advancedSamplingAcquisitionStatus,captain,departureHarbour,departureWellContentStatus,endDate,ersId,fishingTime,formsUrl,generalComment,landingAcquisitionStatus,landingHarbour,landingTotalWeight,landingWellContentStatus,localMarketAcquisitionStatus,localMarketSurveySamplingAcquisitionStatus,localMarketTotalWeight,localMarketWellsSamplingAcquisitionStatus,loch,logbookAcquisitionStatus,logbookComment,logbookDataEntryOperator,logbookDataQuality,observationsAcquisitionStatus,observationsComment,observationsDataEntryOperator,observationsDataQuality,observer,ocean,observationsProgram,logbookProgram,reportsUrl,routeLogbook,routeObs,startDate,targetWellsSamplingAcquisitionStatus,timeAtSea,vessel,generalTab,action.openLinkFormsUrl.tip,action.openLinkReportsUrl.tip,landingAcquisitionStatusLabel.tip,localMarketAcquisitionStatusLabel.tip,localMarketSurveySamplingAcquisitionStatusLabel.tip,localMarketWellsSamplingAcquisitionStatusLabel.tip,logbookAcquisitionStatusLabel.tip,logbookTab,mapTab,observationsAcquisitionStatusLabel.tip,observationsTab,targetWellsSamplingAcquisitionStatusLabel.tip,action.create,choice.go.to.trip,list.navigation.node,list.title,message.not.open,navigation.unsaved,observationsTab,title.can.not.create.trip.sub.data,list.title,type,title,root.list.message.none,logbookDataEntryOperator.validation.required,logbookDataQuality.validation.required,logbookProgram.validation.required,observationsDataEntryOperator.validation.required,observationsProgram.validation.required,observer.validation.required +data.ps.common.Trip=advancedSamplingAcquisitionStatus,captain,departureHarbour,departureWellContentStatus,endDate,ersId,fishingTime,formsUrl,generalComment,landingAcquisitionStatus,landingHarbour,landingTotalWeight,landingWellContentStatus,localMarketAcquisitionStatus,localMarketSurveySamplingAcquisitionStatus,localMarketTotalWeight,localMarketWellsSamplingAcquisitionStatus,loch,logbookAcquisitionStatus,logbookComment,logbookDataEntryOperator,logbookDataQuality,observationsAcquisitionStatus,observationsComment,observationsDataEntryOperator,observationsDataQuality,observer,ocean,observationsProgram,logbookProgram,reportsUrl,routeLogbook,routeObs,startDate,targetWellsSamplingAcquisitionStatus,timeAtSea,vessel,generalTab,action.openLinkFormsUrl.tip,action.openLinkReportsUrl.tip,landingAcquisitionStatusLabel.tip,localMarketAcquisitionStatusLabel.tip,localMarketSurveySamplingAcquisitionStatusLabel.tip,localMarketWellsSamplingAcquisitionStatusLabel.tip,logbookAcquisitionStatusLabel.tip,logbookTab,mapTab,observationsAcquisitionStatusLabel.tip,observationsTab,targetWellsSamplingAcquisitionStatusLabel.tip,action.create,choice.go.to.trip,list.navigation.node,list.title,message.not.open,navigation.unsaved,observationsTab,title.can.not.create.trip.sub.data,list.title,type,title,root.list.message.none,logbookDataEntryOperator.validation.required,logbookDataQuality.validation.required,logbookProgram.validation.required,observationsDataEntryOperator.validation.required,observationsProgram.validation.required,observer.validation.required,landingHarbour.localMarketPossible,landingHarbour.localMarketNotPossible,landingHarbour.requiredForLocalMarket data.ps.common.TripGearUseFeatures=gearUseFeatures data.ps.common.TripLocalmarket=localMarketAcquisitionStatus,localMarketSurveySamplingAcquisitionStatus,localMarketWellsSamplingAcquisitionStatus data.ps.common.TripLogbook=logbookAcquisitionStatus,targetWellsSamplingAcquisitionStatus View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/cd506c645324609f1a9a342e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/cd506c645324609f1a9a342e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] 2 commits: Amélioration du texte d'information quand on ne peut pas encore remplir le...
by Tony CHEMIT (＠tchemit) 04 Jan '23

04 Jan '23

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: fc4ee4b9 by Tony Chemit at 2023-01-04T15:11:19+01:00 Amélioration du texte d'information quand on ne peut pas encore remplir le marché local - closes #2586 - - - - - 6836cd1c by Tony Chemit at 2023-01-04T16:03:51+01:00 Ajout sur le formulaire d'une information sur la saisie possible ou non du marché local à partir du port d'arrivée sélectionné - closes #2590 - - - - - 14 changed files: - client/datasource/editor/ps/src/main/i18n/getters/java.getter - client/datasource/editor/ps/src/main/i18n/templates/checkPsTripLocalMarketAcquisitionStatus_en_GB.ftl - client/datasource/editor/ps/src/main/i18n/templates/checkPsTripLocalMarketAcquisitionStatus_es_ES.ftl - client/datasource/editor/ps/src/main/i18n/templates/checkPsTripLocalMarketAcquisitionStatus_fr_FR.ftl - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/predicates/CheckTripLocalMarketAcquisitionStatus.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/predicates/CheckTripSupport.java - core/api/dto-decoration/src/main/i18n/getters/labels.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/i18nLabels.properties Changes: ===================================== client/datasource/editor/ps/src/main/i18n/getters/java.getter ===================================== @@ -6,6 +6,8 @@ observe.Common.whenArriving observe.Common.whenLeaving observe.data.Activity.comment2 observe.data.message.will.delete.sub.data +observe.data.ps.common.Trip.landingHarbour.localMarketNotPossible +observe.data.ps.common.Trip.landingHarbour.localMarketPossible observe.data.ps.dcp.FloatingObjectPreset.action.add observe.data.ps.dcp.FloatingObjectPreset.action.add.tip observe.data.ps.dcp.FloatingObjectPreset.add.title ===================================== client/datasource/editor/ps/src/main/i18n/templates/checkPsTripLocalMarketAcquisitionStatus_en_GB.ftl ===================================== @@ -20,23 +20,35 @@ <html> <body> - To be able to acquire data of type ${dtoLabel}, the trip form must first be completed: + To acquire ${dtoLabel} data, the trip form must first be completed: <ul> - <li>The Local market collection must be filled with a value that indicate presence of data</li> - <li>The Logbook and associated data tab must be properly filled</li> + <li>The landing harbour must be filled in</li> + <li>This harbour must have packaging reference data associated with it</li> + <li>The tab named Logbook and associated data must be properly filled in</li> + <li>The field named Local market collection must be filled in with a value that indicates existence of data</li> </ul> <hr/> - Click on Access to trip form to fill properly the form and save.. + Click on Access to trip form to fill in properly the form and save. -The Local market collection widget will be focused in the proper tab. + + If landing harbour is not filled in, +<ul> + <li>Its widget will be focused in the proper tab, to enable you to fill in it</li> + <li>Once the landing harbour is provided, you need to fill in the tab named Local market collection in the proper tab</li> +</ul> + + + If landing harbour is filled in, but doesn't have packaging reference data associated associated with it, you will not be able to acquire local market data. + +In other cases, the field named Local market collection is focused in the proper tab. - You can then enter the data. + You can then acquire ${dtoLabel} data. </body> </html> ===================================== client/datasource/editor/ps/src/main/i18n/templates/checkPsTripLocalMarketAcquisitionStatus_es_ES.ftl ===================================== @@ -21,23 +21,35 @@ <body> <h1>#TODO</h1> - To be able to acquire data of type ${dtoLabel}, the trip form must first be completed: + To acquire ${dtoLabel} data, the trip form must first be completed: <ul> - <li>The Local market collection must be filled with a value that indicate presence of data</li> - <li>The Logbook and associated data tab must be properly filled</li> + <li>The landing harbour must be filled in</li> + <li>This harbour must have packaging reference data associated with it</li> + <li>The tab named Logbook and associated data must be properly filled in</li> + <li>The field named Local market collection must be filled in with a value that indicates existence of data</li> </ul> <hr/> - Click on Access to trip form to fill properly the form and save.. + Click on Access to trip form to fill in properly the form and save. -The Local market collection widget will be focused in the proper tab. + + If landing harbour is not filled in, +<ul> + <li>Its widget will be focused in the proper tab, to enable you to fill in it</li> + <li>Once the landing harbour is provided, you need to fill in the tab named Local market collection in the proper tab</li> +</ul> + + + If landing harbour is filled in, but doesn't have packaging reference data associated associated with it, you will not be able to acquire local market data. + +In other cases, the field named Local market collection is focused in the proper tab. - You can then enter the data. + You can then acquire ${dtoLabel} data. </body> </html> ===================================== client/datasource/editor/ps/src/main/i18n/templates/checkPsTripLocalMarketAcquisitionStatus_fr_FR.ftl ===================================== @@ -23,18 +23,30 @@ Pour pouvoir créer une donnée de type ${dtoLabel}, le formulaire marée doit d'abord être complété : <ul> - <li>La valeur du champs Collecte du marché local doit être renseignée avec une valeur reflétant l'existence de données</li> + <li>Le port d'arrivée doit être renseigné</li> + <li>Ce port doit disposer d'un référentiel de conditionnements</li> <li>L'onglet Livre de bord et données associées doit être renseigné</li> + <li>Le champ Collecte du marché local doit être renseigné avec une valeur attestant de l'existence de données</li> </ul> <hr/> - Cliquer sur Accéder au formulaire marée pour compléter ces données et enregistrer. + Cliquez sur Accéder au formulaire marée pour compléter ces données et enregistrer. - - Vous serez redirigé vers l'onglet à renseigner et le champs Collecte du marché local sera sélectionné. + + + Si le port d'arrivée n'est pas renseigné : +<ul> + <li>Vous serez redirigé vers l'onglet « Caractéristiques générales », et le champs Port d'arrivée sera sélectionné pour vous permettre de le saisir.</li> + <li>Une fois celui-ci renseigné, il vous faudra aller renseigner le champs Collecte du marché local sur l'onglet Livre de bord et données associées</li> +</ul> + + + Si le port d'arrivée est renseigné mais que celui-ci ne dispose pas d'un référentiel de conditionnements, il ne sera pas possible de saisir des données de marché local. + +Si le port d'arrivée est renseigné et dispose d'un référentiel de conditionnements, vous serez directement redirigé vers l'onglet Livre de bord et données associées, et le champ Collecte du marché local sera sélectionné pour vous permettre de le saisir. - Vous pourrez ensuite saisir la donnée souhaitée. +Vous pourrez ensuite saisir les données du ${dtoLabel}. </body> </html> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.jaxx ===================================== @@ -113,6 +113,11 @@ <FilterableComboBox id='landingHarbour' genericType='HarbourReference'/> </cell> </row> + <row> + <cell anchor='west' columns="2"> + <JLabel id='landingHarbourMessage' styleClass="skipI18n"/> + </cell> + </row> <row> <cell anchor='west'> <JLabel id='homeIdLabel'/> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.jcss ===================================== @@ -24,6 +24,11 @@ enabled:{!states.isUpdatingMode() || bean.isRouteObsEmpty()}; } +#landingHarbourMessage { + icon:{states.getLandingHarbourMessageIcon(states.isLocalmarketPossible())}; + text:{states.getLandingHarbourMessage(states.isLocalmarketPossible())}; +} + #formsUrl { openLinkTip:"observe.data.ps.common.Trip.action.openLinkFormsUrl.tip"; } ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUIModelStates.java ===================================== @@ -41,8 +41,11 @@ import fr.ird.observe.dto.referential.ps.logbook.WellContentStatusReference; import fr.ird.observe.navigation.id.Project; import fr.ird.observe.services.ObserveServicesProvider; import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition; +import io.ultreia.java4all.i18n.I18n; import io.ultreia.java4all.util.Dates; +import org.nuiton.jaxx.validator.swing.SwingValidatorUtil; +import javax.swing.Icon; import java.beans.PropertyChangeEvent; import java.util.Date; import java.util.Objects; @@ -133,6 +136,20 @@ public class TripUIModelStates extends GeneratedTripUIModelStates { firePropertyChange(PROPERTY_LOCALMARKET_POSSIBLE, oldValue, localmarketPossible); } + public Icon getLandingHarbourMessageIcon(boolean localmarketPossible) { + if (localmarketPossible) { + return SwingValidatorUtil.getInfoIcon(); + } + return SwingValidatorUtil.getErrorIcon(); + } + + public String getLandingHarbourMessage(boolean localmarketPossible) { + if (localmarketPossible) { + return I18n.t("observe.data.ps.common.Trip.landingHarbour.localMarketPossible"); + } + return I18n.t("observe.data.ps.common.Trip.landingHarbour.localMarketNotPossible"); + } + public void setDefaultObservationValues(boolean reset) { TripDto bean = getBean(); if (reset) { ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/predicates/CheckTripLocalMarketAcquisitionStatus.java ===================================== @@ -45,7 +45,13 @@ import java.util.Set; public class CheckTripLocalMarketAcquisitionStatus extends CheckTripSupport<U, D> { public CheckTripLocalMarketAcquisitionStatus() { - super(Set.of(TripLocalmarketDto.class, TripBatchDto.class), TripReference::isLocalmarketEnabled, TripUI::getLogbookTab, TripUI::getLocalMarketAcquisitionStatus); + super(Set.of(TripLocalmarketDto.class, TripBatchDto.class), + TripReference::isLocalmarketEnabled, + TripUI::getLogbookTab, + TripUI::getLocalMarketAcquisitionStatus, + r -> r.getStates().isLocalmarketPossible(), + TripUI::getGeneralTab, + TripUI::getLandingHarbour); } @Override ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/predicates/CheckTripSupport.java ===================================== @@ -49,16 +49,42 @@ public abstract class CheckTripSupport e private final Predicate<TripReference> tripPredicate; private TripUINavigationNode tripNode; - public CheckTripSupport(Set<Class<? extends DataDto>> acceptedTypes, Predicate<TripReference> tripPredicate, Function<TripUI, TabInfo> getTab, Function<TripUI, FilterableComboBox<?>> getCombo) { + public CheckTripSupport(Set<Class<? extends DataDto>> acceptedTypes, + Predicate<TripReference> tripPredicate, + Function<TripUI, TabInfo> getTab, + Function<TripUI, FilterableComboBox<?>> getCombo) { + super(acceptedTypes, TripUI.class, target -> SwingUtilities.invokeLater(() -> applyStrategy(target, getTab, getCombo))); + this.tripPredicate = Objects.requireNonNull(tripPredicate); + } + + public CheckTripSupport(Set<Class<? extends DataDto>> acceptedTypes, + Predicate<TripReference> tripPredicate, + Function<TripUI, TabInfo> getTab, + Function<TripUI, FilterableComboBox<?>> getCombo, + Predicate<TripUI> tripPredicate2, + Function<TripUI, TabInfo> getTab2, + Function<TripUI, FilterableComboBox<?>> getCombo2) { super(acceptedTypes, TripUI.class, target -> SwingUtilities.invokeLater(() -> { - TabInfo tabInfo = getTab.apply(target); - target.selectTab(tabInfo); - FilterableComboBox<?> comboBox = getCombo.apply(target); - SwingUtilities.invokeLater(comboBox.getCombobox()::requestFocusInWindow); + if (tripPredicate2.test(target)) { + // the second predicate is ok, use the first behaviour + applyStrategy(target, getTab, getCombo); + } else { + // the second predicate is ko, use the second behaviour + applyStrategy(target, getTab2, getCombo2); + } })); this.tripPredicate = Objects.requireNonNull(tripPredicate); } + private static void applyStrategy(TripUI target, + Function<TripUI, TabInfo> getTab, + Function<TripUI, FilterableComboBox<?>> getCombo) { + TabInfo tabInfo = getTab.apply(target); + target.selectTab(tabInfo); + FilterableComboBox<?> comboBox = getCombo.apply(target); + SwingUtilities.invokeLater(comboBox.getCombobox()::requestFocusInWindow); + } + @Override public final boolean checkCanCreate(U source, Class<D> dtoType) { TripReference reference = (TripReference) getTripNode(source).getCapability().getReference(); ===================================== core/api/dto-decoration/src/main/i18n/getters/labels.getter ===================================== @@ -776,6 +776,9 @@ observe.data.ps.common.Trip.departureWellContentStatus observe.data.ps.common.Trip.fishingTime observe.data.ps.common.Trip.landingAcquisitionStatus observe.data.ps.common.Trip.landingAcquisitionStatusLabel.tip +observe.data.ps.common.Trip.landingHarbour.localMarketNotPossible +observe.data.ps.common.Trip.landingHarbour.localMarketPossible +observe.data.ps.common.Trip.landingHarbour.requiredForLocalMarket observe.data.ps.common.Trip.landingTotalWeight observe.data.ps.common.Trip.landingWellContentStatus observe.data.ps.common.Trip.localMarketAcquisitionStatusLabel.tip ===================================== core/services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -916,6 +916,9 @@ observe.data.ps.common.Trip.fishingTime=Fishing time (h) observe.data.ps.common.Trip.gearUseFeaturesStat=Count of vessel equipment observe.data.ps.common.Trip.landingAcquisitionStatus=Landing sheet collection observe.data.ps.common.Trip.landingAcquisitionStatusLabel.tip=Only choices that indicate existence of data allow acquisition for landing +observe.data.ps.common.Trip.landingHarbour.localMarketNotPossible=Local market data can not be acquired using this landing harbour +observe.data.ps.common.Trip.landingHarbour.localMarketPossible=Local market data can be acquired using this landing harbour +observe.data.ps.common.Trip.landingHarbour.requiredForLocalMarket=The landing harbour is required to acquire local market data observe.data.ps.common.Trip.landingStat=Count of landing observe.data.ps.common.Trip.landingTotalWeight=Landing total weight (t) observe.data.ps.common.Trip.landingWellContentStatus=Landing well content status ===================================== core/services/i18n/src/main/i18n/translations/services_es_ES.properties ===================================== @@ -916,6 +916,9 @@ observe.data.ps.common.Trip.fishingTime=Heures de peche \#TODO observe.data.ps.common.Trip.gearUseFeaturesStat=Count of vessel equipment observe.data.ps.common.Trip.landingAcquisitionStatus=Landing sheet collection \#TODO observe.data.ps.common.Trip.landingAcquisitionStatusLabel.tip=Only choices that indicate existence of data allow acquisition for landing +observe.data.ps.common.Trip.landingHarbour.localMarketNotPossible=Local market data can not be acquired using this landing harbour \#TODO +observe.data.ps.common.Trip.landingHarbour.localMarketPossible=Local market data can be acquired using this landing harbour \#TODO +observe.data.ps.common.Trip.landingHarbour.requiredForLocalMarket=The landing harbour is required to acquire local market data \#TODO observe.data.ps.common.Trip.landingStat=Count of landing observe.data.ps.common.Trip.landingTotalWeight=Total débarqué (en t) \#TODO observe.data.ps.common.Trip.landingWellContentStatus=État de remplissage des cuves après débarquement \#TODO ===================================== core/services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -916,6 +916,9 @@ observe.data.ps.common.Trip.fishingTime=Heures de pêche observe.data.ps.common.Trip.gearUseFeaturesStat=Nombre d'équipements observe.data.ps.common.Trip.landingAcquisitionStatus=Collecte du bon de débarquement observe.data.ps.common.Trip.landingAcquisitionStatusLabel.tip=Seuls les choix reflétant l'existence des données permettront la collecte du bon de débarquement +observe.data.ps.common.Trip.landingHarbour.localMarketNotPossible=Il n'est pas possible de saisir des données du marché local avec le port d'arrivée sélectionné +observe.data.ps.common.Trip.landingHarbour.localMarketPossible=Il est possible de saisir des données du marché local avec le port d'arrivée sélectionné +observe.data.ps.common.Trip.landingHarbour.requiredForLocalMarket=Il faut renseigner un port d'arrivée pour permettre la saisie des données du marché local observe.data.ps.common.Trip.landingStat=Nombre de débarquements observe.data.ps.common.Trip.landingTotalWeight=Total débarqué (en t) observe.data.ps.common.Trip.landingWellContentStatus=État de remplissage des cuves après débarquement ===================================== model/src/main/models/Observe/dto/class/i18nLabels.properties ===================================== @@ -56,7 +56,7 @@ data.ll.observation.Tdr=basket,branchline,deploymentEnd,deploymentStart,fishingE data.ll.observation.WeightMeasure=weight,weightMeasureType data.ps.common.GearUseFeatures=comment,gear,gearUseFeaturesMeasurement,number,usedInTrip data.ps.common.GearUseFeaturesMeasurement=gearCharacteristic,measurementValue -data.ps.common.Trip=advancedSamplingAcquisitionStatus,captain,departureHarbour,departureWellContentStatus,endDate,ersId,fishingTime,formsUrl,generalComment,landingAcquisitionStatus,landingHarbour,landingTotalWeight,landingWellContentStatus,localMarketAcquisitionStatus,localMarketSurveySamplingAcquisitionStatus,localMarketTotalWeight,localMarketWellsSamplingAcquisitionStatus,loch,logbookAcquisitionStatus,logbookComment,logbookDataEntryOperator,logbookDataQuality,observationsAcquisitionStatus,observationsComment,observationsDataEntryOperator,observationsDataQuality,observer,ocean,observationsProgram,logbookProgram,reportsUrl,routeLogbook,routeObs,startDate,targetWellsSamplingAcquisitionStatus,timeAtSea,vessel,generalTab,action.openLinkFormsUrl.tip,action.openLinkReportsUrl.tip,landingAcquisitionStatusLabel.tip,localMarketAcquisitionStatusLabel.tip,localMarketSurveySamplingAcquisitionStatusLabel.tip,localMarketWellsSamplingAcquisitionStatusLabel.tip,logbookAcquisitionStatusLabel.tip,logbookTab,mapTab,observationsAcquisitionStatusLabel.tip,observationsTab,targetWellsSamplingAcquisitionStatusLabel.tip,action.create,choice.go.to.trip,list.navigation.node,list.title,message.not.open,navigation.unsaved,observationsTab,title.can.not.create.trip.sub.data,list.title,type,title,root.list.message.none,logbookDataEntryOperator.validation.required,logbookDataQuality.validation.required,logbookProgram.validation.required,observationsDataEntryOperator.validation.required,observationsProgram.validation.required,observer.validation.required +data.ps.common.Trip=advancedSamplingAcquisitionStatus,captain,departureHarbour,departureWellContentStatus,endDate,ersId,fishingTime,formsUrl,generalComment,landingAcquisitionStatus,landingHarbour,landingTotalWeight,landingWellContentStatus,localMarketAcquisitionStatus,localMarketSurveySamplingAcquisitionStatus,localMarketTotalWeight,localMarketWellsSamplingAcquisitionStatus,loch,logbookAcquisitionStatus,logbookComment,logbookDataEntryOperator,logbookDataQuality,observationsAcquisitionStatus,observationsComment,observationsDataEntryOperator,observationsDataQuality,observer,ocean,observationsProgram,logbookProgram,reportsUrl,routeLogbook,routeObs,startDate,targetWellsSamplingAcquisitionStatus,timeAtSea,vessel,generalTab,action.openLinkFormsUrl.tip,action.openLinkReportsUrl.tip,landingAcquisitionStatusLabel.tip,localMarketAcquisitionStatusLabel.tip,localMarketSurveySamplingAcquisitionStatusLabel.tip,localMarketWellsSamplingAcquisitionStatusLabel.tip,logbookAcquisitionStatusLabel.tip,logbookTab,mapTab,observationsAcquisitionStatusLabel.tip,observationsTab,targetWellsSamplingAcquisitionStatusLabel.tip,action.create,choice.go.to.trip,list.navigation.node,list.title,message.not.open,navigation.unsaved,observationsTab,title.can.not.create.trip.sub.data,list.title,type,title,root.list.message.none,logbookDataEntryOperator.validation.required,logbookDataQuality.validation.required,logbookProgram.validation.required,observationsDataEntryOperator.validation.required,observationsProgram.validation.required,observer.validation.required,landingHarbour.localMarketPossible,landingHarbour.localMarketNotPossible,landingHarbour.requiredForLocalMarket data.ps.common.TripGearUseFeatures=gearUseFeatures data.ps.common.TripLocalmarket=localMarketAcquisitionStatus,localMarketSurveySamplingAcquisitionStatus,localMarketWellsSamplingAcquisitionStatus data.ps.common.TripLogbook=logbookAcquisitionStatus,targetWellsSamplingAcquisitionStatus View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ba70fbc5555f2f90d95de241… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ba70fbc5555f2f90d95de241… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] Amélioration du texte d'information quand on ne peut pas encore remplir le...
by Tony CHEMIT (＠tchemit) 04 Jan '23

04 Jan '23

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: ba70fbc5 by Tony Chemit at 2023-01-04T14:13:55+01:00 Amélioration du texte d'information quand on ne peut pas encore remplir le marché local - closes #2586 - - - - - 5 changed files: - client/datasource/editor/ps/src/main/i18n/templates/checkPsTripLocalMarketAcquisitionStatus_en_GB.ftl - client/datasource/editor/ps/src/main/i18n/templates/checkPsTripLocalMarketAcquisitionStatus_es_ES.ftl - client/datasource/editor/ps/src/main/i18n/templates/checkPsTripLocalMarketAcquisitionStatus_fr_FR.ftl - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/predicates/CheckTripLocalMarketAcquisitionStatus.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/predicates/CheckTripSupport.java Changes: ===================================== client/datasource/editor/ps/src/main/i18n/templates/checkPsTripLocalMarketAcquisitionStatus_en_GB.ftl ===================================== @@ -23,6 +23,7 @@ To be able to acquire data of type ${dtoLabel}, the trip form must first be completed: <ul> + <li>The landing harbour must be filled (with a packaging referential filled)</li> <li>The Local market collection must be filled with a value that indicate presence of data</li> <li>The Logbook and associated data tab must be properly filled</li> </ul> @@ -32,7 +33,17 @@ Click on Access to trip form to fill properly the form and save.. -The Local market collection widget will be focused in the proper tab. + + If landing harbour is not filled, + <ul> + <li>his widget will be focused in the proper tab</li> + <li>once the landing harbour filled (with a packaging referential filled, you will need to fill the Local market collection in the proper tab</li> +</ul> + + + If landing harbour is filled, but with no packaging referential filled, you will not be able to add local market data. + +In other cases, the Local market collection widget will be focused in the proper tab. ===================================== client/datasource/editor/ps/src/main/i18n/templates/checkPsTripLocalMarketAcquisitionStatus_es_ES.ftl ===================================== @@ -24,6 +24,7 @@ To be able to acquire data of type ${dtoLabel}, the trip form must first be completed: <ul> + <li>The landing harbour must be filled (with a packaging referential filled)</li> <li>The Local market collection must be filled with a value that indicate presence of data</li> <li>The Logbook and associated data tab must be properly filled</li> </ul> @@ -33,7 +34,17 @@ Click on Access to trip form to fill properly the form and save.. -The Local market collection widget will be focused in the proper tab. + + If landing harbour is not filled, +<ul> + <li>his widget will be focused in the proper tab</li> + <li>once the landing harbour filled (with a packaging referential filled, you will need to fill the Local market collection in the proper tab</li> +</ul> + + + If landing harbour is filled, but with no packaging referential filled, you will not be able to add local market data. + +In other cases, the Local market collection widget will be focused in the proper tab. ===================================== client/datasource/editor/ps/src/main/i18n/templates/checkPsTripLocalMarketAcquisitionStatus_fr_FR.ftl ===================================== @@ -23,6 +23,7 @@ Pour pouvoir créer une donnée de type ${dtoLabel}, le formulaire marée doit d'abord être complété : <ul> + <li>Le port d'arrivée doit être renseigné (avec un référentiel de conditionnements remplis)</li> <li>La valeur du champs Collecte du marché local doit être renseignée avec une valeur reflétant l'existence de données</li> <li>L'onglet Livre de bord et données associées doit être renseigné</li> </ul> @@ -32,7 +33,17 @@ Cliquer sur Accéder au formulaire marée pour compléter ces données et enregistrer. - Vous serez redirigé vers l'onglet à renseigner et le champs Collecte du marché local sera sélectionné. + + Si le port d'arrivée n'est pas renseigné, + <ul> + <li>vous serez redirigé vers l'onglet « général » et le champs Port d'arrivée sera sélectionné.</li> + <li>une fois celui-ci renseigné (avec un référentiel de conditionnements remplis), il vous faudra aller renseigner le champs Collecte du marché local dans l'onglet dédié</li> +</ul> + + + Si le port d'arrivée est renseigné mais que celui-ci ne possède pas de référentiel de conditionnements remplis, il n'est pas possible de saisir des données du marché local. + +Si le port d'arrivée est renseigné (avec un référentiel de conditionnements remplis), vous serez redirigé vers l'onglet à renseigner et le champs Collecte du marché local sera sélectionné. Vous pourrez ensuite saisir la donnée souhaitée. ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/predicates/CheckTripLocalMarketAcquisitionStatus.java ===================================== @@ -45,7 +45,13 @@ import java.util.Set; public class CheckTripLocalMarketAcquisitionStatus extends CheckTripSupport<U, D> { public CheckTripLocalMarketAcquisitionStatus() { - super(Set.of(TripLocalmarketDto.class, TripBatchDto.class), TripReference::isLocalmarketEnabled, TripUI::getLogbookTab, TripUI::getLocalMarketAcquisitionStatus); + super(Set.of(TripLocalmarketDto.class, TripBatchDto.class), + TripReference::isLocalmarketEnabled, + TripUI::getLogbookTab, + TripUI::getLocalMarketAcquisitionStatus, + r -> r.getStates().isLocalmarketPossible(), + TripUI::getGeneralTab, + TripUI::getLandingHarbour); } @Override ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/predicates/CheckTripSupport.java ===================================== @@ -49,16 +49,42 @@ public abstract class CheckTripSupport e private final Predicate<TripReference> tripPredicate; private TripUINavigationNode tripNode; - public CheckTripSupport(Set<Class<? extends DataDto>> acceptedTypes, Predicate<TripReference> tripPredicate, Function<TripUI, TabInfo> getTab, Function<TripUI, FilterableComboBox<?>> getCombo) { + public CheckTripSupport(Set<Class<? extends DataDto>> acceptedTypes, + Predicate<TripReference> tripPredicate, + Function<TripUI, TabInfo> getTab, + Function<TripUI, FilterableComboBox<?>> getCombo) { + super(acceptedTypes, TripUI.class, target -> SwingUtilities.invokeLater(() -> applyStrategy(target, getTab, getCombo))); + this.tripPredicate = Objects.requireNonNull(tripPredicate); + } + + public CheckTripSupport(Set<Class<? extends DataDto>> acceptedTypes, + Predicate<TripReference> tripPredicate, + Function<TripUI, TabInfo> getTab, + Function<TripUI, FilterableComboBox<?>> getCombo, + Predicate<TripUI> tripPredicate2, + Function<TripUI, TabInfo> getTab2, + Function<TripUI, FilterableComboBox<?>> getCombo2) { super(acceptedTypes, TripUI.class, target -> SwingUtilities.invokeLater(() -> { - TabInfo tabInfo = getTab.apply(target); - target.selectTab(tabInfo); - FilterableComboBox<?> comboBox = getCombo.apply(target); - SwingUtilities.invokeLater(comboBox.getCombobox()::requestFocusInWindow); + if (tripPredicate2.test(target)) { + // the second predicate is ok, use the first behaviour + applyStrategy(target, getTab, getCombo); + } else { + // the second predicate is ko, use the second behaviour + applyStrategy(target, getTab2, getCombo2); + } })); this.tripPredicate = Objects.requireNonNull(tripPredicate); } + private static void applyStrategy(TripUI target, + Function<TripUI, TabInfo> getTab, + Function<TripUI, FilterableComboBox<?>> getCombo) { + TabInfo tabInfo = getTab.apply(target); + target.selectTab(tabInfo); + FilterableComboBox<?> comboBox = getCombo.apply(target); + SwingUtilities.invokeLater(comboBox.getCombobox()::requestFocusInWindow); + } + @Override public final boolean checkCanCreate(U source, Class<D> dtoType) { TripReference reference = (TripReference) getTripNode(source).getCapability().getReference(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/ba70fbc5555f2f90d95de241e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/ba70fbc5555f2f90d95de241e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] update pom
by Tony CHEMIT (＠tchemit) 03 Jan '23

03 Jan '23

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 1cec9150 by Tony Chemit at 2023-01-03T19:37:33+01:00 update pom - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2022.102</version> + <version>2023.1</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/1cec915024d557475bf98eda2… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/1cec915024d557475bf98eda2… You're receiving this email because of your account on gitlab.com.

1 0