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

Commits:

5 changed files:

Changes:

  • core/api/dto/src/main/resources/observe-reports.properties
    ... ... @@ -827,274 +827,6 @@ report.psObservationCatchTotalCountByGroupAndSpeciesFateDiscardPerAssociation.re
    827 827 
       Group by e
    828 828 
     report.psObservationCatchTotalCountByGroupAndSpeciesFateDiscardPerAssociation.request.5.repeat=species|column
    829 829 
     ################################################################################
    830 
    -## Captures thons selon le type d'association
    831 
    -################################################################################
    832 
    -report.psObservationTargetCatchByAssociation.modelType=PS
    833 
    -report.psObservationTargetCatchByAssociation.name=Observations - Captures de thons selon le type d’association (en t)
    834 
    -report.psObservationTargetCatchByAssociation.description=Afficher la répartitions des captures de thons selon le type d'association
    835 
    -report.psObservationTargetCatchByAssociation.columns=YFT, SKJ, BET, LTA, FRI, Autres, Total
    836 
    -report.psObservationTargetCatchByAssociation.rows=BL sans baleine, BL avec baleine, BO avec requin-baleine, BO sans requin-baleine, Total
    837 
    -report.psObservationTargetCatchByAssociation.operations.1=SumRow
    838 
    -report.psObservationTargetCatchByAssociation.operations.2=SumColumn
    839 
    -# ligne 1
    840 
    -report.psObservationTargetCatchByAssociation.request.1=0,0|row|\
    841 
    -  Select \
    842 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569'  Then ct.catchWeight \
    843 
    -                                                 Else 0.0 End), \
    844 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992'   Then ct.catchWeight \
    845 
    -                                                 Else 0.0 End), \
    846 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then ct.catchWeight \
    847 
    -                                                 Else 0.0 End), \
    848 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685477#0.8024257002747615'  Then ct.catchWeight \
    849 
    -                                                 Else 0.0 End), \
    850 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685477#0.3846921632590058'  Then ct.catchWeight \
    851 
    -                                                 Else 0.0 End), \
    852 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569'  Then 0.0 \
    853 
    -                                                 When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992'   Then 0.0 \
    854 
    -                                                 When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then 0.0 \
    855 
    -                                                 When 'fr.ird.referential.common.Species#1239832685477#0.8024257002747615'  Then 0.0 \
    856 
    -                                                 When 'fr.ird.referential.common.Species#1239832685477#0.3846921632590058'  Then 0.0 \
    857 
    -                                                 Else ct.catchWeight End) \
    858 
    -  From TripImpl m \
    859 
    -  Join m.routeObs r \
    860 
    -  Join r.activity a \
    861 
    -  Join a.set c \
    862 
    -      with c.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#2' \
    863 
    -  Join c.catches ct \
    864 
    -  Join ct.speciesFate sf with sf.discard = FALSE, \
    865 
    -  ObservedSystemImpl os \
    866 
    -  Where \
    867 
    -      m.id In :tripId \
    868 
    -      and os.topiaId = 'fr.ird.referential.ps.common.ObservedSystem#1239832686428#0.9395222812356602' \
    869 
    -      and os not in elements(a.observedSystem)
    870 
    -# ligne 2
    871 
    -report.psObservationTargetCatchByAssociation.request.7=0,1|row|\
    872 
    -  Select \
    873 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569'  Then ct.catchWeight \
    874 
    -                                                 Else 0.0 End), \
    875 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992'   Then ct.catchWeight \
    876 
    -                                                 Else 0.0 End), \
    877 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then ct.catchWeight \
    878 
    -                                                 Else 0.0 End), \
    879 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685477#0.8024257002747615'  Then ct.catchWeight \
    880 
    -                                                 Else 0.0 End), \
    881 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685477#0.3846921632590058'  Then ct.catchWeight \
    882 
    -                                                 Else 0.0 End), \
    883 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569'  Then 0.0 \
    884 
    -                                                 When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992'   Then 0.0 \
    885 
    -                                                 When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then 0.0 \
    886 
    -                                                 When 'fr.ird.referential.common.Species#1239832685477#0.8024257002747615'  Then 0.0 \
    887 
    -                                                 When 'fr.ird.referential.common.Species#1239832685477#0.3846921632590058'  Then 0.0 \
    888 
    -                                                 Else ct.catchWeight End) \
    889 
    -  From TripImpl m \
    890 
    -  Join m.routeObs r \
    891 
    -  Join r.activity a \
    892 
    -  Join a.set c \
    893 
    -      with c.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#2' \
    894 
    -  Join c.catches ct \
    895 
    -  Join ct.speciesFate sf with sf.discard = FALSE, \
    896 
    -  ObservedSystemImpl os \
    897 
    -  Where \
    898 
    -      m.id In :tripId \
    899 
    -      and os.topiaId = 'fr.ird.referential.ps.common.ObservedSystem#1239832686428#0.9395222812356602' \
    900 
    -      and os in elements(a.observedSystem)
    901 
    -# ligne 3
    902 
    -report.psObservationTargetCatchByAssociation.request.13=0,2|row|\
    903 
    -  Select \
    904 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569'  Then ct.catchWeight \
    905 
    -                                                 Else 0.0 End), \
    906 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992'   Then ct.catchWeight \
    907 
    -                                                 Else 0.0 End), \
    908 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then ct.catchWeight \
    909 
    -                                                 Else 0.0 End), \
    910 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685477#0.8024257002747615'  Then ct.catchWeight \
    911 
    -                                                 Else 0.0 End), \
    912 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685477#0.3846921632590058'  Then ct.catchWeight \
    913 
    -                                                 Else 0.0 End), \
    914 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569'  Then 0.0 \
    915 
    -                                                 When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992'   Then 0.0 \
    916 
    -                                                 When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then 0.0 \
    917 
    -                                                 When 'fr.ird.referential.common.Species#1239832685477#0.8024257002747615'  Then 0.0 \
    918 
    -                                                 When 'fr.ird.referential.common.Species#1239832685477#0.3846921632590058'  Then 0.0 \
    919 
    -                                                 Else ct.catchWeight End) \
    920 
    -  From TripImpl m \
    921 
    -  Join m.routeObs r \
    922 
    -  Join r.activity a \
    923 
    -  Join a.set c \
    924 
    -      with c.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#1' \
    925 
    -  Join c.catches ct \
    926 
    -  Join ct.speciesFate sf with sf.discard = FALSE, \
    927 
    -  ObservedSystemImpl os \
    928 
    -  Where \
    929 
    -      m.id In :tripId \
    930 
    -      and os.topiaId = 'fr.ird.referential.ps.common.ObservedSystem#1239832686428#0.9217864901728908' \
    931 
    -      and os in elements(a.observedSystem)
    932 
    -# ligne 4
    933 
    -report.psObservationTargetCatchByAssociation.request.19=0,3|row|\
    934 
    -  Select \
    935 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569'  Then ct.catchWeight \
    936 
    -                                                 Else 0.0 End), \
    937 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992'   Then ct.catchWeight \
    938 
    -                                                 Else 0.0 End), \
    939 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then ct.catchWeight \
    940 
    -                                                 Else 0.0 End), \
    941 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685477#0.8024257002747615'  Then ct.catchWeight \
    942 
    -                                                 Else 0.0 End), \
    943 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685477#0.3846921632590058'  Then ct.catchWeight \
    944 
    -                                                 Else 0.0 End), \
    945 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569'  Then 0.0 \
    946 
    -                                                 When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992'   Then 0.0 \
    947 
    -                                                 When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then 0.0 \
    948 
    -                                                 When 'fr.ird.referential.common.Species#1239832685477#0.8024257002747615'  Then 0.0 \
    949 
    -                                                 When 'fr.ird.referential.common.Species#1239832685477#0.3846921632590058'  Then 0.0 \
    950 
    -                                                 Else ct.catchWeight End) \
    951 
    -  From TripImpl m \
    952 
    -  Join m.routeObs r \
    953 
    -  Join r.activity a \
    954 
    -  Join a.set c \
    955 
    -      with c.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#1' \
    956 
    -  Join c.catches ct \
    957 
    -  Join ct.speciesFate sf with sf.discard = FALSE, \
    958 
    -  ObservedSystemImpl os \
    959 
    -  Where \
    960 
    -      m.id In :tripId \
    961 
    -      and os.topiaId = 'fr.ird.referential.ps.common.ObservedSystem#1239832686428#0.9217864901728908' \
    962 
    -      and os not in elements(a.observedSystem)
    963 
    -################################################################################
    964 
    -## Rejets thons selon le type d'association
    965 
    -################################################################################
    966 
    -report.psObservationTargetDiscardedByAssociation.modelType=PS
    967 
    -report.psObservationTargetDiscardedByAssociation.name=Observations - Rejets de thons selon le type d’association (en t)
    968 
    -report.psObservationTargetDiscardedByAssociation.description=Afficher la répartitions des rejets de thons selon le type d'association
    969 
    -report.psObservationTargetDiscardedByAssociation.columns=YFT, SKJ, BET, LTA, FRI, Autres, Total
    970 
    -report.psObservationTargetDiscardedByAssociation.rows=BL sans baleine, BL avec baleine, BO avec requin-baleine, BO sans requin-baleine, Total
    971 
    -report.psObservationTargetDiscardedByAssociation.operations.1=SumRow
    972 
    -report.psObservationTargetDiscardedByAssociation.operations.2=SumColumn
    973 
    -# ligne 1
    974 
    -report.psObservationTargetDiscardedByAssociation.request.1=0,0|row|\
    975 
    -  Select \
    976 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569'  Then ct.catchWeight \
    977 
    -                                                 Else 0.0 End), \
    978 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992'   Then ct.catchWeight \
    979 
    -                                                 Else 0.0 End), \
    980 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then ct.catchWeight \
    981 
    -                                                 Else 0.0 End), \
    982 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685477#0.8024257002747615'  Then ct.catchWeight \
    983 
    -                                                 Else 0.0 End), \
    984 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685477#0.3846921632590058'  Then ct.catchWeight \
    985 
    -                                                 Else 0.0 End), \
    986 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569'  Then 0.0 \
    987 
    -                                                 When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992'   Then 0.0 \
    988 
    -                                                 When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then 0.0 \
    989 
    -                                                 When 'fr.ird.referential.common.Species#1239832685477#0.8024257002747615'  Then 0.0 \
    990 
    -                                                 When 'fr.ird.referential.common.Species#1239832685477#0.3846921632590058'  Then 0.0 \
    991 
    -                                                 Else ct.catchWeight End) \
    992 
    -  From TripImpl m \
    993 
    -  Join m.routeObs r \
    994 
    -  Join r.activity a \
    995 
    -  Join a.set c \
    996 
    -      with c.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#2' \
    997 
    -  Join c.catches ct \
    998 
    -  Join ct.speciesFate sf with sf.discard = TRUE, \
    999 
    -  ObservedSystemImpl os \
    1000 
    -  Where \
    1001 
    -      m.id In :tripId \
    1002 
    -      and os.topiaId = 'fr.ird.referential.ps.common.ObservedSystem#1239832686428#0.9395222812356602' \
    1003 
    -      and os not in elements(a.observedSystem)
    1004 
    -# ligne 2
    1005 
    -report.psObservationTargetDiscardedByAssociation.request.7=0,1|row|\
    1006 
    -  Select \
    1007 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569'  Then ct.catchWeight \
    1008 
    -                                                 Else 0.0 End), \
    1009 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992'   Then ct.catchWeight \
    1010 
    -                                                 Else 0.0 End), \
    1011 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then ct.catchWeight \
    1012 
    -                                                 Else 0.0 End), \
    1013 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685477#0.8024257002747615'  Then ct.catchWeight \
    1014 
    -                                                 Else 0.0 End), \
    1015 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685477#0.3846921632590058'  Then ct.catchWeight \
    1016 
    -                                                 Else 0.0 End), \
    1017 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569'  Then 0.0 \
    1018 
    -                                                 When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992'   Then 0.0 \
    1019 
    -                                                 When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then 0.0 \
    1020 
    -                                                 When 'fr.ird.referential.common.Species#1239832685477#0.8024257002747615'  Then 0.0 \
    1021 
    -                                                 When 'fr.ird.referential.common.Species#1239832685477#0.3846921632590058'  Then 0.0 \
    1022 
    -                                                 Else ct.catchWeight End) \
    1023 
    -  From TripImpl m \
    1024 
    -  Join m.routeObs r \
    1025 
    -  Join r.activity a \
    1026 
    -  Join a.set c \
    1027 
    -      with c.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#2' \
    1028 
    -  Join c.catches ct \
    1029 
    -  Join ct.speciesFate sf with sf.discard = TRUE, \
    1030 
    -  ObservedSystemImpl os \
    1031 
    -  Where \
    1032 
    -      m.id In :tripId \
    1033 
    -      and os.topiaId = 'fr.ird.referential.ps.common.ObservedSystem#1239832686428#0.9395222812356602' \
    1034 
    -      and os in elements(a.observedSystem)
    1035 
    -# ligne 3
    1036 
    -report.psObservationTargetDiscardedByAssociation.request.13=0,2|row|\
    1037 
    -  Select \
    1038 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569'  Then ct.catchWeight \
    1039 
    -                                                 Else 0.0 End), \
    1040 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992'   Then ct.catchWeight \
    1041 
    -                                                 Else 0.0 End), \
    1042 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then ct.catchWeight \
    1043 
    -                                                 Else 0.0 End), \
    1044 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685477#0.8024257002747615'  Then ct.catchWeight \
    1045 
    -                                                 Else 0.0 End), \
    1046 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685477#0.3846921632590058'  Then ct.catchWeight \
    1047 
    -                                                 Else 0.0 End), \
    1048 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569'  Then 0.0 \
    1049 
    -                                                 When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992'   Then 0.0 \
    1050 
    -                                                 When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then 0.0 \
    1051 
    -                                                 When 'fr.ird.referential.common.Species#1239832685477#0.8024257002747615'  Then 0.0 \
    1052 
    -                                                 When 'fr.ird.referential.common.Species#1239832685477#0.3846921632590058'  Then 0.0 \
    1053 
    -                                                 Else ct.catchWeight End) \
    1054 
    -  From TripImpl m \
    1055 
    -  Join m.routeObs r \
    1056 
    -  Join r.activity a \
    1057 
    -  Join a.set c \
    1058 
    -      with c.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#1' \
    1059 
    -  Join c.catches ct \
    1060 
    -  Join ct.speciesFate sf with sf.discard = TRUE, \
    1061 
    -  ObservedSystemImpl os \
    1062 
    -  Where \
    1063 
    -      m.id In :tripId \
    1064 
    -      and os.topiaId = 'fr.ird.referential.ps.common.ObservedSystem#1239832686428#0.9217864901728908' \
    1065 
    -      and os in elements(a.observedSystem)
    1066 
    -# ligne 4
    1067 
    -report.psObservationTargetDiscardedByAssociation.request.19=0,3|row|\
    1068 
    -  Select \
    1069 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569'  Then ct.catchWeight \
    1070 
    -                                                 Else 0.0 End), \
    1071 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992'   Then ct.catchWeight \
    1072 
    -                                                 Else 0.0 End), \
    1073 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then ct.catchWeight \
    1074 
    -                                                 Else 0.0 End), \
    1075 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685477#0.8024257002747615'  Then ct.catchWeight \
    1076 
    -                                                 Else 0.0 End), \
    1077 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685477#0.3846921632590058'  Then ct.catchWeight \
    1078 
    -                                                 Else 0.0 End), \
    1079 
    -      Sum(CASE ct.species.topiaId When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569'  Then 0.0 \
    1080 
    -                                                 When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992'   Then 0.0 \
    1081 
    -                                                 When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then 0.0 \
    1082 
    -                                                 When 'fr.ird.referential.common.Species#1239832685477#0.8024257002747615'  Then 0.0 \
    1083 
    -                                                 When 'fr.ird.referential.common.Species#1239832685477#0.3846921632590058'  Then 0.0 \
    1084 
    -                                                 Else ct.catchWeight End) \
    1085 
    -  From TripImpl m \
    1086 
    -  Join m.routeObs r \
    1087 
    -  Join r.activity a \
    1088 
    -  Join a.set c \
    1089 
    -      with c.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#1' \
    1090 
    -  Join c.catches ct \
    1091 
    -  Join ct.speciesFate sf with sf.discard = TRUE, \
    1092 
    -  ObservedSystemImpl os \
    1093 
    -  Where \
    1094 
    -      m.id In :tripId \
    1095 
    -      and os.topiaId = 'fr.ird.referential.ps.common.ObservedSystem#1239832686428#0.9217864901728908' \
    1096 
    -      and os not in elements(a.observedSystem)
    1097 
    -################################################################################
    1098 830 
     ## Captures observées
    1099 831 
     ################################################################################
    1100 832 
     report.psObservationCatch.modelType=PS

  • core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsObservationTargetCatchByAssociationReportFixture.java deleted
    1 
    -/*
    2 
    - * #%L
    3 
    - * ObServe Core :: Services :: Test
    4 
    - * %%
    5 
    - * Copyright (C) 2008 - 2022 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 
    -package fr.ird.observe.services.service.report.ps;
    23 
    -
    24 
    -import com.google.auto.service.AutoService;
    25 
    -import fr.ird.observe.dto.report.Report;
    26 
    -import fr.ird.observe.dto.report.ReportRequest;
    27 
    -import fr.ird.observe.services.service.ReportFixture;
    28 
    -
    29 
    -import java.util.Iterator;
    30 
    -
    31 
    -/**
    32 
    - * Test le report {@code targetCatchByAssociation}.
    33 
    - *
    34 
    - * @author Tony Chemit - dev@tchemit.fr
    35 
    - * @since 1.9
    36 
    - */
    37 
    -@AutoService(ReportFixture.class)
    38 
    -public class PsObservationTargetCatchByAssociationReportFixture extends ReportFixture {
    39 
    -
    40 
    -    @Override
    41 
    -    public void assertSyntax(Report report) {
    42 
    -        super.assertSyntax(report);
    43 
    -        Iterator<ReportRequest> requests = getRequestIterator(report);
    44 
    -        assertReportRequestDimension(requests, ReportRequest.RequestLayout.row, 0, 0);
    45 
    -        assertReportRequestDimension(requests, ReportRequest.RequestLayout.row, 0, 1);
    46 
    -        assertReportRequestDimension(requests, ReportRequest.RequestLayout.row, 0, 2);
    47 
    -        assertReportRequestDimension(requests, ReportRequest.RequestLayout.row, 0, 3);
    48 
    -    }
    49 
    -}

  • core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsObservationTargetDiscardedByAssociationReportFixture.java deleted
    1 
    -/*
    2 
    - * #%L
    3 
    - * ObServe Core :: Services :: Test
    4 
    - * %%
    5 
    - * Copyright (C) 2008 - 2022 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 
    -package fr.ird.observe.services.service.report.ps;
    23 
    -
    24 
    -import com.google.auto.service.AutoService;
    25 
    -import fr.ird.observe.dto.report.Report;
    26 
    -import fr.ird.observe.dto.report.ReportRequest;
    27 
    -import fr.ird.observe.services.service.ReportFixture;
    28 
    -
    29 
    -import java.util.Iterator;
    30 
    -
    31 
    -/**
    32 
    - * Test le report {@code targetDiscardedByAssociation}.
    33 
    - *
    34 
    - * @author Tony Chemit - dev@tchemit.fr
    35 
    - * @since 1.9
    36 
    - */
    37 
    -@AutoService(ReportFixture.class)
    38 
    -public class PsObservationTargetDiscardedByAssociationReportFixture extends ReportFixture {
    39 
    -
    40 
    -    @Override
    41 
    -    public void assertSyntax(Report report) {
    42 
    -        super.assertSyntax(report);
    43 
    -        Iterator<ReportRequest> requests = getRequestIterator(report);
    44 
    -        assertReportRequestDimension(requests, ReportRequest.RequestLayout.row, 0, 0);
    45 
    -        assertReportRequestDimension(requests, ReportRequest.RequestLayout.row, 0, 1);
    46 
    -        assertReportRequestDimension(requests, ReportRequest.RequestLayout.row, 0, 2);
    47 
    -        assertReportRequestDimension(requests, ReportRequest.RequestLayout.row, 0, 3);
    48 
    -    }
    49 
    -}

  • core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psObservationTargetCatchByAssociation.properties deleted
    1 
    -###
    2 
    -# #%L
    3 
    -# ObServe Core :: Services :: Test
    4 
    -# %%
    5 
    -# Copyright (C) 2008 - 2022 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 
    -syntax.name=Observations - Captures de thons selon le type d’association (en t)
    23 
    -syntax.description=Afficher la répartitions des captures de thons selon le type d'association
    24 
    -syntax.rows=5
    25 
    -syntax.columns=7
    26 
    -syntax.columnsHeader=YFT^SKJ^BET^LTA^FRI^Autres^Total
    27 
    -syntax.rowsHeader=BL sans baleine^BL avec baleine^BO avec requin-baleine^BO sans requin-baleine^Total
    28 
    -syntax.nbRequests=4
    29 
    -result.columns=7
    30 
    -result.rows=5
    31 
    -result.0=175.0^0.0^7.0^0.0^0.0^0.0^182.0
    32 
    -result.1=null^null^null^null^null^null^0.0
    33 
    -result.2=null^null^null^null^null^null^0.0
    34 
    -result.3=0.0^1.0^0.0^0.0^1.0^12.1406^14.1406
    35 
    -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 
    -###
    2 
    -# #%L
    3 
    -# ObServe Core :: Services :: Test
    4 
    -# %%
    5 
    -# Copyright (C) 2008 - 2022 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=0.0^0.0^0.0^0.0^0.0^0.2882^0.2882
    23 
    -result.1=null^null^null^null^null^null^0.0
    24 
    -result.2=null^null^null^null^null^null^0.0
    25 
    -result.3=0.0^0.0^5.0^0.0^0.0^148.303^153.303
    26 
    -result.4=0.0^0.0^5.0^0.0^0.0^148.5912^153.5912
    27 
    -result.columns=7
    28 
    -result.rows=5
    29 
    -syntax.columns=7
    30 
    -syntax.columnsHeader=YFT^SKJ^BET^LTA^FRI^Autres^Total
    31 
    -syntax.description=Afficher la répartitions des rejets de thons selon le type d'association
    32 
    -syntax.name=Observations - Rejets de thons selon le type d’association (en t)
    33 
    -syntax.nbRequests=4
    34 
    -syntax.rows=5
    35 
    -syntax.rowsHeader=BL sans baleine^BL avec baleine^BO avec requin-baleine^BO sans requin-baleine^Total

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