branch develop updated (647b966 -> 067cfd8)
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 647b966 fixes #7137: [PS] Orthongel - Nouvelle requête Distribution des tailles par espèce non ciblées Merge branch 'feature/7137' into develop new d98308a fix API new 48a13fc ajout d'une opération pour grouper par taille (refs #7138) new 69993bb correction du nom des operations new 7b344a2 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) new 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 The 5 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 067cfd857a86725b3c42376cd1a155a61fc1164e Merge: 647b966 7b344a2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat May 23 13:04:37 2015 +0200 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 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) commit 69993bb92228d98a7791a5e1709e3d7837594165 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat May 23 13:03:49 2015 +0200 correction du nom des operations commit 48a13fc3292818ca7cc537d1f8f01a3acfb8d924 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat May 23 13:03:22 2015 +0200 ajout d'une opération pour grouper par taille (refs #7138) commit d98308a06f6f899f162fff31e63d539e3eeceb9b Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat May 23 13:02:22 2015 +0200 fix API Summary of changes: .../src/main/filters/observe-reports.properties | 127 +++++++++++++++------ .../java/fr/ird/observe/report/ReportBuilder.java | 8 +- .../java/fr/ird/observe/report/model/Report.java | 12 +- .../fr/ird/observe/report/model/ReportExecute.java | 6 +- .../report/model/operations/GroupByLength.java | 87 ++++++++++++++ .../observe/report/model/operations/SumColumn.java | 2 +- .../report/model/operations/SumIntColumn.java | 2 +- .../observe/report/model/operations/SumIntRow.java | 2 +- .../observe/report/model/operations/SumRow.java | 2 +- .../fr.ird.observe.report.model.ReportOperation | 3 +- 10 files changed, 199 insertions(+), 52 deletions(-) create mode 100644 observe-business/src/main/java/fr/ird/observe/report/model/operations/GroupByLength.java -- 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 d98308a06f6f899f162fff31e63d539e3eeceb9b Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat May 23 13:02:22 2015 +0200 fix API --- .../src/main/java/fr/ird/observe/report/model/operations/SumColumn.java | 2 +- .../main/java/fr/ird/observe/report/model/operations/SumIntColumn.java | 2 +- .../src/main/java/fr/ird/observe/report/model/operations/SumIntRow.java | 2 +- .../src/main/java/fr/ird/observe/report/model/operations/SumRow.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/observe-business/src/main/java/fr/ird/observe/report/model/operations/SumColumn.java b/observe-business/src/main/java/fr/ird/observe/report/model/operations/SumColumn.java index 15eca4d..1995f67 100644 --- a/observe-business/src/main/java/fr/ird/observe/report/model/operations/SumColumn.java +++ b/observe-business/src/main/java/fr/ird/observe/report/model/operations/SumColumn.java @@ -66,7 +66,7 @@ public class SumColumn extends ReportOperation { public DataMatrix execute(TopiaContext tx, Report model, DataMatrix incoming, - Map<String, String> variables, + Map<String, Object> variables, Map<String, List<?>> repeatVariablesUniverse) throws TopiaException { if (log.isDebugEnabled()) { diff --git a/observe-business/src/main/java/fr/ird/observe/report/model/operations/SumIntColumn.java b/observe-business/src/main/java/fr/ird/observe/report/model/operations/SumIntColumn.java index 6dab58a..0cc7514 100644 --- a/observe-business/src/main/java/fr/ird/observe/report/model/operations/SumIntColumn.java +++ b/observe-business/src/main/java/fr/ird/observe/report/model/operations/SumIntColumn.java @@ -66,7 +66,7 @@ public class SumIntColumn extends ReportOperation { public DataMatrix execute(TopiaContext tx, Report model, DataMatrix incoming, - Map<String, String> variables, + Map<String, Object> variables, Map<String, List<?>> repeatVariablesUniverse) throws TopiaException { if (log.isDebugEnabled()) { diff --git a/observe-business/src/main/java/fr/ird/observe/report/model/operations/SumIntRow.java b/observe-business/src/main/java/fr/ird/observe/report/model/operations/SumIntRow.java index 30617f2..d9e274e 100644 --- a/observe-business/src/main/java/fr/ird/observe/report/model/operations/SumIntRow.java +++ b/observe-business/src/main/java/fr/ird/observe/report/model/operations/SumIntRow.java @@ -64,7 +64,7 @@ public class SumIntRow extends ReportOperation { public DataMatrix execute(TopiaContext tx, Report model, DataMatrix incoming, - Map<String, String> variables, + Map<String, Object> variables, Map<String, List<?>> repeatVariablesUniverse) throws TopiaException { if (log.isDebugEnabled()) { log.debug("Launch " + this); diff --git a/observe-business/src/main/java/fr/ird/observe/report/model/operations/SumRow.java b/observe-business/src/main/java/fr/ird/observe/report/model/operations/SumRow.java index 08c0c63..ecc3cb1 100644 --- a/observe-business/src/main/java/fr/ird/observe/report/model/operations/SumRow.java +++ b/observe-business/src/main/java/fr/ird/observe/report/model/operations/SumRow.java @@ -64,7 +64,7 @@ public class SumRow extends ReportOperation { public DataMatrix execute(TopiaContext tx, Report model, DataMatrix incoming, - Map<String, String> variables, + Map<String, Object> variables, Map<String, List<?>> repeatVariablesUniverse) throws TopiaException { if (log.isDebugEnabled()) { log.debug("Launch " + this); -- 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 48a13fc3292818ca7cc537d1f8f01a3acfb8d924 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat May 23 13:03:22 2015 +0200 ajout d'une opération pour grouper par taille (refs #7138) --- .../report/model/operations/GroupByLength.java | 87 ++++++++++++++++++++++ .../fr.ird.observe.report.model.ReportOperation | 3 +- 2 files changed, 89 insertions(+), 1 deletion(-) diff --git a/observe-business/src/main/java/fr/ird/observe/report/model/operations/GroupByLength.java b/observe-business/src/main/java/fr/ird/observe/report/model/operations/GroupByLength.java new file mode 100644 index 0000000..6980ca1 --- /dev/null +++ b/observe-business/src/main/java/fr/ird/observe/report/model/operations/GroupByLength.java @@ -0,0 +1,87 @@ +package fr.ird.observe.report.model.operations; + +import fr.ird.observe.report.model.DataMatrix; +import fr.ird.observe.report.model.Report; +import fr.ird.observe.report.model.ReportOperation; +import org.apache.commons.lang3.mutable.MutableInt; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; + +import java.awt.Dimension; +import java.awt.Point; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * To group by legnth (first column, second row is count). + * + * I don't know how to make this with hibernate the group by + sum does not work :(. + * + * Created on 5/23/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 4.0 + */ +public class GroupByLength extends ReportOperation { + + private static final long serialVersionUID = 1L; + + private static final String OPERATION_NAME = "GroupByLength"; + + @Override + public String getOperationName() { + return OPERATION_NAME; + } + + @Override + protected Point computeLocation(Report model, DataMatrix incoming) { + Point result = new Point(0, incoming.getHeight()); + return result; + } + + @Override + protected Dimension computeDimension(Report model, DataMatrix incoming) { + Set<String> lengths = new HashSet<String>(); + for (int i = 0; i < incoming.getHeight(); i++) { + lengths.add((String) incoming.getValue(0, i)); + } + Dimension result = new Dimension(incoming.getWidth(), lengths.size()); + return result; + } + + @Override + public DataMatrix execute(TopiaContext tx, Report model, DataMatrix incoming, Map<String, Object> variables, Map<String, List<?>> repeatVariablesUniverse) throws TopiaException { + + // Première passe pour grouper par classe de taille + Map<String, MutableInt> data = new LinkedHashMap<String, MutableInt>(); + for (int i = 0, nbRows = incoming.getHeight(); i < nbRows; i++) { + + String length = (String) incoming.getValue(0, i); + Integer count = Integer.valueOf(incoming.getValue(1, i).toString()); + + MutableInt mutableInt = data.get(length); + if (mutableInt == null) { + mutableInt = new MutableInt(); + data.put(length, mutableInt); + } + mutableInt.add(count); + + } + + // Deuxième passe pour remplir la matrice + DataMatrix result = createTmpMatrix(model, incoming); + int row = 0; + for (Map.Entry<String, MutableInt> entry : data.entrySet()) { + String length = entry.getKey(); + MutableInt mutableInt = entry.getValue(); + result.setValue(0, row, length); + result.setValue(1, row, mutableInt.intValue()); + row++; + } + + return result; + } +} diff --git a/observe-business/src/main/resources/META-INF/services/fr.ird.observe.report.model.ReportOperation b/observe-business/src/main/resources/META-INF/services/fr.ird.observe.report.model.ReportOperation index 26810d5..a15219d 100644 --- a/observe-business/src/main/resources/META-INF/services/fr.ird.observe.report.model.ReportOperation +++ b/observe-business/src/main/resources/META-INF/services/fr.ird.observe.report.model.ReportOperation @@ -2,4 +2,5 @@ fr.ird.observe.report.model.operations.SumIntColumn fr.ird.observe.report.model.operations.SumColumn fr.ird.observe.report.model.operations.SumIntRow fr.ird.observe.report.model.operations.SumRow -fr.ird.observe.report.model.operations.ExecuteRequests \ No newline at end of file +fr.ird.observe.report.model.operations.ExecuteRequests +fr.ird.observe.report.model.operations.GroupByLength \ No newline at end of file -- 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 69993bb92228d98a7791a5e1709e3d7837594165 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat May 23 13:03:49 2015 +0200 correction du nom des operations --- .../src/main/java/fr/ird/observe/report/ReportBuilder.java | 8 ++++---- .../src/main/java/fr/ird/observe/report/model/Report.java | 12 ++++++------ .../main/java/fr/ird/observe/report/model/ReportExecute.java | 6 ++++-- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/observe-business/src/main/java/fr/ird/observe/report/ReportBuilder.java b/observe-business/src/main/java/fr/ird/observe/report/ReportBuilder.java index be21ca6..6eec032 100644 --- a/observe-business/src/main/java/fr/ird/observe/report/ReportBuilder.java +++ b/observe-business/src/main/java/fr/ird/observe/report/ReportBuilder.java @@ -180,7 +180,7 @@ public class ReportBuilder { } } ReportRequest[] requests = getRequests(reportName, dico); - ReportOperation[] operationss = getObjectOperations(reportName, dico); + ReportOperation[] operationss = getOperations(reportName, dico); ReportVariable[] variables = getVariables(reportName, dico); ReportVariable[] repeatVariables = getRepeatVariables(reportName, dico); @@ -324,7 +324,7 @@ public class ReportBuilder { return def; } - protected ReportOperation[] getObjectOperations(String reportName, Map<String, String> dico) { + protected ReportOperation[] getOperations(String reportName, Map<String, String> dico) { Map<Integer, String> requestDico = new TreeMap<Integer, String>(); Iterator<Map.Entry<String, String>> itr = dico.entrySet().iterator(); @@ -355,7 +355,7 @@ public class ReportBuilder { String operationsDef = requestDico.get(id); - ReportOperation def = getObjectOperation(operationsDef); + ReportOperation def = getOperation(operationsDef); if (log.isInfoEnabled()) { log.info("Detects a operations : " + def); } @@ -458,7 +458,7 @@ public class ReportBuilder { return result.toArray(new ReportVariable[result.size()]); } - protected ReportOperation getObjectOperation(String operationsDef) { + protected ReportOperation getOperation(String operationsDef) { // pour le moment, une operations n'a qu'une seule valeur : celle // du lastName de l'opération diff --git a/observe-business/src/main/java/fr/ird/observe/report/model/Report.java b/observe-business/src/main/java/fr/ird/observe/report/model/Report.java index 7cab59a..318d22e 100644 --- a/observe-business/src/main/java/fr/ird/observe/report/model/Report.java +++ b/observe-business/src/main/java/fr/ird/observe/report/model/Report.java @@ -52,7 +52,7 @@ public class Report implements Serializable { protected final ReportRequest[] requests; /** la liste des opérations à jouer. */ - protected final ReportOperation[] objectOperations; + protected final ReportOperation[] operations; /** la liste des variables du report. */ protected final ReportVariable[] variables; @@ -67,7 +67,7 @@ public class Report implements Serializable { String description, String[] rowHeaders, String[] columnHeaders, - ReportOperation[] objectOperations, + ReportOperation[] operations, ReportVariable[] variables, ReportVariable[] repeatVariables, ReportRequest... requests) { @@ -77,13 +77,13 @@ public class Report implements Serializable { this.rowHeaders = rowHeaders; this.columnHeaders = columnHeaders; this.requests = requests; - this.objectOperations = objectOperations; + this.operations = operations; this.variables = variables; this.repeatVariables = repeatVariables; if (log.isDebugEnabled()) { log.debug("New report [" + id + ":" + name + "], nb requests : " + requests.length + ", nb objectOperations : " + - objectOperations.length + ", nb variables : " + + operations.length + ", nb variables : " + variables.length + ", nb repeat variables : " + repeatVariables.length); } @@ -121,8 +121,8 @@ public class Report implements Serializable { return requests; } - public ReportOperation[] getObjectOperations() { - return objectOperations; + public ReportOperation[] getOperations() { + return operations; } public ReportVariable[] getVariables() { diff --git a/observe-business/src/main/java/fr/ird/observe/report/model/ReportExecute.java b/observe-business/src/main/java/fr/ird/observe/report/model/ReportExecute.java index 83f5983..94500ef 100644 --- a/observe-business/src/main/java/fr/ird/observe/report/model/ReportExecute.java +++ b/observe-business/src/main/java/fr/ird/observe/report/model/ReportExecute.java @@ -21,6 +21,8 @@ */ package fr.ird.observe.report.model; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.report.ReportBuilder; @@ -150,7 +152,7 @@ public class ReportExecute { ); // lancement des opérations supplémentaires - for (ReportOperation objectOperation : report.getObjectOperations()) { + for (ReportOperation objectOperation : report.getOperations()) { DataMatrix tmp = result; if (log.isDebugEnabled()) { @@ -271,7 +273,7 @@ public class ReportExecute { for (ReportVariable variable : report.getRepeatVariables()) { String hql = variable.getRequest(); Object[] objects = ReportRequest.getParams(hql, variables); - List<?> universe = tx.findAll(hql, objects); + List<?> universe = Lists.newArrayList(Sets.newLinkedHashSet(tx.findAll(hql, objects))); repeatVariablesUniverse.put(variable.getName(), universe); } } finally { -- 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 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>.
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 067cfd857a86725b3c42376cd1a155a61fc1164e Merge: 647b966 7b344a2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat May 23 13:04:37 2015 +0200 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 .../src/main/filters/observe-reports.properties | 127 +++++++++++++++------ .../java/fr/ird/observe/report/ReportBuilder.java | 8 +- .../java/fr/ird/observe/report/model/Report.java | 12 +- .../fr/ird/observe/report/model/ReportExecute.java | 6 +- .../report/model/operations/GroupByLength.java | 87 ++++++++++++++ .../observe/report/model/operations/SumColumn.java | 2 +- .../report/model/operations/SumIntColumn.java | 2 +- .../observe/report/model/operations/SumIntRow.java | 2 +- .../observe/report/model/operations/SumRow.java | 2 +- .../fr.ird.observe.report.model.ReportOperation | 3 +- 10 files changed, 199 insertions(+), 52 deletions(-) -- 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