branch develop updated (067cfd8 -> f5c16c9)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 067cfd8 fixes #7138: [PS] Orthongel - Nouvelles requêtes Distribution des tailles par espèce ciblées (type de mesure LD1 ou LF) Merge branch 'feature/7138' into develop new f5c16c9 correction des requetes (refs #7138) 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 f5c16c95615ce7d0303b1802926ca4f77f2590ec Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat May 23 13:16:34 2015 +0200 correction des requetes (refs #7138) Summary of changes: .../src/main/filters/observe-reports.properties | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 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 develop in repository observe. See http://git.codelutin.com/observe.git commit f5c16c95615ce7d0303b1802926ca4f77f2590ec Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat May 23 13:16:34 2015 +0200 correction des requetes (refs #7138) --- .../src/main/filters/observe-reports.properties | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/observe-business/src/main/filters/observe-reports.properties b/observe-business/src/main/filters/observe-reports.properties index 7d572b8..936b1f0 100644 --- a/observe-business/src/main/filters/observe-reports.properties +++ b/observe-business/src/main/filters/observe-reports.properties @@ -1407,6 +1407,7 @@ report.accessoryCatchByGroup.request.11.repeat=speciesId|column report.nonTargetDistributionLengths.name=Distribution des tailles par esp\u00e8ce non cibl\u00e9es report.nonTargetDistributionLengths.description=Afficher la nombre d'individus mesur\u00e9s par classe de taille pour les esp\u00e8ces non cibl\u00e9es report.nonTargetDistributionLengths.columns=Classe de taille,Effectif +report.nonTargetDistributionLengths.operations.1=GroupByLength report.nonTargetDistributionLengths.variable.speciesId=fr.ird.observe.entities.referentiel.Species|\ Select distinct ntl.species \ From TripSeineImpl t \ @@ -1415,15 +1416,6 @@ Join r.activitySeine a \ Join a.setSeine.nonTargetSample nts \ Join nts.nonTargetLength ntl \ Where t.id = :tripId -report.nonTargetDistributionLengths.repeatVariable.length=java.lang.Float|\ -Select distinct ntl.length \ -From TripSeineImpl t \ -Join t.route r \ -Join r.activitySeine a \ -Join a.setSeine.nonTargetSample nts \ -Join nts.nonTargetLength ntl \ -Where t.id = :tripId \ -Order By ntl.length report.nonTargetDistributionLengths.request.1=0,0|row| \ Select ntl.length, sum(ntl.count) \ From TripSeineImpl t \ @@ -1433,9 +1425,8 @@ Join a.setSeine.nonTargetSample nts \ Join nts.nonTargetLength ntl \ Where t.id = :tripId \ And ntl.species.id = :speciesId \ -And ntl.length = :length \ -Group By ntl.length -report.nonTargetDistributionLengths.request.1.repeat=length|column +Group By ntl.length \ +Order By ntl.length ############################################################# ## Distribution des tailles par esp\u00e8ce cibl\u00e8s (LD1) @@ -1444,7 +1435,7 @@ report.nonTargetDistributionLengths.request.1.repeat=length|column report.targetDistributionLengthsLD1.name=Distribution des tailles par esp\u00e8ce cibl\u00e9es (mesure LD1) report.targetDistributionLengthsLD1.description=Afficher la nombre d'individus mesur\u00e9s par classe de taille LD1 pour les esp\u00e8ces cibl\u00e9es report.targetDistributionLengthsLD1.columns=Classe de taille,Effectif -report.targetDistributionLengthsLD1.targetDistributionLengthsLD1.1=GroupByLength +report.targetDistributionLengthsLD1.operations.1=GroupByLength report.targetDistributionLengthsLD1.variable.speciesId=fr.ird.observe.entities.referentiel.Species|\ Select distinct tl.species \ From TripSeineImpl t \ @@ -1475,7 +1466,7 @@ Order By tl.length report.targetDistributionLengthsLF.name=Distribution des tailles par esp\u00e8ce cibl\u00e9es (mesure LF) report.targetDistributionLengthsLF.description=Afficher la nombre d'individus mesur\u00e9s par classe de taille LF pour les esp\u00e8ces cibl\u00e9es report.targetDistributionLengthsLF.columns=Classe de taille,Effectif -report.targetDistributionLengthsLF.targetDistributionLengthsLF.1=GroupByLength +report.targetDistributionLengthsLF.operations.1=GroupByLength report.targetDistributionLengthsLF.variable.speciesId=fr.ird.observe.entities.referentiel.Species|\ Select distinct tl.species \ From TripSeineImpl t \ -- 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