[Observe-commits] [Git][ultreiaio/ird-observe][develop-7.x] 3 commits: Bug requête tableau synthèse DCP - Closes #1244

30 Apr 2019


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


Commits:
747bdbb8 by tchemit at 2019-04-30T10:40:42Z
Bug requête tableau synthèse DCP - Closes #1244

- - - - -
8c479471 by tchemit at 2019-04-30T10:40:44Z
update pom

- - - - -
a4c230a9 by tchemit at 2019-04-30T10:40:44Z
Il manques des traductions...

- - - - -


8 changed files:

- client-core/src/main/i18n/getters/jaxx.getter
- client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetCatchUI.jcss
- client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetDiscardCatchUI.jcss
- observe-i18n/src/main/i18n/translations/observe_en_GB.properties
- observe-i18n/src/main/i18n/translations/observe_es_ES.properties
- observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
- pom.xml
- services/src/main/resources/observe-reports.properties


Changes:

=====================================
client-core/src/main/i18n/getters/jaxx.getter
=====================================
@@ -570,6 +570,7 @@ observe.common.TargetCatchDto.table.deleteExtraMessage
 observe.common.TargetCatchDto.table.speciesThon.tip
 observe.common.TargetCatchDto.table.weightCategory.tip
 observe.common.TargetCatchDto.table.well.tip
+observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver
 observe.common.TargetCatchDto.title
 observe.common.TargetCatchDto.weightCategory
 observe.common.TargetCatchDto.well
@@ -581,6 +582,7 @@ observe.common.TargetDiscardDto.table.deleteExtraMessage
 observe.common.TargetDiscardDto.table.reasonForDiscard.tip
 observe.common.TargetDiscardDto.table.species.tip
 observe.common.TargetDiscardDto.table.weightCategory.tip
+observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver
 observe.common.TargetLengthDto.count
 observe.common.TargetLengthDto.length
 observe.common.TargetLengthDto.tagNumber


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


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


=====================================
observe-i18n/src/main/i18n/translations/observe_en_GB.properties
=====================================
@@ -1253,8 +1253,6 @@ observe.common.SetLonglineDto.settingVesselSpeed=Vessel speed (kts)
 observe.common.SetLonglineDto.shooterSpeed=Shooter speed (kts)
 observe.common.SetLonglineDto.snapWeight=Snap weight (kg)
 observe.common.SetLonglineDto.swivelWeight=swivel weight (kg)
-observe.common.SetLonglineDto.targetCatchCompositionEstimatedByObserver=Composition estimated by observer?
-observe.common.SetLonglineDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimated by observer?
 observe.common.SetLonglineDto.timeBetweenHooks=time between hooks
 observe.common.SetLonglineDto.title=Fishing operation
 observe.common.SetLonglineDto.totalBasketsCount=Total baskets count
@@ -1387,6 +1385,7 @@ observe.common.TargetCatchDto.table.weightCategory=Weight category
 observe.common.TargetCatchDto.table.weightCategory.tip=Weight category
 observe.common.TargetCatchDto.table.well=Well
 observe.common.TargetCatchDto.table.well.tip=Well
+observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver=Composition estimated by observer?
 observe.common.TargetCatchDto.title=Target catch
 observe.common.TargetCatchDto.type=Target catch
 observe.common.TargetCatchDto.types=Target catches
@@ -1410,6 +1409,7 @@ observe.common.TargetDiscardDto.table.weight=Weight (in t)
 observe.common.TargetDiscardDto.table.weight.tip=Weight (in t)
 observe.common.TargetDiscardDto.table.weightCategory=Weight category
 observe.common.TargetDiscardDto.table.weightCategory.tip=Weight category
+observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimated by observer?
 observe.common.TargetLengthDto.count=Count
 observe.common.TargetLengthDto.length=Length (cm)
 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)
 observe.common.SetLonglineDto.shooterSpeed=Velocidad virador (nd)
 observe.common.SetLonglineDto.snapWeight=Peso mosquetón (kg)
 observe.common.SetLonglineDto.swivelWeight=Peso destorcedor (kg)
-observe.common.SetLonglineDto.targetCatchCompositionEstimatedByObserver=¿Composición estimada por el observador?
-observe.common.SetLonglineDto.targetDiscardCatchCompositionEstimatedByObserver=¿Composición estimada por el observador?
 observe.common.SetLonglineDto.timeBetweenHooks=Tiempo entre anzuelos (s)
 observe.common.SetLonglineDto.title=Operación de pesca
 observe.common.SetLonglineDto.totalBasketsCount=Número total de canastas
