Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 5973b503 by Tony Chemit at 2022-11-14T13:38:45+01:00 Rapports Distributions de tailles - Closes #2533 - - - - - 5829f08b by Tony Chemit at 2022-11-14T13:38:45+01:00 Report API - add safe guard tests (to be able to copy partial matrix) - - - - - 21b35310 by Tony Chemit at 2022-11-14T13:38:45+01:00 Report GUI - Manage report with no columns and row headers (everything is coming from the report result to be able to manage dynamic columns) - - - - - 246f57a8 by Tony Chemit at 2022-11-14T13:38:45+01:00 Report model - Fix psObservationFobUsageMinimal report (one line escape was missing) - - - - - 832e14f1 by Tony Chemit at 2022-11-14T13:38:45+01:00 Report API - Be able to order variables and repeat variables - - - - - 78659144 by Tony Chemit at 2022-11-14T13:38:45+01:00 Report GUI - Respect report variables order in Report model - - - - - 16 changed files: - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ResultTableModel.java - core/api/dto/src/main/resources/observe-reports.properties - + core/persistence/java/src/main/java/fr/ird/observe/spi/report/ComputePsObservationLengthsDistribution.java - core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsObservationTargetStoredDistributionLengthsLFReportFixture.java → core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsObservationLengthsDistributionReportFixture.java - − core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsObservationNonTargetDistributionLengthsReportFixture.java - − core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsObservationTargetDiscardedDistributionLengthsLD1ReportFixture.java - − core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsObservationTargetDiscardedDistributionLengthsLFReportFixture.java - − core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsObservationTargetStoredDistributionLengthsLD1ReportFixture.java - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psObservationNonTargetDistributionLengths.properties → core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psObservationLengthsDistribution.properties - − core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psObservationTargetDiscardedDistributionLengthsLD1.properties - − core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psObservationTargetDiscardedDistributionLengthsLF.properties - − core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psObservationTargetStoredDistributionLengthsLD1.properties - − core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psObservationTargetStoredDistributionLengthsLF.properties - toolkit/api/src/main/java/fr/ird/observe/dto/report/DataMatrix.java - toolkit/api/src/main/java/fr/ird/observe/dto/report/ReportBuilder.java Changes: ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportModel.java ===================================== @@ -43,10 +43,10 @@ import java.net.URL; import java.nio.file.Files; import java.util.Collections; import java.util.Date; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.TreeMap; import java.util.stream.Collectors; /** @@ -81,7 +81,7 @@ public class ReportModel extends AdminActionModel { /** * les variables utilisées pour le report. */ - protected final Map<String, Object> variables; + protected final Map<String, Object> variables = new LinkedHashMap<>(); /** * la fichier contenant la définition des reports. */ @@ -128,7 +128,6 @@ public class ReportModel extends AdminActionModel { public ReportModel() { super(AdminStep.REPORT); - variables = new TreeMap<>(); // quand le type de modèle change, on mets à jour les rapports disponibles addPropertyChangeListener(REPORT_FILE_PROPERTY_NAME, evt -> updateReports()); } ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ResultTableModel.java ===================================== @@ -149,12 +149,11 @@ public class ResultTableModel extends AbstractTableModel { rowNames.addAll(Arrays.asList(report.getRowHeaders())); } - withColumnHeader = !columnNames.isEmpty(); - withRowHeader = !rowNames.isEmpty(); - table.setTableHeader(!withColumnHeader ? null : tableHeader); - table.createDefaultColumnsFromModel(); int nbRows = incomingData.getHeight(); int nbCols = incomingData.getWidth(); + + withColumnHeader = !columnNames.isEmpty(); + withRowHeader = !rowNames.isEmpty(); if (withRowHeader) { // on ajoute une première colonne aux données nbCols += 1; @@ -162,6 +161,22 @@ public class ResultTableModel extends AbstractTableModel { incomingData.setX(1); } + if (!withColumnHeader && !withRowHeader) { + // let's say we always use columns from incomingData + table.setTableHeader(tableHeader); + for (int i = 0; i < nbCols; i++) { + columnNames.add((String) incomingData.getValue(i, 0)); + } + incomingData.setY(-1); + withColumnHeader = true; + nbRows--; + + } else { + table.setTableHeader(!withColumnHeader ? null : tableHeader); + } + table.createDefaultColumnsFromModel(); + + data.setHeight(nbRows); data.setWidth(nbCols); @@ -185,7 +200,9 @@ public class ResultTableModel extends AbstractTableModel { } else if (withColumnHeader) { } - data.copyData(incomingData); + if (nbCols > 0) { + data.copyData(incomingData); + } fireTableStructureChanged(); table.revalidate(); table.repaint(); @@ -220,7 +237,7 @@ public class ResultTableModel extends AbstractTableModel { } public String getClipboardContent(boolean copyRowHeaders, boolean copyColumnHeaders) { - return getDataContent(copyRowHeaders, copyColumnHeaders, true,'\t'); + return getDataContent(copyRowHeaders, copyColumnHeaders, true, '\t'); } public String getCsvContent() { ===================================== core/api/dto/src/main/resources/observe-reports.properties ===================================== @@ -157,8 +157,8 @@ report.psObservationFobUsageMinimal.request.3=2,0|row|\ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' -and (dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#2' \ + and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ + and (dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#2' \ or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#8' \ or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#4' \ or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#5' \ @@ -949,14 +949,13 @@ report.psObservationCatchByGroup.request.1=0,0|row|\ Group by e \ Order By e.homeId ########################################################### -## Distribution des tailles par espèces non ciblées +## Distribution des tailles par espèces et type de mesure ########################################################### -report.psObservationNonTargetDistributionLengths.modelType=PS -report.psObservationNonTargetDistributionLengths.name=Observations - Distribution des tailles par espèces non ciblées -report.psObservationNonTargetDistributionLengths.description=Afficher la nombre d'individus mesurés par classe de taille pour les espèces non ciblées -report.psObservationNonTargetDistributionLengths.columns=Classe de taille,Effectif -report.psObservationNonTargetDistributionLengths.operations.1=GroupByLength -report.psObservationNonTargetDistributionLengths.variable.speciesId=fr.ird.observe.dto.referential.common.SpeciesDto|\ +report.psObservationLengthsDistribution.modelType=PS +report.psObservationLengthsDistribution.name=Observations - Distribution des tailles par espèces et type de mesure +report.psObservationLengthsDistribution.description=Afficher la nombre d'individus mesurés par classe de taille pour les espèces et le type de mesure +report.psObservationLengthsDistribution.operations.1=ComputePsObservationLengthsDistribution +report.psObservationLengthsDistribution.variable.1.species=fr.ird.observe.dto.referential.common.SpeciesDto|\ Select distinct ntl.species \ From TripImpl t \ Join t.routeObs r \ @@ -964,133 +963,32 @@ Join r.activity a \ Join a.set.sample nts \ Join nts.sampleMeasure ntl \ Where t.id In :tripId -report.psObservationNonTargetDistributionLengths.request.1=0,0|row| \ -Select ntl.length, sum(ntl.count) \ +report.psObservationLengthsDistribution.variable.2.sizeMeasureType=fr.ird.observe.dto.referential.common.SizeMeasureTypeDto|\ +Select distinct ntl.sizeMeasureType \ From TripImpl t \ Join t.routeObs r \ Join r.activity a \ Join a.set.sample nts \ Join nts.sampleMeasure ntl \ -Where t.id In :tripId \ -And ntl.species.id = :speciesId \ -Group By ntl.length \ -Order By ntl.length -#################################################################### -## Distribution des tailles des conservés par espèces ciblées (LD1) -#################################################################### -report.psObservationTargetStoredDistributionLengthsLD1.modelType=PS -report.psObservationTargetStoredDistributionLengthsLD1.name=Observations - Distribution des tailles des captures par espèces ciblées (mesure LD1) -report.psObservationTargetStoredDistributionLengthsLD1.description=Afficher le nombre d'individus capturés, mesurés par classe de taille LD1 pour les espèces ciblées -report.psObservationTargetStoredDistributionLengthsLD1.columns=Classe de taille,Effectif -report.psObservationTargetStoredDistributionLengthsLD1.operations.1=GroupByLength -report.psObservationTargetStoredDistributionLengthsLD1.variable.speciesId=fr.ird.observe.dto.referential.common.SpeciesDto|\ -Select distinct tl.species \ -From TripImpl t \ -Join t.routeObs r \ -Join r.activity a \ -Join a.set.sample ts \ -Join ts.sampleMeasure tl \ -Where t.id In :tripId \ -And tl.sizeMeasureType = 'fr.ird.referential.common.SizeMeasureType#1433499466774#0.529249255312607' -report.psObservationTargetStoredDistributionLengthsLD1.request.1=0,0|row| \ -Select tl.length , Sum(tl.count) \ -From TripImpl t \ -Join t.routeObs r \ -Join r.activity a \ -Join a.set.sample ts \ -Join ts.sampleMeasure tl \ -Where t.id In :tripId \ - And tl.species.id = :speciesId \ - And tl.sizeMeasureType = 'fr.ird.referential.common.SizeMeasureType#1433499466774#0.529249255312607' \ -Group By tl.length \ -Order By tl.length -################################################################ -## Distribution des tailles des rejets par espèces ciblées (LD1) -################################################################ -report.psObservationTargetDiscardedDistributionLengthsLD1.modelType=PS -report.psObservationTargetDiscardedDistributionLengthsLD1.name=Observations - Distribution des tailles des rejets par espèces ciblées (mesure LD1) -report.psObservationTargetDiscardedDistributionLengthsLD1.description=Afficher la nombre d'individus rejetés, mesurés par classe de taille LD1 pour les espèces ciblées -report.psObservationTargetDiscardedDistributionLengthsLD1.columns=Classe de taille,Effectif -report.psObservationTargetDiscardedDistributionLengthsLD1.operations.1=GroupByLength -report.psObservationTargetDiscardedDistributionLengthsLD1.variable.speciesId=fr.ird.observe.dto.referential.common.SpeciesDto|\ -Select distinct tl.species \ -From TripImpl t \ -Join t.routeObs r \ -Join r.activity a \ -Join a.set.sample ts \ -Join ts.sampleMeasure tl \ -Where t.id In :tripId \ -And tl.sizeMeasureType = 'fr.ird.referential.common.SizeMeasureType#1433499466774#0.529249255312607' -report.psObservationTargetDiscardedDistributionLengthsLD1.request.1=0,0|row| \ -Select tl.length , Sum(tl.count) \ -From TripImpl t \ -Join t.routeObs r \ -Join r.activity a \ -Join a.set.sample ts \ -Join ts.sampleMeasure tl \ -Where t.id In :tripId \ - And tl.species.id = :speciesId \ - And tl.sizeMeasureType = 'fr.ird.referential.common.SizeMeasureType#1433499466774#0.529249255312607'\ -Group By tl.length \ -Order By tl.length -############################################################### -## Distribution des tailles des conservés par espèces ciblées (LF) -############################################################### -report.psObservationTargetStoredDistributionLengthsLF.modelType=PS -report.psObservationTargetStoredDistributionLengthsLF.name=Observations - Distribution des tailles des captures par espèces ciblées (mesure LF) -report.psObservationTargetStoredDistributionLengthsLF.description=Afficher le nombre d'individus capturés, mesurés par classe de taille LF pour les espèces ciblées -report.psObservationTargetStoredDistributionLengthsLF.columns=Classe de taille,Effectif -report.psObservationTargetStoredDistributionLengthsLF.operations.1=GroupByLength -report.psObservationTargetStoredDistributionLengthsLF.variable.speciesId=fr.ird.observe.dto.referential.common.SpeciesDto|\ -Select distinct tl.species \ -From TripImpl t \ -Join t.routeObs r \ -Join r.activity a \ -Join a.set.sample ts \ -Join ts.sampleMeasure tl \ -Where t.id In :tripId \ -And tl.sizeMeasureType = 'fr.ird.referential.common.SizeMeasureType#1433499465700#0.0902433863375336' -report.psObservationTargetStoredDistributionLengthsLF.request.1=0,0|row| \ -Select tl.length , Sum(tl.count) \ -From TripImpl t \ -Join t.routeObs r \ -Join r.activity a \ -Join a.set.sample ts \ -Join ts.sampleMeasure tl \ -Where t.id In :tripId \ - And tl.species.id = :speciesId \ - And tl.sizeMeasureType = 'fr.ird.referential.common.SizeMeasureType#1433499465700#0.0902433863375336' \ -Group By tl.length \ -Order By tl.length -############################################################### -## Distribution des tailles des rejets par espèces ciblées (LF) -############################################################### -report.psObservationTargetDiscardedDistributionLengthsLF.modelType=PS -report.psObservationTargetDiscardedDistributionLengthsLF.name=Observations - Distribution des tailles des rejets par espèces ciblées (mesure LF) -report.psObservationTargetDiscardedDistributionLengthsLF.description=Afficher le nombre d'individus rejetés, mesurés par classe de taille LF pour les espèces ciblées -report.psObservationTargetDiscardedDistributionLengthsLF.columns=Classe de taille,Effectif -report.psObservationTargetDiscardedDistributionLengthsLF.operations.1=GroupByLength -report.psObservationTargetDiscardedDistributionLengthsLF.variable.speciesId=fr.ird.observe.dto.referential.common.SpeciesDto|\ -Select distinct tl.species \ +Where t.id In :tripId +report.psObservationLengthsDistribution.repeatVariable.speciesFate=fr.ird.observe.entities.referential.ps.common.SpeciesFate|\ +Select distinct sf \ From TripImpl t \ Join t.routeObs r \ Join r.activity a \ -Join a.set.sample ts \ -Join ts.sampleMeasure tl \ -Where t.id In :tripId \ -And tl.sizeMeasureType = 'fr.ird.referential.common.SizeMeasureType#1433499465700#0.0902433863375336' -report.psObservationTargetDiscardedDistributionLengthsLF.request.1=0,0|row| \ -Select tl.length , Sum(tl.count) \ +Join a.set.sample nts \ +Join nts.sampleMeasure ntl with ntl.species.id = :species And ntl.sizeMeasureType.id = :sizeMeasureType \ +Left Join ntl.speciesFate sf \ +Where t.id In :tripId +report.psObservationLengthsDistribution.repeatVariable.length=java.lang.Float|\ +Select distinct ntl.length \ From TripImpl t \ Join t.routeObs r \ Join r.activity a \ -Join a.set.sample ts \ -Join ts.sampleMeasure tl \ +Join a.set.sample nts \ +Join nts.sampleMeasure ntl with ntl.species.id = :species And ntl.sizeMeasureType.id = :sizeMeasureType \ Where t.id In :tripId \ - And tl.species.id = :speciesId \ - And tl.sizeMeasureType = 'fr.ird.referential.common.SizeMeasureType#1433499465700#0.0902433863375336' \ -Group By tl.length \ -Order By tl.length +Order By ntl.length ############################################ ## Répartition des calées par cuves ############################################ ===================================== core/persistence/java/src/main/java/fr/ird/observe/spi/report/ComputePsObservationLengthsDistribution.java ===================================== @@ -0,0 +1,161 @@ +package fr.ird.observe.spi.report; + +/*- + * #%L + * ObServe Core :: Persistence :: Java + * %% + * Copyright (C) 2008 - 2022 IRD, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import com.google.auto.service.AutoService; +import fr.ird.observe.dto.report.DataMatrix; +import fr.ird.observe.dto.report.Report; +import fr.ird.observe.dto.report.ReportOperationConsumer; +import fr.ird.observe.dto.report.ReportRequestExecutor; +import fr.ird.observe.dto.report.ReportVariable; +import fr.ird.observe.entities.referential.ps.common.SpeciesFate; + +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; +import java.util.stream.Collectors; + +/** + * Created on 13/11/2022. + * + * @author Tony Chemit - dev@tchemit.fr + * @since 9.0.17 + */ +@AutoService(ReportOperationConsumer.class) +public class ComputePsObservationLengthsDistribution implements ReportOperationConsumer { + + /** + * To get total count per length. + */ + public static final String TOTAL_COUNT_REQUEST = "" + + "Select sum(ntl.count) \n" + + "From TripImpl t \n" + + "Join t.routeObs r \n" + + "Join r.activity a \n" + + "Join a.set.sample nts \n" + + "Join nts.sampleMeasure ntl With ntl.species.id = :species And ntl.sizeMeasureType.id = :sizeMeasureType \n" + + "Where t.id In :tripId \n" + + "Group By ntl.length \n" + + "Order By ntl.length"; + + /** + * To get species fate count per length + */ + public static final String SPECIES_FATE_COUNT_REQUEST = "" + + "Select ntl.length, sum(ntl.count) \n" + + "From TripImpl t \n" + + "Join t.routeObs r \n" + + "Join r.activity a \n" + + "Join a.set.sample nts \n" + + "Join nts.sampleMeasure ntl With ntl.species.id = :species And ntl.sizeMeasureType.id = :sizeMeasureType And ntl.speciesFate.id = :speciesFate\n" + + "Where t.id In :tripId \n" + + "Group By ntl.length \n" + + "Order By ntl.length"; + + /** + * To get null species fate count per length + */ + public static final String NULL_SPECIES_FATE_COUNT_REQUEST = "" + + "Select ntl.length, sum(ntl.count) \n" + + "From TripImpl t \n" + + "Join t.routeObs r \n" + + "Join r.activity a \n" + + "Join a.set.sample nts \n" + + "Join nts.sampleMeasure ntl With ntl.species.id = :species And ntl.sizeMeasureType.id = :sizeMeasureType And ntl.speciesFate Is Null\n" + + "Where t.id In :tripId \n" + + "Group By ntl.length \n" + + "Order By ntl.length"; + + @Override + public DataMatrix consume(String parameters, ReportRequestExecutor requestExecutor, Report report, Set<String> tripId, DataMatrix incoming) { + + Map<String, Object> queryParameters = new TreeMap<>(); + queryParameters.put("tripId", tripId); + for (ReportVariable<?> variable : report.getVariables()) { + queryParameters.put(variable.getName(), variable.getSelectedValue()); + } + + Set<SpeciesFate> speciesFateList = report.<SpeciesFate>getRepeatVariable("speciesFate").getValues(); + List<String> lengthList = report.getRepeatVariable("length").getValues().stream().map(Object::toString).collect(Collectors.toList()); + + DataMatrix result = createTmpMatrix(0, 0, 2 + speciesFateList.size(), 1 + lengthList.size()); + boolean useNullSpeciesFate = speciesFateList.remove(null); + int columnIndex = 0; + fillLengthsColumn(result, columnIndex++, lengthList); + + for (SpeciesFate speciesFate : speciesFateList) { + fillSpeciesFateCountColumn(result, columnIndex++, queryParameters, speciesFate, lengthList, requestExecutor); + } + + if (useNullSpeciesFate) { + fillSpeciesFateCountColumn(result, columnIndex++, queryParameters, null, lengthList, requestExecutor); + } + + fillTotalCountColumn(result, columnIndex, queryParameters, requestExecutor); + + return result; + } + + private void fillLengthsColumn(DataMatrix result, int columnIndex, List<String> lengthList) { + int index = 0; + result.setValue(columnIndex, index++, "Classe de taille (cm)"); + for (String length : lengthList) { + result.setValue(columnIndex, index++, length); + } + } + + private void fillSpeciesFateCountColumn(DataMatrix result, int columnIndex, Map<String, Object> queryParameters, SpeciesFate speciesFate, List<String> lengthList, ReportRequestExecutor requestExecutor) { + String header; + List<Object[]> rows; + if (speciesFate == null) { + header = "Aucun"; + queryParameters.remove("speciesFate"); + rows = requestExecutor.executeRequest(NULL_SPECIES_FATE_COUNT_REQUEST, queryParameters); + } else { + header = speciesFate.getLabel2(); + queryParameters.put("speciesFate", speciesFate.getId()); + rows = requestExecutor.executeRequest(SPECIES_FATE_COUNT_REQUEST, queryParameters); + } + result.setValue(columnIndex, 0, String.format("Effectif ( devenir - %s )", header)); + + for (Object[] row : rows) { + String length = row[0].toString(); + Number count = (Number) row[1]; + int index = lengthList.indexOf(length); + result.setValue(columnIndex, index + 1, count); + } + } + + private void fillTotalCountColumn(DataMatrix result, int columnIndex, Map<String, Object> queryParameters, ReportRequestExecutor requestExecutor) { + result.setValue(columnIndex, 0, "Effectif total"); + List<Object> rows = requestExecutor.executeRequest(TOTAL_COUNT_REQUEST, queryParameters); + int index = 1; + for (Object row : rows) { + Number count = (Number) row; + result.setValue(columnIndex, index++, count); + } + } + +} + ===================================== core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsObservationTargetStoredDistributionLengthsLFReportFixture.java → core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsObservationLengthsDistributionReportFixture.java ===================================== @@ -24,24 +24,21 @@ package fr.ird.observe.services.service.report.ps; import com.google.auto.service.AutoService; import fr.ird.observe.dto.report.Report; -import fr.ird.observe.dto.report.ReportRequest; import fr.ird.observe.services.service.ReportFixture; -import java.util.Iterator; - /** - * Created on 17/02/2021. + * Created on 13/11/2022. * * @author Tony Chemit - dev@tchemit.fr - * @since 8.0.6 + * @since 9.0.17 */ @AutoService(ReportFixture.class) -public class PsObservationTargetStoredDistributionLengthsLFReportFixture extends ReportFixture { +public class PsObservationLengthsDistributionReportFixture extends ReportFixture { @Override - public void assertSyntax(Report report) { - super.assertSyntax(report); - Iterator<ReportRequest> requests = getRequestIterator(report); - assertReportRequestDimension(requests, ReportRequest.RequestLayout.row, 0, 0); + protected void setVariables(Report report) { + setVariableValue(report, "species", "fr.ird.referential.common.Species#1239832684537#0.2397229787936519"); + setVariableValue(report, "sizeMeasureType", "fr.ird.referential.common.SizeMeasureType#1433499465700#0.0902433863375336"); } } + ===================================== core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsObservationNonTargetDistributionLengthsReportFixture.java deleted ===================================== @@ -1,47 +0,0 @@ -/* - * #%L - * ObServe Core :: Services :: Test - * %% - * Copyright (C) 2008 - 2022 IRD, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.services.service.report.ps; - - -import com.google.auto.service.AutoService; -import fr.ird.observe.dto.report.Report; -import fr.ird.observe.dto.report.ReportRequest; -import fr.ird.observe.services.service.ReportFixture; - -import java.util.Iterator; - -/** - * Test du report {@code accessoryCatch}. - * - * @author Tony Chemit - dev@tchemit.fr - * @since 1.9 - */ -@AutoService(ReportFixture.class) -public class PsObservationNonTargetDistributionLengthsReportFixture extends ReportFixture { - - @Override - public void assertSyntax(Report report) { - super.assertSyntax(report); - Iterator<ReportRequest> requests = getRequestIterator(report); - assertReportRequestDimension(requests, ReportRequest.RequestLayout.row, 0, 0); - } -} ===================================== core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsObservationTargetDiscardedDistributionLengthsLD1ReportFixture.java deleted ===================================== @@ -1,47 +0,0 @@ -package fr.ird.observe.services.service.report.ps; - -/*- - * #%L - * ObServe Core :: Services :: Test - * %% - * Copyright (C) 2008 - 2022 IRD, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import com.google.auto.service.AutoService; -import fr.ird.observe.dto.report.Report; -import fr.ird.observe.dto.report.ReportRequest; -import fr.ird.observe.services.service.ReportFixture; - -import java.util.Iterator; - -/** - * Created on 17/02/2021. - * - * @author Tony Chemit - dev@tchemit.fr - * @since 8.0.6 - */ -@AutoService(ReportFixture.class) -public class PsObservationTargetDiscardedDistributionLengthsLD1ReportFixture extends ReportFixture { - - @Override - public void assertSyntax(Report report) { - super.assertSyntax(report); - Iterator<ReportRequest> requests = getRequestIterator(report); - assertReportRequestDimension(requests, ReportRequest.RequestLayout.row, 0, 0); - } -} ===================================== core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsObservationTargetDiscardedDistributionLengthsLFReportFixture.java deleted ===================================== @@ -1,47 +0,0 @@ -package fr.ird.observe.services.service.report.ps; - -/*- - * #%L - * ObServe Core :: Services :: Test - * %% - * Copyright (C) 2008 - 2022 IRD, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import com.google.auto.service.AutoService; -import fr.ird.observe.dto.report.Report; -import fr.ird.observe.dto.report.ReportRequest; -import fr.ird.observe.services.service.ReportFixture; - -import java.util.Iterator; - -/** - * Created on 17/02/2021. - * - * @author Tony Chemit - dev@tchemit.fr - * @since 8.0.6 - */ -@AutoService(ReportFixture.class) -public class PsObservationTargetDiscardedDistributionLengthsLFReportFixture extends ReportFixture { - - @Override - public void assertSyntax(Report report) { - super.assertSyntax(report); - Iterator<ReportRequest> requests = getRequestIterator(report); - assertReportRequestDimension(requests, ReportRequest.RequestLayout.row, 0, 0); - } -} ===================================== core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsObservationTargetStoredDistributionLengthsLD1ReportFixture.java deleted ===================================== @@ -1,47 +0,0 @@ -package fr.ird.observe.services.service.report.ps; - -/*- - * #%L - * ObServe Core :: Services :: Test - * %% - * Copyright (C) 2008 - 2022 IRD, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import com.google.auto.service.AutoService; -import fr.ird.observe.dto.report.Report; -import fr.ird.observe.dto.report.ReportRequest; -import fr.ird.observe.services.service.ReportFixture; - -import java.util.Iterator; - -/** - * Created on 17/02/2021. - * - * @author Tony Chemit - dev@tchemit.fr - * @since 8.0.6 - */ -@AutoService(ReportFixture.class) -public class PsObservationTargetStoredDistributionLengthsLD1ReportFixture extends ReportFixture { - - @Override - public void assertSyntax(Report report) { - super.assertSyntax(report); - Iterator<ReportRequest> requests = getRequestIterator(report); - assertReportRequestDimension(requests, ReportRequest.RequestLayout.row, 0, 0); - } -} ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psObservationNonTargetDistributionLengths.properties → core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psObservationLengthsDistribution.properties ===================================== @@ -19,11 +19,17 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -syntax.columns=2 -syntax.columnsHeader=Classe de taille^Effectif -syntax.description=Afficher la nombre d'individus mesurés par classe de taille pour les espèces non ciblées -syntax.name=Observations - Distribution des tailles par espèces non ciblées -syntax.nbRequests=1 +syntax.name=Observations - Distribution des tailles par espèces et type de mesure +syntax.description=Afficher la nombre d'individus mesurés par classe de taille pour les espèces et le type de mesure syntax.rows=-1 +syntax.columns=-1 +syntax.columnsHeader= syntax.rowsHeader= -tripIds=${PS_COMMON_TRIP},${PS_COMMON_TRIP_MOVE} +syntax.nbRequests=0 +result.columns=3 +result.rows=5 +result.0=Classe de taille (cm)^Effectif ( devenir - Aucun )^Effectif total +result.1=50.0^2^2 +result.2=54.0^1^1 +result.3=68.0^1^1 +result.4=70.0^1^1 ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psObservationTargetDiscardedDistributionLengthsLD1.properties deleted ===================================== @@ -1,28 +0,0 @@ -### -# #%L -# ObServe Core :: Services :: Test -# %% -# Copyright (C) 2008 - 2022 IRD, Ultreia.io -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### -syntax.columns=2 -syntax.columnsHeader=Classe de taille^Effectif -syntax.description=Afficher la nombre d'individus rejetés, mesurés par classe de taille LD1 pour les espèces ciblées -syntax.name=Observations - Distribution des tailles des rejets par espèces ciblées (mesure LD1) -syntax.nbRequests=1 -syntax.rows=-1 -syntax.rowsHeader= ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psObservationTargetDiscardedDistributionLengthsLF.properties deleted ===================================== @@ -1,28 +0,0 @@ -### -# #%L -# ObServe Core :: Services :: Test -# %% -# Copyright (C) 2008 - 2022 IRD, Ultreia.io -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### -syntax.columns=2 -syntax.columnsHeader=Classe de taille^Effectif -syntax.description=Afficher le nombre d'individus rejetés, mesurés par classe de taille LF pour les espèces ciblées -syntax.name=Observations - Distribution des tailles des rejets par espèces ciblées (mesure LF) -syntax.nbRequests=1 -syntax.rows=-1 -syntax.rowsHeader= ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psObservationTargetStoredDistributionLengthsLD1.properties deleted ===================================== @@ -1,28 +0,0 @@ -### -# #%L -# ObServe Core :: Services :: Test -# %% -# Copyright (C) 2008 - 2022 IRD, Ultreia.io -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### -syntax.columns=2 -syntax.columnsHeader=Classe de taille^Effectif -syntax.description=Afficher le nombre d'individus capturés, mesurés par classe de taille LD1 pour les espèces ciblées -syntax.name=Observations - Distribution des tailles des captures par espèces ciblées (mesure LD1) -syntax.nbRequests=1 -syntax.rows=-1 -syntax.rowsHeader= ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psObservationTargetStoredDistributionLengthsLF.properties deleted ===================================== @@ -1,28 +0,0 @@ -### -# #%L -# ObServe Core :: Services :: Test -# %% -# Copyright (C) 2008 - 2022 IRD, Ultreia.io -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### -syntax.columns=2 -syntax.columnsHeader=Classe de taille^Effectif -syntax.description=Afficher le nombre d'individus capturés, mesurés par classe de taille LF pour les espèces ciblées -syntax.name=Observations - Distribution des tailles des captures par espèces ciblées (mesure LF) -syntax.nbRequests=1 -syntax.rows=-1 -syntax.rowsHeader= ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/report/DataMatrix.java ===================================== @@ -159,7 +159,13 @@ public class DataMatrix implements JsonAware { log.debug(String.format("copying incoming matrix (dim: %s, location: %s)", incoming.getDimension(), incoming.getLocation())); for (int i = 0; i < width; i++) { + if (x + i < 0) { + continue; + } for (int j = 0; j < height; j++) { + if (y + j < 0) { + continue; + } Serializable value = incoming.getValue(i, j); setValue(x + i, y + j, value); } ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/report/ReportBuilder.java ===================================== @@ -319,12 +319,14 @@ public class ReportBuilder { Map.Entry<String, String> entry = itr.next(); String key = entry.getKey(); if (!key.startsWith(VARIABLE_PREFIX)) { - continue; } String operations = entry.getValue(); String id = key.substring(VARIABLE_PREFIX.length()); - + int indexOf = id.indexOf("."); + if (indexOf > -1) { + id = id.substring(indexOf + 1); + } // on interdit la surcharge d'une variable déjà trouvée pour le report if (ids.contains(id)) { throw new IllegalArgumentException("La variable " + id + " est déjà définie pour le report " + reportName); @@ -359,12 +361,14 @@ public class ReportBuilder { Map.Entry<String, String> entry = itr.next(); String key = entry.getKey(); if (!key.startsWith(REPEAT_VARIABLE_PREFIX)) { - continue; } String operations = entry.getValue(); String id = key.substring(REPEAT_VARIABLE_PREFIX.length()); - + int indexOf = id.indexOf("."); + if (indexOf > -1) { + id = id.substring(indexOf + 1); + } // on interdit la surcharge d'une variable déjà trouvée pour le report if (ids.contains(id)) { throw new IllegalArgumentException("La variable de répétition " + id + " est déjà définie pour le report " + reportName); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/29db74f10ccd6fa8fa2cf0101... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/29db74f10ccd6fa8fa2cf0101... You're receiving this email because of your account on gitlab.com.