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

[Git][ultreiaio/ird-observe][develop] 4 commits: La valeur du champs ps_observation.Catch.well a des fois la valeur vide, à la...
by Tony CHEMIT (＠tchemit) March 20, 2024

March 20, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: bbaef632 by Tony Chemit at 2024-03-20T14:51:13+01:00 La valeur du champs ps_observation.Catch.well a des fois la valeur vide, à la place de la valeur nulle - Closes #2857 - - - - - 6229d78f by Tony Chemit at 2024-03-20T14:51:13+01:00 Use updated check-services-types configuration - - - - - e8744294 by Tony Chemit at 2024-03-20T14:51:13+01:00 update pom - - - - - 84da9a9a by Tony Chemit at 2024-03-20T14:51:13+01:00 fix Observations - Types d'activités par zones FPA report (missing GroupBy for postgresql) - - - - - 7 changed files: - core/api/services/pom.xml - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_3.java - + core/persistence/migration/src/main/resources/db/migration/v9/9.3/02_issue-2857-common.sql - core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationActivitiesByZone.report - core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationRepartionCaleeParCuve.report - pom.xml - toolkit/api-services/pom.xml Changes: ===================================== core/api/services/pom.xml ===================================== @@ -203,18 +203,30 @@ <goal>check-services-types</goal> </goals> <configuration> - <acceptedTypes> + <acceptedParameterTypes> <acceptedType>io.ultreia.java4all.util.Version</acceptedType> <acceptedType>java.lang.Class</acceptedType> <acceptedType>java.lang.String</acceptedType> - <acceptedType>java.util.List</acceptedType> +  <acceptedType>java.util.Set</acceptedType> <acceptedType>java.util.Map</acceptedType> <acceptedType>java.util.Date</acceptedType> - </acceptedTypes> - <acceptedAssignableTypes> + </acceptedParameterTypes> + <acceptedReturnTypes> + <acceptedType>io.ultreia.java4all.util.Version</acceptedType> +  + <acceptedType>java.lang.String</acceptedType> + <acceptedType>java.util.List</acceptedType> + <acceptedType>java.util.Set</acceptedType> +  + <acceptedType>java.util.Date</acceptedType> + </acceptedReturnTypes> + <acceptedAssignableParameterTypes> + <acceptedAssignableType>io.ultreia.java4all.util.json.JsonAware</acceptedAssignableType> + </acceptedAssignableParameterTypes> + <acceptedAssignableReturnTypes> <acceptedAssignableType>io.ultreia.java4all.util.json.JsonAware</acceptedAssignableType> - </acceptedAssignableTypes> + </acceptedAssignableReturnTypes> </configuration> </execution> </executions> ===================================== core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_3.java ===================================== @@ -49,6 +49,8 @@ public class DataSourceMigrationForVersion_9_3 extends ByMajorMigrationVersionRe if (withIds) { // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2044 executor.addScript("01", "issue-2044"); + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2857 + executor.addScript("02", "issue-2857"); } } ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.3/02_issue-2857-common.sql ===================================== @@ -0,0 +1,22 @@ +--- +-- #%L +-- ObServe Core :: Persistence :: Migration +-- %% +-- Copyright (C) 2008 - 2024 IRD, Ultreia.io +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as +-- published by the Free Software Foundation, either version 3 of the +-- License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public +-- License along with this program. If not, see +-- <http://www.gnu.org/licenses/gpl-3.0.html>. +-- #L% +--- +UPDATE ps_observation.Catch Set well = NULL Where well = ''; ===================================== core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationActivitiesByZone.report ===================================== @@ -42,7 +42,8 @@ From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.routeObs r \ Join r.activity a With a.currentFpaZone.id = :zoneFpaId \ Join a.floatingObject dcp \ -Where m.id In :tripId +Where m.id In :tripId \ +Group By a.currentFpaZone.code, a.currentFpaZone.@i18nColumnName@ request.1.repeat.name=zoneFpaId request.1.repeat.layout=column request.1.comment=visite + peche / visite - peche / Deploiement + peche / Deploiement - peche / Modifie + peche / Modifie - peche / Retire + peche / Retire - peche / Abandonne + peche / Abandonne - peche / Coule + peche / Coule - peche / Remplace + peche / Remplace - peche / Autre ou ancien peche + peche / Autre ou ancien peche - peche / Nombre de tortues ===================================== core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationRepartionCaleeParCuve.report ===================================== @@ -34,14 +34,15 @@ request.1.layout=row request.1.request=Select r.date, Cast(a.time As java.sql.Time), \ a.latitude, \ a.longitude, \ -case when a.set.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#1' then 'BO' else 'BL' end, \ +case when s.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#1' then 'BO' else 'BL' end, \ tc.species.faoCode, \ Sum(tc.catchWeight), \ tc.well \ From TripImpl t \ Join t.routeObs r \ -Join r.activity a \ -Join a.set.catches tc \ -Where t.id In :tripId and tc.well != null \ -Group By r.date, a.time, a.latitude, a.longitude, tc.species, tc.species.faoCode, tc.well, a.set.schoolType \ +Join r.activity a With a.set Is Not Null \ +Join a.set s With s.catches Is Not Empty \ +Join s.catches tc With tc.well Is Not Null And tc.well != '' \ +Where t.id In :tripId \ +Group By r.date, a.time, a.latitude, a.longitude, tc.species, tc.species.faoCode, tc.well, s.schoolType \ Order By r.date, a.time, tc.species, tc.well ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2024.13</version> + <version>2024.14</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> ===================================== toolkit/api-services/pom.xml ===================================== @@ -154,18 +154,30 @@ <goal>check-services-types</goal> </goals> <configuration> - <acceptedTypes> + <acceptedParameterTypes> <acceptedType>io.ultreia.java4all.util.Version</acceptedType> <acceptedType>java.lang.Class</acceptedType> <acceptedType>java.lang.String</acceptedType> - <acceptedType>java.util.List</acceptedType> + <acceptedType>java.util.Set</acceptedType> <acceptedType>java.util.Map</acceptedType> <acceptedType>java.util.Date</acceptedType> - </acceptedTypes> - <acceptedAssignableTypes> + </acceptedParameterTypes> + <acceptedReturnTypes> + <acceptedType>io.ultreia.java4all.util.Version</acceptedType> + + <acceptedType>java.lang.String</acceptedType> + <acceptedType>java.util.List</acceptedType> + <acceptedType>java.util.Set</acceptedType> + + <acceptedType>java.util.Date</acceptedType> + </acceptedReturnTypes> + <acceptedAssignableParameterTypes> + <acceptedAssignableType>io.ultreia.java4all.util.json.JsonAware</acceptedAssignableType> + </acceptedAssignableParameterTypes> + <acceptedAssignableReturnTypes> <acceptedAssignableType>io.ultreia.java4all.util.json.JsonAware</acceptedAssignableType> - </acceptedAssignableTypes> + </acceptedAssignableReturnTypes> </configuration> </execution> </executions> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/52f465b8c60de2af1cde0be8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/52f465b8c60de2af1cde0be8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: La valeur du champs ps_observation.Catch.well a des fois la valeur vide, à la...
by Tony CHEMIT (＠tchemit) March 20, 2024

