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

[Git][ultreiaio/ird-observe] Deleted branch release/9.2.1
by Tony CHEMIT (＠tchemit) Nov. 14, 2023

Nov. 14, 2023

Tony CHEMIT deleted branch release/9.2.1 at ultreiaio / ird-observe -- 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.2.1' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) Nov. 14, 2023

Nov. 14, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 26e27715 by Tony Chemit at 2023-11-14T16:52:35+01:00 [jgitflow-maven-plugin]updating poms for branch'release/9.2.1' with non-snapshot versions[skip ci] - - - - - 92131097 by Tony Chemit at 2023-11-14T17:11:52+01:00 [jgitflow-maven-plugin]merging 'release/9.2.1' into 'master' - - - - - ce079ce4 by Tony Chemit at 2023-11-14T17:11:57+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 550888fb by Tony Chemit at 2023-11-14T17:11:58+01:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 90eab29a by Tony Chemit at 2023-11-14T17:11:59+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/cd4f3685afb7205bc80732a1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/cd4f3685afb7205bc80732a1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v9.2.1
by Tony CHEMIT (＠tchemit) Nov. 14, 2023

Nov. 14, 2023

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

1 0

[Git][ultreiaio/ird-observe][release/9.2.1] [jgitflow-maven-plugin]updating poms for branch'release/9.2.1' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) Nov. 14, 2023

Nov. 14, 2023

Tony CHEMIT pushed to branch release/9.2.1 at ultreiaio / ird-observe Commits: 26e27715 by Tony Chemit at 2023-11-14T16:52:35+01:00 [jgitflow-maven-plugin]updating poms for branch'release/9.2.1' 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/26e2771596b4482aead2517da… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/26e2771596b4482aead2517da… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master] 16 commits: [jgitflow-maven-plugin]updating poms for 9.2.1-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) Nov. 14, 2023

