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

Commits:

1 changed file:

Changes:

  • services/src/main/resources/observe-reports.properties
    ... ... @@ -124,23 +124,28 @@ report.dailySetAndCatch.request.1=0,0|row|\
    124 124 
     report.dcpUsage.modelType=PS
    125 125 
     report.dcpUsage.name=Utilisation des DCP
    126 126 
     report.dcpUsage.description=Tableau r\u00e9capitulatif du nombre de DCP visit\u00e9s selon l\u2019action effectu\u00e9e (visites avec et sans p\u00eache, mis \u00e0 l\u2019eau, r\u00e9cuperation), et tortues observ\u00e9es
    127 
    -report.dcpUsage.columns=Type de DCP (Tableau 8),Nombre visit\u00e9s,Nombre p\u00each\u00e9s,Nombre mis \u00e0 l\u2019eau seuls,Nombre renforc\u00e9s par radeau balis\u00e9,R\u00e9cup\u00e9r\u00e9 sans p\u00eache,Nombre de tortues associ\u00e9es
    127 
    +report.dcpUsage.columns=Type de DCP (Tableau 8),Visit\u00e9s,P\u00each\u00e9s,Mis \u00e0 l\u2019eau seuls,Modifications ou renforcements,Retaits,Abandonn\u00e9s (sans balise ou non d\u00e9truit ou non coul\u00e9),Coul\u00e9s,Remplacements,Autre (p\u00e9ciser dans les notes),Tortues associ\u00e9es
    128 128 
     report.dcpUsage.repeatVariable.typeObjetId=java.lang.String|\
    129 
    -  Select to.id \
    130 
    -  From TripSeineImpl m \
    131 
    -  Join m.route r \
    132 
    -  Join r.activitySeine a \
    133 
    -  Join a.floatingObject dcp \
    134 
    -  Join dcp.objectType to \
    135 
    -  Where \
    136 
    -      m.id In :tripId \
    137 
    -  Order by to.code
    129 
    +  Select distinct (om.standardCode) \
    130 
    +  From ObjectMaterialImpl om \
    131 
    +  Where standardCode is not null \
    132 
    +  And standardCode != '' \
    133 
    +  And (Select Count(dcp) \
    134 
    +       From TripSeineImpl m \
    135 
    +       Join m.route r \
    136 
    +       Join r.activitySeine a \
    137 
    +       Join a.floatingObject dcp \
    138 
    +       Where \
    139 
    +           m.id In :tripId \
    140 
    +           and (dcp.computedWhenLeavingSimplifiedObjectType = om.standardCode Or dcp.computedWhenArrivingSimplifiedObjectType = om.standardCode) \
    141 
    +       ) > 0
    138 142 
     report.dcpUsage.request.1=0,0|row|\
    139 
    -  Select concat(str(to.code) , ' - ', to.label2) \
    140 
    -  From ObjectTypeImpl to \
    143 
    +  Select concat(str(to.standardCode) , ' - ', to.label2) \
    144 
    +  From ObjectMaterialImpl to \
    141 145 
       Where \
    142 
    -      to.id = :typeObjetId
    146 
    +      to.standardCode = :typeObjetId
    143 147 
     report.dcpUsage.request.1.repeat=typeObjetId|column
    148 
    +# visite
    144 149 
     report.dcpUsage.request.2=1,0|row|\
    145 150 
       Select Count(dcp) \
    146 151 
       From TripSeineImpl m \
    ... ... @@ -149,9 +154,10 @@ report.dcpUsage.request.2=1,0|row|\
    149 154 
       Join a.floatingObject dcp \
    150 155 
       Where \
    151 156 
           m.id In :tripId \
    152 
    -      and dcp.objectType.id = :typeObjetId  \
    153 
    -      and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686249#0.8268884472438458'
    157 
    +      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
    158 
    +      and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2'
    154 159 
     report.dcpUsage.request.2.repeat=typeObjetId|column
    160 
    +# peche
    155 161 
     report.dcpUsage.request.3=2,0|row|\
    156 162 
       Select Count(dcp) \
    157 163 
       From TripSeineImpl m \
    ... ... @@ -160,9 +166,10 @@ report.dcpUsage.request.3=2,0|row|\
    160 166 
       Join a.floatingObject dcp \
    161 167 
       Where \
    162 168 
           m.id In :tripId \
    163 
    -      and dcp.objectType.id = :typeObjetId  \
    164 
    -      and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686249#0.8431519556575698'
    169 
    +      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
    170 
    +      and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3'
    165 171 
     report.dcpUsage.request.3.repeat=typeObjetId|column
    172 
    +# mis a l'eau
    166 173 
     report.dcpUsage.request.4=3,0|row|\
    167 174 
       Select Count(dcp) \
    168 175 
       From TripSeineImpl m \
    ... ... @@ -171,9 +178,12 @@ report.dcpUsage.request.4=3,0|row|\
    171 178 
       Join a.floatingObject dcp \
    172 179 
       Where \
    173 180 
           m.id In :tripId \
    174 
    -      and dcp.objectType.id = :typeObjetId  \
    175 
    -      and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686248#0.8669327599318251'
    181 
    +      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
    182 
    +      and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#1'
    176 183 
     report.dcpUsage.request.4.repeat=typeObjetId|column
    184 
    +# modification ou rneforcement
    185 
    +#FIXME Supprime de la requete du dessous
    186 
    +#FIXME    and dcp.objectFate.id = 'fr.ird.observe.entities.referentiel.seine.ObjectFate#1396860761530#0.8869464242156488' \
    177 187 
     report.dcpUsage.request.5=4,0|row|\
    178 188 
       Select Count(dcp) \
    179 189 
       From TripSeineImpl m \
    ... ... @@ -182,10 +192,10 @@ report.dcpUsage.request.5=4,0|row|\
    182 192 
       Join a.floatingObject dcp \
    183 193 
       Where \
    184 194 
           m.id In :tripId \
    185 
    -      and dcp.objectType.id = :typeObjetId  \
    186 
    -      and dcp.objectFate.id = 'fr.ird.observe.entities.referentiel.seine.ObjectFate#1396860761530#0.8869464242156488' \
    187 
    -      and dcp.objectOperation.id != 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686248#0.8669327599318251'
    195 
    +      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
    196 
    +      and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8'
    188 197 
     report.dcpUsage.request.5.repeat=typeObjetId|column
    198 
    +# Retrait
    189 199 
     report.dcpUsage.request.6=5,0|row|\
    190 200 
       Select Count(dcp) \
    191 201 
       From TripSeineImpl m \
    ... ... @@ -194,10 +204,59 @@ report.dcpUsage.request.6=5,0|row|\
    194 204 
       Join a.floatingObject dcp \
    195 205 
       Where \
    196 206 
           m.id In :tripId \
    197 
    -      and dcp.objectType.id = :typeObjetId  \
    198 
    -      and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686249#0.7838704130950722'
    207 
    +      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
    208 
    +      and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4'
    199 209 
     report.dcpUsage.request.6.repeat=typeObjetId|column
    200 
    -report.dcpUsage.request.7=6,0|row| \
    210 
    +# abondonne
    211 
    +report.dcpUsage.request.7=6,0|row|\
    212 
    +  Select Count(dcp) \
    213 
    +  From TripSeineImpl m \
    214 
    +  Join m.route r \
    215 
    +  Join r.activitySeine a \
    216 
    +  Join a.floatingObject dcp \
    217 
    +  Where \
    218 
    +      m.id In :tripId \
    219 
    +      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
    220 
    +      and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5'
    221 
    +report.dcpUsage.request.7.repeat=typeObjetId|column
    222 
    +# coule
    223 
    +report.dcpUsage.request.8=7,0|row|\
    224 
    +  Select Count(dcp) \
    225 
    +  From TripSeineImpl m \
    226 
    +  Join m.route r \
    227 
    +  Join r.activitySeine a \
    228 
    +  Join a.floatingObject dcp \
    229 
    +  Where \
    230 
    +      m.id In :tripId \
    231 
    +      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
    232 
    +      and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7'
    233 
    +report.dcpUsage.request.8.repeat=typeObjetId|column
    234 
    +# remplacement
    235 
    +report.dcpUsage.request.9=8,0|row|\
    236 
    +  Select Count(dcp) \
    237 
    +  From TripSeineImpl m \
    238 
    +  Join m.route r \
    239 
    +  Join r.activitySeine a \
    240 
    +  Join a.floatingObject dcp \
    241 
    +  Where \
    242 
    +      m.id In :tripId \
    243 
    +      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
    244 
    +      and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#09'
    245 
    +report.dcpUsage.request.9.repeat=typeObjetId|column
    246 
    +# autre
    247 
    +report.dcpUsage.request.10=9,0|row|\
    248 
    +  Select Count(dcp) \
    249 
    +  From TripSeineImpl m \
    250 
    +  Join m.route r \
    251 
    +  Join r.activitySeine a \
    252 
    +  Join a.floatingObject dcp \
    253 
    +  Where \
    254 
    +      m.id In :tripId \
    255 
    +      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
    256 
    +      and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#10'
    257 
    +report.dcpUsage.request.10.repeat=typeObjetId|column
    258 
    +# tortues
    259 
    +report.dcpUsage.request.11=10,0|row| \
    201 260 
       Select Sum(efo.count) \
    202 261 
       From TripSeineImpl m \
    203 262 
       Join m.route r \
    ... ... @@ -206,9 +265,10 @@ report.dcpUsage.request.7=6,0|row| \
    206 265 
       Join dcp.objectObservedSpecies efo \
    207 266 
       Where \
    208 267 
           m.id In :tripId \
    209 
    -      and dcp.objectType.id = :typeObjetId  \
    268 
    +      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
    210 269 
           and efo.species.speciesGroup.id = 'fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.24333033683679461'
    211 
    -report.dcpUsage.request.7.repeat=typeObjetId|column
    270 
    +report.dcpUsage.request.11.repeat=typeObjetId|column
    271 
    +
    212 272 
     ################################################################################
    213 273 
     ## Nombre des cal\u00e9es selon le type d'association
    214 274 
     ################################################################################

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