Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 200e1417 by tchemit at 2019-04-28T12:15:50Z Bug requête tableau synthèse DCP - Closes #1244 - - - - - 1 changed file: - services/src/main/resources/observe-reports.properties Changes: ===================================== services/src/main/resources/observe-reports.properties ===================================== @@ -137,13 +137,14 @@ report.dcpUsage.repeatVariable.typeObjetId=java.lang.String|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = om.standardCode Or dcp.computedWhenArrivingSimplifiedObjectType = om.standardCode) \ + and dcp.computedWhenArrivingSimplifiedObjectType = om.standardCode \ ) > 0 report.dcpUsage.request.1=0,0|row|\ - Select concat(str(to.standardCode) , ' - ', to.label2) \ - From ObjectMaterialImpl to \ + Select concat(str(om.standardCode) , ' - ', om.label2) \ + From ObjectMaterialImpl om \ Where \ - to.standardCode = :typeObjetId + om.standardCode = :typeObjetId \ + And om.status != 0 report.dcpUsage.request.1.repeat=typeObjetId|column # visite report.dcpUsage.request.2=1,0|row|\ @@ -154,7 +155,7 @@ report.dcpUsage.request.2=1,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#2' report.dcpUsage.request.2.repeat=typeObjetId|column # peche @@ -166,7 +167,7 @@ report.dcpUsage.request.3=2,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and (dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#3' Or a.vesselActivitySeine.id = 'fr.ird.referential.ps.common.VesselActivitySeine#1239832675369#0.12552908048322586') report.dcpUsage.request.3.repeat=typeObjetId|column # mis a l'eau @@ -178,7 +179,7 @@ report.dcpUsage.request.4=3,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#1' report.dcpUsage.request.4.repeat=typeObjetId|column # modification ou rneforcement @@ -192,7 +193,7 @@ report.dcpUsage.request.5=4,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#8' report.dcpUsage.request.5.repeat=typeObjetId|column # Retrait @@ -204,7 +205,7 @@ report.dcpUsage.request.6=5,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#4' report.dcpUsage.request.6.repeat=typeObjetId|column # abondonne @@ -216,7 +217,7 @@ report.dcpUsage.request.7=6,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#5' report.dcpUsage.request.7.repeat=typeObjetId|column # coule @@ -228,7 +229,7 @@ report.dcpUsage.request.8=7,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#7' report.dcpUsage.request.8.repeat=typeObjetId|column # remplacement @@ -240,7 +241,7 @@ report.dcpUsage.request.9=8,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#09' report.dcpUsage.request.9.repeat=typeObjetId|column # autre @@ -252,7 +253,7 @@ report.dcpUsage.request.10=9,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#10' report.dcpUsage.request.10.repeat=typeObjetId|column # tortues @@ -265,7 +266,7 @@ report.dcpUsage.request.11=10,0|row| \ Join dcp.objectObservedSpecies efo \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and efo.species.speciesGroup.id = 'fr.ird.referential.common.SpeciesGroup#1239832683690#0.24333033683679461' report.dcpUsage.request.11.repeat=typeObjetId|column View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/200e1417d430b49a1e34afd61c16... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/200e1417d430b49a1e34afd61c16... You're receiving this email because of your account on gitlab.com.