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/4c54e1be800b656ca0c1493a02... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4c54e1be800b656ca0c1493a02... You're receiving this email because of your account on gitlab.com.