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

[Git][ultreiaio/ird-observe][develop-9.0.x] 6 commits: Consolidation - amélioration API
by Tony CHEMIT (＠tchemit) 12 Mar '23

12 Mar '23

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 90e393c7 by Tony Chemit at 2023-03-12T14:43:23+01:00 Consolidation - amélioration API - - - - - 8e7d4709 by Tony Chemit at 2023-03-12T14:43:23+01:00 Consolidation - amélioration API Dcp - - - - - ed7e96aa by Tony Chemit at 2023-03-12T14:43:23+01:00 Consolidation - renommage SampleConsolidateXXX en SampleMeasureConsolidateXXX Consolidation - ajout de SetConsolidateActions - - - - - fff06549 by Tony Chemit at 2023-03-12T14:43:23+01:00 Consolidation - ajout consolidation pour les logbook - - - - - a337110b by Tony Chemit at 2023-03-12T14:45:10+01:00 Ajout d'une documentation sur la consolidation - Closes #2642 - - - - - fde6973c by Tony Chemit at 2023-03-12T14:46:01+01:00 Remove javadoc from site reports (not ready to use it) - - - - - 30 changed files: - .gitignore - client/datasource/actions/src/main/i18n/getters/java.getter - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - 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-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/common/TripConsolidateResult.java - + core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/dcp/CleanComputedValuesAction.java - core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/dcp/ComputeBiodegradableConsolidateAction.java - core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/dcp/ComputeNonEntanglingConsolidateAction.java - core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/dcp/ComputeSimplifiedObjectTypeConsolidateAction.java - core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/dcp/FloatingObjectConsolidateAction.java - core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/dcp/FloatingObjectConsolidateContextSupport.java - core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/dcp/FloatingObjectConsolidateEngineSupport.java - core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/dcp/FloatingObjectConsolidateRequestSupport.java - core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/localmarket/BatchConsolidateActions.java - + core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/ActivityConsolidateResult.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/FloatingObjectAdapter.java → core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/ActivityConsolidateResultBuilder.java - core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/FloatingObjectActions.java → core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/FloatingObjectConsolidateActions.java - core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/FloatingObjectConsolidateEngine.java - core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/observation/FloatingObjectActions.java → core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/observation/FloatingObjectConsolidateActions.java - core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/observation/FloatingObjectConsolidateEngine.java - core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/common/TripConsolidateEngine.java - + core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/ActivityConsolidateContext.java - + core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/ActivityConsolidateEngine.java - core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/observation/ActivityConsolidateContext.java - core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/observation/CatchConsolidateActions.java - core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/observation/SampleConsolidateActions.java → core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/observation/SampleMeasureConsolidateActions.java - core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/observation/SampleConsolidateContext.java → core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/observation/SampleMeasureConsolidateContext.java - core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/observation/SampleConsolidateEngine.java → core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/observation/SampleMeasureConsolidateEngine.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e4ecc3d7316fc997050d9dea… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e4ecc3d7316fc997050d9dea… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] 2 commits: update pom
by Tony CHEMIT (＠tchemit) 10 Mar '23

10 Mar '23

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: ee52baba by Tony Chemit at 2023-03-10T18:51:38+01:00 update pom - - - - - e4ecc3d7 by Tony Chemit at 2023-03-10T20:30:54+01:00 Problème de sérialisation sur le retour de la consolidation en mode serveur - Closes #2641 - - - - - 3 changed files: - core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/observation/ActivityConsolidateEngine.java - pom.xml - toolkit/api/src/main/java/fr/ird/observe/dto/ToolkitIdModifications.java Changes: ===================================== core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/observation/ActivityConsolidateEngine.java ===================================== @@ -100,8 +100,10 @@ public class ActivityConsolidateEngine { if (r.withWarnings()) { log.info(String.format("%s Found some warnings on activity: %s - %s", activityPrefix, activity.getTopiaId(), r.getActivityLabel())); } - - + if (r.getCatchModifications() != null) { + // Replace in modifications any entity by his id (only necessary for catches modifications) + r.getCatchModifications().forEach(ToolkitIdModifications::replaceToolkitIdReferencesById); + } }); return result; } catch (Exception e) { ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2023.11</version> + <version>2023.12</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> @@ -128,7 +128,6 @@  <lib.version.hsqldb>2.7.0</lib.version.hsqldb>  - <lib.version.java4all.java-lang>2.0.5</lib.version.java4all.java-lang>  <license.licenseName>gpl_v3</license.licenseName> <license.organizationName>IRD, Ultreia.io</license.organizationName> ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/ToolkitIdModifications.java ===================================== @@ -79,4 +79,15 @@ public class ToolkitIdModifications extends JavaBeanModifications implements Jso public int warningsCount() { return getWarnings() == null ? 0 : getWarnings().size(); } + + public void replaceToolkitIdReferencesById() { + for (JavaBeanPropertyModification modification : getModifications()) { + if (modification.getOldValue() instanceof ToolkitId) { + modification.setOldValue(((ToolkitId) modification.getOldValue()).getTopiaId()); + } + if (modification.getNewValue() instanceof ToolkitId) { + modification.setNewValue(((ToolkitId) modification.getNewValue()).getTopiaId()); + } + } + } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ca00c3d358414d6fb1afefcb… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ca00c3d358414d6fb1afefcb… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: update pom
by Tony CHEMIT (＠tchemit) 10 Mar '23