March 20, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 360958e1 by Tony Chemit at 2024-03-20T14:43:02+01:00 La valeur du champs ps_observation.Catch.well a des fois la valeur vide, à la place de la valeur nulle - Closes #2857 - - - - - 3c4728dc by Tony Chemit at 2024-03-20T14:43:02+01:00 Use updated check-services-types configuration - - - - - 6742fce9 by Tony Chemit at 2024-03-20T14:43:02+01:00 update pom - - - - - 52f465b8 by Tony Chemit at 2024-03-20T14:43:02+01:00 fix Observations - Types d'activités par zones FPA report (missing GroupBy for postgresql) - - - - - 7 changed files: - core/api/services/pom.xml - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_3.java - + core/persistence/migration/src/main/resources/db/migration/v9/9.3/02_issue-2857-common.sql - core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationActivitiesByZone.report - core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationRepartionCaleeParCuve.report - pom.xml - toolkit/api-services/pom.xml Changes: ===================================== core/api/services/pom.xml ===================================== @@ -203,18 +203,30 @@ <goal>check-services-types</goal> </goals> <configuration> - <acceptedTypes> + <acceptedParameterTypes> <acceptedType>io.ultreia.java4all.util.Version</acceptedType> <acceptedType>java.lang.Class</acceptedType> <acceptedType>java.lang.String</acceptedType> - <acceptedType>java.util.List</acceptedType> +  <acceptedType>java.util.Set</acceptedType> <acceptedType>java.util.Map</acceptedType> <acceptedType>java.util.Date</acceptedType> - </acceptedTypes> - <acceptedAssignableTypes> + </acceptedParameterTypes> + <acceptedReturnTypes> + <acceptedType>io.ultreia.java4all.util.Version</acceptedType> +  + <acceptedType>java.lang.String</acceptedType> + <acceptedType>java.util.List</acceptedType> + <acceptedType>java.util.Set</acceptedType> +  + <acceptedType>java.util.Date</acceptedType> + </acceptedReturnTypes> + <acceptedAssignableParameterTypes> + <acceptedAssignableType>io.ultreia.java4all.util.json.JsonAware</acceptedAssignableType> + </acceptedAssignableParameterTypes> + <acceptedAssignableReturnTypes> <acceptedAssignableType>io.ultreia.java4all.util.json.JsonAware</acceptedAssignableType> - </acceptedAssignableTypes> + </acceptedAssignableReturnTypes> </configuration> </execution> </executions> ===================================== core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_3.java ===================================== @@ -49,6 +49,8 @@ public class DataSourceMigrationForVersion_9_3 extends ByMajorMigrationVersionRe if (withIds) { // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2044 executor.addScript("01", "issue-2044"); + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2857 + executor.addScript("01", "issue-2857"); } } ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.3/02_issue-2857-common.sql ===================================== @@ -0,0 +1,22 @@ +--- +-- #%L +-- ObServe Core :: Persistence :: Migration +-- %% +-- Copyright (C) 2008 - 2024 IRD, Ultreia.io +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as +-- published by the Free Software Foundation, either version 3 of the +-- License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public +-- License along with this program. If not, see +-- <http://www.gnu.org/licenses/gpl-3.0.html>. +-- #L% +--- +UPDATE ps_observation.Catch Set well = NULL Where well = ''; ===================================== core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationActivitiesByZone.report ===================================== @@ -42,7 +42,8 @@ From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.routeObs r \ Join r.activity a With a.currentFpaZone.id = :zoneFpaId \ Join a.floatingObject dcp \ -Where m.id In :tripId +Where m.id In :tripId \ +Group By a.currentFpaZone.code, a.currentFpaZone.@i18nColumnName@ request.1.repeat.name=zoneFpaId request.1.repeat.layout=column request.1.comment=visite + peche / visite - peche / Deploiement + peche / Deploiement - peche / Modifie + peche / Modifie - peche / Retire + peche / Retire - peche / Abandonne + peche / Abandonne - peche / Coule + peche / Coule - peche / Remplace + peche / Remplace - peche / Autre ou ancien peche + peche / Autre ou ancien peche - peche / Nombre de tortues ===================================== core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationRepartionCaleeParCuve.report ===================================== @@ -34,14 +34,15 @@ request.1.layout=row request.1.request=Select r.date, Cast(a.time As java.sql.Time), \ a.latitude, \ a.longitude, \ -case when a.set.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#1' then 'BO' else 'BL' end, \ +case when s.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#1' then 'BO' else 'BL' end, \ tc.species.faoCode, \ Sum(tc.catchWeight), \ tc.well \ From TripImpl t \ Join t.routeObs r \ -Join r.activity a \ -Join a.set.catches tc \ -Where t.id In :tripId and tc.well != null \ -Group By r.date, a.time, a.latitude, a.longitude, tc.species, tc.species.faoCode, tc.well, a.set.schoolType \ +Join r.activity a With a.set Is Not Null \ +Join a.set s With s.catches Is Not Empty \ +Join s.catches tc With tc.well Is Not Null And tc.well != '' \ +Where t.id In :tripId \ +Group By r.date, a.time, a.latitude, a.longitude, tc.species, tc.species.faoCode, tc.well, s.schoolType \ Order By r.date, a.time, tc.species, tc.well ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2024.13</version> + <version>2024.14</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> ===================================== toolkit/api-services/pom.xml ===================================== @@ -154,18 +154,30 @@ <goal>check-services-types</goal> </goals> <configuration> - <acceptedTypes> + <acceptedParameterTypes> <acceptedType>io.ultreia.java4all.util.Version</acceptedType> <acceptedType>java.lang.Class</acceptedType> <acceptedType>java.lang.String</acceptedType> - <acceptedType>java.util.List</acceptedType> + <acceptedType>java.util.Set</acceptedType> <acceptedType>java.util.Map</acceptedType> <acceptedType>java.util.Date</acceptedType> - </acceptedTypes> - <acceptedAssignableTypes> + </acceptedParameterTypes> + <acceptedReturnTypes> + <acceptedType>io.ultreia.java4all.util.Version</acceptedType> + + <acceptedType>java.lang.String</acceptedType> + <acceptedType>java.util.List</acceptedType> + <acceptedType>java.util.Set</acceptedType> + + <acceptedType>java.util.Date</acceptedType> + </acceptedReturnTypes> + <acceptedAssignableParameterTypes> + <acceptedAssignableType>io.ultreia.java4all.util.json.JsonAware</acceptedAssignableType> + </acceptedAssignableParameterTypes> + <acceptedAssignableReturnTypes> <acceptedAssignableType>io.ultreia.java4all.util.json.JsonAware</acceptedAssignableType> - </acceptedAssignableTypes> + </acceptedAssignableReturnTypes> </configuration> </execution> </executions> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5575d304f92c2d0e1d73f88b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5575d304f92c2d0e1d73f88b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: La valeur du champs ps_observation.Catch.well a des fois la valeur vide, à la...
by Tony CHEMIT (＠tchemit) March 20, 2024