@@ -1387,6 +1385,7 @@ observe.common.TargetCatchDto.table.weightCategory=Categoría de peso
 observe.common.TargetCatchDto.table.weightCategory.tip=Categoría de peso
 observe.common.TargetCatchDto.table.well=Cuba
 observe.common.TargetCatchDto.table.well.tip=Cuba
+observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver=¿Composición estimada por el observador?
 observe.common.TargetCatchDto.title=Captura de túnidos
 observe.common.TargetCatchDto.type=Captura de túnidos
 observe.common.TargetCatchDto.types=Capturas de túnidos
@@ -1410,6 +1409,7 @@ observe.common.TargetDiscardDto.table.weight=Peso
 observe.common.TargetDiscardDto.table.weight.tip=Peso (en t)
 observe.common.TargetDiscardDto.table.weightCategory=Categoría de peso
 observe.common.TargetDiscardDto.table.weightCategory.tip=Categoría de peso
+observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver=¿Composición estimada por el observador?
 observe.common.TargetLengthDto.count=Número
 observe.common.TargetLengthDto.length=Talla (cm)
 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)
 observe.common.SetLonglineDto.shooterSpeed=Vitesse shooter (nd)
 observe.common.SetLonglineDto.snapWeight=Poids snap (kg)
 observe.common.SetLonglineDto.swivelWeight=Poids de l'émerillon (kg)
-observe.common.SetLonglineDto.targetCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ?
-observe.common.SetLonglineDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ?
 observe.common.SetLonglineDto.timeBetweenHooks=Temps entre hameçons (s)
 observe.common.SetLonglineDto.title=Opération de pêche
 observe.common.SetLonglineDto.totalBasketsCount=Nombre total de paniers
@@ -1387,6 +1385,7 @@ observe.common.TargetCatchDto.table.weightCategory=Catégorie de poids
 observe.common.TargetCatchDto.table.weightCategory.tip=Catégorie de poids
 observe.common.TargetCatchDto.table.well=Cuve
 observe.common.TargetCatchDto.table.well.tip=Cuve
+observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ?
 observe.common.TargetCatchDto.title=Thons conservés
 observe.common.TargetCatchDto.type=Thons conservés
 observe.common.TargetCatchDto.types=Thons conservés
@@ -1410,6 +1409,7 @@ observe.common.TargetDiscardDto.table.weight=Poids
 observe.common.TargetDiscardDto.table.weight.tip=Poids (en t)
 observe.common.TargetDiscardDto.table.weightCategory=Catégorie de poids
 observe.common.TargetDiscardDto.table.weightCategory.tip=Catégorie de poids
+observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ?
 observe.common.TargetLengthDto.count=Nombre
 observe.common.TargetLengthDto.length=Taille (en cm)
 observe.common.TargetLengthDto.table.count=Effectif


=====================================
pom.xml
=====================================
@@ -26,7 +26,7 @@
   <parent>
     <groupId>io.ultreia.maven</groupId>
     <artifactId>pom</artifactId>
-    <version>2019.8.14</version>
+    <version>2019.8.15</version>
   </parent>
 
   <groupId>fr.ird.observe</groupId>


=====================================
services/src/main/resources/observe-reports.properties
=====================================
@@ -119,12 +119,12 @@ report.dailySetAndCatch.request.1=0,0|row|\
   Group By r.date \
   Order By r.date
 ################################################################################
-## Utilisation des DCP
+## Utilisation des FOB
 ################################################################################
 report.dcpUsage.modelType=PS
-report.dcpUsage.name=Utilisation des DCP
-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
-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
+report.dcpUsage.name=Utilisation des FOB
+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
+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
 report.dcpUsage.repeatVariable.typeObjetId=java.lang.String|\
   Select distinct (om.standardCode) \
   From ObjectMaterialImpl om \
@@ -137,13 +137,14 @@ report.dcpUsage.repeatVariable.typeObjetId=java.lang.String|\
        Join a.floatingObject dcp \
        Where \
            m.id In :tripId \