10 Mar '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f7bbacac by Tony Chemit at 2023-03-10T21:20:49+01:00 update pom - - - - - 9ac12ae9 by Tony Chemit at 2023-03-10T21:20:53+01:00 Problème de sérialisation sur le retour de la consolidation en mode serveur - Closes #2641 - - - - - 3 changed files: - core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/observation/ActivityConsolidateEngine.java - pom.xml - toolkit/api/src/main/java/fr/ird/observe/dto/ToolkitIdModifications.java Changes: ===================================== core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/observation/ActivityConsolidateEngine.java ===================================== @@ -100,8 +100,10 @@ public class ActivityConsolidateEngine { if (r.withWarnings()) { log.info(String.format("%s Found some warnings on activity: %s - %s", activityPrefix, activity.getTopiaId(), r.getActivityLabel())); } - - + if (r.getCatchModifications() != null) { + // Replace in modifications any entity by his id (only necessary for catches modifications) + r.getCatchModifications().forEach(ToolkitIdModifications::replaceToolkitIdReferencesById); + } }); return result; } catch (Exception e) { ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2023.11</version> + <version>2023.12</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> @@ -128,7 +128,6 @@  <lib.version.hsqldb>2.7.0</lib.version.hsqldb>  - <lib.version.java4all.java-lang>2.0.5</lib.version.java4all.java-lang>  <license.licenseName>gpl_v3</license.licenseName> <license.organizationName>IRD, Ultreia.io</license.organizationName> ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/ToolkitIdModifications.java ===================================== @@ -79,4 +79,15 @@ public class ToolkitIdModifications extends JavaBeanModifications implements Jso public int warningsCount() { return getWarnings() == null ? 0 : getWarnings().size(); } + + public void replaceToolkitIdReferencesById() { + for (JavaBeanPropertyModification modification : getModifications()) { + if (modification.getOldValue() instanceof ToolkitId) { + modification.setOldValue(((ToolkitId) modification.getOldValue()).getTopiaId()); + } + if (modification.getNewValue() instanceof ToolkitId) { + modification.setNewValue(((ToolkitId) modification.getNewValue()).getTopiaId()); + } + } + } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c1af653a4df88e65a7185e88… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c1af653a4df88e65a7185e88… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] Imperfection sur le rapport Observations - Dénombrement des captures selon le...
by Tony CHEMIT (＠tchemit) 10 Mar '23

