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

Commits:

3 changed files:

Changes:

  • pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>io.ultreia.maven</groupId>
    28 28 
         <artifactId>pom</artifactId>
    29 
    -    <version>2019.8.14</version>
    29 
    +    <version>2019.8.15</version>
    30 30 
       </parent>
    31 31
    32 32 
       <groupId>fr.ird.observe</groupId>

  • services-local/src/test/java/fr/ird/observe/services/local/service/actions/report/ReportDcpUsageTest.java
    ... ... @@ -45,8 +45,8 @@ public class ReportDcpUsageTest extends AbstractReportServiceLocalTest {
    45 45 
             Assert.assertNotNull(report);
    46 46 
             assertReportName(
    47 47 
                     report,
    48 
    -                "Utilisation des DCP",
    49 
    -                "Tableau récapitulatif du nombre de DCP visités selon l’action effectuée (visites avec et sans pêche, mis à l’eau, récuperation), et tortues observées"
    48 
    +                "Utilisation des FOB",
    49 
    +                "Tableau récapitulatif du nombre de FOB visités selon l’action effectuée (visites avec et sans pêche, mis à l’eau, récuperation), et tortues observées"
    50 50 
             );
    51 51
    52 52 
             /*
    ... ... @@ -56,15 +56,15 @@ public class ReportDcpUsageTest extends AbstractReportServiceLocalTest {
    56 56 
                     report,
    57 57 
                     -1,
    58 58 
                     11,
    59 
    -                new String[]{"Type de DCP (Tableau 8)",
    60 
    -                        "Visités",
    59 
    +                new String[]{"Type de FOB (Tableau 8)",
    60 
    +                        "Visités sans pêche",
    61 61 
                             "Pêchés",
    62 62 
                             "Mis à l’eau seuls",
    63 
    -                        "Modifications ou renforcements",
    64 
    -                        "Retaits",
    63 
    +                        "Modifiés ou renforcés",
    64 
    +                        "Retirés",
    65 65 
                             "Abandonnés (sans balise ou non détruit ou non coulé)",
    66 66 
                             "Coulés",
    67 
    -                        "Remplacements",
    67 
    +                        "Remplacés",
    68 68 
                             "Autre (péciser dans les notes)",
    69 69 
                             "Tortues associées"
    70 70 
                     }

  • services/src/main/resources/observe-reports.properties
    ... ... @@ -119,12 +119,12 @@ report.dailySetAndCatch.request.1=0,0|row|\
    119 119 
       Group By r.date \
    120 120 
       Order By r.date
    121 121 
     ################################################################################
    122 
    -## Utilisation des DCP
    122 
    +## Utilisation des FOB
    123 123 
     ################################################################################
    124 124 
     report.dcpUsage.modelType=PS
    125 
    -report.dcpUsage.name=Utilisation des DCP
    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),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
    125 
    +report.dcpUsage.name=Utilisation des FOB
    126 
    +report.dcpUsage.description=Tableau r\u00e9capitulatif du nombre de FOB 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 FOB (Tableau 8),Visit\u00e9s sans p\u00eache,P\u00each\u00e9s,Mis \u00e0 l\u2019eau seuls,Modifi\u00e9s ou renforc\u00e9s,Retir\u00e9s,Abandonn\u00e9s (sans balise ou non d\u00e9truit ou non coul\u00e9),Coul\u00e9s,Remplac\u00e9s,Autre (p\u00e9ciser dans les notes),Tortues associ\u00e9es
    128 128 
     report.dcpUsage.repeatVariable.typeObjetId=java.lang.String|\
    129 129 
       Select distinct (om.standardCode) \
    130 130 
       From ObjectMaterialImpl om \
    ... ... @@ -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 Or dcp.computedWhenLeavingSimplifiedObjectType = 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,8 +155,9 @@ 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.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#2'
    158 
    +      and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    159 
    +      and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#2' \
    160 
    +	  and a.vesselActivitySeine.id != 'fr.ird.referential.ps.observation.VesselActivitySeine#1239832675369#0.12552908048322586'
    159 161 
     report.dcpUsage.request.2.repeat=typeObjetId|column
    160 162 
     # peche
    161 163 
     report.dcpUsage.request.3=2,0|row|\
    ... ... @@ -166,8 +168,8 @@ report.dcpUsage.request.3=2,0|row|\
    166 168 
       Join a.floatingObject dcp \
    167 169 
       Where \
    168 170 
           m.id In :tripId \
    169 
    -      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
    170 
    -      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')
    171 
    +      and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    172 
    +      and (dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#3' Or a.vesselActivitySeine.id = 'fr.ird.referential.ps.observation.VesselActivitySeine#1239832675369#0.12552908048322586')
    171 173 
     report.dcpUsage.request.3.repeat=typeObjetId|column
    172 174 
     # mis a l'eau
    173 175 
     report.dcpUsage.request.4=3,0|row|\
    ... ... @@ -178,10 +180,10 @@ report.dcpUsage.request.4=3,0|row|\
    178 180 
       Join a.floatingObject dcp \
    179 181 
       Where \
    180 182 
           m.id In :tripId \
    181 
    -      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
    183 
    +      and dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId \
    182 184 
           and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#1'
    183 185 
     report.dcpUsage.request.4.repeat=typeObjetId|column
    184 
    -# modification ou rneforcement
    186 
    +# modification ou renforcement
    185 187 
     #FIXME Supprime de la requete du dessous
    186 188 
     #FIXME    and dcp.objectFate.id = 'fr.ird.referential.ps.ObjectFate#1396860761530#0.8869464242156488' \
    187 189 
     report.dcpUsage.request.5=4,0|row|\
    ... ... @@ -192,7 +194,7 @@ report.dcpUsage.request.5=4,0|row|\
    192 194 
       Join a.floatingObject dcp \
    193 195 
       Where \
    194 196 
           m.id In :tripId \
    195 
    -      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
    197 
    +      and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    196 198 
           and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#8'
    197 199 
     report.dcpUsage.request.5.repeat=typeObjetId|column
    198 200 
     # Retrait
    ... ... @@ -204,7 +206,7 @@ report.dcpUsage.request.6=5,0|row|\
    204 206 
       Join a.floatingObject dcp \
    205 207 
       Where \
    206 208 
           m.id In :tripId \
    207 
    -      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
    209 
    +      and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    208 210 
           and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#4'
    209 211 
     report.dcpUsage.request.6.repeat=typeObjetId|column
    210 212 
     # abondonne
    ... ... @@ -216,7 +218,7 @@ report.dcpUsage.request.7=6,0|row|\
    216 218 
       Join a.floatingObject dcp \
    217 219 
       Where \
    218 220 
           m.id In :tripId \
    219 
    -      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
    221 
    +      and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    220 222 
           and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#5'
    221 223 
     report.dcpUsage.request.7.repeat=typeObjetId|column
    222 224 
     # coule
    ... ... @@ -228,7 +230,7 @@ report.dcpUsage.request.8=7,0|row|\
    228 230 
       Join a.floatingObject dcp \
    229 231 
       Where \
    230 232 
           m.id In :tripId \
    231 
    -      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
    233 
    +      and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    232 234 
           and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#7'
    233 235 
     report.dcpUsage.request.8.repeat=typeObjetId|column
    234 236 
     # remplacement
    ... ... @@ -240,7 +242,7 @@ report.dcpUsage.request.9=8,0|row|\
    240 242 
       Join a.floatingObject dcp \
    241 243 
       Where \
    242 244 
           m.id In :tripId \
    243 
    -      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
    245 
    +      and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    244 246 
           and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#09'
    245 247 
     report.dcpUsage.request.9.repeat=typeObjetId|column
    246 248 
     # autre
    ... ... @@ -252,7 +254,7 @@ report.dcpUsage.request.10=9,0|row|\
    252 254 
       Join a.floatingObject dcp \
    253 255 
       Where \
    254 256 
           m.id In :tripId \
    255 
    -      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
    257 
    +      and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    256 258 
           and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#10'
    257 259 
     report.dcpUsage.request.10.repeat=typeObjetId|column
    258 260 
     # tortues
    ... ... @@ -265,7 +267,7 @@ report.dcpUsage.request.11=10,0|row| \
    265 267 
       Join dcp.objectObservedSpecies efo \
    266 268 
       Where \
    267 269 
           m.id In :tripId \
    268 
    -      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
    270 
    +      and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    269 271 
           and efo.species.speciesGroup.id = 'fr.ird.referential.common.SpeciesGroup#1239832683690#0.24333033683679461'
    270 272 
     report.dcpUsage.request.11.repeat=typeObjetId|column
    271 273

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