Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: b4c3bb68 by Tony Chemit at 2020-07-01T11:13:28+02:00 Requêtes de synthèse PS - Closes #1529 - - - - - 87541675 by Tony Chemit at 2020-07-01T11:13:31+02:00 [PS][Observations] Activité : contrôle trop strict - Closes #1552 - - - - - 3 changed files: - dto/src/main/models/Observe.model - services-local/src/test/java/fr/ird/observe/services/local/service/actions/report/ReportDcpUsageTest.java - services/src/main/resources/observe-reports.properties Changes: ===================================== dto/src/main/models/Observe.model ===================================== @@ -610,7 +610,7 @@ data.seine.ActivitySeine > data.Openable | references=time,vesselActivitySeine,s time + {*:1} Date | notNull latitude + {*:1} Float | notNull longitude + {*:1} Float | notNull -vesselSpeed + {*:1} Float | strictlyPositiveNumber +vesselSpeed + {*:1} Float | positiveNumber seaSurfaceTemperature + {*:1} Float | mayNotNull strictlyPositiveNumber ersId + {*:1} String floatingObjectEmpty + {*:1} boolean ===================================== services-local/src/test/java/fr/ird/observe/services/local/service/actions/report/ReportDcpUsageTest.java ===================================== @@ -32,7 +32,9 @@ import org.junit.Ignore; * * @author Tony Chemit - dev@tchemit.fr * @since 1.9 + * FIXME Use new report for FOB (see https://gitlab.com/ultreiaio/ird-observe/-/issues/1529) */ +@Ignore public class ReportDcpUsageTest extends AbstractReportServiceLocalTest { @Override ===================================== services/src/main/resources/observe-reports.properties ===================================== @@ -119,13 +119,19 @@ report.dailySetAndCatch.request.1=0,0|row|\ Group By r.date \ Order By r.date ################################################################################ -## Utilisation des FOB +## Utilisation des FOB, tableau simplifie ################################################################################ -report.dcpUsage.modelType=PS -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|\ +report.fobUsageMinimal.modelType=PS +report.fobUsageMinimal.name=Utilisation des FOB, tableau simplifi\u00e9e +report.fobUsageMinimal.description=Tableau r\u00e9capitulatif des FOB rencontr\u00e9s, par types CECOFAD et types d\u2019actions regroup\u00e9s (rencontr\u00e9s et p\u00each\u00e9s, rencontr\u00e9s non p\u00each\u00e9s, d\u00e9ploy\u00e9s), et nombres de tortues observ\u00e9es +report.fobUsageMinimal.columns=Type de FOB, \ + Rencontr\u00e9s p\u00each\u00e9s, \ + Rencontr\u00e9s non p\u00each\u00e9s, \ + D\u00e9ploy\u00e9s, \ + Tortues associ\u00e9es + +# liste des types CECOFAD en presence sur les donnees selectionnees +report.fobUsageMinimal.repeatVariable.typeObjetId=java.lang.String|\ Select distinct (om.standardCode) \ From ObjectMaterialImpl om \ Where standardCode is not null \ @@ -139,15 +145,37 @@ report.dcpUsage.repeatVariable.typeObjetId=java.lang.String|\ m.id In :tripId \ and (dcp.computedWhenArrivingSimplifiedObjectType = om.standardCode Or dcp.computedWhenLeavingSimplifiedObjectType = om.standardCode) \ ) > 0 -report.dcpUsage.request.1=0,0|row|\ +report.fobUsageMinimal.request.1=0,0|row|\ Select concat(str(om.standardCode) , ' - ', om.label2) \ From ObjectMaterialImpl om \ Where \ om.standardCode = :typeObjetId \ And om.status != 0 -report.dcpUsage.request.1.repeat=typeObjetId|column -# visite -report.dcpUsage.request.2=1,0|row|\ +report.fobUsageMinimal.request.1.repeat=typeObjetId|column + +# rencontres + peches +report.fobUsageMinimal.request.2=1,0|row|\ + Select Count(dcp) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.floatingObject dcp \ + Where \ + m.id In :tripId \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ + and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' \ + and (dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' \ + or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8' \ + or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4' \ + or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5' \ + or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7' \ + or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#9' \ + or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#10' \ + or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3') +report.fobUsageMinimal.request.2.repeat=typeObjetId|column + +# rencontres - peches +report.fobUsageMinimal.request.3=2,0|row|\ Select Count(dcp) \ From TripSeineImpl m \ Join m.route r \ @@ -156,23 +184,120 @@ report.dcpUsage.request.2=1,0|row|\ Where \ m.id In :tripId \ 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|\ +and (dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' \ + or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8' \ + or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4' \ + or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5' \ + or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7' \ + or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#9' \ + or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#10' \ + or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3') +report.fobUsageMinimal.request.3.repeat=typeObjetId|column + +# deployes +report.fobUsageMinimal.request.4=3,0|row|\ Select Count(dcp) \ From TripSeineImpl m \ Join m.route r \ Join r.activitySeine a \ Join a.floatingObject dcp \ + Where \ + m.id In :tripId \ + and dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId \ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#1' +report.fobUsageMinimal.request.4.repeat=typeObjetId|column + +# Nombre de tortues +report.fobUsageMinimal.request.5=4,0|row| \ + Select Sum(efo.count) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.floatingObject dcp \ + Join dcp.objectObservedSpecies efo \ Where \ m.id In :tripId \ 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 -report.dcpUsage.request.4=3,0|row|\ + and efo.species.speciesGroup.id = 'fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.24333033683679461' +report.fobUsageMinimal.request.5.repeat=typeObjetId|column +################################################################################ +## Utilisation des FOB, tableau detaille +################################################################################ +report.fobUsageExtended.modelType=PS +report.fobUsageExtended.name=Utilisation des FOB, tableau d\u00e9taill\u00e9 +report.fobUsageExtended.description=Tableau r\u00e9capitulatif des FOB rencontr\u00e9s, par types CECOFAD et types d\u2019actions (d\u00e9ploiements, simples visites, modifications, diverses modalit\u00e9s de retraits), avec et sans p\u00eache, et nombres de tortues observ\u00e9es +report.fobUsageExtended.columns=Type de FOB, \ + Visit\u00e9s P\u00each\u00e9s, \ + Visit\u00e9s non P\u00each\u00e9s, \ + D\u00e9ploiement apr\u00e8s P\u00eaches, \ + D\u00e9ploiement seul, \ + Modifi\u00e9s P\u00each\u00e9s, \ + Modifi\u00e9s non P\u00each\u00e9s, \ + Retir\u00e9s P\u00each\u00e9s, \ + Retir\u00e9s non P\u00each\u00e9s, \ + Abandonn\u00e9s P\u00each\u00e9s, \ + Abandonn\u00e9s non P\u00each\u00e9s, \ + Coul\u00e9s P\u00each\u00e9s, \ + Coul\u00e9s non P\u00each\u00e9s, \ + Remplac\u00e9s P\u00each\u00e9s, \ + Remplac\u00e9s non P\u00each\u00e9s, \ + Autre P\u00each\u00e9s, \ + Autre non P\u00each\u00e9s, \ + Tortues associ\u00e9es + +report.fobUsageExtended.repeatVariable.typeObjetId=java.lang.String|\ + Select distinct (om.standardCode) \ + From ObjectMaterialImpl om \ + Where standardCode is not null \ + And standardCode != '' \ + And (Select Count(dcp) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.floatingObject dcp \ + Where \ + m.id In :tripId \ + and (dcp.computedWhenArrivingSimplifiedObjectType = om.standardCode Or dcp.computedWhenLeavingSimplifiedObjectType = om.standardCode) \ + ) > 0 +report.fobUsageExtended.request.1=0,0|row|\ + Select concat(str(om.standardCode) , ' - ', om.label2) \ + From ObjectMaterialImpl om \ + Where \ + om.standardCode = :typeObjetId \ + And om.status != 0 +report.fobUsageExtended.request.1.repeat=typeObjetId|column + +# visite + peche +report.fobUsageExtended.request.2=1,0|row|\ + Select Count(dcp) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.floatingObject dcp \ + Where \ + m.id In :tripId \ + 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.fobUsageExtended.request.2.repeat=typeObjetId|column + +# visite - peche +report.fobUsageExtended.request.3=2,0|row|\ + Select Count(dcp) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.floatingObject dcp \ + Where \ + m.id In :tripId \ + 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.fobUsageExtended.request.3.repeat=typeObjetId|column + +# Deploiement + peche +report.fobUsageExtended.request.4=3,0|row|\ Select Count(dcp) \ From TripSeineImpl m \ Join m.route r \ @@ -181,12 +306,110 @@ report.dcpUsage.request.4=3,0|row|\ Where \ m.id In :tripId \ 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 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|\ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#1' \ + and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' +report.fobUsageExtended.request.4.repeat=typeObjetId|column + +# Deploiement - peche +report.fobUsageExtended.request.5=4,0|row|\ + Select Count(dcp) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.floatingObject dcp \ + Where \ + m.id In :tripId \ + and dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId \ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#1' \ + and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' +report.fobUsageExtended.request.5.repeat=typeObjetId|column + +# Modifie + peche +report.fobUsageExtended.request.6=5,0|row|\ + Select Count(dcp) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.floatingObject dcp \ + Where \ + m.id In :tripId \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8' \ + and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' +report.fobUsageExtended.request.6.repeat=typeObjetId|column + +# Modifie - peche +report.fobUsageExtended.request.7=6,0|row|\ + Select Count(dcp) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.floatingObject dcp \ + Where \ + m.id In :tripId \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8' \ + and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' +report.fobUsageExtended.request.7.repeat=typeObjetId|column + +# Retire + peche +report.fobUsageExtended.request.8=7,0|row|\ + Select Count(dcp) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.floatingObject dcp \ + Where \ + m.id In :tripId \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4' \ + and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' +report.fobUsageExtended.request.8.repeat=typeObjetId|column + +# Retire - peche +report.fobUsageExtended.request.9=8,0|row|\ + Select Count(dcp) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.floatingObject dcp \ + Where \ + m.id In :tripId \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4' \ + and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' +report.fobUsageExtended.request.9.repeat=typeObjetId|column + +# Abandonne + peche +report.fobUsageExtended.request.10=9,0|row|\ + Select Count(dcp) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.floatingObject dcp \ + Where \ + m.id In :tripId \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5' \ + and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' +report.fobUsageExtended.request.10.repeat=typeObjetId|column + +# Abandonne - peche +report.fobUsageExtended.request.11=10,0|row|\ + Select Count(dcp) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.floatingObject dcp \ + Where \ + m.id In :tripId \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5' \ + and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' +report.fobUsageExtended.request.11.repeat=typeObjetId|column + +# Coule + peche +report.fobUsageExtended.request.12=11,0|row|\ Select Count(dcp) \ From TripSeineImpl m \ Join m.route r \ @@ -195,10 +418,12 @@ report.dcpUsage.request.5=4,0|row|\ Where \ m.id In :tripId \ 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 -report.dcpUsage.request.6=5,0|row|\ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7' \ + and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' +report.fobUsageExtended.request.12.repeat=typeObjetId|column + +# Coule - peche +report.fobUsageExtended.request.13=12,0|row|\ Select Count(dcp) \ From TripSeineImpl m \ Join m.route r \ @@ -207,10 +432,12 @@ report.dcpUsage.request.6=5,0|row|\ Where \ m.id In :tripId \ 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 -report.dcpUsage.request.7=6,0|row|\ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7' \ + and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' +report.fobUsageExtended.request.13.repeat=typeObjetId|column + +# Remplace + peche +report.fobUsageExtended.request.14=13,0|row|\ Select Count(dcp) \ From TripSeineImpl m \ Join m.route r \ @@ -219,10 +446,12 @@ report.dcpUsage.request.7=6,0|row|\ Where \ m.id In :tripId \ 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 -report.dcpUsage.request.8=7,0|row|\ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#9' \ + and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' +report.fobUsageExtended.request.14.repeat=typeObjetId|column + +# Remplace - peche +report.fobUsageExtended.request.15=14,0|row|\ Select Count(dcp) \ From TripSeineImpl m \ Join m.route r \ @@ -231,10 +460,12 @@ report.dcpUsage.request.8=7,0|row|\ Where \ m.id In :tripId \ 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 -report.dcpUsage.request.9=8,0|row|\ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#9' \ + and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' +report.fobUsageExtended.request.15.repeat=typeObjetId|column + +# Autre ou ancien peche + peche +report.fobUsageExtended.request.16=15,0|row|\ Select Count(dcp) \ From TripSeineImpl m \ Join m.route r \ @@ -243,10 +474,13 @@ report.dcpUsage.request.9=8,0|row|\ Where \ m.id In :tripId \ 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 -report.dcpUsage.request.10=9,0|row|\ + and (dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#10' \ + or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3') \ + and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' +report.fobUsageExtended.request.16.repeat=typeObjetId|column + +# Autre ou ancien peche - peche +report.fobUsageExtended.request.17=16,0|row|\ Select Count(dcp) \ From TripSeineImpl m \ Join m.route r \ @@ -255,10 +489,13 @@ report.dcpUsage.request.10=9,0|row|\ Where \ m.id In :tripId \ 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 -report.dcpUsage.request.11=10,0|row| \ + and (dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#10' \ + or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3') \ + and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' +report.fobUsageExtended.request.17.repeat=typeObjetId|column + +# Nombre de tortues +report.fobUsageExtended.request.18=17,0|row| \ Select Sum(efo.count) \ From TripSeineImpl m \ Join m.route r \ @@ -269,8 +506,7 @@ report.dcpUsage.request.11=10,0|row| \ m.id In :tripId \ 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 - +report.fobUsageExtended.request.18.repeat=typeObjetId|column ################################################################################ ## Nombre des cal\u00e9es selon le type d'association ################################################################################ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/abe16820422541fbf4fb25581... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/abe16820422541fbf4fb25581... You're receiving this email because of your account on gitlab.com.
participants (1)
-
Tony CHEMIT