10 Mar '23

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: ca00c3d3 by Tony Chemit at 2023-03-10T17:27:27+01:00 Imperfection sur le rapport Observations - Dénombrement des captures selon le type d'association, filtrées par groupe et mode (rejeté/conservé) - Closes #2640 - - - - - 2 changed files: - core/persistence/report/src/main/resources/observe-reports.properties - model/src/main/resources/observe-reports-legacy.properties Changes: ===================================== core/persistence/report/src/main/resources/observe-reports.properties ===================================== @@ -1095,7 +1095,7 @@ Join t.routeObs r \ Join r.activity a \ Join a.set c \ Join c.catches ca with ca.totalCount Is Not Null \ -Join ca.speciesFate sf with sf.discard = :discardMode \ +Join ca.speciesFate sf with (:discardMode Is Null and sf.discard Is Null) Or (sf.discard = :discardMode) \ Join ca.species e \ Join e.speciesGroup sg \ Where t.id In :tripId \ @@ -1107,7 +1107,8 @@ From TripImpl t \ Join t.routeObs r \ Join r.activity a \ Join a.set c \ -Join c.catches ca with ca.totalCount Is Not Null And ca.speciesFate.discard = :discardMode \ +Join c.catches ca with ca.totalCount Is Not Null \ +Join ca.speciesFate sf with (:discardMode Is Null and sf.discard Is Null) Or (sf.discard = :discardMode) \ Join ca.species e with e.speciesGroup.id = :speciesGroup \ Where t.id In :tripId \ Order By e.faoCode @@ -1131,7 +1132,7 @@ Join m.routeObs r \ Join r.activity a \ Join a.set c with c.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#2' \ Join c.catches ca with ca.totalCount Is Not Null \ -Join ca.speciesFate sf with sf.discard = :discardMode, \ +Join ca.speciesFate sf with (:discardMode Is Null and sf.discard Is Null) Or (sf.discard = :discardMode), \ ObservedSystemImpl os, \ SpeciesImpl e \ Where \ @@ -1151,7 +1152,7 @@ Join m.routeObs r \ Join r.activity a \ Join a.set c with c.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#2' \ Join c.catches ca with ca.totalCount Is Not Null \ -Join ca.speciesFate sf with sf.discard = :discardMode, \ +Join ca.speciesFate sf with (:discardMode Is Null and sf.discard Is Null) Or (sf.discard = :discardMode), \ ObservedSystemImpl os, \ SpeciesImpl e \ Where \ @@ -1171,7 +1172,7 @@ Join m.routeObs r \ Join r.activity a \ Join a.set c with c.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#1' \ Join c.catches ca with ca.totalCount Is Not Null \ -Join ca.speciesFate sf with sf.discard = :discardMode, \ +Join ca.speciesFate sf with (:discardMode Is Null and sf.discard Is Null) Or (sf.discard = :discardMode), \ ObservedSystemImpl os1, \ ObservedSystemImpl os2, \ ObservedSystemImpl os3, \ @@ -1195,7 +1196,7 @@ Join m.routeObs r \ Join r.activity a \ Join a.set c with c.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#1' \ Join c.catches ca with ca.totalCount Is Not Null \ -Join ca.speciesFate sf with sf.discard = :discardMode, \ +Join ca.speciesFate sf with (:discardMode Is Null and sf.discard Is Null) Or (sf.discard = :discardMode), \ ObservedSystemImpl os1, \ ObservedSystemImpl os2, \ ObservedSystemImpl os3, \ @@ -1374,7 +1375,7 @@ Join t.routeObs r \ Join r.activity a \ Join a.set c \ Join c.catches ca with ca.catchWeight Is Not Null \ -Join ca.speciesFate sf with sf.discard = :discardMode \ +Join ca.speciesFate sf with (:discardMode Is Null and sf.discard Is Null) Or (sf.discard = :discardMode) \ Join ca.species e \ Join e.speciesGroup sg \ Where t.id In :tripId \ @@ -1386,7 +1387,8 @@ From TripImpl t \ Join t.routeObs r \ Join r.activity a \ Join a.set c \ -Join c.catches ca with ca.catchWeight Is Not Null And ca.speciesFate.discard = :discardMode \ +Join c.catches ca with ca.catchWeight Is Not Null \ +Join ca.speciesFate sf with (:discardMode Is Null and sf.discard Is Null) Or (sf.discard = :discardMode) \ Join ca.species e with e.speciesGroup.id = :speciesGroup \ Where t.id In :tripId \ Order By e.faoCode @@ -1410,7 +1412,7 @@ Join m.routeObs r \ Join r.activity a \ Join a.set c with c.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#2' \ Join c.catches ca with ca.catchWeight Is Not Null \ -Join ca.speciesFate sf with sf.discard = :discardMode, \ +Join ca.speciesFate sf with (:discardMode Is Null and sf.discard Is Null) Or (sf.discard = :discardMode), \ ObservedSystemImpl os, \ SpeciesImpl e \ Where \ @@ -1430,7 +1432,7 @@ Join m.routeObs r \ Join r.activity a \ Join a.set c with c.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#2' \ Join c.catches ca with ca.catchWeight Is Not Null \ -Join ca.speciesFate sf with sf.discard = :discardMode, \ +Join ca.speciesFate sf with (:discardMode Is Null and sf.discard Is Null) Or (sf.discard = :discardMode), \ ObservedSystemImpl os, \ SpeciesImpl e \ Where \ @@ -1450,7 +1452,7 @@ Join m.routeObs r \ Join r.activity a \ Join a.set c with c.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#1' \ Join c.catches ca with ca.catchWeight Is Not Null \ -Join ca.speciesFate sf with sf.discard = :discardMode, \ +Join ca.speciesFate sf with (:discardMode Is Null and sf.discard Is Null) Or (sf.discard = :discardMode), \ ObservedSystemImpl os1, \ ObservedSystemImpl os2, \ ObservedSystemImpl os3, \ @@ -1474,7 +1476,7 @@ Join m.routeObs r \ Join r.activity a \ Join a.set c with c.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#1' \ Join c.catches ca with ca.catchWeight Is Not Null \ -Join ca.speciesFate sf with sf.discard = :discardMode, \ +Join ca.speciesFate sf with (:discardMode Is Null and sf.discard Is Null) Or (sf.discard = :discardMode), \ ObservedSystemImpl os1, \ ObservedSystemImpl os2, \ ObservedSystemImpl os3, \ ===================================== model/src/main/resources/observe-reports-legacy.properties ===================================== @@ -590,7 +590,7 @@ Join t.routeObs r \ Join r.activity a \ Join a.set c \ Join c.catches ca with ca.catchWeight Is Not Null \ -Join ca.speciesFate sf with sf.discard = :discardMode \ +Join ca.speciesFate sf with (:discardMode Is Null and sf.discard Is Null) Or (sf.discard = :discardMode) \ Join ca.species e \ Join e.speciesGroup sg \ Where t.id In :tripId \ @@ -601,7 +601,8 @@ From TripImpl t \ Join t.routeObs r \ Join r.activity a \ Join a.set c \ -Join c.catches ca with ca.catchWeight Is Not Null And ca.speciesFate.discard = :discardMode \ +Join c.catches ca with ca.catchWeight Is Not Null \ +Join ca.speciesFate sf with (:discardMode Is Null and sf.discard Is Null) Or (sf.discard = :discardMode) \ Join ca.species e with e.speciesGroup.id = :speciesGroup \ Where t.id In :tripId \ Order By e.faoCode @@ -625,7 +626,7 @@ report.psObservationCatchWeightByGroupAndSpeciesFateDiscardPerAssociation.reques Join r.activity a \ Join a.set c with c.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#2' \ Join c.catches ca with ca.catchWeight Is Not Null \ - Join ca.speciesFate sf with sf.discard = :discardMode, \ + Join ca.speciesFate sf with (:discardMode Is Null and sf.discard Is Null) Or (sf.discard = :discardMode), \ ObservedSystemImpl os, \ SpeciesImpl e \ Where \ @@ -643,7 +644,7 @@ report.psObservationCatchWeightByGroupAndSpeciesFateDiscardPerAssociation.reques Join r.activity a \ Join a.set c with c.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#2' \ Join c.catches ca with ca.catchWeight Is Not Null \ - Join ca.speciesFate sf with sf.discard = :discardMode, \ + Join ca.speciesFate sf with (:discardMode Is Null and sf.discard Is Null) Or (sf.discard = :discardMode), \ ObservedSystemImpl os, \ SpeciesImpl e \ Where \ @@ -661,7 +662,7 @@ report.psObservationCatchWeightByGroupAndSpeciesFateDiscardPerAssociation.reques Join r.activity a \ Join a.set c with c.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#1' \ Join c.catches ca with ca.catchWeight Is Not Null \ - Join ca.speciesFate sf with sf.discard = :discardMode, \ + Join ca.speciesFate sf with (:discardMode Is Null and sf.discard Is Null) Or (sf.discard = :discardMode), \ ObservedSystemImpl os1, \ ObservedSystemImpl os2, \ ObservedSystemImpl os3, \ @@ -683,7 +684,7 @@ report.psObservationCatchWeightByGroupAndSpeciesFateDiscardPerAssociation.reques Join r.activity a \ Join a.set c with c.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#1' \ Join c.catches ca with ca.catchWeight Is Not Null \ - Join ca.speciesFate sf with sf.discard = :discardMode, \ + Join ca.speciesFate sf with (:discardMode Is Null and sf.discard Is Null) Or (sf.discard = :discardMode), \ ObservedSystemImpl os1, \ ObservedSystemImpl os2, \ ObservedSystemImpl os3, \ @@ -721,7 +722,7 @@ Join t.routeObs r \ Join r.activity a \ Join a.set c \ Join c.catches ca with ca.totalCount Is Not Null \ -Join ca.speciesFate sf with sf.discard = :discardMode \ +Join ca.speciesFate sf with (:discardMode Is Null and sf.discard Is Null) Or (sf.discard = :discardMode) \ Join ca.species e \ Join e.speciesGroup sg \ Where t.id In :tripId \ @@ -732,7 +733,8 @@ From TripImpl t \ Join t.routeObs r \ Join r.activity a \ Join a.set c \ -Join c.catches ca with ca.totalCount Is Not Null And ca.speciesFate.discard = :discardMode \ +Join c.catches ca with ca.totalCount Is Not Null \ +Join ca.speciesFate sf with (:discardMode Is Null and sf.discard Is Null) Or (sf.discard = :discardMode) \ Join ca.species e with e.speciesGroup.id = :speciesGroup \ Where t.id In :tripId \ Order By e.faoCode @@ -756,7 +758,7 @@ report.psObservationCatchTotalCountByGroupAndSpeciesFateDiscardPerAssociation.re Join r.activity a \ Join a.set c with c.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#2' \ Join c.catches ca with ca.totalCount Is Not Null \ - Join ca.speciesFate sf with sf.discard = :discardMode, \ + Join ca.speciesFate sf with (:discardMode Is Null and sf.discard Is Null) Or (sf.discard = :discardMode), \ ObservedSystemImpl os, \ SpeciesImpl e \ Where \ @@ -774,7 +776,7 @@ report.psObservationCatchTotalCountByGroupAndSpeciesFateDiscardPerAssociation.re Join r.activity a \ Join a.set c with c.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#2' \ Join c.catches ca with ca.totalCount Is Not Null \ - Join ca.speciesFate sf with sf.discard = :discardMode, \ + Join ca.speciesFate sf with (:discardMode Is Null and sf.discard Is Null) Or (sf.discard = :discardMode), \ ObservedSystemImpl os, \ SpeciesImpl e \ Where \ @@ -792,7 +794,7 @@ report.psObservationCatchTotalCountByGroupAndSpeciesFateDiscardPerAssociation.re Join r.activity a \ Join a.set c with c.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#1' \ Join c.catches ca with ca.totalCount Is Not Null \ - Join ca.speciesFate sf with sf.discard = :discardMode, \ + Join ca.speciesFate sf with (:discardMode Is Null and sf.discard Is Null) Or (sf.discard = :discardMode), \ ObservedSystemImpl os1, \ ObservedSystemImpl os2, \ ObservedSystemImpl os3, \ @@ -814,7 +816,7 @@ report.psObservationCatchTotalCountByGroupAndSpeciesFateDiscardPerAssociation.re Join r.activity a \ Join a.set c with c.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#1' \ Join c.catches ca with ca.totalCount Is Not Null \ - Join ca.speciesFate sf with sf.discard = :discardMode, \ + Join ca.speciesFate sf with (:discardMode Is Null and sf.discard Is Null) Or (sf.discard = :discardMode), \ ObservedSystemImpl os1, \ ObservedSystemImpl os2, \ ObservedSystemImpl os3, \ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/ca00c3d358414d6fb1afefcb4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/ca00c3d358414d6fb1afefcb4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Messages en double dans le log de l'assistant d'export - Closes #2638
by Tony CHEMIT (＠tchemit) 10 Mar '23

