Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

5 changed files:

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
    920 920 
     report.psLogbookWellPlanCheck.name=Livre de bord - Vérification des plan de cuves
    921 921 
     report.psLogbookWellPlanCheck.description=Livre de bord - Vérification des plan de cuves
    922 922 
     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
    923 
    +report.psLogbookWellPlanCheck.repeatVariable.1.name=activity
    924 
    +report.psLogbookWellPlanCheck.repeatVariable.1.type=fr.ird.observe.entities.data.ps.logbook.Activity
    925 
    +report.psLogbookWellPlanCheck.repeatVariable.1.request=Select a \
    926 
    +From TripImpl t \
    927 
    +Join t.routeLogbook r \
    928 
    +Join r.activity a \
    929 
    +Join t.vessel vessel \
    930 
    +Left Join a.vesselActivity vesselActivity \
    931 
    +Where t.id In :tripId and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \
    932 
    +Order By vessel.code,t.startDate,r.date,a.number,a.time
    923 933 
     report.psLogbookWellPlanCheck.request.1.location=0,0
    924 934 
     report.psLogbookWellPlanCheck.request.1.layout=row
    925 935 
     report.psLogbookWellPlanCheck.request.1.request=Select vessel.code,\
    ... ... @@ -928,7 +938,17 @@ concat(day(t.startDate), '/', month(t.startDate), '/', year(t.startDate)), \
    928 938 
     concat(day(t.endDate), '/', month(t.endDate), '/', year(t.endDate)), \
    929 939 
     concat(day(r.date), '/', month(r.date), '/', year(r.date)), \
    930 940 
     a.number, \
    931 
    -concat(hour(a.time), ':', minute(a.time)), \
    941 
    +concat(hour(a.time), ':', minute(a.time)) \
    942 
    +From TripImpl t \
    943 
    +Join t.routeLogbook r \
    944 
    +Join r.activity a \
    945 
    +Join t.vessel vessel \
    946 
    +Where t.id In :tripId and a = :activity
    947 
    +report.psLogbookWellPlanCheck.request.1.repeat.name=activity
    948 
    +report.psLogbookWellPlanCheck.request.1.repeat.layout=column
    949 
    +report.psLogbookWellPlanCheck.request.2.location=7,0
    950 
    +report.psLogbookWellPlanCheck.request.2.layout=row
    951 
    +report.psLogbookWellPlanCheck.request.2.request=Select \
    932 952 
     Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569'  Then ct.weight Else 0.0 End), \
    933 953 
     Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992'   Then ct.weight Else 0.0 End), \
    934 954 
     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 \
    942 962 
     Join t.routeLogbook r \
    943 963 
     Join r.activity a \
    944 964 
     Join a.catches ct \
    945 
    -Join t.vessel vessel \
    946 
    -Left Join a.vesselActivity vesselActivity \
    947 
    -Where t.id In :tripId and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \
    948 
    -Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \
    949 
    -Order By vessel.code,t.startDate,r.date,a.time
    950 
    -report.psLogbookWellPlanCheck.request.2.location=12,0
    951 
    -report.psLogbookWellPlanCheck.request.2.layout=row
    952 
    -report.psLogbookWellPlanCheck.request.2.request=Select \
    965 
    +Where t.id In :tripId and a = :activity
    966 
    +report.psLogbookWellPlanCheck.request.2.repeat.name=activity
    967 
    +report.psLogbookWellPlanCheck.request.2.repeat.layout=column
    968 
    +report.psLogbookWellPlanCheck.request.3.location=12,0
    969 
    +report.psLogbookWellPlanCheck.request.3.layout=row
    970 
    +report.psLogbookWellPlanCheck.request.3.request=Select \
    953 971 
     Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569'  Then was.weight Else 0.0 End), \
    954 972 
     Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992'   Then was.weight Else 0.0 End), \
    955 973 
     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 \
    963 981 
     Join t.well w \
    964 982 
     Join w.wellActivity wa \
    965 983 
     Join wa.wellActivitySpecies was \
    966 
    -Join t.routeLogbook r \
    967 
    -Join r.activity a \
    968 
    -Join t.vessel vessel \
    969 
    -Left Join a.vesselActivity vesselActivity \
    970 
    -Where t.id In :tripId and wa.activity = a and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \
    971 
    -Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \
    972 
    -Order By vessel.code,t.startDate,r.date,a.time
    973 
    -report.psLogbookWellPlanCheck.request.3.location=17,0
    974 
    -report.psLogbookWellPlanCheck.request.3.layout=row
    975 
    -report.psLogbookWellPlanCheck.request.3.request=Select \
    984 
    +Where t.id In :tripId and wa.activity = :activity
    985 
    +report.psLogbookWellPlanCheck.request.3.repeat.name=activity
    986 
    +report.psLogbookWellPlanCheck.request.3.repeat.layout=column
    987 
    +report.psLogbookWellPlanCheck.request.4.location=17,0
    988 
    +report.psLogbookWellPlanCheck.request.4.layout=row
    989 
    +report.psLogbookWellPlanCheck.request.4.request=Select \
    976 990 
     Sum(ct.weight) \
    977 991 
     From TripImpl t \
    978 992 
     Join t.routeLogbook r \
    979 993 
     Join r.activity a \
    980 994 
     Join a.catches ct \
    981 
    -Join t.vessel vessel \
    982 
    -Left Join a.vesselActivity vesselActivity \
    983 
    -Where t.id In :tripId and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \
    984 
    -Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \
    985 
    -Order By vessel.code,t.startDate,r.date,a.time
    986 
    -report.psLogbookWellPlanCheck.request.4.location=18,0
    987 
    -report.psLogbookWellPlanCheck.request.4.layout=row
    988 
    -report.psLogbookWellPlanCheck.request.4.request=Select \
    995 
    +Where t.id In :tripId and a = :activity
    996 
    +report.psLogbookWellPlanCheck.request.4.repeat.name=activity
    997 
    +report.psLogbookWellPlanCheck.request.4.repeat.layout=column
    998 
    +report.psLogbookWellPlanCheck.request.5.location=18,0
    999 
    +report.psLogbookWellPlanCheck.request.5.layout=row
    1000 
    +report.psLogbookWellPlanCheck.request.5.request=Select \
    989 1001 
     Sum(was.weight) \
    990 1002 
     From TripImpl t \
    991 1003 
     Join t.well w \
    992 1004 
     Join w.wellActivity wa \
    993 1005 
     Join wa.wellActivitySpecies was \
    994 
    -Join t.routeLogbook r \
    995 
    -Join r.activity a \
    996 
    -Join t.vessel vessel \
    997 
    -Left Join a.vesselActivity vesselActivity \
    998 
    -Where t.id In :tripId and wa.activity = a and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \
    999 
    -Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \
    1000 
    -Order By vessel.code,t.startDate,r.date,a.time
    1006 
    +Where t.id In :tripId and wa.activity = :activity
    1007 
    +report.psLogbookWellPlanCheck.request.5.repeat.name=activity
    1008 
    +report.psLogbookWellPlanCheck.request.5.repeat.layout=column
    1001 1009 
     report.psLogbookWellPlanCheck.operations.1.type=SubtractColum
    1002 1010 
     report.psLogbookWellPlanCheck.operations.1.parameters=17|18|19
    1003 1011 
     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 @@
    20 20 
     # #L%
    21 21 
     ###
    22 22 
     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
    23 
    +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^-
    24 
    +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^-
    25 
    +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^-
    23 26 
     result.columns=20
    24 
    -result.rows=1
    27 
    +result.rows=4
    25 28 
     syntax.columns=20
    26 29 
     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
    27 30 
     syntax.description=Livre de bord - Vérification des plan de cuves
    28 31 
     syntax.name=Livre de bord - Vérification des plan de cuves
    29 
    -syntax.nbRequests=4
    32 
    +syntax.nbRequests=5
    30 33 
     syntax.rows=-1
    31 34 
     syntax.rowsHeader=
    32 35 
     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
    1387 1387 
     report.psLogbookWellPlanCheck.modelType=PS
    1388 1388 
     report.psLogbookWellPlanCheck.name=Livre de bord - Vérification des plan de cuves
    1389 1389 
     report.psLogbookWellPlanCheck.description=Livre de bord - Vérification des plan de cuves
    1390 
    -report.psLogbookWellPlanCheck.columns=Code bateau,\
    1391 
    -Nom bateau,\
    1392 
    -Date départ,\
    1393 
    -Date arrivée,\
    1394 
    -Date de route,\
    1395 
    -Numéro activité,\
    1396 
    -Heure activité,\
    1397 
    -Logbook YFT,\
    1398 
    -Logbook SKJ,\
    1399 
    -Logbook BET,\
    1400 
    -Logbook ALB,\
    1401 
    -Logbook Autres,\
    1402 
    -Plan de cuves YFT,\
    1403 
    -Plan de cuves SKJ,\
    1404 
    -Plan de cuves BET,\
    1405 
    -Plan de cuves ALB,\
    1406 
    -Plan de cuves Autres,\
    1407 
    -Logbook Total,\
    1408 
    -Plan de cuves Total,\
    1409 
    -Différence
    1390 
    +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
    1391 
    +report.psLogbookWellPlanCheck.repeatVariable.activity=fr.ird.observe.entities.data.ps.logbook.Activity|Select a \
    1392 
    +From TripImpl t \
    1393 
    +Join t.routeLogbook r \
    1394 
    +Join r.activity a \
    1395 
    +Join t.vessel vessel \
    1396 
    +Left Join a.vesselActivity vesselActivity \
    1397 
    +Where t.id In :tripId and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \
    1398 
    +Order By vessel.code,t.startDate,r.date,a.number,a.time
    1410 1399 
     report.psLogbookWellPlanCheck.request.1=0,0|row|Select vessel.code,\
    1411 1400 
     vessel.label2,\
    1412 1401 
     concat(day(t.startDate), '/', month(t.startDate), '/', year(t.startDate)), \
    1413 1402 
     concat(day(t.endDate), '/', month(t.endDate), '/', year(t.endDate)), \
    1414 1403 
     concat(day(r.date), '/', month(r.date), '/', year(r.date)), \
    1415 1404 
     a.number, \
    1416 
    -concat(hour(a.time), ':', minute(a.time)), \
    1405 
    +concat(hour(a.time), ':', minute(a.time)) \
    1406 
    +From TripImpl t \
    1407 
    +Join t.routeLogbook r \
    1408 
    +Join r.activity a \
    1409 
    +Join t.vessel vessel \
    1410 
    +Where t.id In :tripId and a = :activity
    1411 
    +report.psLogbookWellPlanCheck.request.1.repeat=activity|column
    1412 
    +report.psLogbookWellPlanCheck.request.2=7,0|row|Select \
    1417 1413 
     Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569'  Then ct.weight Else 0.0 End), \
    1418 1414 
     Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992'   Then ct.weight Else 0.0 End), \
    1419 1415 
     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 \
    1427 1423 
     Join t.routeLogbook r \
    1428 1424 
     Join r.activity a \
    1429 1425 
     Join a.catches ct \
    1430 
    -Join t.vessel vessel \
    1431 
    -Left Join a.vesselActivity vesselActivity \
    1432 
    -Where t.id In :tripId and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \
    1433 
    -Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \
    1434 
    -Order By vessel.code,t.startDate,r.date,a.time
    1435 
    -report.psLogbookWellPlanCheck.request.2=12,0|row|Select \
    1426 
    +Where t.id In :tripId and a = :activity
    1427 
    +report.psLogbookWellPlanCheck.request.2.repeat=activity|column
    1428 
    +report.psLogbookWellPlanCheck.request.3=12,0|row|Select \
    1436 1429 
     Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569'  Then was.weight Else 0.0 End), \
    1437 1430 
     Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992'   Then was.weight Else 0.0 End), \
    1438 1431 
     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 \
    1446 1439 
     Join t.well w \
    1447 1440 
     Join w.wellActivity wa \
    1448 1441 
     Join wa.wellActivitySpecies was \
    1449 
    -Join t.routeLogbook r \
    1450 
    -Join r.activity a \
    1451 
    -Join t.vessel vessel \
    1452 
    -Left Join a.vesselActivity vesselActivity \
    1453 
    -Where t.id In :tripId and wa.activity = a and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \
    1454 
    -Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \
    1455 
    -Order By vessel.code,t.startDate,r.date,a.time
    1456 
    -report.psLogbookWellPlanCheck.request.3=17,0|row|Select \
    1442 
    +Where t.id In :tripId and wa.activity = :activity
    1443 
    +report.psLogbookWellPlanCheck.request.3.repeat=activity|column
    1444 
    +report.psLogbookWellPlanCheck.request.4=17,0|row|Select \
    1457 1445 
     Sum(ct.weight) \
    1458 1446 
     From TripImpl t \
    1459 1447 
     Join t.routeLogbook r \
    1460 1448 
     Join r.activity a \
    1461 1449 
     Join a.catches ct \
    1462 
    -Join t.vessel vessel \
    1463 
    -Left Join a.vesselActivity vesselActivity \
    1464 
    -Where t.id In :tripId and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \
    1465 
    -Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \
    1466 
    -Order By vessel.code,t.startDate,r.date,a.time
    1467 
    -report.psLogbookWellPlanCheck.request.4=18,0|row|Select \
    1450 
    +Where t.id In :tripId and a = :activity
    1451 
    +report.psLogbookWellPlanCheck.request.4.repeat=activity|column
    1452 
    +report.psLogbookWellPlanCheck.request.5=18,0|row|Select \
    1468 1453 
     Sum(was.weight) \
    1469 1454 
     From TripImpl t \
    1470 1455 
     Join t.well w \
    1471 1456 
     Join w.wellActivity wa \
    1472 1457 
     Join wa.wellActivitySpecies was \
    1473 
    -Join t.routeLogbook r \
    1474 
    -Join r.activity a \
    1475 
    -Join t.vessel vessel \
    1476 
    -Left Join a.vesselActivity vesselActivity \
    1477 
    -Where t.id In :tripId and wa.activity = a and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \
    1478 
    -Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \
    1479 
    -Order By vessel.code,t.startDate,r.date,a.time
    1458 
    +Where t.id In :tripId and wa.activity = :activity
    1459 
    +report.psLogbookWellPlanCheck.request.5.repeat=activity|column
    1480 1460 
     report.psLogbookWellPlanCheck.operations.1=SubtractColum:17|18|19
    1481 1461 
     report.psLogbookWellPlanCheck.operations.2=SumColumn:0|6
    1482 1462 
     ############################################

  • src/site/markdown/avdth/referential.md
    ... ... @@ -241,6 +241,7 @@ Mapping type d'activité
    241 241 
     3. On ajoute en plus un système observé **110** et **setSuccessStatus** à **2**.
    242 242 
     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.
    243 243 
     5. Le type d'activité a été ajouté lors de la migration de la version *9.1.0* (avant on utilisait *99*)
    244 
    +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).
    244 245
    245 246 
     ### REF_SCHOOL_TYPE
    246 247

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. Manage all notifications · Help