March 20, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 759d9a95 by Tony Chemit at 2024-03-20T14:36:39+01:00 La valeur du champs ps_observation.Catch.well a des fois la valeur vide, à la place de la valeur nulle - Closes #2857 - - - - - a8bf13a3 by Tony Chemit at 2024-03-20T14:37:10+01:00 Use updated check-services-types configuration - - - - - b6f198a3 by Tony Chemit at 2024-03-20T14:37:34+01:00 update pom - - - - - 5575d304 by Tony Chemit at 2024-03-20T14:38:13+01:00 fix Observations - Types d'activités par zones FPA report (missing GroupBy for postgresql) - - - - - 7 changed files: - core/api/services/pom.xml - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_3.java - + core/persistence/migration/src/main/resources/db/migration/v9/9.3/02_issue-2857-common.sql - core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationActivitiesByZone.report - core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationRepartionCaleeParCuve.report - pom.xml - toolkit/api-services/pom.xml Changes: ===================================== core/api/services/pom.xml ===================================== @@ -203,18 +203,30 @@ <goal>check-services-types</goal> </goals> <configuration> - <acceptedTypes> + <acceptedParameterTypes> <acceptedType>io.ultreia.java4all.util.Version</acceptedType> <acceptedType>java.lang.Class</acceptedType> <acceptedType>java.lang.String</acceptedType> - <acceptedType>java.util.List</acceptedType> +  <acceptedType>java.util.Set</acceptedType> <acceptedType>java.util.Map</acceptedType> <acceptedType>java.util.Date</acceptedType> - </acceptedTypes> - <acceptedAssignableTypes> + </acceptedParameterTypes> + <acceptedReturnTypes> + <acceptedType>io.ultreia.java4all.util.Version</acceptedType> +  + <acceptedType>java.lang.String</acceptedType> + <acceptedType>java.util.List</acceptedType> + <acceptedType>java.util.Set</acceptedType> +  + <acceptedType>java.util.Date</acceptedType> + </acceptedReturnTypes> + <acceptedAssignableParameterTypes> + <acceptedAssignableType>io.ultreia.java4all.util.json.JsonAware</acceptedAssignableType> + </acceptedAssignableParameterTypes> + <acceptedAssignableReturnTypes> <acceptedAssignableType>io.ultreia.java4all.util.json.JsonAware</acceptedAssignableType> - </acceptedAssignableTypes> + </acceptedAssignableReturnTypes> </configuration> </execution> </executions> ===================================== core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_3.java ===================================== @@ -49,6 +49,8 @@ public class DataSourceMigrationForVersion_9_3 extends ByMajorMigrationVersionRe if (withIds) { // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2044 executor.addScript("01", "issue-2044"); + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2857 + executor.addScript("01", "issue-2857"); } } ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.3/02_issue-2857-common.sql ===================================== @@ -0,0 +1 @@ +UPDATE ps_observation.Catch Set well = NULL Where well = ''; \ No newline at end of file ===================================== core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationActivitiesByZone.report ===================================== @@ -42,7 +42,8 @@ From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.routeObs r \ Join r.activity a With a.currentFpaZone.id = :zoneFpaId \ Join a.floatingObject dcp \ -Where m.id In :tripId +Where m.id In :tripId \ +Group By a.currentFpaZone.code, a.currentFpaZone.@i18nColumnName@ request.1.repeat.name=zoneFpaId request.1.repeat.layout=column request.1.comment=visite + peche / visite - peche / Deploiement + peche / Deploiement - peche / Modifie + peche / Modifie - peche / Retire + peche / Retire - peche / Abandonne + peche / Abandonne - peche / Coule + peche / Coule - peche / Remplace + peche / Remplace - peche / Autre ou ancien peche + peche / Autre ou ancien peche - peche / Nombre de tortues ===================================== core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationRepartionCaleeParCuve.report ===================================== @@ -34,14 +34,15 @@ request.1.layout=row request.1.request=Select r.date, Cast(a.time As java.sql.Time), \ a.latitude, \ a.longitude, \ -case when a.set.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#1' then 'BO' else 'BL' end, \ +case when s.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#1' then 'BO' else 'BL' end, \ tc.species.faoCode, \ Sum(tc.catchWeight), \ tc.well \ From TripImpl t \ Join t.routeObs r \ -Join r.activity a \ -Join a.set.catches tc \ -Where t.id In :tripId and tc.well != null \ -Group By r.date, a.time, a.latitude, a.longitude, tc.species, tc.species.faoCode, tc.well, a.set.schoolType \ +Join r.activity a With a.set Is Not Null \ +Join a.set s With s.catches Is Not Empty \ +Join s.catches tc With tc.well Is Not Null And tc.well != '' \ +Where t.id In :tripId \ +Group By r.date, a.time, a.latitude, a.longitude, tc.species, tc.species.faoCode, tc.well, s.schoolType \ Order By r.date, a.time, tc.species, tc.well ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2024.13</version> + <version>2024.14</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> ===================================== toolkit/api-services/pom.xml ===================================== @@ -154,18 +154,30 @@ <goal>check-services-types</goal> </goals> <configuration> - <acceptedTypes> + <acceptedParameterTypes> <acceptedType>io.ultreia.java4all.util.Version</acceptedType> <acceptedType>java.lang.Class</acceptedType> <acceptedType>java.lang.String</acceptedType> - <acceptedType>java.util.List</acceptedType> + <acceptedType>java.util.Set</acceptedType> <acceptedType>java.util.Map</acceptedType> <acceptedType>java.util.Date</acceptedType> - </acceptedTypes> - <acceptedAssignableTypes> + </acceptedParameterTypes> + <acceptedReturnTypes> + <acceptedType>io.ultreia.java4all.util.Version</acceptedType> + + <acceptedType>java.lang.String</acceptedType> + <acceptedType>java.util.List</acceptedType> + <acceptedType>java.util.Set</acceptedType> + + <acceptedType>java.util.Date</acceptedType> + </acceptedReturnTypes> + <acceptedAssignableParameterTypes> + <acceptedAssignableType>io.ultreia.java4all.util.json.JsonAware</acceptedAssignableType> + </acceptedAssignableParameterTypes> + <acceptedAssignableReturnTypes> <acceptedAssignableType>io.ultreia.java4all.util.json.JsonAware</acceptedAssignableType> - </acceptedAssignableTypes> + </acceptedAssignableReturnTypes> </configuration> </execution> </executions> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0abb219ce8fb6a4ccdd0e51c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0abb219ce8fb6a4ccdd0e51c… 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.3.0-RC-5)
by Tony CHEMIT (＠tchemit) March 19, 2024

March 19, 2024

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 5e9feb9f by Tony Chemit at 2024-03-19T20:45:47+01:00 Site checkin for project ObServe (version 9.3.0-RC-5) - - - - - 8 changed files: - + 9.3.0-RC-5/CHANGELOG.html - + 9.3.0-RC-5/architecture-logicielle.html - + 9.3.0-RC-5/avdth/common.html - + 9.3.0-RC-5/avdth/index.html - + 9.3.0-RC-5/avdth/landing.html - + 9.3.0-RC-5/avdth/local_market.html - + 9.3.0-RC-5/avdth/logbook.html - + 9.3.0-RC-5/avdth/referential.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/5e9feb9fabfb066ffb8aada80… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/5e9feb9fabfb066ffb8aada80… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/9.3.0-RC-5
by Tony CHEMIT (＠tchemit) March 19, 2024

March 19, 2024

Tony CHEMIT deleted branch release/9.3.0-RC-5 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.3.0-RC-5
by Tony CHEMIT (＠tchemit) March 19, 2024

March 19, 2024

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

1 0

[Git][ultreiaio/ird-observe][release/9.3.0-RC-5] [jgitflow-maven-plugin]updating poms for branch'release/9.3.0-RC-5' with...
by Tony CHEMIT (＠tchemit) March 19, 2024

