Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: fcf880a9 by Tony Chemit at 2024-03-19T15:22:32+01:00 Ajout des rapports sur les FOB PS - Logbook - Closes #2855 - - - - - 9 changed files: - + core/persistence/report/src/main/resources/META-INF/report/default/ps/psLogbookFobUsageExtended.report - + core/persistence/report/src/main/resources/META-INF/report/default/ps/psLogbookFobUsageMinimal.report - core/persistence/report/src/main/resources/META-INF/report/embedded.list - core/persistence/report/src/test/java/fr/ird/observe/report/ToolsTest.java - + core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsLogbookFobUsageExtendedReportFixture.java - + core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsLogbookFobUsageMinimalReportFixture.java - + core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psLogbookFobUsageExtended.properties - + core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psLogbookFobUsageMinimal.properties - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService.properties Changes: ===================================== core/persistence/report/src/main/resources/META-INF/report/default/ps/psLogbookFobUsageExtended.report ===================================== @@ -0,0 +1,86 @@ +### +# #%L +# ObServe Core :: Persistence :: Report +# %% +# Copyright (C) 2008 - 2023 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% +### +modelType=PS +name=Livre de bord - Utilisation des FOB, tableau détaillé +name.en=Logbook - FOB usage - detailled version +name.es= +description=Tableau récapitulatif des FOB rencontrés, par types CECOFAD et types d’actions (déploiements, simples visites, modifications, diverses modalités de retraits), avec et sans pêche +description.en=Summary of FOB encountered, by CECOFAD types, types of object operation (deployment, visit, update, kinds of retrievals), presence or absence of associated fishing set +description.es= +columns=Type de FOB,Visités Pêchés,Visités non Pêchés,Déploiement après Pêches,Déploiement seul,Modifiés Pêchés,Modifiés non Pêchés,Retirés Pêchés,Retirés non Pêchés,Abandonnés Pêchés,Abandonnés non Pêchés,Coulés Pêchés,Coulés non Pêchés,Remplacés Pêchés,Remplacés non Pêchés,Autre Pêchés,Autre non Pêchés +columns.en=CECOFAD type,Visit and fishing,Visit only,Deployment after fishing,Deployment only,Modification after fishing,Modification only,Retrieval after fishing,Retrieval only,Abandonment after fishing,Abandonment only,Sinking after fishing,Sinking only,Replacment after fishing,Replacment only,Other activity after fishing,Other activity only +columns.es= +repeatVariable.1.name=typeObjetId +repeatVariable.1.type=java.lang.String +repeatVariable.1.request=Select distinct (om.standardCode) \ +From ObjectMaterialImpl om \ +Where om.standardCode is not null \ +And om.standardCode != '' \ +And (om.standardCode In (Select Distinct(dcp.computedWhenArrivingSimplifiedObjectType) \ +From fr.ird.observe.entities.data.ps.common.TripImpl m \ +Join m.routeLogbook r \ +Join r.activity a \ +Join a.floatingObject dcp With dcp.computedWhenArrivingSimplifiedObjectType Is Not Null \ +Where m.id In :tripId ) Or om.standardCode In (Select Distinct(dcp.computedWhenLeavingSimplifiedObjectType) \ +From fr.ird.observe.entities.data.ps.common.TripImpl m \ +Join m.routeLogbook r \ +Join r.activity a \ +Join a.floatingObject dcp With dcp.computedWhenLeavingSimplifiedObjectType Is Not Null \ +Where m.id In :tripId )) \ +Order by om.standardCode +request.1.location=0,0 +request.1.layout=row +request.1.request=Select concat(str(om.standardCode) , ' - ', om.@i18nColumnName@) \ +From ObjectMaterialImpl om \ +Where \ +om.standardCode = :typeObjetId \ +And om.status != 0 +request.1.repeat.name=typeObjetId +request.1.repeat.layout=column +request.2.location=1,0 +request.2.layout=row +request.2.request=Select \ +Sum(Case When dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId 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' Then 1 Else 0 End), \ +Sum(Case When dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId 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' Then 1 Else 0 End), \ +Sum(Case When dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId And dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#1' And a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' Then 1 Else 0 End), \ +Sum(Case When dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId And dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#1' And a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' Then 1 Else 0 End), \ +Sum(Case When dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId And dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#8' And a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' Then 1 Else 0 End), \ +Sum(Case When dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId And dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#8' And a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' Then 1 Else 0 End), \ +Sum(Case When dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId And dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#4' And a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' Then 1 Else 0 End), \ +Sum(Case When dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId And dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#4' And a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' Then 1 Else 0 End), \ +Sum(Case When dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId And dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#5' And a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' Then 1 Else 0 End), \ +Sum(Case When dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId And dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#5' And a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' Then 1 Else 0 End), \ +Sum(Case When dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId And dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#7' And a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' Then 1 Else 0 End), \ +Sum(Case When dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId And dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#7' And a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' Then 1 Else 0 End), \ +Sum(Case When dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId And dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#9' And a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' Then 1 Else 0 End), \ +Sum(Case When dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId And dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#9' And a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' Then 1 Else 0 End), \ +Sum(Case When dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId And (dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#10' Or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#3') And a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' Then 1 Else 0 End), \ +Sum(Case When dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId And (dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#10' Or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#3') And a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' Then 1 Else 0 End) \ +From fr.ird.observe.entities.data.ps.common.TripImpl m \ +Join m.routeLogbook r \ +Join r.activity a \ +Join a.floatingObject dcp With dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ +Where \ +m.id In :tripId +request.2.repeat.name=typeObjetId +request.2.repeat.layout=column +request.2.comment=visite + peche / visite - peche / Deploiement + peche / Deploiement - peche / Modifie + peche / Modifie - peche / Retire + peche / Retire - peche / Abandonne + peche / Abandonne - peche / Coule + peche / Coule - peche / Remplace + peche / Remplace - peche / Autre ou ancien peche + peche / Autre ou ancien peche - peche / Nombre de tortues ===================================== core/persistence/report/src/main/resources/META-INF/report/default/ps/psLogbookFobUsageMinimal.report ===================================== @@ -0,0 +1,88 @@ +### +# #%L +# ObServe Core :: Persistence :: Report +# %% +# Copyright (C) 2008 - 2023 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% +### +modelType=PS +name=Livre de bord - Utilisation des FOB, tableau simplifiée +name.en=Logbook - FOB usage, simplified version +name.es= +description=Tableau récapitulatif des FOB rencontrés, par types CECOFAD et types d’actions regroupés (rencontrés et pêchés, rencontrés non pêchés, déployés) +description.en=Total number of found FOB,per CECOFAD types and action type (Visited fishing,Visited not fishing, deployed) +description.es= +columns=Type de FOB,Rencontrés pêchés,Rencontrés non pêchés,Déployés +columns.en=FOB type,Visited fishing,Visiting no fishing,Deployed +columns.es= +repeatVariable.1.name=typeObjetId +repeatVariable.1.type=java.lang.String +repeatVariable.1.request=Select distinct (om.standardCode) \ +From ObjectMaterialImpl om \ +Where om.standardCode is not null \ +And om.standardCode != '' \ +And (om.standardCode In (Select Distinct(dcp.computedWhenArrivingSimplifiedObjectType) \ +From fr.ird.observe.entities.data.ps.common.TripImpl m \ +Join m.routeLogbook r \ +Join r.activity a \ +Join a.floatingObject dcp With dcp.computedWhenArrivingSimplifiedObjectType Is Not Null \ +Where m.id In :tripId ) Or om.standardCode In (Select Distinct(dcp.computedWhenLeavingSimplifiedObjectType) \ +From fr.ird.observe.entities.data.ps.common.TripImpl m \ +Join m.routeLogbook r \ +Join r.activity a \ +Join a.floatingObject dcp With dcp.computedWhenLeavingSimplifiedObjectType Is Not Null \ +Where m.id In :tripId )) \ +Order by om.standardCode +repeatVariable.1.comment=liste des types CECOFAD en presence sur les donnees selectionnees +request.1.location=0,0 +request.1.layout=row +request.1.request=Select concat(str(om.standardCode) , ' - ', om.@i18nColumnName@) \ +From ObjectMaterialImpl om \ +Where \ +om.standardCode = :typeObjetId \ +And om.status != 0 +request.1.repeat.name=typeObjetId +request.1.repeat.layout=column +request.2.location=1,0 +request.2.layout=row +request.2.request=Select \ +Sum(Case When 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' \ +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' \ +or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#7' \ +or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#9' \ +or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#10' \ +or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#3') Then 1 Else 0 End), \ +Sum(Case When 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' \ +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' \ +or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#7' \ +or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#9' \ +or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#10' \ +or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#3') Then 1 Else 0 End), \ +Sum(Case When dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId And dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#1' Then 1 Else 0 End) \ +From fr.ird.observe.entities.data.ps.common.TripImpl m \ +Join m.routeLogbook r \ +Join r.activity a \ +Join a.floatingObject dcp With dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId \ +Where \ +m.id In :tripId +request.2.repeat.name=typeObjetId +request.2.repeat.layout=column +request.2.comment=rencontres + peches / rencontres - peches / deployes / Nombre de tortues ===================================== core/persistence/report/src/main/resources/META-INF/report/embedded.list ===================================== @@ -10,6 +10,8 @@ default/ps/psLocalmarketBatch.report default/ps/psLocalmarketSample.report default/ps/psLocalmarketSurvey.report default/ps/psLogbookActivity.report +default/ps/psLogbookFobUsageExtended.report +default/ps/psLogbookFobUsageMinimal.report default/ps/psLogbookSampleMeasures.report default/ps/psLogbookSampleSet.report default/ps/psLogbookSampleSpeciesMeasures.report ===================================== core/persistence/report/src/test/java/fr/ird/observe/report/ToolsTest.java ===================================== @@ -47,7 +47,7 @@ import java.util.Objects; public class ToolsTest { - public static final int REPORTS_COUNT_COUNT = 35; + public static final int REPORTS_COUNT_COUNT = 37; private static Path reportsPath(Path basedir) { return basedir.resolve("src").resolve("main").resolve("resources").resolve("META-INF").resolve("report"); ===================================== core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsLogbookFobUsageExtendedReportFixture.java ===================================== @@ -0,0 +1,49 @@ +package fr.ird.observe.services.service.report.ps; + +/*- + * #%L + * ObServe Core :: Services :: Test + * %% + * Copyright (C) 2008 - 2023 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.report.Report; +import fr.ird.observe.report.definition.ReportRequestDefinition; +import fr.ird.observe.report.definition.RequestLayout; +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 PsLogbookFobUsageExtendedReportFixture extends ReportFixture { + + @Override + public void assertSyntax(Report report) { + super.assertSyntax(report); + Iterator<ReportRequestDefinition> requests = getRequestIterator(report); + assertReportRequestDimension(requests, RequestLayout.row, 0, 0); + assertReportRequestDimension(requests, RequestLayout.row, 1, 0); + } +} ===================================== core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsLogbookFobUsageMinimalReportFixture.java ===================================== @@ -0,0 +1,49 @@ +package fr.ird.observe.services.service.report.ps; + +/*- + * #%L + * ObServe Core :: Services :: Test + * %% + * Copyright (C) 2008 - 2023 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.report.Report; +import fr.ird.observe.report.definition.ReportRequestDefinition; +import fr.ird.observe.report.definition.RequestLayout; +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 PsLogbookFobUsageMinimalReportFixture extends ReportFixture { + + @Override + public void assertSyntax(Report report) { + super.assertSyntax(report); + Iterator<ReportRequestDefinition> requests = getRequestIterator(report); + assertReportRequestDimension(requests, RequestLayout.row, 0, 0); + assertReportRequestDimension(requests, RequestLayout.row, 1, 0); + } +} ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psLogbookFobUsageExtended.properties ===================================== @@ -0,0 +1,31 @@ +### +# #%L +# ObServe Core :: Services :: Test +# %% +# Copyright (C) 2008 - 2023 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=DFAD - DFAD (FAD dérivant)^0^0^0^0^0^0^0^0^1^0^0^0^0^0^0^0 +result.columns=17 +result.rows=1 +syntax.columns=17 +syntax.columnsHeader=Type de FOB^Visités Pêchés^Visités non Pêchés^Déploiement après Pêches^Déploiement seul^Modifiés Pêchés^Modifiés non Pêchés^Retirés Pêchés^Retirés non Pêchés^Abandonnés Pêchés^Abandonnés non Pêchés^Coulés Pêchés^Coulés non Pêchés^Remplacés Pêchés^Remplacés non Pêchés^Autre Pêchés^Autre non Pêchés +syntax.description=Tableau récapitulatif des FOB rencontrés, par types CECOFAD et types d’actions (déploiements, simples visites, modifications, diverses modalités de retraits), avec et sans pêche +syntax.name=Livre de bord - Utilisation des FOB, tableau détaillé +syntax.nbRequests=2 +syntax.rows=-1 +syntax.rowsHeader= ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psLogbookFobUsageMinimal.properties ===================================== @@ -0,0 +1,31 @@ +### +# #%L +# ObServe Core :: Services :: Test +# %% +# Copyright (C) 2008 - 2023 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=DFAD - DFAD (FAD dérivant)^1^0^0 +result.columns=4 +result.rows=1 +syntax.columns=4 +syntax.columnsHeader=Type de FOB^Rencontrés pêchés^Rencontrés non pêchés^Déployés +syntax.description=Tableau récapitulatif des FOB rencontrés, par types CECOFAD et types d’actions regroupés (rencontrés et pêchés, rencontrés non pêchés, déployés) +syntax.name=Livre de bord - Utilisation des FOB, tableau simplifiée +syntax.nbRequests=2 +syntax.rows=-1 +syntax.rowsHeader= ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService.properties ===================================== @@ -19,4 +19,4 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -report.count=35 +report.count=37 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/fcf880a9e47248aea607bfd004... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/fcf880a9e47248aea607bfd004... You're receiving this email because of your account on gitlab.com.
participants (1)
-
Tony CHEMIT (＠tchemit)