Nov. 14, 2023

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: 44f91b51 by Tony Chemit at 2023-10-09T11:14:50+02:00 [jgitflow-maven-plugin]updating poms for 9.2.1-SNAPSHOT development[skip ci] - - - - - bbd8662d by Tony Chemit at 2023-10-09T12:03:03+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - b3ce84eb by Tony Chemit at 2023-10-09T12:03:04+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 921c45da by Tony Chemit at 2023-10-09T12:03:06+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 3a5523c0 by Tony Chemit at 2023-10-09T12:12:57+02:00 Update changelog for v.9.2.0 [skip CI] - - - - - 8af50c62 by Tony Chemit at 2023-10-18T15:38:30+02:00 Improve cache usage in gears (See #2793) - - - - - 489f0113 by Tony Chemit at 2023-11-13T10:09:00+01:00 update pom - - - - - 1aca8fce by Tony Chemit at 2023-11-13T10:27:06+01:00 Erreur migration 9.1 vers 9.2 de la base centrale AZTI - Closes #2801 - - - - - bf41e7c3 by Tony Chemit at 2023-11-13T11:09:58+01:00 Erreur de migration sur bases AZTI locales - Closes #2800 - - - - - dc95c50b by Tony Chemit at 2023-11-13T12:19:19+01:00 Ajout d'un code à transcoder OPERA vers VesselActivity - Closes #2803 - - - - - 0698ab90 by Tony Chemit at 2023-11-13T12:50:00+01:00 Précisions sur les déductions AVDTH ASSOC vers FloatingObject et ObjectMaterial - Closes #2802 - - - - - 52a731b0 by Tony Chemit at 2023-11-14T16:18:08+01:00 Souci de décalage de lignes sur le rapport Vérification des plans de cuve - Closes #2798 - - - - - d1c1551a by Tony Chemit at 2023-11-14T16:18:08+01:00 Ajout d'un code à transcoder OPERA vers VesselActivity - Closes #2803 - - - - - ba36ec10 by Tony Chemit at 2023-11-14T16:50:29+01:00 Update changelog for v.9.2.1 [skip CI] - - - - - 26e27715 by Tony Chemit at 2023-11-14T16:52:35+01:00 [jgitflow-maven-plugin]updating poms for branch'release/9.2.1' with non-snapshot versions[skip ci] - - - - - 92131097 by Tony Chemit at 2023-11-14T17:11:52+01:00 [jgitflow-maven-plugin]merging 'release/9.2.1' into 'master' - - - - - 30 changed files: - CHANGELOG.md - 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/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeaturesMeasurementsTableModelSupport.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 - 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/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectReader.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/VesselActivityInterceptor.java - core/persistence/consolidation/pom.xml - core/persistence/decoration/pom.xml - core/persistence/java/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a66fe707621d03218009c347… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a66fe707621d03218009c347… 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.2.2-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) Nov. 14, 2023

Nov. 14, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: cd4f3685 by Tony Chemit at 2023-11-14T16:52:18+01:00 [jgitflow-maven-plugin]updating poms for 9.2.2-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/cd4f3685afb7205bc80732a1b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/cd4f3685afb7205bc80732a1b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/9.2.1
by Tony CHEMIT (＠tchemit) Nov. 14, 2023

Nov. 14, 2023

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

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Souci de décalage de lignes sur le rapport Vérification des plans de cuve - Closes #2798
by Tony CHEMIT (＠tchemit) Nov. 14, 2023

Nov. 14, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 52a731b0 by Tony Chemit at 2023-11-14T16:18:08+01:00 Souci de décalage de lignes sur le rapport Vérification des plans de cuve - Closes #2798 - - - - - d1c1551a by Tony Chemit at 2023-11-14T16:18:08+01:00 Ajout d'un code à transcoder OPERA vers VesselActivity - Closes #2803 - - - - - ba36ec10 by Tony Chemit at 2023-11-14T16:50:29+01:00 Update changelog for v.9.2.1 [skip CI] - - - - - 5 changed files: - CHANGELOG.md - core/persistence/report/src/main/resources/observe-reports.properties - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psLogbookWellPlanCheck.properties - model/src/main/resources/observe-reports-legacy.properties - src/site/markdown/avdth/referential.md Changes: ===================================== CHANGELOG.md ===================================== The diff for this file was not included because it is too large. ===================================== core/persistence/report/src/main/resources/observe-reports.properties ===================================== @@ -920,6 +920,16 @@ report.psLogbookWellPlanCheck.modelType=PS report.psLogbookWellPlanCheck.name=Livre de bord - Vérification des plan de cuves report.psLogbookWellPlanCheck.description=Livre de bord - Vérification des plan de cuves report.psLogbookWellPlanCheck.columns=Code bateau,Nom bateau,Date départ,Date arrivée,Date de route,Numéro activité,Heure activité,Logbook YFT,Logbook SKJ,Logbook BET,Logbook ALB,Logbook Autres,Plan de cuves YFT,Plan de cuves SKJ,Plan de cuves BET,Plan de cuves ALB,Plan de cuves Autres,Logbook Total,Plan de cuves Total,Différence +report.psLogbookWellPlanCheck.repeatVariable.1.name=activity +report.psLogbookWellPlanCheck.repeatVariable.1.type=fr.ird.observe.entities.data.ps.logbook.Activity +report.psLogbookWellPlanCheck.repeatVariable.1.request=Select a \ +From TripImpl t \ +Join t.routeLogbook r \ +Join r.activity a \ +Join t.vessel vessel \ +Left Join a.vesselActivity vesselActivity \ +Where t.id In :tripId and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ +Order By vessel.code,t.startDate,r.date,a.number,a.time report.psLogbookWellPlanCheck.request.1.location=0,0 report.psLogbookWellPlanCheck.request.1.layout=row report.psLogbookWellPlanCheck.request.1.request=Select vessel.code,\ @@ -928,7 +938,17 @@ concat(day(t.startDate), '/', month(t.startDate), '/', year(t.startDate)), \ concat(day(t.endDate), '/', month(t.endDate), '/', year(t.endDate)), \ concat(day(r.date), '/', month(r.date), '/', year(r.date)), \ a.number, \ -concat(hour(a.time), ':', minute(a.time)), \ +concat(hour(a.time), ':', minute(a.time)) \ +From TripImpl t \ +Join t.routeLogbook r \ +Join r.activity a \ +Join t.vessel vessel \ +Where t.id In :tripId and a = :activity +report.psLogbookWellPlanCheck.request.1.repeat.name=activity +report.psLogbookWellPlanCheck.request.1.repeat.layout=column +report.psLogbookWellPlanCheck.request.2.location=7,0 +report.psLogbookWellPlanCheck.request.2.layout=row +report.psLogbookWellPlanCheck.request.2.request=Select \ Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then ct.weight Else 0.0 End), \ Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then ct.weight Else 0.0 End), \ Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then ct.weight Else 0.0 End), \ @@ -942,14 +962,12 @@ From TripImpl t \ Join t.routeLogbook r \ Join r.activity a \ Join a.catches ct \ -Join t.vessel vessel \ -Left Join a.vesselActivity vesselActivity \ -Where t.id In :tripId and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ -Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \ -Order By vessel.code,t.startDate,r.date,a.time -report.psLogbookWellPlanCheck.request.2.location=12,0 -report.psLogbookWellPlanCheck.request.2.layout=row -report.psLogbookWellPlanCheck.request.2.request=Select \ +Where t.id In :tripId and a = :activity +report.psLogbookWellPlanCheck.request.2.repeat.name=activity +report.psLogbookWellPlanCheck.request.2.repeat.layout=column +report.psLogbookWellPlanCheck.request.3.location=12,0 +report.psLogbookWellPlanCheck.request.3.layout=row +report.psLogbookWellPlanCheck.request.3.request=Select \ Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then was.weight Else 0.0 End), \ Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then was.weight Else 0.0 End), \ Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then was.weight Else 0.0 End), \ @@ -963,41 +981,31 @@ From TripImpl t \ Join t.well w \ Join w.wellActivity wa \ Join wa.wellActivitySpecies was \ -Join t.routeLogbook r \ -Join r.activity a \ -Join t.vessel vessel \ -Left Join a.vesselActivity vesselActivity \ -Where t.id In :tripId and wa.activity = a and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ -Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \ -Order By vessel.code,t.startDate,r.date,a.time -report.psLogbookWellPlanCheck.request.3.location=17,0 -report.psLogbookWellPlanCheck.request.3.layout=row -report.psLogbookWellPlanCheck.request.3.request=Select \ +Where t.id In :tripId and wa.activity = :activity +report.psLogbookWellPlanCheck.request.3.repeat.name=activity +report.psLogbookWellPlanCheck.request.3.repeat.layout=column +report.psLogbookWellPlanCheck.request.4.location=17,0 +report.psLogbookWellPlanCheck.request.4.layout=row +report.psLogbookWellPlanCheck.request.4.request=Select \ Sum(ct.weight) \ From TripImpl t \ Join t.routeLogbook r \ Join r.activity a \ Join a.catches ct \ -Join t.vessel vessel \ -Left Join a.vesselActivity vesselActivity \ -Where t.id In :tripId and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ -Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \ -Order By vessel.code,t.startDate,r.date,a.time -report.psLogbookWellPlanCheck.request.4.location=18,0 -report.psLogbookWellPlanCheck.request.4.layout=row -report.psLogbookWellPlanCheck.request.4.request=Select \ +Where t.id In :tripId and a = :activity +report.psLogbookWellPlanCheck.request.4.repeat.name=activity +report.psLogbookWellPlanCheck.request.4.repeat.layout=column +report.psLogbookWellPlanCheck.request.5.location=18,0 +report.psLogbookWellPlanCheck.request.5.layout=row +report.psLogbookWellPlanCheck.request.5.request=Select \ Sum(was.weight) \ From TripImpl t \ Join t.well w \ Join w.wellActivity wa \ Join wa.wellActivitySpecies was \ -Join t.routeLogbook r \ -Join r.activity a \ -Join t.vessel vessel \ -Left Join a.vesselActivity vesselActivity \ -Where t.id In :tripId and wa.activity = a and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ -Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \ -Order By vessel.code,t.startDate,r.date,a.time +Where t.id In :tripId and wa.activity = :activity +report.psLogbookWellPlanCheck.request.5.repeat.name=activity +report.psLogbookWellPlanCheck.request.5.repeat.layout=column report.psLogbookWellPlanCheck.operations.1.type=SubtractColum report.psLogbookWellPlanCheck.operations.1.parameters=17|18|19 report.psLogbookWellPlanCheck.operations.2.type=SumColumn ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psLogbookWellPlanCheck.properties ===================================== @@ -20,13 +20,16 @@ # #L% ### result.0=483^CAP BOJADOR^30/3/2019^8/4/2019^30/3/2019^1^15:12^0.0^123.0^43.0^0.0^0.0^0.0^0.0^12.0^0.0^0.0^166.0^12.0^154.0 +result.1=483^CAP BOJADOR^30/3/2019^8/4/2019^1/4/2019^1^15:12^null^null^null^null^null^null^null^null^null^null^null^null^- +result.2=483^CAP BOJADOR^30/3/2019^8/4/2019^1/4/2019^1^15:12^null^null^null^null^null^null^null^null^null^null^null^null^- +result.3=Total^null^null^null^null^null^-^0.0^123.0^43.0^0.0^0.0^0.0^0.0^12.0^0.0^0.0^166.0^12.0^- result.columns=20 -result.rows=1 +result.rows=4 syntax.columns=20 syntax.columnsHeader=Code bateau^Nom bateau^Date départ^Date arrivée^Date de route^Numéro activité^Heure activité^Logbook YFT^Logbook SKJ^Logbook BET^Logbook ALB^Logbook Autres^Plan de cuves YFT^Plan de cuves SKJ^Plan de cuves BET^Plan de cuves ALB^Plan de cuves Autres^Logbook Total^Plan de cuves Total^Différence syntax.description=Livre de bord - Vérification des plan de cuves syntax.name=Livre de bord - Vérification des plan de cuves -syntax.nbRequests=4 +syntax.nbRequests=5 syntax.rows=-1 syntax.rowsHeader= tripIds=${PS_COMMON_TRIP},${PS_COMMON_TRIP_MOVE} ===================================== model/src/main/resources/observe-reports-legacy.properties ===================================== @@ -1387,33 +1387,29 @@ Order By vessel.code,t.startDate,t.endDate,w.well,r.date,a.time report.psLogbookWellPlanCheck.modelType=PS report.psLogbookWellPlanCheck.name=Livre de bord - Vérification des plan de cuves report.psLogbookWellPlanCheck.description=Livre de bord - Vérification des plan de cuves -report.psLogbookWellPlanCheck.columns=Code bateau,\ -Nom bateau,\ -Date départ,\ -Date arrivée,\ -Date de route,\ -Numéro activité,\ -Heure activité,\ -Logbook YFT,\ -Logbook SKJ,\ -Logbook BET,\ -Logbook ALB,\ -Logbook Autres,\ -Plan de cuves YFT,\ -Plan de cuves SKJ,\ -Plan de cuves BET,\ -Plan de cuves ALB,\ -Plan de cuves Autres,\ -Logbook Total,\ -Plan de cuves Total,\ -Différence +report.psLogbookWellPlanCheck.columns=Code bateau,Nom bateau,Date départ,Date arrivée,Date de route,Numéro activité,Heure activité,Logbook YFT,Logbook SKJ,Logbook BET,Logbook ALB,Logbook Autres,Plan de cuves YFT,Plan de cuves SKJ,Plan de cuves BET,Plan de cuves ALB,Plan de cuves Autres,Logbook Total,Plan de cuves Total,Différence +report.psLogbookWellPlanCheck.repeatVariable.activity=fr.ird.observe.entities.data.ps.logbook.Activity|Select a \ +From TripImpl t \ +Join t.routeLogbook r \ +Join r.activity a \ +Join t.vessel vessel \ +Left Join a.vesselActivity vesselActivity \ +Where t.id In :tripId and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ +Order By vessel.code,t.startDate,r.date,a.number,a.time report.psLogbookWellPlanCheck.request.1=0,0|row|Select vessel.code,\ vessel.label2,\ concat(day(t.startDate), '/', month(t.startDate), '/', year(t.startDate)), \ concat(day(t.endDate), '/', month(t.endDate), '/', year(t.endDate)), \ concat(day(r.date), '/', month(r.date), '/', year(r.date)), \ a.number, \ -concat(hour(a.time), ':', minute(a.time)), \ +concat(hour(a.time), ':', minute(a.time)) \ +From TripImpl t \ +Join t.routeLogbook r \ +Join r.activity a \ +Join t.vessel vessel \ +Where t.id In :tripId and a = :activity +report.psLogbookWellPlanCheck.request.1.repeat=activity|column +report.psLogbookWellPlanCheck.request.2=7,0|row|Select \ Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then ct.weight Else 0.0 End), \ Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then ct.weight Else 0.0 End), \ Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then ct.weight Else 0.0 End), \ @@ -1427,12 +1423,9 @@ From TripImpl t \ Join t.routeLogbook r \ Join r.activity a \ Join a.catches ct \ -Join t.vessel vessel \ -Left Join a.vesselActivity vesselActivity \ -Where t.id In :tripId and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ -Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \ -Order By vessel.code,t.startDate,r.date,a.time -report.psLogbookWellPlanCheck.request.2=12,0|row|Select \ +Where t.id In :tripId and a = :activity +report.psLogbookWellPlanCheck.request.2.repeat=activity|column +report.psLogbookWellPlanCheck.request.3=12,0|row|Select \ Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then was.weight Else 0.0 End), \ Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then was.weight Else 0.0 End), \ Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then was.weight Else 0.0 End), \ @@ -1446,37 +1439,24 @@ From TripImpl t \ Join t.well w \ Join w.wellActivity wa \ Join wa.wellActivitySpecies was \ -Join t.routeLogbook r \ -Join r.activity a \ -Join t.vessel vessel \ -Left Join a.vesselActivity vesselActivity \ -Where t.id In :tripId and wa.activity = a and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ -Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \ -Order By vessel.code,t.startDate,r.date,a.time -report.psLogbookWellPlanCheck.request.3=17,0|row|Select \ +Where t.id In :tripId and wa.activity = :activity +report.psLogbookWellPlanCheck.request.3.repeat=activity|column +report.psLogbookWellPlanCheck.request.4=17,0|row|Select \ Sum(ct.weight) \ From TripImpl t \ Join t.routeLogbook r \ Join r.activity a \ Join a.catches ct \ -Join t.vessel vessel \ -Left Join a.vesselActivity vesselActivity \ -Where t.id In :tripId and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ -Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \ -Order By vessel.code,t.startDate,r.date,a.time -report.psLogbookWellPlanCheck.request.4=18,0|row|Select \ +Where t.id In :tripId and a = :activity +report.psLogbookWellPlanCheck.request.4.repeat=activity|column +report.psLogbookWellPlanCheck.request.5=18,0|row|Select \ Sum(was.weight) \ From TripImpl t \ Join t.well w \ Join w.wellActivity wa \ Join wa.wellActivitySpecies was \ -Join t.routeLogbook r \ -Join r.activity a \ -Join t.vessel vessel \ -Left Join a.vesselActivity vesselActivity \ -Where t.id In :tripId and wa.activity = a and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ -Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \ -Order By vessel.code,t.startDate,r.date,a.time +Where t.id In :tripId and wa.activity = :activity +report.psLogbookWellPlanCheck.request.5.repeat=activity|column report.psLogbookWellPlanCheck.operations.1=SubtractColum:17|18|19 report.psLogbookWellPlanCheck.operations.2=SumColumn:0|6 ############################################ ===================================== src/site/markdown/avdth/referential.md ===================================== @@ -241,6 +241,7 @@ Mapping type d'activité 3. On ajoute en plus un système observé **110** et **setSuccessStatus** à **2**. 4. Si un dcp est trouvé alors on utilise un type d'activité introduit en version *9.1.0* qui permet l'ajout de dcp. 5. Le type d'activité a été ajouté lors de la migration de la version *9.1.0* (avant on utilisait *99*) +6. Si **C_OPERA** est supérieur ou égal à **52**, alors on fait correspondre le référentiel avec le même code (il doit alors être présent dans le référentiel). ### REF_SCHOOL_TYPE View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2a47f0a8590b1a0905c6a5ce… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2a47f0a8590b1a0905c6a5ce… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Ajout d'un code à transcoder OPERA vers VesselActivity - Closes #2803
by Tony CHEMIT (＠tchemit) Nov. 14, 2023

Nov. 14, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2a47f0a8 by Tony Chemit at 2023-11-14T16:03:45+01:00 Ajout d'un code à transcoder OPERA vers VesselActivity - Closes #2803 - - - - - 1 changed file: - src/site/markdown/avdth/referential.md Changes: ===================================== src/site/markdown/avdth/referential.md ===================================== @@ -241,6 +241,7 @@ Mapping type d'activité 3. On ajoute en plus un système observé **110** et **setSuccessStatus** à **2**. 4. Si un dcp est trouvé alors on utilise un type d'activité introduit en version *9.1.0* qui permet l'ajout de dcp. 5. Le type d'activité a été ajouté lors de la migration de la version *9.1.0* (avant on utilisait *99*) +6. Si **C_OPERA** est supérieur ou égal à **52**, alors on fait correspondre le référentiel avec le même code (il doit alors être présent dans le référentiel). ### REF_SCHOOL_TYPE View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2a47f0a8590b1a0905c6a5ce7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2a47f0a8590b1a0905c6a5ce7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Souci de décalage de lignes sur le rapport Vérification des plans de cuve - Closes #2798
by Tony CHEMIT (＠tchemit) Nov. 14, 2023

Nov. 14, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4c54e1be by Tony Chemit at 2023-11-14T15:57:55+01:00 Souci de décalage de lignes sur le rapport Vérification des plans de cuve - Closes #2798 - - - - - 2 changed files: - core/persistence/report/src/main/resources/observe-reports.properties - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psLogbookWellPlanCheck.properties Changes: ===================================== core/persistence/report/src/main/resources/observe-reports.properties ===================================== @@ -920,6 +920,16 @@ report.psLogbookWellPlanCheck.modelType=PS report.psLogbookWellPlanCheck.name=Livre de bord - Vérification des plan de cuves report.psLogbookWellPlanCheck.description=Livre de bord - Vérification des plan de cuves report.psLogbookWellPlanCheck.columns=Code bateau,Nom bateau,Date départ,Date arrivée,Date de route,Numéro activité,Heure activité,Logbook YFT,Logbook SKJ,Logbook BET,Logbook ALB,Logbook Autres,Plan de cuves YFT,Plan de cuves SKJ,Plan de cuves BET,Plan de cuves ALB,Plan de cuves Autres,Logbook Total,Plan de cuves Total,Différence +report.psLogbookWellPlanCheck.repeatVariable.1.name=activity +report.psLogbookWellPlanCheck.repeatVariable.1.type=fr.ird.observe.entities.data.ps.logbook.Activity +report.psLogbookWellPlanCheck.repeatVariable.1.request=Select a \ +From TripImpl t \ +Join t.routeLogbook r \ +Join r.activity a \ +Join t.vessel vessel \ +Left Join a.vesselActivity vesselActivity \ +Where t.id In :tripId and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ +Order By vessel.code,t.startDate,r.date,a.number,a.time report.psLogbookWellPlanCheck.request.1.location=0,0 report.psLogbookWellPlanCheck.request.1.layout=row report.psLogbookWellPlanCheck.request.1.request=Select vessel.code,\ @@ -928,7 +938,17 @@ concat(day(t.startDate), '/', month(t.startDate), '/', year(t.startDate)), \ concat(day(t.endDate), '/', month(t.endDate), '/', year(t.endDate)), \ concat(day(r.date), '/', month(r.date), '/', year(r.date)), \ a.number, \ -concat(hour(a.time), ':', minute(a.time)), \ +concat(hour(a.time), ':', minute(a.time)) \ +From TripImpl t \ +Join t.routeLogbook r \ +Join r.activity a \ +Join t.vessel vessel \ +Where t.id In :tripId and a = :activity +report.psLogbookWellPlanCheck.request.1.repeat.name=activity +report.psLogbookWellPlanCheck.request.1.repeat.layout=column +report.psLogbookWellPlanCheck.request.2.location=7,0 +report.psLogbookWellPlanCheck.request.2.layout=row +report.psLogbookWellPlanCheck.request.2.request=Select \ Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then ct.weight Else 0.0 End), \ Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then ct.weight Else 0.0 End), \ Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then ct.weight Else 0.0 End), \ @@ -942,14 +962,12 @@ From TripImpl t \ Join t.routeLogbook r \ Join r.activity a \ Join a.catches ct \ -Join t.vessel vessel \ -Left Join a.vesselActivity vesselActivity \ -Where t.id In :tripId and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ -Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \ -Order By vessel.code,t.startDate,r.date,a.time -report.psLogbookWellPlanCheck.request.2.location=12,0 -report.psLogbookWellPlanCheck.request.2.layout=row -report.psLogbookWellPlanCheck.request.2.request=Select \ +Where t.id In :tripId and a = :activity +report.psLogbookWellPlanCheck.request.2.repeat.name=activity +report.psLogbookWellPlanCheck.request.2.repeat.layout=column +report.psLogbookWellPlanCheck.request.3.location=12,0 +report.psLogbookWellPlanCheck.request.3.layout=row +report.psLogbookWellPlanCheck.request.3.request=Select \ Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then was.weight Else 0.0 End), \ Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then was.weight Else 0.0 End), \ Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then was.weight Else 0.0 End), \ @@ -963,41 +981,31 @@ From TripImpl t \ Join t.well w \ Join w.wellActivity wa \ Join wa.wellActivitySpecies was \ -Join t.routeLogbook r \ -Join r.activity a \ -Join t.vessel vessel \ -Left Join a.vesselActivity vesselActivity \ -Where t.id In :tripId and wa.activity = a and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ -Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \ -Order By vessel.code,t.startDate,r.date,a.time -report.psLogbookWellPlanCheck.request.3.location=17,0 -report.psLogbookWellPlanCheck.request.3.layout=row -report.psLogbookWellPlanCheck.request.3.request=Select \ +Where t.id In :tripId and wa.activity = :activity +report.psLogbookWellPlanCheck.request.3.repeat.name=activity +report.psLogbookWellPlanCheck.request.3.repeat.layout=column +report.psLogbookWellPlanCheck.request.4.location=17,0 +report.psLogbookWellPlanCheck.request.4.layout=row +report.psLogbookWellPlanCheck.request.4.request=Select \ Sum(ct.weight) \ From TripImpl t \ Join t.routeLogbook r \ Join r.activity a \ Join a.catches ct \ -Join t.vessel vessel \ -Left Join a.vesselActivity vesselActivity \ -Where t.id In :tripId and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ -Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \ -Order By vessel.code,t.startDate,r.date,a.time -report.psLogbookWellPlanCheck.request.4.location=18,0 -report.psLogbookWellPlanCheck.request.4.layout=row -report.psLogbookWellPlanCheck.request.4.request=Select \ +Where t.id In :tripId and a = :activity +report.psLogbookWellPlanCheck.request.4.repeat.name=activity +report.psLogbookWellPlanCheck.request.4.repeat.layout=column +report.psLogbookWellPlanCheck.request.5.location=18,0 +report.psLogbookWellPlanCheck.request.5.layout=row +report.psLogbookWellPlanCheck.request.5.request=Select \ Sum(was.weight) \ From TripImpl t \ Join t.well w \ Join w.wellActivity wa \ Join wa.wellActivitySpecies was \ -Join t.routeLogbook r \ -Join r.activity a \ -Join t.vessel vessel \ -Left Join a.vesselActivity vesselActivity \ -Where t.id In :tripId and wa.activity = a and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ -Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \ -Order By vessel.code,t.startDate,r.date,a.time +Where t.id In :tripId and wa.activity = :activity +report.psLogbookWellPlanCheck.request.5.repeat.name=activity +report.psLogbookWellPlanCheck.request.5.repeat.layout=column report.psLogbookWellPlanCheck.operations.1.type=SubtractColum report.psLogbookWellPlanCheck.operations.1.parameters=17|18|19 report.psLogbookWellPlanCheck.operations.2.type=SumColumn ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psLogbookWellPlanCheck.properties ===================================== @@ -20,13 +20,16 @@ # #L% ### result.0=483^CAP BOJADOR^30/3/2019^8/4/2019^30/3/2019^1^15:12^0.0^123.0^43.0^0.0^0.0^0.0^0.0^12.0^0.0^0.0^166.0^12.0^154.0 +result.1=483^CAP BOJADOR^30/3/2019^8/4/2019^1/4/2019^1^15:12^null^null^null^null^null^null^null^null^null^null^null^null^- +result.2=483^CAP BOJADOR^30/3/2019^8/4/2019^1/4/2019^1^15:12^null^null^null^null^null^null^null^null^null^null^null^null^- +result.3=Total^null^null^null^null^null^-^0.0^123.0^43.0^0.0^0.0^0.0^0.0^12.0^0.0^0.0^166.0^12.0^- result.columns=20 -result.rows=1 +result.rows=4 syntax.columns=20 syntax.columnsHeader=Code bateau^Nom bateau^Date départ^Date arrivée^Date de route^Numéro activité^Heure activité^Logbook YFT^Logbook SKJ^Logbook BET^Logbook ALB^Logbook Autres^Plan de cuves YFT^Plan de cuves SKJ^Plan de cuves BET^Plan de cuves ALB^Plan de cuves Autres^Logbook Total^Plan de cuves Total^Différence syntax.description=Livre de bord - Vérification des plan de cuves syntax.name=Livre de bord - Vérification des plan de cuves -syntax.nbRequests=4 +syntax.nbRequests=5 syntax.rows=-1 syntax.rowsHeader= tripIds=${PS_COMMON_TRIP},${PS_COMMON_TRIP_MOVE} View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4c54e1be800b656ca0c1493a0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4c54e1be800b656ca0c1493a0… You're receiving this email because of your account on gitlab.com.

1 0