March 19, 2024

Tony CHEMIT pushed to branch release/9.3.0-RC-5 at ultreiaio / ird-observe Commits: d53792ac by Tony Chemit at 2024-03-19T20:23:41+01:00 [jgitflow-maven-plugin]updating poms for branch'release/9.3.0-RC-5' 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/d53792aca0a360bebab31e9eb… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d53792aca0a360bebab31e9eb… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master] 45 commits: [jgitflow-maven-plugin]updating poms for 9.3.0-RC-5-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) March 19, 2024

March 19, 2024

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: c7547dfb by Tony Chemit at 2024-02-26T09:02:16+01:00 [jgitflow-maven-plugin]updating poms for 9.3.0-RC-5-SNAPSHOT development[skip ci] - - - - - 089e6f13 by Tony Chemit at 2024-02-26T09:19:07+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - bbef1b45 by Tony Chemit at 2024-02-26T09:19:07+01:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - e5452729 by Tony Chemit at 2024-02-26T09:19:09+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - c28a9e85 by Tony Chemit at 2024-02-29T12:19:24+01:00 Agrandissement de popup - Closes #2836 - - - - - 02bad581 by Tony Chemit at 2024-03-05T15:31:57+01:00 update pom - - - - - 69c33e34 by Tony Chemit at 2024-03-05T16:20:51+01:00 toolkit-templates - vérification que la tag-value digits est bien définie pour tout attribute de type décimal sur le modèle de persistance - - - - - bee7fdae by Tony Chemit at 2024-03-05T16:20:54+01:00 model - Remplissages de la tag-value digits manquante - - - - - 330e1682 by Tony Chemit at 2024-03-05T16:20:58+01:00 persistence - Mise à jour des descripteurs d'entités - - - - - 895a9697 by Tony Chemit at 2024-03-05T16:23:06+01:00 Merge branch 'feature/issue-2844' into develop Consolidation du modèle de persistence sur les données de type décimales - Closes #2844 - - - - - bab62840 by Tony Chemit at 2024-03-05T16:23:48+01:00 persistence meta-model: add more stuff in TopiaMetadataEntity - - - - - 22aa0c31 by Tony Chemit at 2024-03-05T16:24:12+01:00 persistence sql-model: add more stuff in TopiaEntitySqlTable - - - - - df0a7b49 by Tony Chemit at 2024-03-05T16:24:13+01:00 persistence: update TopiaEntitySqlModel.json - - - - - ac3d0822 by Tony Chemit at 2024-03-05T16:26:12+01:00 Merge branch 'feature/augments-entityModel' into develop - - - - - f3055cda by Tony Chemit at 2024-03-05T16:39:51+01:00 persistence - add timestampNow on ServiceContext - - - - - 1a82f8d0 by Tony Chemit at 2024-03-05T16:39:51+01:00 persistence - add method clearSession on TopiaHibernateSupport - - - - - 47f1b396 by Tony Chemit at 2024-03-05T16:39:59+01:00 persistence - Introduction de SqlConversions pour gérer les conversions java → sql - - - - - 2c4fed94 by Tony Chemit at 2024-03-08T12:54:45+01:00 persistence - introduce ToolkitIdModificationsToSql - - - - - ae84f818 by Tony Chemit at 2024-03-08T12:54:52+01:00 persistence - introduce toSql method on consolidate engine to produce sql script of modifications - - - - - 6af33613 by Tony Chemit at 2024-03-08T12:54:58+01:00 persistence - on TripConsolidateEngine.consolidate, now use the generated sql script to finalize consolidation instead of letting Hibernate doing it for us - - - - - 8a4f3493 by Tony Chemit at 2024-03-15T08:19:43+01:00 Merge branch 'feature/issue-2843' into develop Erreur sur transaction et plantage de Tomcat sur consolidation en mode serveur - Closes #2843 - - - - - 8c5dacfe by Tony Chemit at 2024-03-15T08:55:32+01:00 update pom - - - - - c9a29d65 by Tony Chemit at 2024-03-15T13:54:37+01:00 Test method ReportService.initColumnRendererParameters - - - - - c211705f by Tony Chemit at 2024-03-15T13:54:37+01:00 Reports are not copied to the right place... - - - - - b5ef9ebc by Tony Chemit at 2024-03-15T14:38:31+01:00 Update reports documentation - - - - - 88b13f8a by Tony Chemit at 2024-03-16T13:06:10+01:00 Add more TimeLog and fix log.debug issues in ReportRequestExecutor - - - - - b5b80021 by Tony Chemit at 2024-03-18T11:00:40+01:00 Optimisation du rapport Livre de bord - Vérification des plan de cuves - Closes #2849 - - - - - 56d7291a by Tony Chemit at 2024-03-18T11:00:40+01:00 Optimisation du rapport Livre de bord - Plan de cuves - Closes #2850 - - - - - 294f63b2 by Tony Chemit at 2024-03-18T11:00:46+01:00 Optimisation du rapport Observations - Utilisation des FOB, tableau simplifiée - Closes #2851 - - - - - 7f181c46 by Tony Chemit at 2024-03-18T11:00:53+01:00 Optimisation du rapport Observations - Utilisation des FOB, tableau détaillé - Closes #2852 - - - - - 8aa68e2b by Tony Chemit at 2024-03-18T11:00:53+01:00 Lors d'exports massifs de données, le token expire rapidement et fait échouer la suite du processus - Closes #2839 - - - - - 8634165e by Tony Chemit at 2024-03-18T11:00:53+01:00 Amélioration de la taille des colonnes du tableau des résultats d'un rapport - Closes #2853 - - - - - e06ff9e9 by Tony Chemit at 2024-03-19T11:22:17+01:00 Fix one i18n translation - - - - - 11ea9d2d by Tony Chemit at 2024-03-19T14:20:44+01:00 Review DataManager code (no more logic in the tasks) - - - - - f0d95762 by Tony Chemit at 2024-03-19T14:20:44+01:00 Reduce log in ReferentialIdsBuilder - - - - - ed8c4a22 by Tony Chemit at 2024-03-19T14:20:44+01:00 Fix DataSource IO in long actions - - - - - b3cab5a2 by Tony Chemit at 2024-03-19T14:20:44+01:00 Perte de connection au serveur lors d'envoie massif de marées - Closes #2854 - - - - - 4b1fe74f by Tony Chemit at 2024-03-19T14:20:44+01:00 update pom - - - - - 584fa484 by Tony Chemit at 2024-03-19T15:00:14+01:00 Mise à jour du rapport psObservationAllActivities - - - - - ddc116b2 by Tony Chemit at 2024-03-19T15:00:14+01:00 Ajout du rapport psObservationActivitiesByZone - - - - - 27355e37 by Tony Chemit at 2024-03-19T15:00:58+01:00 Merge branch 'feature/issue-2848' into develop Tableaux de synthèse à intégrer - Closes #2848 - - - - - fcf880a9 by Tony Chemit at 2024-03-19T15:22:32+01:00 Ajout des rapports sur les FOB PS - Logbook - Closes #2855 - - - - - 8cb7f1d6 by Tony Chemit at 2024-03-19T20:14:00+01:00 Nouveau rapport PS / Observations & Logbooks / Captures par Zone FPA, espèce et devenir - Closes #2856 - - - - - d53792ac by Tony Chemit at 2024-03-19T20:23:41+01:00 [jgitflow-maven-plugin]updating poms for branch'release/9.3.0-RC-5' with non-snapshot versions[skip ci] - - - - - bfe516d5 by Tony Chemit at 2024-03-19T20:38:54+01:00 [jgitflow-maven-plugin]merging 'release/9.3.0-RC-5' into 'master' - - - - - 30 changed files: - client/configuration/pom.xml - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/core/pom.xml - client/core/src/main/java/fr/ird/observe/client/datasource/api/data/CopyDataTask.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/data/DataManager.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/data/DataTaskSupport.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/data/DeleteDataTask.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/data/InsertMissingReferentialTask.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/data/TaskSide.java - client/datasource/actions/pom.xml - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/export/actions/Prepare.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/actions/Apply.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/actions/Start.java - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeletePanel.java - 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 - 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/pom.xml - core/api/dto-decoration/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d8e3a9df16827d2883843aa7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d8e3a9df16827d2883843aa7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/9.3.0-RC-5' with...
by Tony CHEMIT (＠tchemit) March 19, 2024

March 19, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d53792ac by Tony Chemit at 2024-03-19T20:23:41+01:00 [jgitflow-maven-plugin]updating poms for branch'release/9.3.0-RC-5' with non-snapshot versions[skip ci] - - - - - bfe516d5 by Tony Chemit at 2024-03-19T20:38:54+01:00 [jgitflow-maven-plugin]merging 'release/9.3.0-RC-5' into 'master' - - - - - 144e8568 by Tony Chemit at 2024-03-19T20:38:58+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 9ac42b8d by Tony Chemit at 2024-03-19T20:38:59+01:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 0abb219c by Tony Chemit at 2024-03-19T20:39:00+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/bcddf0a609a4e5f4d3253609… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/bcddf0a609a4e5f4d3253609… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 9.3.0-RC-6-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) March 19, 2024

March 19, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: bcddf0a6 by Tony Chemit at 2024-03-19T20:23:24+01:00 [jgitflow-maven-plugin]updating poms for 9.3.0-RC-6-SNAPSHOT development[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto-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/bcddf0a609a4e5f4d32536096… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/bcddf0a609a4e5f4d32536096… You're receiving this email because of your account on gitlab.com.

1 0