branch feature/7146 updated (a6be8bf -> e0fe798)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7146 in repository observe. See http://git.codelutin.com/observe.git from a6be8bf refs #7146 : Rejets thons selon le type d'association (439.503 ms ==> 227.16 ms) new e0fe798 refs #7146 : Captures accessoires observées The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit e0fe7989aab33ef24c309fc7e9e0d8854fc34d3f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed May 27 15:25:51 2015 +0200 refs #7146 : Captures accessoires observées Summary of changes: .../src/main/filters/observe-reports.properties | 69 +++++++++------------- 1 file changed, 29 insertions(+), 40 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 e0fe7989aab33ef24c309fc7e9e0d8854fc34d3f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed May 27 15:25:51 2015 +0200 refs #7146 : Captures accessoires observées --- .../src/main/filters/observe-reports.properties | 69 +++++++++------------- 1 file changed, 29 insertions(+), 40 deletions(-) diff --git a/observe-business/src/main/filters/observe-reports.properties b/observe-business/src/main/filters/observe-reports.properties index 342169b..0c712c1 100644 --- a/observe-business/src/main/filters/observe-reports.properties +++ b/observe-business/src/main/filters/observe-reports.properties @@ -581,56 +581,45 @@ report.accessoryCatch.repeatVariable.speciesId=java.lang.String|\ report.accessoryCatch.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)) \ + 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.accessoryCatch.request.1.repeat=speciesId|column report.accessoryCatch.request.2=1,0|row|\ Select \ - case when Count(distinct ca) > 0 then \ - concat('+', \ - case when Sum(ca.totalCount) is not null then concat(' Effectif : ', str(Sum(ca.totalCount))) else '' end , \ - case when Sum(ca.catchWeight) is not null then concat(' Poids total (t) : ' , str(Sum(ca.catchWeight))) else '' end ) \ - else '-' end \ - From SetSeineImpl c, NonTargetCatchImpl ca \ - Where \ - c in ( \ - Select distinct aa.setSeine From TripSeineImpl m, RouteImpl r, ActivitySeineImpl aa \ - Where m.id = :tripId \ - and r in elements(m.route) \ - and aa in elements(r.activitySeine) \ - and aa.setSeine is not null \ - and aa.setSeine.schoolType = 2 \ - ) \ - and ca in elements(c.nonTargetCatch) \ - and ca.species.id = :speciesId + case when Count(ca) > 0 then \ + concat('+', \ + case when Sum(ca.totalCount) is not null then concat(' Effectif : ', str(Sum(ca.totalCount))) else '' end , \ + case when Sum(ca.catchWeight) is not null then concat(' Poids total (t) : ' , str(Sum(ca.catchWeight))) else '' end ) \ + else '-' end \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.setSeine c \ + with c.schoolType = 2 \ + Join c.nonTargetCatch ca \ + with ca.species.id = :speciesId \ + Where m.id = :tripId report.accessoryCatch.request.2.repeat=speciesId|column -##Select case when Count(distinct ca) > 0 then concat('+', case when Sum(ca.totalCount) is not null then concat(' Effectif : ', str(Sum(ca.totalCount))) else '' end , case when Sum(ca.catchWeight) is not null then concat(' Poids total (t) : ' , str(Sum(ca.catchWeight))) else '' end ) else '-' end From fr.ird.observe.entities.seine.SetSeineImpl c, fr.ird.observe.entities.seine.NonTargetCatchImpl ca Where c in ( Select distinct aa.setSeine From fr.ird.observe.entities.seine.TripSeineImpl [...] - report.accessoryCatch.request.3=2,0|row|\ Select \ - case when Count(distinct ca) > 0 then \ - concat('+', \ - case when Sum(ca.totalCount) is not null then concat(' Effectif : ', str(Sum(ca.totalCount))) else '' end , \ - case when Sum(ca.catchWeight) is not null then concat(' Poids total (t) : ' , str(Sum(ca.catchWeight))) else '' end ) \ - else '-' end \ - From SetSeineImpl c, NonTargetCatchImpl ca \ - Where \ - c in ( \ - Select distinct aa.setSeine From TripSeineImpl m, RouteImpl r, ActivitySeineImpl aa \ - Where m.id = :tripId \ - and r in elements(m.route) \ - and aa in elements(r.activitySeine) \ - and aa.setSeine is not null \ - and aa.setSeine.schoolType = 1 \ - ) \ - and ca in elements(c.nonTargetCatch) \ - and ca.species.id = :speciesId + case when Count(ca) > 0 then \ + concat('+', \ + case when Sum(ca.totalCount) is not null then concat(' Effectif : ', str(Sum(ca.totalCount))) else '' end , \ + case when Sum(ca.catchWeight) is not null then concat(' Poids total (t) : ' , str(Sum(ca.catchWeight))) else '' end ) \ + else '-' end \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.setSeine c \ + with c.schoolType = 1 \ + Join c.nonTargetCatch ca \ + with ca.species.id = :speciesId \ + Where m.id = :tripId report.accessoryCatch.request.3.repeat=speciesId|column ################################################################################ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm