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

Commits:

8 changed files:

Changes:

  • client-core/src/main/i18n/getters/jaxx.getter
    ... ... @@ -570,6 +570,7 @@ observe.common.TargetCatchDto.table.deleteExtraMessage
    570 570 
     observe.common.TargetCatchDto.table.speciesThon.tip
    571 571 
     observe.common.TargetCatchDto.table.weightCategory.tip
    572 572 
     observe.common.TargetCatchDto.table.well.tip
    573 
    +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver
    573 574 
     observe.common.TargetCatchDto.title
    574 575 
     observe.common.TargetCatchDto.weightCategory
    575 576 
     observe.common.TargetCatchDto.well
    ... ... @@ -581,6 +582,7 @@ observe.common.TargetDiscardDto.table.deleteExtraMessage
    581 582 
     observe.common.TargetDiscardDto.table.reasonForDiscard.tip
    582 583 
     observe.common.TargetDiscardDto.table.species.tip
    583 584 
     observe.common.TargetDiscardDto.table.weightCategory.tip
    585 
    +observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver
    584 586 
     observe.common.TargetLengthDto.count
    585 587 
     observe.common.TargetLengthDto.length
    586 588 
     observe.common.TargetLengthDto.tagNumber

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetCatchUI.jcss
    ... ... @@ -69,6 +69,7 @@
    69 69 
       horizontalTextPosition:{JCheckBox.LEFT};
    70 70 
       _propertyName:{SetSeineTargetCatchDto.PROPERTY_TARGET_CATCH_COMPOSITION_ESTIMATED_BY_OBSERVER};
    71 71 
       selected:{BooleanUtils.isTrue(bean.isTargetCatchCompositionEstimatedByObserver())};
    72 
    +  text:"observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver";
    72 73 
     }
    73 74
    74 75 
     #moveUp {

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetDiscardCatchUI.jcss
    ... ... @@ -75,6 +75,7 @@
    75 75 
       horizontalTextPosition:{JCheckBox.LEFT};
    76 76 
       _propertyName:{SetSeineTargetCatchDto.PROPERTY_TARGET_DISCARD_CATCH_COMPOSITION_ESTIMATED_BY_OBSERVER};
    77 77 
       selected:{BooleanUtils.isTrue(bean.isTargetDiscardCatchCompositionEstimatedByObserver())};
    78 
    +  text:"observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver";
    78 79 
     }
    79 80
    80 81 
     #moveUp {

  • observe-i18n/src/main/i18n/translations/observe_en_GB.properties
    ... ... @@ -1253,8 +1253,6 @@ observe.common.SetLonglineDto.settingVesselSpeed=Vessel speed (kts)
    1253 1253 
     observe.common.SetLonglineDto.shooterSpeed=Shooter speed (kts)
    1254 1254 
     observe.common.SetLonglineDto.snapWeight=Snap weight (kg)
    1255 1255 
     observe.common.SetLonglineDto.swivelWeight=swivel weight (kg)
    1256 
    -observe.common.SetLonglineDto.targetCatchCompositionEstimatedByObserver=Composition estimated by observer?
    1257 
    -observe.common.SetLonglineDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimated by observer?
    1258 1256 
     observe.common.SetLonglineDto.timeBetweenHooks=time between hooks
    1259 1257 
     observe.common.SetLonglineDto.title=Fishing operation
    1260 1258 
     observe.common.SetLonglineDto.totalBasketsCount=Total baskets count
    ... ... @@ -1387,6 +1385,7 @@ observe.common.TargetCatchDto.table.weightCategory=Weight category
    1387 1385 
     observe.common.TargetCatchDto.table.weightCategory.tip=Weight category
    1388 1386 
     observe.common.TargetCatchDto.table.well=Well
    1389 1387 
     observe.common.TargetCatchDto.table.well.tip=Well
    1388 
    +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver=Composition estimated by observer?
    1390 1389 
     observe.common.TargetCatchDto.title=Target catch
    1391 1390 
     observe.common.TargetCatchDto.type=Target catch
    1392 1391 
     observe.common.TargetCatchDto.types=Target catches
    ... ... @@ -1410,6 +1409,7 @@ observe.common.TargetDiscardDto.table.weight=Weight (in t)
    1410 1409 
     observe.common.TargetDiscardDto.table.weight.tip=Weight (in t)
    1411 1410 
     observe.common.TargetDiscardDto.table.weightCategory=Weight category
    1412 1411 
     observe.common.TargetDiscardDto.table.weightCategory.tip=Weight category
    1412 
    +observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimated by observer?
    1413 1413 
     observe.common.TargetLengthDto.count=Count
    1414 1414 
     observe.common.TargetLengthDto.length=Length (cm)
    1415 1415 
     observe.common.TargetLengthDto.table.count=Count

  • observe-i18n/src/main/i18n/translations/observe_es_ES.properties
    ... ... @@ -1253,8 +1253,6 @@ observe.common.SetLonglineDto.settingVesselSpeed=Velocidad del barco (nd)
    1253 1253 
     observe.common.SetLonglineDto.shooterSpeed=Velocidad virador (nd)
    1254 1254 
     observe.common.SetLonglineDto.snapWeight=Peso mosquetón (kg)
    1255 1255 
     observe.common.SetLonglineDto.swivelWeight=Peso destorcedor (kg)
    1256 
    -observe.common.SetLonglineDto.targetCatchCompositionEstimatedByObserver=¿Composición estimada por el observador?
    1257 
    -observe.common.SetLonglineDto.targetDiscardCatchCompositionEstimatedByObserver=¿Composición estimada por el observador?
    1258 1256 
     observe.common.SetLonglineDto.timeBetweenHooks=Tiempo entre anzuelos (s)
    1259 1257 
     observe.common.SetLonglineDto.title=Operación de pesca
    1260 1258 
     observe.common.SetLonglineDto.totalBasketsCount=Número total de canastas
    ... ... @@ -1387,6 +1385,7 @@ observe.common.TargetCatchDto.table.weightCategory=Categoría de peso
    1387 1385 
     observe.common.TargetCatchDto.table.weightCategory.tip=Categoría de peso
    1388 1386 
     observe.common.TargetCatchDto.table.well=Cuba
    1389 1387 
     observe.common.TargetCatchDto.table.well.tip=Cuba
    1388 
    +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver=¿Composición estimada por el observador?
    1390 1389 
     observe.common.TargetCatchDto.title=Captura de túnidos
    1391 1390 
     observe.common.TargetCatchDto.type=Captura de túnidos
    1392 1391 
     observe.common.TargetCatchDto.types=Capturas de túnidos
    ... ... @@ -1410,6 +1409,7 @@ observe.common.TargetDiscardDto.table.weight=Peso
    1410 1409 
     observe.common.TargetDiscardDto.table.weight.tip=Peso (en t)
    1411 1410 
     observe.common.TargetDiscardDto.table.weightCategory=Categoría de peso
    1412 1411 
     observe.common.TargetDiscardDto.table.weightCategory.tip=Categoría de peso
    1412 
    +observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver=¿Composición estimada por el observador?
    1413 1413 
     observe.common.TargetLengthDto.count=Número
    1414 1414 
     observe.common.TargetLengthDto.length=Talla (cm)
    1415 1415 
     observe.common.TargetLengthDto.table.count=Número

  • observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
    ... ... @@ -1253,8 +1253,6 @@ observe.common.SetLonglineDto.settingVesselSpeed=Vitesse bateau (nd)
    1253 1253 
     observe.common.SetLonglineDto.shooterSpeed=Vitesse shooter (nd)
    1254 1254 
     observe.common.SetLonglineDto.snapWeight=Poids snap (kg)
    1255 1255 
     observe.common.SetLonglineDto.swivelWeight=Poids de l'émerillon (kg)
    1256 
    -observe.common.SetLonglineDto.targetCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ?
    1257 
    -observe.common.SetLonglineDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ?
    1258 1256 
     observe.common.SetLonglineDto.timeBetweenHooks=Temps entre hameçons (s)
    1259 1257 
     observe.common.SetLonglineDto.title=Opération de pêche
    1260 1258 
     observe.common.SetLonglineDto.totalBasketsCount=Nombre total de paniers
    ... ... @@ -1387,6 +1385,7 @@ observe.common.TargetCatchDto.table.weightCategory=Catégorie de poids
    1387 1385 
     observe.common.TargetCatchDto.table.weightCategory.tip=Catégorie de poids
    1388 1386 
     observe.common.TargetCatchDto.table.well=Cuve
    1389 1387 
     observe.common.TargetCatchDto.table.well.tip=Cuve
    1388 
    +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ?
    1390 1389 
     observe.common.TargetCatchDto.title=Thons conservés
    1391 1390 
     observe.common.TargetCatchDto.type=Thons conservés
    1392 1391 
     observe.common.TargetCatchDto.types=Thons conservés
    ... ... @@ -1410,6 +1409,7 @@ observe.common.TargetDiscardDto.table.weight=Poids
    1410 1409 
     observe.common.TargetDiscardDto.table.weight.tip=Poids (en t)
    1411 1410 
     observe.common.TargetDiscardDto.table.weightCategory=Catégorie de poids
    1412 1411 
     observe.common.TargetDiscardDto.table.weightCategory.tip=Catégorie de poids
    1412 
    +observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ?
    1413 1413 
     observe.common.TargetLengthDto.count=Nombre
    1414 1414 
     observe.common.TargetLengthDto.length=Taille (en cm)
    1415 1415 
     observe.common.TargetLengthDto.table.count=Effectif

  • 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/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.observe.entities.referentiel.seine.ObjectOperation#0#2'
    158 
    +      and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    159 
    +      and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' \
    160 
    +	  and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.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,7 +168,7 @@ 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) \
    171 
    +      and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    170 172 
           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 173 
     report.dcpUsage.request.3.repeat=typeObjetId|column
    172 174 
     # mis a l'eau
    ... ... @@ -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.observe.entities.referentiel.seine.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.observe.entities.referentiel.seine.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.observe.entities.referentiel.seine.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.observe.entities.referentiel.seine.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.observe.entities.referentiel.seine.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.observe.entities.referentiel.seine.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.observe.entities.referentiel.seine.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.observe.entities.referentiel.seine.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.observe.entities.referentiel.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.