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 7b344a207e24c3afd3fc9bed99d970fcc99ecb33 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat May 23 13:04:35 2015 +0200 ajout des requetes la distribution sur les échantillons des espèces ciblés + amélioration de celle pour les espèces non ciblées (refs #7138) --- .../src/main/filters/observe-reports.properties | 127 +++++++++++++++------ 1 file changed, 92 insertions(+), 35 deletions(-) diff --git a/observe-business/src/main/filters/observe-reports.properties b/observe-business/src/main/filters/observe-reports.properties index d59869a..7d572b8 100644 --- a/observe-business/src/main/filters/observe-reports.properties +++ b/observe-business/src/main/filters/observe-reports.properties @@ -182,8 +182,8 @@ report.setByAssociation.name=Nombre de cal\u00e9es selon le type d\u2019associat report.setByAssociation.description=Afficher la r\u00e9partitions des cal\u00e9es selon le type d\u2019association l\u2019issue du coup. Les coups sur BL baleine et BO requin-baleine sont sp\u00e9cifi\u00e9s. report.setByAssociation.columns=BL sans baleine, BL avec baleine, BO avec requin-baleine, BO sans requin-baleine, Total report.setByAssociation.rows=Coups positifs, Coups nuls, Total -report.setByAssociation.objectOperation.1=SumIntRow -report.setByAssociation.objectOperation.2=SumIntColumn +report.setByAssociation.operations.1=SumIntRow +report.setByAssociation.operations.2=SumIntColumn report.setByAssociation.request.1=0,0|column|\ Select Count(distinct a) \ From TripSeineImpl m, RouteImpl r, ActivitySeineImpl a \ @@ -290,8 +290,8 @@ report.targetCatchByAssociation.name=Capture de thon selon le type d'association report.targetCatchByAssociation.description=Afficher la r\u00e9partitions des captures de thons selon le type d'association report.targetCatchByAssociation.columns=YFT, SKJ, BET, LTA, FRI, Autres, Total report.targetCatchByAssociation.rows=BL sans baleine, BL avec baleine, BO avec requin-baleine, BO sans requin-baleine, Total -report.targetCatchByAssociation.objectOperation.1=SumRow -report.targetCatchByAssociation.objectOperation.2=SumColumn +report.targetCatchByAssociation.operations.1=SumRow +report.targetCatchByAssociation.operations.2=SumColumn # ligne 1 report.targetCatchByAssociation.request.1=0,0|row|\ @@ -703,8 +703,8 @@ report.targetDiscardedByAssociation.name=Rejets de thons selon le type d\u2019as report.targetDiscardedByAssociation.description=Afficher la r\u00e9partitions des rejets de thons selon le type d'association report.targetDiscardedByAssociation.columns=YFT, SKJ, BET, LTA, FRI, Autres, Total report.targetDiscardedByAssociation.rows=BL sans baleine, BL avec baleine, BO avec requin-baleine, BO sans requin-baleine, Total -report.targetDiscardedByAssociation.objectOperation.1=SumRow -report.targetDiscardedByAssociation.objectOperation.2=SumColumn +report.targetDiscardedByAssociation.operations.1=SumRow +report.targetDiscardedByAssociation.operations.2=SumColumn # ligne 1 report.targetDiscardedByAssociation.request.1=0,0|row|\ @@ -1404,39 +1404,96 @@ report.accessoryCatchByGroup.request.11.repeat=speciesId|column ## Distribution des tailles par esp\u00e8ce non cibl\u00e8s ########################################################### -report.nonTargetDistributionLengths.name= Distribution des tailles par esp\u00e8ce non cibles +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.variable.speciesId=fr.ird.observe.entities.referentiel.Species|Select s From SpeciesListImpl sl, SpeciesImpl s Where sl.id = 'fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.2' And s in elements(sl.species) Order By s.code +report.nonTargetDistributionLengths.variable.speciesId=fr.ird.observe.entities.referentiel.Species|\ +Select distinct ntl.species \ +From TripSeineImpl t \ +Join t.route r \ +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 SetSeineImpl s, NonTargetSampleImpl nts, NonTargetLengthImpl ntl \ - Where \ - s 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 nts in elements(s.nonTargetSample) \ - and ntl in elements(nts.nonTargetLength) \ - and ntl.species.id = :speciesId - +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 SetSeineImpl s, NonTargetSampleImpl nts, NonTargetLengthImpl ntl \ - Where \ - s 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 nts in elements(s.nonTargetSample) \ - and ntl in elements(nts.nonTargetLength) \ - and ntl.species.id = :speciesId \ - and ntl.length = :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 \ +And ntl.species.id = :speciesId \ +And ntl.length = :length \ Group By ntl.length -report.nonTargetDistributionLengths.request.1.repeat=length|column \ No newline at end of file +report.nonTargetDistributionLengths.request.1.repeat=length|column + +############################################################# +## Distribution des tailles par esp\u00e8ce cibl\u00e8s (LD1) +############################################################# + +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.variable.speciesId=fr.ird.observe.entities.referentiel.Species|\ +Select distinct tl.species \ +From TripSeineImpl t \ +Join t.route r \ +Join r.activitySeine a \ +Join a.setSeine.targetSample ts \ +Join ts.targetLength tl \ +Where t.id = :tripId \ +And tl.measureType = 1 +report.targetDistributionLengthsLD1.request.1=0,0|row| \ +Select tl.length , Sum(tl.count) \ +From TripSeineImpl t \ +Join t.route r \ +Join r.activitySeine a \ +Join a.setSeine.targetSample ts \ +Join ts.targetLength tl \ +Where t.id = :tripId \ + And tl.species.id = :speciesId \ + And tl.length = :length \ + And tl.measureType = 1 \ +Group By tl.length \ +Order By tl.length + +############################################################ +## Distribution des tailles par esp\u00e8ce cibl\u00e8s (LF) +############################################################ + +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.variable.speciesId=fr.ird.observe.entities.referentiel.Species|\ +Select distinct tl.species \ +From TripSeineImpl t \ +Join t.route r \ +Join r.activitySeine a \ +Join a.setSeine.targetSample ts \ +Join ts.targetLength tl \ +Where t.id = :tripId \ +And tl.measureType = 2 +report.targetDistributionLengthsLF.request.1=0,0|row| \ +Select tl.length , Sum(tl.count) \ +From TripSeineImpl t \ +Join t.route r \ +Join r.activitySeine a \ +Join a.setSeine.targetSample ts \ +Join ts.targetLength tl \ +Where t.id = :tripId \ + And tl.species.id = :speciesId \ + And tl.measureType = 2 \ +Group By tl.length \ +Order By tl.length -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.