10 Mar '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 79714b44 by Tony Chemit at 2023-03-10T15:09:19+01:00 Messages en double dans le log de l'assistant d'export - Closes #2638 - - - - - 1 changed file: - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/AdminTabUIActionSupport.java Changes: ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/AdminTabUIActionSupport.java ===================================== @@ -38,24 +38,46 @@ import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState; import javax.swing.JTextArea; import javax.swing.KeyStroke; +import java.beans.PropertyChangeListener; import java.util.concurrent.Callable; public abstract class AdminTabUIActionSupport<U extends AdminTabUI> extends JComponentActionSupport<U> implements WithClientUIContextApi { + /** + * To listen progression model messages (to add them in action messages area). + */ + private final PropertyChangeListener progressionModelListener; + public AdminTabUIActionSupport(String label, String shortDescription, String actionIcon, KeyStroke acceleratorKey) { super(label, shortDescription, actionIcon, acceleratorKey); + progressionModelListener = evt -> { + String message = (String) evt.getNewValue(); + addMessage(message); + }; } public AdminTabUIActionSupport(String actionCommandKey, String label, String shortDescription, String actionIcon, KeyStroke acceleratorKey) { super(actionCommandKey, label, shortDescription, actionIcon, acceleratorKey); + progressionModelListener = evt -> { + String message = (String) evt.getNewValue(); + addMessage(message); + }; } public AdminTabUIActionSupport(String label, String shortDescription, String actionIcon, char acceleratorKey) { super(label, shortDescription, actionIcon, acceleratorKey); + progressionModelListener = evt -> { + String message = (String) evt.getNewValue(); + addMessage(message); + }; } public AdminTabUIActionSupport(String actionCommandKey, String label, String shortDescription, String actionIcon, char acceleratorKey) { super(actionCommandKey, label, shortDescription, actionIcon, acceleratorKey); + progressionModelListener = evt -> { + String message = (String) evt.getNewValue(); + addMessage(message); + }; } protected void addAdminWorkerWithNoProgress(String label, Callable<WizardState> callable) { @@ -94,15 +116,14 @@ public abstract class AdminTabUIActionSupport<U extends AdminTabUI> extends JCom protected void installProgressBar() { ProgressionModel model = ui.getStepModel().getProgressModel(); model.installUI(ui.getProgressBar(), false); - model.addPropertyChangeListener(ProgressionModel.PROPERTY_MESSAGE, evt -> { - String message = (String) evt.getNewValue(); - addMessage(message); - }); + model.removePropertyChangeListener(ProgressionModel.PROPERTY_MESSAGE, progressionModelListener); + model.addPropertyChangeListener(ProgressionModel.PROPERTY_MESSAGE, progressionModelListener); } protected void unInstallProgressBar() { ProgressionModel model = ui.getStepModel().getProgressModel(); model.uninstallUI(ui.getProgressBar()); + model.removePropertyChangeListener(ProgressionModel.PROPERTY_MESSAGE, progressionModelListener); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/79714b448c94b9ff41168cde5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/79714b448c94b9ff41168cde5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe (version 9.0.27)
by Tony CHEMIT (＠tchemit) 10 Mar '23

