Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

9 changed files:

Changes:

  • core/persistence/report/src/main/resources/META-INF/report/default/ps/psLogbookFobUsageExtended.report
    1 
    +###
    2 
    +# #%L
    3 
    +# ObServe Core :: Persistence :: Report
    4 
    +# %%
    5 
    +# Copyright (C) 2008 - 2023 IRD, Ultreia.io
    6 
    +# %%
    7 
    +# This program is free software: you can redistribute it and/or modify
    8 
    +# it under the terms of the GNU General Public License as
    9 
    +# published by the Free Software Foundation, either version 3 of the
    10 
    +# License, or (at your option) any later version.
    11 
    +#
    12 
    +# This program is distributed in the hope that it will be useful,
    13 
    +# but WITHOUT ANY WARRANTY; without even the implied warranty of
    14 
    +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15 
    +# GNU General Public License for more details.
    16 
    +#
    17 
    +# You should have received a copy of the GNU General Public
    18 
    +# License along with this program.  If not, see
    19 
    +# <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 
    +# #L%
    21 
    +###
    22 
    +modelType=PS
    23 
    +name=Livre de bord - Utilisation des FOB, tableau détaillé
    24 
    +name.en=Logbook - FOB usage - detailled version
    25 
    +name.es=
    26 
    +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
    27 
    +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
    28 
    +description.es=
    29 
    +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
    30 
    +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
    31 
    +columns.es=
    32 
    +repeatVariable.1.name=typeObjetId
    33 
    +repeatVariable.1.type=java.lang.String
    34 
    +repeatVariable.1.request=Select distinct (om.standardCode) \
    35 
    +From ObjectMaterialImpl om \
    36 
    +Where om.standardCode is not null \
    37 
    +And om.standardCode != '' \
    38 
    +And (om.standardCode In (Select Distinct(dcp.computedWhenArrivingSimplifiedObjectType) \
    39 
    +From fr.ird.observe.entities.data.ps.common.TripImpl m \
    40 
    +Join m.routeLogbook r \
    41 
    +Join r.activity a \
    42 
    +Join a.floatingObject dcp With dcp.computedWhenArrivingSimplifiedObjectType Is Not Null \
    43 
    +Where m.id In :tripId ) Or om.standardCode In (Select Distinct(dcp.computedWhenLeavingSimplifiedObjectType) \
    44 
    +From fr.ird.observe.entities.data.ps.common.TripImpl m \
    45 
    +Join m.routeLogbook r \
    46 
    +Join r.activity a \
    47 
    +Join a.floatingObject dcp With dcp.computedWhenLeavingSimplifiedObjectType Is Not Null \
    48 
    +Where m.id In :tripId )) \
    49 
    +Order by om.standardCode
    50 
    +request.1.location=0,0
    51 
    +request.1.layout=row
    52 
    +request.1.request=Select concat(str(om.standardCode) , ' - ', om.@i18nColumnName@) \
    53 
    +From ObjectMaterialImpl om \
    54 
    +Where \
    55 
    +om.standardCode = :typeObjetId \
    56 
    +And om.status != 0
    57 
    +request.1.repeat.name=typeObjetId
    58 
    +request.1.repeat.layout=column
    59 
    +request.2.location=1,0
    60 
    +request.2.layout=row
    61 
    +request.2.request=Select \
    62 
    +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), \
    63 
    +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), \
    64 
    +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), \
    65 
    +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), \
    66 
    +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), \
    67 
    +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), \
    68 
    +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), \
    69 
    +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), \
    70 
    +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), \
    71 
    +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), \
    72 
    +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), \
    73 
    +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), \
    74 
    +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), \
    75 
    +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), \
    76 
    +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), \
    77 
    +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) \
    78 
    +From fr.ird.observe.entities.data.ps.common.TripImpl m \
    79 
    +Join m.routeLogbook r \
    80 
    +Join r.activity a \
    81 
    +Join a.floatingObject dcp With dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
    82 
    +Where \
    83 
    +m.id In :tripId
    84 
    +request.2.repeat.name=typeObjetId
    85 
    +request.2.repeat.layout=column
    86 
    +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
    1 
    +###
    2 
    +# #%L
    3 
    +# ObServe Core :: Persistence :: Report
    4 
    +# %%
    5 
    +# Copyright (C) 2008 - 2023 IRD, Ultreia.io
    6 
    +# %%
    7 
    +# This program is free software: you can redistribute it and/or modify
    8 
    +# it under the terms of the GNU General Public License as
    9 
    +# published by the Free Software Foundation, either version 3 of the
    10 
    +# License, or (at your option) any later version.
    11 
    +#
    12 
    +# This program is distributed in the hope that it will be useful,
    13 
    +# but WITHOUT ANY WARRANTY; without even the implied warranty of
    14 
    +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15 
    +# GNU General Public License for more details.
    16 
    +#
    17 
    +# You should have received a copy of the GNU General Public
    18 
    +# License along with this program.  If not, see
    19 
    +# <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 
    +# #L%
    21 
    +###
    22 
    +modelType=PS
    23 
    +name=Livre de bord - Utilisation des FOB, tableau simplifiée
    24 
    +name.en=Logbook - FOB usage, simplified version
    25 
    +name.es=
    26 
    +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)
    27 
    +description.en=Total number of found FOB,per CECOFAD types and action type (Visited fishing,Visited not fishing, deployed)
    28 
    +description.es=
    29 
    +columns=Type de FOB,Rencontrés pêchés,Rencontrés non pêchés,Déployés
    30 
    +columns.en=FOB type,Visited fishing,Visiting no fishing,Deployed
    31 
    +columns.es=
    32 
    +repeatVariable.1.name=typeObjetId
    33 
    +repeatVariable.1.type=java.lang.String
    34 
    +repeatVariable.1.request=Select distinct (om.standardCode) \
    35 
    +From ObjectMaterialImpl om \
    36 
    +Where om.standardCode is not null \
    37 
    +And om.standardCode != '' \
    38 
    +And (om.standardCode In (Select Distinct(dcp.computedWhenArrivingSimplifiedObjectType) \
    39 
    +From fr.ird.observe.entities.data.ps.common.TripImpl m \
    40 
    +Join m.routeLogbook r \
    41 
    +Join r.activity a \
    42 
    +Join a.floatingObject dcp With dcp.computedWhenArrivingSimplifiedObjectType Is Not Null \
    43 
    +Where m.id In :tripId ) Or om.standardCode In (Select Distinct(dcp.computedWhenLeavingSimplifiedObjectType) \
    44 
    +From fr.ird.observe.entities.data.ps.common.TripImpl m \
    45 
    +Join m.routeLogbook r \
    46 
    +Join r.activity a \
    47 
    +Join a.floatingObject dcp With dcp.computedWhenLeavingSimplifiedObjectType Is Not Null \
    48 
    +Where m.id In :tripId )) \
    49 
    +Order by om.standardCode
    50 
    +repeatVariable.1.comment=liste des types CECOFAD en presence sur les donnees selectionnees
    51 
    +request.1.location=0,0
    52 
    +request.1.layout=row
    53 
    +request.1.request=Select concat(str(om.standardCode) , ' - ', om.@i18nColumnName@) \
    54 
    +From ObjectMaterialImpl om \
    55 
    +Where \
    56 
    +om.standardCode = :typeObjetId \
    57 
    +And om.status != 0
    58 
    +request.1.repeat.name=typeObjetId
    59 
    +request.1.repeat.layout=column
    60 
    +request.2.location=1,0
    61 
    +request.2.layout=row
    62 
    +request.2.request=Select \
    63 
    +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' \
    64 
    +or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#8' \
    65 
    +or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#4' \
    66 
    +or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#5' \
    67 
    +or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#7' \
    68 
    +or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#9' \
    69 
    +or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#10' \
    70 
    +or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#3') Then 1 Else 0 End), \
    71 
    +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' \
    72 
    +or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#8' \
    73 
    +or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#4' \
    74 
    +or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#5' \
    75 
    +or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#7' \
    76 
    +or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#9' \
    77 
    +or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#10' \
    78 
    +or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#3') Then 1 Else 0 End), \
    79 
    +Sum(Case When dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId And dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#1' Then 1 Else 0 End) \
    80 
    +From fr.ird.observe.entities.data.ps.common.TripImpl m \
    81 
    +Join m.routeLogbook r \
    82 
    +Join r.activity a \
    83 
    +Join a.floatingObject dcp With dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId \
    84 
    +Where \
    85 
    +m.id In :tripId
    86 
    +request.2.repeat.name=typeObjetId
    87 
    +request.2.repeat.layout=column
    88 
    +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
    10 10 
     default/ps/psLocalmarketSample.report
    11 11 
     default/ps/psLocalmarketSurvey.report
    12 12 
     default/ps/psLogbookActivity.report
    13 
    +default/ps/psLogbookFobUsageExtended.report
    14 
    +default/ps/psLogbookFobUsageMinimal.report
    13 15 
     default/ps/psLogbookSampleMeasures.report
    14 16 
     default/ps/psLogbookSampleSet.report
    15 17 
     default/ps/psLogbookSampleSpeciesMeasures.report

  • core/persistence/report/src/test/java/fr/ird/observe/report/ToolsTest.java
    ... ... @@ -47,7 +47,7 @@ import java.util.Objects;
    47 47
    48 48 
     public class ToolsTest {
    49 49
    50 
    -    public static final int REPORTS_COUNT_COUNT = 35;
    50 
    +    public static final int REPORTS_COUNT_COUNT = 37;
    51 51
    52 52 
         private static Path reportsPath(Path basedir) {
    53 53 
             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
    1 
    +package fr.ird.observe.services.service.report.ps;
    2 
    +
    3 
    +/*-
    4 
    + * #%L
    5 
    + * ObServe Core :: Services :: Test
    6 
    + * %%
    7 
    + * Copyright (C) 2008 - 2023 IRD, Ultreia.io
    8 
    + * %%
    9 
    + * This program is free software: you can redistribute it and/or modify
    10 
    + * it under the terms of the GNU General Public License as
    11 
    + * published by the Free Software Foundation, either version 3 of the
    12 
    + * License, or (at your option) any later version.
    13 
    + *
    14 
    + * This program is distributed in the hope that it will be useful,
    15 
    + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 
    + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 
    + * GNU General Public License for more details.
    18 
    + *
    19 
    + * You should have received a copy of the GNU General Public
    20 
    + * License along with this program.  If not, see
    21 
    + * <http://www.gnu.org/licenses/gpl-3.0.html>.
    22 
    + * #L%
    23 
    + */
    24 
    +
    25 
    +import com.google.auto.service.AutoService;
    26 
    +import fr.ird.observe.report.Report;
    27 
    +import fr.ird.observe.report.definition.ReportRequestDefinition;
    28 
    +import fr.ird.observe.report.definition.RequestLayout;
    29 
    +import fr.ird.observe.services.service.ReportFixture;
    30 
    +
    31 
    +import java.util.Iterator;
    32 
    +
    33 
    +/**
    34 
    + * Created on 17/02/2021.
    35 
    + *
    36 
    + * @author Tony Chemit - dev@tchemit.fr
    37 
    + * @since 8.0.6
    38 
    + */
    39 
    +@AutoService(ReportFixture.class)
    40 
    +public class PsLogbookFobUsageExtendedReportFixture extends ReportFixture {
    41 
    +
    42 
    +    @Override
    43 
    +    public void assertSyntax(Report report) {
    44 
    +        super.assertSyntax(report);
    45 
    +        Iterator<ReportRequestDefinition> requests = getRequestIterator(report);
    46 
    +        assertReportRequestDimension(requests, RequestLayout.row, 0, 0);
    47 
    +        assertReportRequestDimension(requests, RequestLayout.row, 1, 0);
    48 
    +    }
    49 
    +}

  • core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsLogbookFobUsageMinimalReportFixture.java
    1 
    +package fr.ird.observe.services.service.report.ps;
    2 
    +
    3 
    +/*-
    4 
    + * #%L
    5 
    + * ObServe Core :: Services :: Test
    6 
    + * %%
    7 
    + * Copyright (C) 2008 - 2023 IRD, Ultreia.io
    8 
    + * %%
    9 
    + * This program is free software: you can redistribute it and/or modify
    10 
    + * it under the terms of the GNU General Public License as
    11 
    + * published by the Free Software Foundation, either version 3 of the
    12 
    + * License, or (at your option) any later version.
    13 
    + *
    14 
    + * This program is distributed in the hope that it will be useful,
    15 
    + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 
    + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 
    + * GNU General Public License for more details.
    18 
    + *
    19 
    + * You should have received a copy of the GNU General Public
    20 
    + * License along with this program.  If not, see
    21 
    + * <http://www.gnu.org/licenses/gpl-3.0.html>.
    22 
    + * #L%
    23 
    + */
    24 
    +
    25 
    +import com.google.auto.service.AutoService;
    26 
    +import fr.ird.observe.report.Report;
    27 
    +import fr.ird.observe.report.definition.ReportRequestDefinition;
    28 
    +import fr.ird.observe.report.definition.RequestLayout;
    29 
    +import fr.ird.observe.services.service.ReportFixture;
    30 
    +
    31 
    +import java.util.Iterator;
    32 
    +
    33 
    +/**
    34 
    + * Created on 17/02/2021.
    35 
    + *
    36 
    + * @author Tony Chemit - dev@tchemit.fr
    37 
    + * @since 8.0.6
    38 
    + */
    39 
    +@AutoService(ReportFixture.class)
    40 
    +public class PsLogbookFobUsageMinimalReportFixture extends ReportFixture {
    41 
    +
    42 
    +    @Override
    43 
    +    public void assertSyntax(Report report) {
    44 
    +        super.assertSyntax(report);
    45 
    +        Iterator<ReportRequestDefinition> requests = getRequestIterator(report);
    46 
    +        assertReportRequestDimension(requests, RequestLayout.row, 0, 0);
    47 
    +        assertReportRequestDimension(requests, RequestLayout.row, 1, 0);
    48 
    +    }
    49 
    +}

  • core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psLogbookFobUsageExtended.properties
    1 
    +###
    2 
    +# #%L
    3 
    +# ObServe Core :: Services :: Test
    4 
    +# %%
    5 
    +# Copyright (C) 2008 - 2023 IRD, Ultreia.io
    6 
    +# %%
    7 
    +# This program is free software: you can redistribute it and/or modify
    8 
    +# it under the terms of the GNU General Public License as
    9 
    +# published by the Free Software Foundation, either version 3 of the
    10 
    +# License, or (at your option) any later version.
    11 
    +#
    12 
    +# This program is distributed in the hope that it will be useful,
    13 
    +# but WITHOUT ANY WARRANTY; without even the implied warranty of
    14 
    +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15 
    +# GNU General Public License for more details.
    16 
    +#
    17 
    +# You should have received a copy of the GNU General Public
    18 
    +# License along with this program.  If not, see
    19 
    +# <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 
    +# #L%
    21 
    +###
    22 
    +result.0=DFAD - DFAD (FAD dérivant)^0^0^0^0^0^0^0^0^1^0^0^0^0^0^0^0
    23 
    +result.columns=17
    24 
    +result.rows=1
    25 
    +syntax.columns=17
    26 
    +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
    27 
    +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
    28 
    +syntax.name=Livre de bord - Utilisation des FOB, tableau détaillé
    29 
    +syntax.nbRequests=2
    30 
    +syntax.rows=-1
    31 
    +syntax.rowsHeader=

  • core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psLogbookFobUsageMinimal.properties
    1 
    +###
    2 
    +# #%L
    3 
    +# ObServe Core :: Services :: Test
    4 
    +# %%
    5 
    +# Copyright (C) 2008 - 2023 IRD, Ultreia.io
    6 
    +# %%
    7 
    +# This program is free software: you can redistribute it and/or modify
    8 
    +# it under the terms of the GNU General Public License as
    9 
    +# published by the Free Software Foundation, either version 3 of the
    10 
    +# License, or (at your option) any later version.
    11 
    +#
    12 
    +# This program is distributed in the hope that it will be useful,
    13 
    +# but WITHOUT ANY WARRANTY; without even the implied warranty of
    14 
    +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15 
    +# GNU General Public License for more details.
    16 
    +#
    17 
    +# You should have received a copy of the GNU General Public
    18 
    +# License along with this program.  If not, see
    19 
    +# <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 
    +# #L%
    21 
    +###
    22 
    +result.0=DFAD - DFAD (FAD dérivant)^1^0^0
    23 
    +result.columns=4
    24 
    +result.rows=1
    25 
    +syntax.columns=4
    26 
    +syntax.columnsHeader=Type de FOB^Rencontrés pêchés^Rencontrés non pêchés^Déployés
    27 
    +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)
    28 
    +syntax.name=Livre de bord - Utilisation des FOB, tableau simplifiée
    29 
    +syntax.nbRequests=2
    30 
    +syntax.rows=-1
    31 
    +syntax.rowsHeader=

  • core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService.properties
    ... ... @@ -19,4 +19,4 @@
    19 19 
     # <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 20 
     # #L%
    21 21 
     ###
    22 
    -report.count=35
    22 
    +report.count=37

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. Manage all notifications · Help