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

Commits:

1 changed file:

Changes:

  • services/src/main/resources/observe-reports.properties
    ... ... @@ -137,9 +137,9 @@ report.fobUsageMinimal.repeatVariable.typeObjetId=java.lang.String|\
    137 137 
       Where standardCode is not null \
    138 138 
       And standardCode != '' \
    139 139 
       And (Select Count(dcp) \
    140 
    -       From TripSeineImpl m \
    140 
    +       From fr.ird.observe.entities.data.ps.common.TripImpl m \
    141 141 
            Join m.route r \
    142 
    -       Join r.activitySeine a \
    142 
    +       Join r.activity a \
    143 143 
            Join a.floatingObject dcp \
    144 144 
            Where \
    145 145 
                m.id In :tripId \
    ... ... @@ -156,70 +156,70 @@ report.fobUsageMinimal.request.1.repeat=typeObjetId|column
    156 156 
     # rencontres + peches
    157 157 
     report.fobUsageMinimal.request.2=1,0|row|\
    158 158 
       Select Count(dcp) \
    159 
    -  From TripSeineImpl m \
    159 
    +  From fr.ird.observe.entities.data.ps.common.TripImpl m \
    160 160 
       Join m.route r \
    161 
    -  Join r.activitySeine a \
    161 
    +  Join r.activity a \
    162 162 
       Join a.floatingObject dcp \
    163 163 
       Where \
    164 164 
           m.id In :tripId \
    165 165 
           and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    166 
    -	  and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' \
    167 
    -	  and (dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' \
    168 
    -	  	   or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8' \
    169 
    -	  	   or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4' \
    170 
    -	  	   or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5' \
    171 
    -	  	   or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7' \
    172 
    -	  	   or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#9' \
    173 
    -	  	   or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#10' \
    174 
    -      	   or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3')
    166 
    +	  and a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \
    167 
    +	  and (dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#2' \
    168 
    +	  	   or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#8' \
    169 
    +	  	   or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#4' \
    170 
    +	  	   or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#5' \
    171 
    +	  	   or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#7' \
    172 
    +	  	   or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#9' \
    173 
    +	  	   or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#10' \
    174 
    +      	   or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#3')
    175 175 
     report.fobUsageMinimal.request.2.repeat=typeObjetId|column
    176 176
    177 177 
     # rencontres - peches
    178 178 
     report.fobUsageMinimal.request.3=2,0|row|\
    179 179 
       Select Count(dcp) \
    180 
    -  From TripSeineImpl m \
    180 
    +  From fr.ird.observe.entities.data.ps.common.TripImpl m \
    181 181 
       Join m.route r \
    182 
    -  Join r.activitySeine a \
    182 
    +  Join r.activity a \
    183 183 
       Join a.floatingObject dcp \
    184 184 
       Where \
    185 185 
           m.id In :tripId \
    186 186 
           and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    187 
    -	  and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586'
    188 
    -and (dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' \
    189 
    -	  	   or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8' \
    190 
    -	  	   or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4' \
    191 
    -	  	   or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5' \
    192 
    -	  	   or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7' \
    193 
    -	  	   or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#9' \
    194 
    -	  	   or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#10' \
    195 
    -      	   or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3')
    187 
    +	  and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586'
    188 
    +and (dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#2' \
    189 
    +	  	   or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#8' \
    190 
    +	  	   or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#4' \
    191 
    +	  	   or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#5' \
    192 
    +	  	   or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#7' \
    193 
    +	  	   or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#9' \
    194 
    +	  	   or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#10' \
    195 
    +      	   or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#3')
    196 196 
     report.fobUsageMinimal.request.3.repeat=typeObjetId|column
    197 197
    198 198 
     # deployes
    199 199 
     report.fobUsageMinimal.request.4=3,0|row|\
    200 200 
       Select Count(dcp) \
    201 
    -  From TripSeineImpl m \
    201 
    +  From fr.ird.observe.entities.data.ps.common.TripImpl m \
    202 202 
       Join m.route r \
    203 
    -  Join r.activitySeine a \
    203 
    +  Join r.activity a \
    204 204 
       Join a.floatingObject dcp \
    205 205 
       Where \
    206 206 
           m.id In :tripId \
    207 207 
           and dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId \
    208 
    -	  and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#1'
    208 
    +	  and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#1'
    209 209 
     report.fobUsageMinimal.request.4.repeat=typeObjetId|column
    210 210
    211 211 
     # Nombre de tortues
    212 212 
     report.fobUsageMinimal.request.5=4,0|row| \
    213 213 
       Select Sum(efo.count) \
    214 
    -  From TripSeineImpl m \
    214 
    +  From fr.ird.observe.entities.data.ps.common.TripImpl m \
    215 215 
       Join m.route r \
    216 
    -  Join r.activitySeine a \
    216 
    +  Join r.activity a \
    217 217 
       Join a.floatingObject dcp \
    218 218 
       Join dcp.objectObservedSpecies efo \
    219 219 
       Where \
    220 220 
           m.id In :tripId \
    221 221 
           and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    222 
    -      and efo.species.speciesGroup.id = 'fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.24333033683679461'
    222 
    +      and efo.species.speciesGroup.id = 'fr.ird.referential.common.SpeciesGroup#1239832683690#0.24333033683679461'
    223 223 
     report.fobUsageMinimal.request.5.repeat=typeObjetId|column
    224 224 
     ################################################################################
    225 225 
     ## Utilisation des FOB, tableau detaille
    ... ... @@ -252,9 +252,9 @@ report.fobUsageExtended.repeatVariable.typeObjetId=java.lang.String|\
    252 252 
       Where standardCode is not null \
    253 253 
       And standardCode != '' \
    254 254 
       And (Select Count(dcp) \
    255 
    -       From TripSeineImpl m \
    255 
    +       From fr.ird.observe.entities.data.ps.common.TripImpl m \
    256 256 
            Join m.route r \
    257 
    -       Join r.activitySeine a \
    257 
    +       Join r.activity a \
    258 258 
            Join a.floatingObject dcp \
    259 259 
            Where \
    260 260 
                m.id In :tripId \
    ... ... @@ -271,241 +271,241 @@ report.fobUsageExtended.request.1.repeat=typeObjetId|column
    271 271 
     # visite + peche
    272 272 
     report.fobUsageExtended.request.2=1,0|row|\
    273 273 
       Select Count(dcp) \
    274 
    -  From TripSeineImpl m \
    274 
    +  From fr.ird.observe.entities.data.ps.common.TripImpl m \
    275 275 
       Join m.route r \
    276 
    -  Join r.activitySeine a \
    276 
    +  Join r.activity a \
    277 277 
       Join a.floatingObject dcp \
    278 278 
       Where \
    279 279 
           m.id In :tripId \
    280 280 
           and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    281 
    -      and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' \
    282 
    -	  and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586'
    281 
    +      and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#2' \
    282 
    +	  and a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586'
    283 283 
     report.fobUsageExtended.request.2.repeat=typeObjetId|column
    284 284
    285 285 
     # visite - peche
    286 286 
     report.fobUsageExtended.request.3=2,0|row|\
    287 287 
       Select Count(dcp) \
    288 
    -  From TripSeineImpl m \
    288 
    +  From fr.ird.observe.entities.data.ps.common.TripImpl m \
    289 289 
       Join m.route r \
    290 
    -  Join r.activitySeine a \
    290 
    +  Join r.activity a \
    291 291 
       Join a.floatingObject dcp \
    292 292 
       Where \
    293 293 
           m.id In :tripId \
    294 294 
           and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    295 
    -      and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' \
    296 
    -	  and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586'
    295 
    +      and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#2' \
    296 
    +	  and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586'
    297 297 
     report.fobUsageExtended.request.3.repeat=typeObjetId|column
    298 298
    299 299 
     # Deploiement + peche
    300 300 
     report.fobUsageExtended.request.4=3,0|row|\
    301 301 
       Select Count(dcp) \
    302 
    -  From TripSeineImpl m \
    302 
    +  From fr.ird.observe.entities.data.ps.common.TripImpl m \
    303 303 
       Join m.route r \
    304 
    -  Join r.activitySeine a \
    304 
    +  Join r.activity a \
    305 305 
       Join a.floatingObject dcp \
    306 306 
       Where \
    307 307 
           m.id In :tripId \
    308 308 
           and dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId \
    309 
    -      and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#1' \
    310 
    -	  and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586'
    309 
    +      and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#1' \
    310 
    +	  and a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586'
    311 311 
     report.fobUsageExtended.request.4.repeat=typeObjetId|column
    312 312
    313 313 
     # Deploiement - peche
    314 314 
     report.fobUsageExtended.request.5=4,0|row|\
    315 315 
       Select Count(dcp) \
    316 
    -  From TripSeineImpl m \
    316 
    +  From fr.ird.observe.entities.data.ps.common.TripImpl m \
    317 317 
       Join m.route r \
    318 
    -  Join r.activitySeine a \
    318 
    +  Join r.activity a \
    319 319 
       Join a.floatingObject dcp \
    320 320 
       Where \
    321 321 
           m.id In :tripId \
    322 322 
           and dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId \
    323 
    -      and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#1' \
    324 
    -	  and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586'
    323 
    +      and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#1' \
    324 
    +	  and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586'
    325 325 
     report.fobUsageExtended.request.5.repeat=typeObjetId|column
    326 326
    327 327 
     # Modifie + peche
    328 328 
     report.fobUsageExtended.request.6=5,0|row|\
    329 329 
       Select Count(dcp) \
    330 
    -  From TripSeineImpl m \
    330 
    +  From fr.ird.observe.entities.data.ps.common.TripImpl m \
    331 331 
       Join m.route r \
    332 
    -  Join r.activitySeine a \
    332 
    +  Join r.activity a \
    333 333 
       Join a.floatingObject dcp \
    334 334 
       Where \
    335 335 
           m.id In :tripId \
    336 336 
           and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    337 
    -      and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8' \
    338 
    -	  and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586'
    337 
    +      and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#8' \
    338 
    +	  and a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586'
    339 339 
     report.fobUsageExtended.request.6.repeat=typeObjetId|column
    340 340
    341 341 
     # Modifie - peche
    342 342 
     report.fobUsageExtended.request.7=6,0|row|\
    343 343 
       Select Count(dcp) \
    344 
    -  From TripSeineImpl m \
    344 
    +  From fr.ird.observe.entities.data.ps.common.TripImpl m \
    345 345 
       Join m.route r \
    346 
    -  Join r.activitySeine a \
    346 
    +  Join r.activity a \
    347 347 
       Join a.floatingObject dcp \
    348 348 
       Where \
    349 349 
           m.id In :tripId \
    350 350 
           and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    351 
    -      and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8' \
    352 
    -	  and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586'
    351 
    +      and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#8' \
    352 
    +	  and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586'
    353 353 
     report.fobUsageExtended.request.7.repeat=typeObjetId|column
    354 354
    355 355 
     # Retire + peche
    356 356 
     report.fobUsageExtended.request.8=7,0|row|\
    357 357 
       Select Count(dcp) \
    358 
    -  From TripSeineImpl m \
    358 
    +  From fr.ird.observe.entities.data.ps.common.TripImpl m \
    359 359 
       Join m.route r \
    360 
    -  Join r.activitySeine a \
    360 
    +  Join r.activity a \
    361 361 
       Join a.floatingObject dcp \
    362 362 
       Where \
    363 363 
           m.id In :tripId \
    364 364 
           and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    365 
    -      and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4' \
    366 
    -	  and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586'
    365 
    +      and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#4' \
    366 
    +	  and a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586'
    367 367 
     report.fobUsageExtended.request.8.repeat=typeObjetId|column
    368 368
    369 369 
     # Retire - peche
    370 370 
     report.fobUsageExtended.request.9=8,0|row|\
    371 371 
       Select Count(dcp) \
    372 
    -  From TripSeineImpl m \
    372 
    +  From fr.ird.observe.entities.data.ps.common.TripImpl m \
    373 373 
       Join m.route r \
    374 
    -  Join r.activitySeine a \
    374 
    +  Join r.activity a \
    375 375 
       Join a.floatingObject dcp \
    376 376 
       Where \
    377 377 
           m.id In :tripId \
    378 378 
           and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    379 
    -      and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4' \
    380 
    -	  and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586'
    379 
    +      and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#4' \
    380 
    +	  and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586'
    381 381 
     report.fobUsageExtended.request.9.repeat=typeObjetId|column
    382 382
    383 383 
     # Abandonne + peche
    384 384 
     report.fobUsageExtended.request.10=9,0|row|\
    385 385 
       Select Count(dcp) \
    386 
    -  From TripSeineImpl m \
    386 
    +  From fr.ird.observe.entities.data.ps.common.TripImpl m \
    387 387 
       Join m.route r \
    388 
    -  Join r.activitySeine a \
    388 
    +  Join r.activity a \
    389 389 
       Join a.floatingObject dcp \
    390 390 
       Where \
    391 391 
           m.id In :tripId \
    392 392 
           and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    393 
    -      and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5' \
    394 
    -	  and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586'
    393 
    +      and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#5' \
    394 
    +	  and a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586'
    395 395 
     report.fobUsageExtended.request.10.repeat=typeObjetId|column
    396 396
    397 397 
     # Abandonne - peche
    398 398 
     report.fobUsageExtended.request.11=10,0|row|\
    399 399 
       Select Count(dcp) \
    400 
    -  From TripSeineImpl m \
    400 
    +  From fr.ird.observe.entities.data.ps.common.TripImpl m \
    401 401 
       Join m.route r \
    402 
    -  Join r.activitySeine a \
    402 
    +  Join r.activity a \
    403 403 
       Join a.floatingObject dcp \
    404 404 
       Where \
    405 405 
           m.id In :tripId \
    406 406 
           and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    407 
    -      and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5' \
    408 
    -	  and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586'
    407 
    +      and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#5' \
    408 
    +	  and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586'
    409 409 
     report.fobUsageExtended.request.11.repeat=typeObjetId|column
    410 410
    411 411 
     # Coule + peche
    412 412 
     report.fobUsageExtended.request.12=11,0|row|\
    413 413 
       Select Count(dcp) \
    414 
    -  From TripSeineImpl m \
    414 
    +  From fr.ird.observe.entities.data.ps.common.TripImpl m \
    415 415 
       Join m.route r \
    416 
    -  Join r.activitySeine a \
    416 
    +  Join r.activity a \
    417 417 
       Join a.floatingObject dcp \
    418 418 
       Where \
    419 419 
           m.id In :tripId \
    420 420 
           and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    421 
    -      and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7' \
    422 
    -	  and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586'
    421 
    +      and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#7' \
    422 
    +	  and a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586'
    423 423 
     report.fobUsageExtended.request.12.repeat=typeObjetId|column
    424 424
    425 425 
     # Coule - peche
    426 426 
     report.fobUsageExtended.request.13=12,0|row|\
    427 427 
       Select Count(dcp) \
    428 
    -  From TripSeineImpl m \
    428 
    +  From fr.ird.observe.entities.data.ps.common.TripImpl m \
    429 429 
       Join m.route r \
    430 
    -  Join r.activitySeine a \
    430 
    +  Join r.activity a \
    431 431 
       Join a.floatingObject dcp \
    432 432 
       Where \
    433 433 
           m.id In :tripId \
    434 434 
           and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    435 
    -      and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7' \
    436 
    -	  and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586'
    435 
    +      and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#7' \
    436 
    +	  and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586'
    437 437 
     report.fobUsageExtended.request.13.repeat=typeObjetId|column
    438 438
    439 439 
     # Remplace + peche
    440 440 
     report.fobUsageExtended.request.14=13,0|row|\
    441 441 
       Select Count(dcp) \
    442 
    -  From TripSeineImpl m \
    442 
    +  From fr.ird.observe.entities.data.ps.common.TripImpl m \
    443 443 
       Join m.route r \
    444 
    -  Join r.activitySeine a \
    444 
    +  Join r.activity a \
    445 445 
       Join a.floatingObject dcp \
    446 446 
       Where \
    447 447 
           m.id In :tripId \
    448 448 
           and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    449 
    -      and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#9' \
    450 
    -	  and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586'
    449 
    +      and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#9' \
    450 
    +	  and a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586'
    451 451 
     report.fobUsageExtended.request.14.repeat=typeObjetId|column
    452 452
    453 453 
     # Remplace - peche
    454 454 
     report.fobUsageExtended.request.15=14,0|row|\
    455 455 
       Select Count(dcp) \
    456 
    -  From TripSeineImpl m \
    456 
    +  From fr.ird.observe.entities.data.ps.common.TripImpl m \
    457 457 
       Join m.route r \
    458 
    -  Join r.activitySeine a \
    458 
    +  Join r.activity a \
    459 459 
       Join a.floatingObject dcp \
    460 460 
       Where \
    461 461 
           m.id In :tripId \
    462 462 
           and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    463 
    -      and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#9' \
    464 
    -	  and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586'
    463 
    +      and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#9' \
    464 
    +	  and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586'
    465 465 
     report.fobUsageExtended.request.15.repeat=typeObjetId|column
    466 466
    467 467 
     # Autre ou ancien peche + peche
    468 468 
     report.fobUsageExtended.request.16=15,0|row|\
    469 469 
       Select Count(dcp) \
    470 
    -  From TripSeineImpl m \
    470 
    +  From fr.ird.observe.entities.data.ps.common.TripImpl m \
    471 471 
       Join m.route r \
    472 
    -  Join r.activitySeine a \
    472 
    +  Join r.activity a \
    473 473 
       Join a.floatingObject dcp \
    474 474 
       Where \
    475 475 
           m.id In :tripId \
    476 476 
           and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    477 
    -      and (dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#10' \
    478 
    -      	   or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3') \
    479 
    -	  and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586'
    477 
    +      and (dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#10' \
    478 
    +      	   or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#3') \
    479 
    +	  and a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586'
    480 480 
     report.fobUsageExtended.request.16.repeat=typeObjetId|column
    481 481
    482 482 
     # Autre ou ancien peche - peche
    483 483 
     report.fobUsageExtended.request.17=16,0|row|\
    484 484 
       Select Count(dcp) \
    485 
    -  From TripSeineImpl m \
    485 
    +  From fr.ird.observe.entities.data.ps.common.TripImpl m \
    486 486 
       Join m.route r \
    487 
    -  Join r.activitySeine a \
    487 
    +  Join r.activity a \
    488 488 
       Join a.floatingObject dcp \
    489 489 
       Where \
    490 490 
           m.id In :tripId \
    491 491 
           and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    492 
    -      and (dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#10' \
    493 
    -      	   or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3') \
    494 
    -	  and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586'
    492 
    +      and (dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#10' \
    493 
    +      	   or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#3') \
    494 
    +	  and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586'
    495 495 
     report.fobUsageExtended.request.17.repeat=typeObjetId|column
    496 496
    497 497 
     # Nombre de tortues
    498 498 
     report.fobUsageExtended.request.18=17,0|row| \
    499 499 
       Select Sum(efo.count) \
    500 
    -  From TripSeineImpl m \
    500 
    +  From fr.ird.observe.entities.data.ps.common.TripImpl m \
    501 501 
       Join m.route r \
    502 
    -  Join r.activitySeine a \
    502 
    +  Join r.activity a \
    503 503 
       Join a.floatingObject dcp \
    504 504 
       Join dcp.objectObservedSpecies efo \
    505 505 
       Where \
    506 506 
           m.id In :tripId \
    507 507 
           and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    508 
    -      and efo.species.speciesGroup.id = 'fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.24333033683679461'
    508 
    +      and efo.species.speciesGroup.id = 'fr.ird.referential.common.SpeciesGroup#1239832683690#0.24333033683679461'
    509 509 
     report.fobUsageExtended.request.18.repeat=typeObjetId|column
    510 510 
     ################################################################################
    511 511 
     ## Nombre des cal\u00e9es selon le type d'association

    • —
    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.