10 Mar '23

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 8e421145 by Tony Chemit at 2023-03-10T08:55:08+01:00 Site checkin for project ObServe (version 9.0.27) - - - - - 1 changed file: - versions.json Changes: ===================================== versions.json ===================================== @@ -1,5 +1,6 @@ { - "latest": "08/03/2023 08:39 UTC", + "latest": "10/03/2023 07:54 UTC", + "9.0.27": "10/03/2023 07:54 UTC", "9.0.26": "08/03/2023 08:39 UTC", "9.0.25": "14/02/2023 11:24 UTC", "9.0.24": "25/01/2023 16:17 UTC", View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8e421145dce800ba56852594c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8e421145dce800ba56852594c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe (version 9.0.27)
by Tony CHEMIT (＠tchemit) 10 Mar '23

10 Mar '23

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 7a0aff29 by Tony Chemit at 2023-03-10T08:37:31+01:00 Site checkin for project ObServe (version 9.0.27) - - - - - 11 changed files: - + 9.0.27/CHANGELOG.html - + 9.0.27/architecture-logicielle.html - + 9.0.27/avdth/common.html - + 9.0.27/avdth/index.html - + 9.0.27/avdth/landing.html - + 9.0.27/avdth/local_market.html - + 9.0.27/avdth/logbook.html - + 9.0.27/avdth/referential.html - + 9.0.27/avdth/sample.html - + 9.0.27/changelog.html - + 9.0.27/changes-report.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/7a0aff29b9486f6e0e8e39efd… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/7a0aff29b9486f6e0e8e39efd… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/9.0.27
by Tony CHEMIT (＠tchemit) 09 Mar '23

09 Mar '23

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

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v9.0.27
by Tony CHEMIT (＠tchemit) 09 Mar '23

09 Mar '23

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

1 0

[Git][ultreiaio/ird-observe][release/9.0.27] [jgitflow-maven-plugin]updating poms for branch'release/9.0.27' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) 09 Mar '23

09 Mar '23

Tony CHEMIT pushed to branch release/9.0.27 at ultreiaio / ird-observe Commits: 02744bd3 by Tony Chemit at 2023-03-09T19:27:11+01:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.27' with non-snapshot versions[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-consolidation/pom.xml - core/api/dto-decoration/pom.xml - core/api/dto-validation/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/avdth/pom.xml - core/persistence/consolidation/pom.xml - core/persistence/decoration/pom.xml - core/persistence/java/pom.xml - core/persistence/migration/pom.xml - core/persistence/pom.xml - core/persistence/report/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/02744bd3c3943b1c6b739fa41… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/02744bd3c3943b1c6b739fa41… You're receiving this email because of your account on gitlab.com.

1 0