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

Commits:

1 changed file:

Changes:

  • services/src/main/resources/observe-reports.properties
    ... ... @@ -137,13 +137,14 @@ report.dcpUsage.repeatVariable.typeObjetId=java.lang.String|\
    137 137 
            Join a.floatingObject dcp \
    138 138 
            Where \
    139 139 
                m.id In :tripId \
    140 
    -           and (dcp.computedWhenLeavingSimplifiedObjectType = om.standardCode Or dcp.computedWhenArrivingSimplifiedObjectType = om.standardCode) \
    140 
    +           and dcp.computedWhenArrivingSimplifiedObjectType = om.standardCode \
    141 141 
            ) > 0
    142 142 
     report.dcpUsage.request.1=0,0|row|\
    143 
    -  Select concat(str(to.standardCode) , ' - ', to.label2) \
    144 
    -  From ObjectMaterialImpl to \
    143 
    +  Select concat(str(om.standardCode) , ' - ', om.label2) \
    144 
    +  From ObjectMaterialImpl om \
    145 145 
       Where \
    146 
    -      to.standardCode = :typeObjetId
    146 
    +      om.standardCode = :typeObjetId \
    147 
    +      And om.status != 0
    147 148 
     report.dcpUsage.request.1.repeat=typeObjetId|column
    148 149 
     # visite
    149 150 
     report.dcpUsage.request.2=1,0|row|\
    ... ... @@ -154,7 +155,7 @@ report.dcpUsage.request.2=1,0|row|\
    154 155 
       Join a.floatingObject dcp \
    155 156 
       Where \
    156 157 
           m.id In :tripId \
    157 
    -      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
    158 
    +      and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    158 159 
           and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2'
    159 160 
     report.dcpUsage.request.2.repeat=typeObjetId|column
    160 161 
     # peche
    ... ... @@ -166,7 +167,7 @@ report.dcpUsage.request.3=2,0|row|\
    166 167 
       Join a.floatingObject dcp \
    167 168 
       Where \
    168 169 
           m.id In :tripId \
    169 
    -      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
    170 
    +      and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    170 171 
           and (dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3' Or a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586')
    171 172 
     report.dcpUsage.request.3.repeat=typeObjetId|column
    172 173 
     # mis a l'eau
    ... ... @@ -178,7 +179,7 @@ report.dcpUsage.request.4=3,0|row|\
    178 179 
       Join a.floatingObject dcp \
    179 180 
       Where \
    180 181 
           m.id In :tripId \
    181 
    -      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
    182 
    +      and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    182 183 
           and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#1'
    183 184 
     report.dcpUsage.request.4.repeat=typeObjetId|column
    184 185 
     # modification ou rneforcement
    ... ... @@ -192,7 +193,7 @@ report.dcpUsage.request.5=4,0|row|\
    192 193 
       Join a.floatingObject dcp \
    193 194 
       Where \
    194 195 
           m.id In :tripId \
    195 
    -      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
    196 
    +      and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    196 197 
           and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8'
    197 198 
     report.dcpUsage.request.5.repeat=typeObjetId|column
    198 199 
     # Retrait
    ... ... @@ -204,7 +205,7 @@ report.dcpUsage.request.6=5,0|row|\
    204 205 
       Join a.floatingObject dcp \
    205 206 
       Where \
    206 207 
           m.id In :tripId \
    207 
    -      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
    208 
    +      and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    208 209 
           and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4'
    209 210 
     report.dcpUsage.request.6.repeat=typeObjetId|column
    210 211 
     # abondonne
    ... ... @@ -216,7 +217,7 @@ report.dcpUsage.request.7=6,0|row|\
    216 217 
       Join a.floatingObject dcp \
    217 218 
       Where \
    218 219 
           m.id In :tripId \
    219 
    -      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
    220 
    +      and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    220 221 
           and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5'
    221 222 
     report.dcpUsage.request.7.repeat=typeObjetId|column
    222 223 
     # coule
    ... ... @@ -228,7 +229,7 @@ report.dcpUsage.request.8=7,0|row|\
    228 229 
       Join a.floatingObject dcp \
    229 230 
       Where \
    230 231 
           m.id In :tripId \
    231 
    -      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
    232 
    +      and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    232 233 
           and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7'
    233 234 
     report.dcpUsage.request.8.repeat=typeObjetId|column
    234 235 
     # remplacement
    ... ... @@ -240,7 +241,7 @@ report.dcpUsage.request.9=8,0|row|\
    240 241 
       Join a.floatingObject dcp \
    241 242 
       Where \
    242 243 
           m.id In :tripId \
    243 
    -      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
    244 
    +      and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    244 245 
           and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#09'
    245 246 
     report.dcpUsage.request.9.repeat=typeObjetId|column
    246 247 
     # autre
    ... ... @@ -252,7 +253,7 @@ report.dcpUsage.request.10=9,0|row|\
    252 253 
       Join a.floatingObject dcp \
    253 254 
       Where \
    254 255 
           m.id In :tripId \
    255 
    -      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
    256 
    +      and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    256 257 
           and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#10'
    257 258 
     report.dcpUsage.request.10.repeat=typeObjetId|column
    258 259 
     # tortues
    ... ... @@ -265,7 +266,7 @@ report.dcpUsage.request.11=10,0|row| \
    265 266 
       Join dcp.objectObservedSpecies efo \
    266 267 
       Where \
    267 268 
           m.id In :tripId \
    268 
    -      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
    269 
    +      and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    269 270 
           and efo.species.speciesGroup.id = 'fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.24333033683679461'
    270 271 
     report.dcpUsage.request.11.repeat=typeObjetId|column
    271 272

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.