Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 74681acf by Tony Chemit at 2022-12-12T15:05:18+01:00 Report - suppression des reports psObservationTargetCatchByAssociation et psObservationTargetDiscardedByAssociation - - - - - 5 changed files: - core/api/dto/src/main/resources/observe-reports.properties - − core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsObservationTargetCatchByAssociationReportFixture.java - − core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsObservationTargetDiscardedByAssociationReportFixture.java - − core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psObservationTargetCatchByAssociation.properties - − core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psObservationTargetDiscardedByAssociation.properties Changes: ===================================== core/api/dto/src/main/resources/observe-reports.properties ===================================== @@ -827,274 +827,6 @@ report.psObservationCatchTotalCountByGroupAndSpeciesFateDiscardPerAssociation.re Group by e report.psObservationCatchTotalCountByGroupAndSpeciesFateDiscardPerAssociation.request.5.repeat=species|column ################################################################################ -## Captures thons selon le type d'association -################################################################################ -report.psObservationTargetCatchByAssociation.modelType=PS -report.psObservationTargetCatchByAssociation.name=Observations - Captures de thons selon le type d’association (en t) -report.psObservationTargetCatchByAssociation.description=Afficher la répartitions des captures de thons selon le type d'association -report.psObservationTargetCatchByAssociation.columns=YFT, SKJ, BET, LTA, FRI, Autres, Total -report.psObservationTargetCatchByAssociation.rows=BL sans baleine, BL avec baleine, BO avec requin-baleine, BO sans requin-baleine, Total -report.psObservationTargetCatchByAssociation.operations.1=SumRow -report.psObservationTargetCatchByAssociation.operations.2=SumColumn -# ligne 1 -report.psObservationTargetCatchByAssociation.request.1=0,0|row|\ - Select \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685477#0.8024257002747615' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685477#0.3846921632590058' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685477#0.8024257002747615' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685477#0.3846921632590058' Then 0.0 \ - Else ct.catchWeight End) \ - From TripImpl m \ - Join m.routeObs r \ - Join r.activity a \ - Join a.set c \ - with c.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#2' \ - Join c.catches ct \ - Join ct.speciesFate sf with sf.discard = FALSE, \ - ObservedSystemImpl os \ - Where \ - m.id In :tripId \ - and os.topiaId = 'fr.ird.referential.ps.common.ObservedSystem#1239832686428#0.9395222812356602' \ - and os not in elements(a.observedSystem) -# ligne 2 -report.psObservationTargetCatchByAssociation.request.7=0,1|row|\ - Select \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685477#0.8024257002747615' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685477#0.3846921632590058' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685477#0.8024257002747615' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685477#0.3846921632590058' Then 0.0 \ - Else ct.catchWeight End) \ - From TripImpl m \ - Join m.routeObs r \ - Join r.activity a \ - Join a.set c \ - with c.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#2' \ - Join c.catches ct \ - Join ct.speciesFate sf with sf.discard = FALSE, \ - ObservedSystemImpl os \ - Where \ - m.id In :tripId \ - and os.topiaId = 'fr.ird.referential.ps.common.ObservedSystem#1239832686428#0.9395222812356602' \ - and os in elements(a.observedSystem) -# ligne 3 -report.psObservationTargetCatchByAssociation.request.13=0,2|row|\ - Select \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685477#0.8024257002747615' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685477#0.3846921632590058' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685477#0.8024257002747615' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685477#0.3846921632590058' Then 0.0 \ - Else ct.catchWeight End) \ - From TripImpl m \ - Join m.routeObs r \ - Join r.activity a \ - Join a.set c \ - with c.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#1' \ - Join c.catches ct \ - Join ct.speciesFate sf with sf.discard = FALSE, \ - ObservedSystemImpl os \ - Where \ - m.id In :tripId \ - and os.topiaId = 'fr.ird.referential.ps.common.ObservedSystem#1239832686428#0.9217864901728908' \ - and os in elements(a.observedSystem) -# ligne 4 -report.psObservationTargetCatchByAssociation.request.19=0,3|row|\ - Select \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685477#0.8024257002747615' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685477#0.3846921632590058' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685477#0.8024257002747615' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685477#0.3846921632590058' Then 0.0 \ - Else ct.catchWeight End) \ - From TripImpl m \ - Join m.routeObs r \ - Join r.activity a \ - Join a.set c \ - with c.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#1' \ - Join c.catches ct \ - Join ct.speciesFate sf with sf.discard = FALSE, \ - ObservedSystemImpl os \ - Where \ - m.id In :tripId \ - and os.topiaId = 'fr.ird.referential.ps.common.ObservedSystem#1239832686428#0.9217864901728908' \ - and os not in elements(a.observedSystem) -################################################################################ -## Rejets thons selon le type d'association -################################################################################ -report.psObservationTargetDiscardedByAssociation.modelType=PS -report.psObservationTargetDiscardedByAssociation.name=Observations - Rejets de thons selon le type d’association (en t) -report.psObservationTargetDiscardedByAssociation.description=Afficher la répartitions des rejets de thons selon le type d'association -report.psObservationTargetDiscardedByAssociation.columns=YFT, SKJ, BET, LTA, FRI, Autres, Total -report.psObservationTargetDiscardedByAssociation.rows=BL sans baleine, BL avec baleine, BO avec requin-baleine, BO sans requin-baleine, Total -report.psObservationTargetDiscardedByAssociation.operations.1=SumRow -report.psObservationTargetDiscardedByAssociation.operations.2=SumColumn -# ligne 1 -report.psObservationTargetDiscardedByAssociation.request.1=0,0|row|\ - Select \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685477#0.8024257002747615' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685477#0.3846921632590058' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685477#0.8024257002747615' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685477#0.3846921632590058' Then 0.0 \ - Else ct.catchWeight End) \ - From TripImpl m \ - Join m.routeObs r \ - Join r.activity a \ - Join a.set c \ - with c.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#2' \ - Join c.catches ct \ - Join ct.speciesFate sf with sf.discard = TRUE, \ - ObservedSystemImpl os \ - Where \ - m.id In :tripId \ - and os.topiaId = 'fr.ird.referential.ps.common.ObservedSystem#1239832686428#0.9395222812356602' \ - and os not in elements(a.observedSystem) -# ligne 2 -report.psObservationTargetDiscardedByAssociation.request.7=0,1|row|\ - Select \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685477#0.8024257002747615' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685477#0.3846921632590058' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685477#0.8024257002747615' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685477#0.3846921632590058' Then 0.0 \ - Else ct.catchWeight End) \ - From TripImpl m \ - Join m.routeObs r \ - Join r.activity a \ - Join a.set c \ - with c.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#2' \ - Join c.catches ct \ - Join ct.speciesFate sf with sf.discard = TRUE, \ - ObservedSystemImpl os \ - Where \ - m.id In :tripId \ - and os.topiaId = 'fr.ird.referential.ps.common.ObservedSystem#1239832686428#0.9395222812356602' \ - and os in elements(a.observedSystem) -# ligne 3 -report.psObservationTargetDiscardedByAssociation.request.13=0,2|row|\ - Select \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685477#0.8024257002747615' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685477#0.3846921632590058' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685477#0.8024257002747615' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685477#0.3846921632590058' Then 0.0 \ - Else ct.catchWeight End) \ - From TripImpl m \ - Join m.routeObs r \ - Join r.activity a \ - Join a.set c \ - with c.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#1' \ - Join c.catches ct \ - Join ct.speciesFate sf with sf.discard = TRUE, \ - ObservedSystemImpl os \ - Where \ - m.id In :tripId \ - and os.topiaId = 'fr.ird.referential.ps.common.ObservedSystem#1239832686428#0.9217864901728908' \ - and os in elements(a.observedSystem) -# ligne 4 -report.psObservationTargetDiscardedByAssociation.request.19=0,3|row|\ - Select \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685477#0.8024257002747615' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685477#0.3846921632590058' Then ct.catchWeight \ - Else 0.0 End), \ - Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685477#0.8024257002747615' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685477#0.3846921632590058' Then 0.0 \ - Else ct.catchWeight End) \ - From TripImpl m \ - Join m.routeObs r \ - Join r.activity a \ - Join a.set c \ - with c.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#1' \ - Join c.catches ct \ - Join ct.speciesFate sf with sf.discard = TRUE, \ - ObservedSystemImpl os \ - Where \ - m.id In :tripId \ - and os.topiaId = 'fr.ird.referential.ps.common.ObservedSystem#1239832686428#0.9217864901728908' \ - and os not in elements(a.observedSystem) -################################################################################ ## Captures observées ################################################################################ report.psObservationCatch.modelType=PS ===================================== core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsObservationTargetCatchByAssociationReportFixture.java deleted ===================================== @@ -1,49 +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 le report {@code targetCatchByAssociation}. - * - * @author Tony Chemit - dev@tchemit.fr - * @since 1.9 - */ -@AutoService(ReportFixture.class) -public class PsObservationTargetCatchByAssociationReportFixture extends ReportFixture { - - @Override - public void assertSyntax(Report report) { - super.assertSyntax(report); - Iterator<ReportRequest> requests = getRequestIterator(report); - assertReportRequestDimension(requests, ReportRequest.RequestLayout.row, 0, 0); - assertReportRequestDimension(requests, ReportRequest.RequestLayout.row, 0, 1); - assertReportRequestDimension(requests, ReportRequest.RequestLayout.row, 0, 2); - assertReportRequestDimension(requests, ReportRequest.RequestLayout.row, 0, 3); - } -} ===================================== core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsObservationTargetDiscardedByAssociationReportFixture.java deleted ===================================== @@ -1,49 +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 le report {@code targetDiscardedByAssociation}. - * - * @author Tony Chemit - dev@tchemit.fr - * @since 1.9 - */ -@AutoService(ReportFixture.class) -public class PsObservationTargetDiscardedByAssociationReportFixture extends ReportFixture { - - @Override - public void assertSyntax(Report report) { - super.assertSyntax(report); - Iterator<ReportRequest> requests = getRequestIterator(report); - assertReportRequestDimension(requests, ReportRequest.RequestLayout.row, 0, 0); - assertReportRequestDimension(requests, ReportRequest.RequestLayout.row, 0, 1); - assertReportRequestDimension(requests, ReportRequest.RequestLayout.row, 0, 2); - assertReportRequestDimension(requests, ReportRequest.RequestLayout.row, 0, 3); - } -} ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psObservationTargetCatchByAssociation.properties deleted ===================================== @@ -1,35 +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.name=Observations - Captures de thons selon le type d’association (en t) -syntax.description=Afficher la répartitions des captures de thons selon le type d'association -syntax.rows=5 -syntax.columns=7 -syntax.columnsHeader=YFT^SKJ^BET^LTA^FRI^Autres^Total -syntax.rowsHeader=BL sans baleine^BL avec baleine^BO avec requin-baleine^BO sans requin-baleine^Total -syntax.nbRequests=4 -result.columns=7 -result.rows=5 -result.0=175.0^0.0^7.0^0.0^0.0^0.0^182.0 -result.1=null^null^null^null^null^null^0.0 -result.2=null^null^null^null^null^null^0.0 -result.3=0.0^1.0^0.0^0.0^1.0^12.1406^14.1406 -result.4=175.0^1.0^7.0^0.0^1.0^12.1406^196.1406 \ No newline at end of file ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psObservationTargetDiscardedByAssociation.properties deleted ===================================== @@ -1,35 +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% -### -result.0=0.0^0.0^0.0^0.0^0.0^0.2882^0.2882 -result.1=null^null^null^null^null^null^0.0 -result.2=null^null^null^null^null^null^0.0 -result.3=0.0^0.0^5.0^0.0^0.0^148.303^153.303 -result.4=0.0^0.0^5.0^0.0^0.0^148.5912^153.5912 -result.columns=7 -result.rows=5 -syntax.columns=7 -syntax.columnsHeader=YFT^SKJ^BET^LTA^FRI^Autres^Total -syntax.description=Afficher la répartitions des rejets de thons selon le type d'association -syntax.name=Observations - Rejets de thons selon le type d’association (en t) -syntax.nbRequests=4 -syntax.rows=5 -syntax.rowsHeader=BL sans baleine^BL avec baleine^BO avec requin-baleine^BO sans requin-baleine^Total View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/74681acf4c75e2bbec212e57f4... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/74681acf4c75e2bbec212e57f4... You're receiving this email because of your account on gitlab.com.