This is an automated email from the git hooks/post-receive script. New commit to branch feature/7146 in repository observe. See http://git.codelutin.com/observe.git commit 428163bd5f1d51270d8748cce2d42b24b0ca0794 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed May 27 16:35:38 2015 +0200 refs #7146 : Captures accessoires par speciesGroup d'espéces --- .../src/main/filters/observe-reports.properties | 235 ++++----------------- 1 file changed, 42 insertions(+), 193 deletions(-) diff --git a/observe-business/src/main/filters/observe-reports.properties b/observe-business/src/main/filters/observe-reports.properties index 0c712c1..3b21725 100644 --- a/observe-business/src/main/filters/observe-reports.properties +++ b/observe-business/src/main/filters/observe-reports.properties @@ -630,200 +630,49 @@ report.accessoryCatchByGroup.name=D\u00e9nombrement des captures accessoires et report.accessoryCatchByGroup.description=Afficher les nombres de captures accessoires par groupe d'esp\u00e8ce selon le type de banc et le devenir report.accessoryCatchByGroup.columns=Esp\u00e8ce, Total BL, Total BO, Sorti vivant/\u00e9chapp\u00e9, Sorti mort, Rejet\u00e9 vivant, Rejet\u00e9 mort, Partiellement conserv\u00e9, Cuve, Cuisine, Autre report.accessoryCatchByGroup.variable.speciesGroupId=fr.ird.observe.entities.referentiel.SpeciesGroup|From SpeciesGroupImpl ge Order By ge.code -report.accessoryCatchByGroup.repeatVariable.speciesId=java.lang.String|\ - Select e.id From SpeciesImpl e \ - Where e.speciesGroup.id = :speciesGroupId \ - and e in ( \ - Select distinct e1 From TripSeineImpl m, RouteImpl r, ActivitySeineImpl a, NonTargetCatchImpl cf, SpeciesImpl e1 \ - Where m.id = :tripId \ - and r in elements(m.route) \ - and a in elements(r.activitySeine) \ - and a.setSeine is not null \ - and cf in elements(a.setSeine.nonTargetCatch) \ - and cf.species.id = e1.id \ - ) \ - Order By e.homeId - -report.accessoryCatchByGroup.request.1=0,0|row|Select \ - concat(\ - '[FAO]', (case when e.faoCode is not null then e.faoCode else '-' end), \ - ' [sc]', (case when e.scientificLabel is not null then e.scientificLabel else '-' end), \ - ' [fr]', (case when e.label2 is not null then e.label2 else '-' end)) \ - From SpeciesImpl e \ - Where e.id = :speciesId -report.accessoryCatchByGroup.request.1.repeat=speciesId|column -report.accessoryCatchByGroup.request.2=1,0|row|\ - Select Sum(ca.totalCount) \ - From SetSeineImpl c, NonTargetCatchImpl ca \ - Where \ - c in ( \ - Select distinct a.setSeine From TripSeineImpl m, RouteImpl r, ActivitySeineImpl a \ - Where m.id = :tripId \ - and r in elements(m.route) \ - and a in elements(r.activitySeine) \ - and a.setSeine is not null \ - and a.setSeine.schoolType = 2 \ - ) \ - and ca in elements(c.nonTargetCatch) \ - and ca.species.id = :speciesId -report.accessoryCatchByGroup.request.2.repeat=speciesId|column - -report.accessoryCatchByGroup.request.3=2,0|row|\ - Select Sum(ca.totalCount) \ - From SetSeineImpl c, NonTargetCatchImpl ca \ - Where \ - c in ( \ - Select distinct a.setSeine From TripSeineImpl m, RouteImpl r, ActivitySeineImpl a \ - Where m.id = :tripId \ - and r in elements(m.route) \ - and a in elements(r.activitySeine) \ - and a.setSeine is not null \ - and a.setSeine.schoolType = 1 \ - ) \ - and ca in elements(c.nonTargetCatch) \ - and ca.species.id = :speciesId -report.accessoryCatchByGroup.request.3.repeat=speciesId|column - -report.accessoryCatchByGroup.request.4=3,0|row|\ - Select Sum(ca.totalCount) \ - From SetSeineImpl c, NonTargetCatchImpl ca \ - Where \ - c in ( \ - Select distinct a.setSeine From TripSeineImpl m, RouteImpl r, ActivitySeineImpl a \ - Where m.id = :tripId \ - and r in elements(m.route) \ - and a in elements(r.activitySeine) \ - and a.setSeine is not null \ - ) \ - and ca in elements(c.nonTargetCatch) \ - and ca.species.id = :speciesId \ - and ca.speciesFate.id in ( \ - 'fr.ird.observe.entities.referentiel.seine.SpeciesFate#1239832683619#0.9931091059863436', \ - 'fr.ird.observe.entities.referentiel.seine.SpeciesFate#1239832683618#0.06155887805368032' \ - ) -report.accessoryCatchByGroup.request.4.repeat=speciesId|column - -report.accessoryCatchByGroup.request.5=4,0|row|\ - Select Sum(ca.totalCount) \ - From SetSeineImpl c, NonTargetCatchImpl ca \ - Where \ - c in ( \ - Select distinct a.setSeine From TripSeineImpl m, RouteImpl r, ActivitySeineImpl a \ - Where m.id = :tripId \ - and r in elements(m.route) \ - and a in elements(r.activitySeine) \ - and a.setSeine is not null \ - ) \ - and ca in elements(c.nonTargetCatch) \ - and ca.species.id = :speciesId \ - and ca.speciesFate.id in ('fr.ird.observe.entities.referentiel.seine.SpeciesFate#1239832683619#0.11883784875534997') -report.accessoryCatchByGroup.request.5.repeat=speciesId|column - -report.accessoryCatchByGroup.request.6=5,0|row|\ - Select Sum(ca.totalCount) \ - From SetSeineImpl c, NonTargetCatchImpl ca \ - Where \ - c in ( \ - Select distinct a.setSeine From TripSeineImpl m, RouteImpl r, ActivitySeineImpl a \ - Where m.id = :tripId \ - and r in elements(m.route) \ - and a in elements(r.activitySeine) \ - and a.setSeine is not null \ - ) \ - and ca in elements(c.nonTargetCatch) \ - and ca.species.id = :speciesId \ - and ca.speciesFate.id = 'fr.ird.observe.entities.referentiel.seine.SpeciesFate#1239832683619#0.5308862132841506' -report.accessoryCatchByGroup.request.6.repeat=speciesId|column - -report.accessoryCatchByGroup.request.7=6,0|row|\ - Select Sum(ca.totalCount) \ - From SetSeineImpl c, NonTargetCatchImpl ca \ - Where \ - c in ( \ - Select distinct a.setSeine From TripSeineImpl m, RouteImpl r, ActivitySeineImpl a \ - Where m.id = :tripId \ - and r in elements(m.route) \ - and a in elements(r.activitySeine) \ - and a.setSeine is not null \ - ) \ - and ca in elements(c.nonTargetCatch) \ - and ca.species.id = :speciesId \ - and ca.speciesFate.id = 'fr.ird.observe.entities.referentiel.seine.SpeciesFate#1239832683619#0.6250731662108877' -report.accessoryCatchByGroup.request.7.repeat=speciesId|column - -report.accessoryCatchByGroup.request.8=7,0|row|\ - Select Sum(ca.totalCount) \ - From SetSeineImpl c, NonTargetCatchImpl ca \ - Where \ - c in ( \ - Select distinct a.setSeine From TripSeineImpl m, RouteImpl r, ActivitySeineImpl a \ - Where m.id = :tripId \ - and r in elements(m.route) \ - and a in elements(r.activitySeine) \ - and a.setSeine is not null \ - ) \ - and ca in elements(c.nonTargetCatch) \ - and ca.species.id = :speciesId \ - and ca.speciesFate.id = 'fr.ird.observe.entities.referentiel.seine.SpeciesFate#1239832683620#0.46609703818634485' -report.accessoryCatchByGroup.request.8.repeat=speciesId|column - -report.accessoryCatchByGroup.request.9=8,0|row|\ - Select Sum(ca.totalCount) \ - From SetSeineImpl c, NonTargetCatchImpl ca \ - Where \ - c in ( \ - Select distinct a.setSeine From TripSeineImpl m, RouteImpl r, ActivitySeineImpl a \ - Where m.id = :tripId \ - and r in elements(m.route) \ - and a in elements(r.activitySeine) \ - and a.setSeine is not null \ - ) \ - and ca in elements(c.nonTargetCatch) \ - and ca.species.id = :speciesId \ - and ca.speciesFate.id in ('fr.ird.observe.entities.referentiel.seine.SpeciesFate#1239832683619#0.5722739932065866') -report.accessoryCatchByGroup.request.9.repeat=speciesId|column - -report.accessoryCatchByGroup.request.10=9,0|row|\ - Select Sum(ca.totalCount) \ - From SetSeineImpl c, NonTargetCatchImpl ca \ - Where \ - c in ( \ - Select distinct a.setSeine From TripSeineImpl m, RouteImpl r, ActivitySeineImpl a \ - Where m.id = :tripId \ - and r in elements(m.route) \ - and a in elements(r.activitySeine) \ - and a.setSeine is not null \ - ) \ - and ca in elements(c.nonTargetCatch) \ - and ca.species.id = :speciesId \ - and ca.speciesFate.id in ('fr.ird.observe.entities.referentiel.seine.SpeciesFate#1239832683621#0.6728026426066158') -report.accessoryCatchByGroup.request.10.repeat=speciesId|column - -report.accessoryCatchByGroup.request.11=10,0|row|\ - Select Sum(ca.totalCount) \ - From SetSeineImpl c, NonTargetCatchImpl ca \ - Where \ - c in ( \ - Select distinct a.setSeine From TripSeineImpl m, RouteImpl r, ActivitySeineImpl a \ - Where m.id = :tripId \ - and r in elements(m.route) \ - and a in elements(r.activitySeine) \ - and a.setSeine is not null \ - ) \ - and ca in elements(c.nonTargetCatch) \ - and ca.species.id = :speciesId \ - and ca.speciesFate.id not in ( \ - 'fr.ird.observe.entities.referentiel.seine.SpeciesFate#1239832683619#0.9931091059863436', \ - 'fr.ird.observe.entities.referentiel.seine.SpeciesFate#1239832683618#0.06155887805368032', \ - 'fr.ird.observe.entities.referentiel.seine.SpeciesFate#1239832683619#0.11883784875534997', \ - 'fr.ird.observe.entities.referentiel.seine.SpeciesFate#1239832683619#0.5308862132841506', \ - 'fr.ird.observe.entities.referentiel.seine.SpeciesFate#1239832683619#0.6250731662108877', \ - 'fr.ird.observe.entities.referentiel.seine.SpeciesFate#1239832683620#0.46609703818634485', \ - 'fr.ird.observe.entities.referentiel.seine.SpeciesFate#1239832683619#0.5722739932065866', \ - 'fr.ird.observe.entities.referentiel.seine.SpeciesFate#1239832683621#0.6728026426066158' \ - ) -report.accessoryCatchByGroup.request.11.repeat=speciesId|column +report.accessoryCatchByGroup.request.1=0,0|row|\ + Select \ + concat(\ + '[FAO]', (case when e.faoCode is not null then e.faoCode else '-' end), \ + ' [sc]', (case when e.scientificLabel is not null then e.scientificLabel else '-' end), \ + ' [fr]', (case when e.label2 is not null then e.label2 else '-' end)), \ + Sum(case c.schoolType when 2 then ca.totalCount else 0.0 end), \ + Sum(case c.schoolType when 1 then ca.totalCount else 0.0 end), \ + Sum(case ca.speciesFate.id when 'fr.ird.observe.entities.referentiel.seine.SpeciesFate#1239832683619#0.9931091059863436' then ca.totalCount \ + when 'fr.ird.observe.entities.referentiel.seine.SpeciesFate#1239832683618#0.06155887805368032' then ca.totalCount \ + else 0.0 end), \ + Sum(case ca.speciesFate.id when 'fr.ird.observe.entities.referentiel.seine.SpeciesFate#1239832683619#0.11883784875534997' then ca.totalCount \ + else 0.0 end), \ + Sum(case ca.speciesFate.id when 'fr.ird.observe.entities.referentiel.seine.SpeciesFate#1239832683619#0.5308862132841506' then ca.totalCount \ + else 0.0 end), \ + Sum(case ca.speciesFate.id when 'fr.ird.observe.entities.referentiel.seine.SpeciesFate#1239832683619#0.6250731662108877' then ca.totalCount \ + else 0.0 end), \ + Sum(case ca.speciesFate.id when 'fr.ird.observe.entities.referentiel.seine.SpeciesFate#1239832683620#0.46609703818634485' then ca.totalCount \ + else 0.0 end), \ + Sum(case ca.speciesFate.id when 'fr.ird.observe.entities.referentiel.seine.SpeciesFate#1239832683619#0.5722739932065866' then ca.totalCount \ + else 0.0 end), \ + Sum(case ca.speciesFate.id when 'fr.ird.observe.entities.referentiel.seine.SpeciesFate#1239832683621#0.6728026426066158' then ca.totalCount \ + else 0.0 end), \ + Sum(case ca.speciesFate.id when 'fr.ird.observe.entities.referentiel.seine.SpeciesFate#1239832683619#0.9931091059863436' then 0.0 \ + when 'fr.ird.observe.entities.referentiel.seine.SpeciesFate#1239832683618#0.06155887805368032' then 0.0 \ + when 'fr.ird.observe.entities.referentiel.seine.SpeciesFate#1239832683619#0.11883784875534997' then 0.0 \ + when 'fr.ird.observe.entities.referentiel.seine.SpeciesFate#1239832683619#0.5308862132841506' then 0.0 \ + when 'fr.ird.observe.entities.referentiel.seine.SpeciesFate#1239832683619#0.6250731662108877' then 0.0 \ + when 'fr.ird.observe.entities.referentiel.seine.SpeciesFate#1239832683620#0.46609703818634485' then 0.0 \ + when 'fr.ird.observe.entities.referentiel.seine.SpeciesFate#1239832683619#0.5722739932065866' then 0.0 \ + when 'fr.ird.observe.entities.referentiel.seine.SpeciesFate#1239832683621#0.6728026426066158' then 0.0 \ + else ca.totalCount end) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.setSeine c \ + Join c.nonTargetCatch ca \ + Join ca.species e \ + with e.speciesGroup.id = :speciesGroupId \ + Where m.id = :tripId \ + Group by e \ + Order By e.homeId ########################################################### ## Distribution des tailles par esp\u00e8ce non cibl\u00e8s -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.