-           and (dcp.computedWhenLeavingSimplifiedObjectType = om.standardCode Or dcp.computedWhenArrivingSimplifiedObjectType = om.standardCode) \
+           and (dcp.computedWhenArrivingSimplifiedObjectType = om.standardCode Or dcp.computedWhenLeavingSimplifiedObjectType = om.standardCode) \
        ) > 0
 report.dcpUsage.request.1=0,0|row|\
-  Select concat(str(to.standardCode) , ' - ', to.label2) \
-  From ObjectMaterialImpl to \
+  Select concat(str(om.standardCode) , ' - ', om.label2) \
+  From ObjectMaterialImpl om \
   Where \
-      to.standardCode = :typeObjetId
+      om.standardCode = :typeObjetId \
+      And om.status != 0
 report.dcpUsage.request.1.repeat=typeObjetId|column
 # visite
 report.dcpUsage.request.2=1,0|row|\
@@ -154,8 +155,9 @@ report.dcpUsage.request.2=1,0|row|\
   Join a.floatingObject dcp \
   Where \
       m.id In :tripId \
-      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
-      and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2'
+      and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
+      and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' \
+	  and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586'
 report.dcpUsage.request.2.repeat=typeObjetId|column
 # peche
 report.dcpUsage.request.3=2,0|row|\
@@ -166,7 +168,7 @@ report.dcpUsage.request.3=2,0|row|\
   Join a.floatingObject dcp \
   Where \
       m.id In :tripId \
-      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
+      and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
       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')
 report.dcpUsage.request.3.repeat=typeObjetId|column
 # mis a l'eau
@@ -178,10 +180,10 @@ report.dcpUsage.request.4=3,0|row|\
   Join a.floatingObject dcp \
   Where \
       m.id In :tripId \
-      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
+      and dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId \
       and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#1'
 report.dcpUsage.request.4.repeat=typeObjetId|column
-# modification ou rneforcement
+# modification ou renforcement
 #FIXME Supprime de la requete du dessous
 #FIXME    and dcp.objectFate.id = 'fr.ird.observe.entities.referentiel.seine.ObjectFate#1396860761530#0.8869464242156488' \
 report.dcpUsage.request.5=4,0|row|\
@@ -192,7 +194,7 @@ report.dcpUsage.request.5=4,0|row|\
   Join a.floatingObject dcp \
   Where \
       m.id In :tripId \
-      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
+      and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
       and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8'
 report.dcpUsage.request.5.repeat=typeObjetId|column
 # Retrait
@@ -204,7 +206,7 @@ report.dcpUsage.request.6=5,0|row|\
   Join a.floatingObject dcp \
   Where \
       m.id In :tripId \
-      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
+      and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
       and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4'
 report.dcpUsage.request.6.repeat=typeObjetId|column
 # abondonne
@@ -216,7 +218,7 @@ report.dcpUsage.request.7=6,0|row|\
   Join a.floatingObject dcp \
   Where \
       m.id In :tripId \
-      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
+      and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
       and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5'
 report.dcpUsage.request.7.repeat=typeObjetId|column
 # coule
@@ -228,7 +230,7 @@ report.dcpUsage.request.8=7,0|row|\
   Join a.floatingObject dcp \
   Where \
       m.id In :tripId \
-      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
+      and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
       and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7'
 report.dcpUsage.request.8.repeat=typeObjetId|column
 # remplacement
@@ -240,7 +242,7 @@ report.dcpUsage.request.9=8,0|row|\
   Join a.floatingObject dcp \
   Where \
       m.id In :tripId \
-      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
+      and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
       and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#09'
 report.dcpUsage.request.9.repeat=typeObjetId|column
 # autre
@@ -252,7 +254,7 @@ report.dcpUsage.request.10=9,0|row|\
   Join a.floatingObject dcp \
   Where \
       m.id In :tripId \
-      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
+      and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
       and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#10'
 report.dcpUsage.request.10.repeat=typeObjetId|column
 # tortues
@@ -265,7 +267,7 @@ report.dcpUsage.request.11=10,0|row| \
   Join dcp.objectObservedSpecies efo \
   Where \
       m.id In :tripId \
-      and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
+      and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
       and efo.species.speciesGroup.id = 'fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.24333033683679461'
 report.dcpUsage.request.11.repeat=typeObjetId|column
 



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/c3206aa8fec058c7fcaae635efb...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/c3206aa8fec058c7fcaae635efb...
You're receiving this email because of your account on gitlab.com.

    