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

Commits:

13 changed files:

Changes:

  • t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level2/Level2Action.ftl
    ... ... @@ -35,6 +35,12 @@ Corriger avec les échantillons de leur strate échantillon
    35 35 
     Corriger avec leur propre échantillon
    36 36 
     </#if>
    37 37
    38 
    +<#if configuration.useWeightCategoriesInStratum>
    39 
    +Utilisation des catégories de poids +10/-10 dans la stratification.
    40 
    +<#else>
    41 
    +Catégories de poids +10/-10 non utilisés dans la stratification.
    42 
    +</#if>
    43 
    +
    38 44 
     <#list oceans?values as ocean>
    39 45 
     Océan sélectionné : ${ocean}
    40 46 
     </#list>
    ... ... @@ -63,6 +69,7 @@ Flotte d'échantillon sélectionnée : ${sampleFleet}
    63 69 
     Pavillon d'échantillon sélectionnée : ${sampleFlag}
    64 70 
     </#list>
    65 71
    72 
    +
    66 73 
     Qualité des strates échantillons :
    67 74
    68 75 
     - Nombre minimum d'effectif dans les échantillons :

  • t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level2/Level2Action_en.ftl
    ... ... @@ -35,6 +35,12 @@ Fix with the stratum sample
    35 35 
     Fix with their own sample
    36 36 
     </#if>
    37 37
    38 
    +<#if configuration.useWeightCategoriesInStratum>
    39 
    +Use weight categories +10/-10 in stratification.
    40 
    +<#else>
    41 
    +Do not use weight categories +10/-10 in stratification.
    42 
    +</#if>
    43 
    +
    38 44 
     <#list oceans?values as ocean>
    39 45 
     Selected ocean: ${ocean}
    40 46 
     </#list>

  • t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level3/Level3Action.ftl
    ... ... @@ -35,6 +35,12 @@ Appliquer les structures de tailles de la strate échantillons
    35 35 
     Conserver leurs échantillons en l'état
    36 36 
     </#if>
    37 37
    38 
    +<#if configuration.useWeightCategoriesInStratum>
    39 
    +Utilisation des catégories de poids +10/-10 dans la stratification.
    40 
    +<#else>
    41 
    +Catégories de poids +10/-10 non utilisés dans la stratification.
    42 
    +</#if>
    43 
    +
    38 44 
     <#if configuration.useWeightCategories>
    39 45 
     Générer les structures de tailles par catégories de poids
    40 46 
     <#else>

  • t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level3/Level3Action_en.ftl
    ... ... @@ -35,6 +35,12 @@ Apply length structures from the sample statrum
    35 35 
     Keep their own samples (do nothing)
    36 36 
     </#if>
    37 37
    38 
    +<#if configuration.useWeightCategoriesInStratum>
    39 
    +Use weight categories +10/-10 in stratification.
    40 
    +<#else>
    41 
    +Do not use weight categories +10/-10 in stratification.
    42 
    +</#if>
    43 
    +
    38 44 
     <#if configuration.useWeightCategories>
    39 45 
     Generate length structures by weight category
    40 46 
     <#else>

  • t3-domain/src/main/java/fr/ird/t3/actions/stratum/LevelConfigurationWithStratum.java
    ... ... @@ -111,6 +111,10 @@ public abstract class LevelConfigurationWithStratum implements T3ActionConfigura
    111 111 
          * The first step is the general configuration.
    112 112 
          */
    113 113 
         private boolean validStep1;
    114 
    +    /**
    115 
    +     * Flag to add weight categories as a component of the stratum hierarchy.
    116 
    +     */
    117 
    +    private boolean useWeightCategoriesInStratum;
    114 118
    115 119 
         /**
    116 120 
          * Flag to validate the step two of configuration.
    ... ... @@ -307,4 +311,12 @@ public abstract class LevelConfigurationWithStratum implements T3ActionConfigura
    307 311 
         public void setLocale(Locale locale) {
    308 312 
             this.locale = locale;
    309 313 
         }
    314 
    +
    315 
    +    public boolean isUseWeightCategoriesInStratum() {
    316 
    +        return useWeightCategoriesInStratum;
    317 
    +    }
    318 
    +
    319 
    +    public void setUseWeightCategoriesInStratum(boolean useWeightCategoriesInStratum) {
    320 
    +        this.useWeightCategoriesInStratum= useWeightCategoriesInStratum;
    321 
    +    }
    310 322 
     }

  • t3-web/src/main/java/fr/ird/t3/web/actions/data/level2/ConfigureLevel2Step2Action.java
    ... ... @@ -33,8 +33,9 @@ import org.apache.commons.collections.CollectionUtils;
    33 33 
     import org.apache.commons.logging.Log;
    34 34 
     import org.apache.commons.logging.LogFactory;
    35 35
    36 
    +import java.util.LinkedHashSet;
    36 37 
     import java.util.Map;
    37 
    -import java.util.TreeSet;
    38 
    +import java.util.Set;
    38 39
    39 40 
     /**
    40 41 
      * To manager the step 2 of a level 2 treatment configuration.
    ... ... @@ -83,8 +84,8 @@ public class ConfigureLevel2Step2Action extends AbstractConfigureAction<Level2Co
    83 84
    84 85 
             missingDatas = false;
    85 86
    86 
    -        TreeSet<Country> sampleFlags = new TreeSet<>();
    87 
    -        TreeSet<Country> sampleFleets = new TreeSet<>();
    87 
    +        Set<Country> sampleFlags = new LinkedHashSet<>();
    88 
    +        Set<Country> sampleFleets = new LinkedHashSet<>();
    88 89 
             for (String oceanId : configuration.getOceanIds()) {
    89 90 
                 sampleFlags.addAll(countryDAO.findAllFlagUsedInSample(oceanId));
    90 91 
                 sampleFleets.addAll(countryDAO.findAllFleetUsedInSample(oceanId));

  • t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/ConfigureLevel3Step2Action.java
    ... ... @@ -34,8 +34,9 @@ import org.apache.commons.logging.Log;
    34 34 
     import org.apache.commons.logging.LogFactory;
    35 35 
     import org.apache.struts2.interceptor.ParameterAware;
    36 36
    37 
    +import java.util.LinkedHashSet;
    37 38 
     import java.util.Map;
    38 
    -import java.util.TreeSet;
    39 
    +import java.util.Set;
    39 40 
     import java.util.regex.Matcher;
    40 41 
     import java.util.regex.Pattern;
    41 42
    ... ... @@ -51,24 +52,24 @@ public class ConfigureLevel3Step2Action extends AbstractConfigureAction<Level3Co
    51 52 
         public static final Pattern BL_STRATUM_MINIMUM_COUNT_PATTERN = Pattern.compile("BL:(.*)?");
    52 53 
         private static final long serialVersionUID = 1L;
    53 54 
         private static final Log log = LogFactory.getLog(ConfigureLevel3Step2Action.class);
    54 
    -    protected final Map<String, String> timeSteps = createTimeSteps();
    55 
    +    private final Map<String, String> timeSteps = createTimeSteps();
    55 56 
         @InjectDAO(entityType = Country.class)
    56 
    -    protected transient CountryTopiaDao countryDAO;
    57 
    +    private transient CountryTopiaDao countryDAO;
    57 58 
         @InjectDecoratedBeans(beanType = Country.class)
    58 
    -    protected Map<String, String> sampleFleets;
    59 
    +    private Map<String, String> sampleFleets;
    59 60 
         @InjectDecoratedBeans(beanType = Country.class)
    60 
    -    protected Map<String, String> sampleFlags;
    61 
    +    private Map<String, String> sampleFlags;
    61 62 
         @InjectDecoratedBeans(beanType = Species.class, filterById = true, pathIds = "speciesIds")
    62 
    -    protected Map<String, String> species;
    63 
    -    protected Map<String, String> useSamplesOrNot;
    64 
    -    protected Map<String, String> useWeightCategoriesOrNot;
    63 
    +    private Map<String, String> species;
    64 
    +    private Map<String, String> useSamplesOrNot;
    65 
    +    private Map<String, String> useWeightCategoriesOrNot;
    65 66 
         /**
    66 67 
          * Flag to know if some data are missings.
    67 68 
          * <p/>
    68 69 
          * This flag is setted in the {@link #prepare()} method while
    69 70 
          * loading possibles data.
    70 71 
          */
    71 
    -    protected boolean missingDatas;
    72 
    +    private boolean missingDatas;
    72 73
    73 74 
         public ConfigureLevel3Step2Action() {
    74 75 
             super(Level3Configuration.class);
    ... ... @@ -88,8 +89,8 @@ public class ConfigureLevel3Step2Action extends AbstractConfigureAction<Level3Co
    88 89
    89 90 
             missingDatas = false;
    90 91
    91 
    -        TreeSet<Country> sampleFlags = new TreeSet<>();
    92 
    -        TreeSet<Country> sampleFleets = new TreeSet<>();
    92 
    +        Set<Country> sampleFlags = new LinkedHashSet<>();
    93 
    +        Set<Country> sampleFleets = new LinkedHashSet<>();
    93 94 
             for (String oceanId : configuration.getOceanIds()) {
    94 95 
                 sampleFlags.addAll(countryDAO.findAllFlagUsedInSample(oceanId));
    95 96 
                 sampleFleets.addAll(countryDAO.findAllFleetUsedInSample(oceanId));

  • t3-web/src/main/resources/i18n/t3-web_en_GB.properties
    ... ... @@ -118,6 +118,7 @@ t3.common.uploaded.source=Input file uploaded
    118 118 
     t3.common.usable.trips=Marées utilisables
    119 119 
     t3.common.useReplacementVessel=Use a replacement vessel
    120 120 
     t3.common.useSamplesOnly=Database 'Samples only'
    121 
    +t3.common.useWeightCategoriesInStratum=Use Weight categories -10/+10 in stratum
    121 122 
     t3.common.useWells=Use wells
    122 123 
     t3.common.user.outputDatabases=List of configured target databases
    123 124 
     t3.common.user.t3Databases=List of configured working databases

  • t3-web/src/main/resources/i18n/t3-web_fr_FR.properties
    ... ... @@ -118,6 +118,7 @@ t3.common.uploaded.source=Source téléchargé
    118 118 
     t3.common.usable.trips=Marées utilisables
    119 119 
     t3.common.useReplacementVessel=Utiliser un navire de remplacement
    120 120 
     t3.common.useSamplesOnly=Base échantillon seulement
    121 
    +t3.common.useWeightCategoriesInStratum=Utiliser les catégories de poids -10/+10Kg dans la stratification
    121 122 
     t3.common.useWells=Utilisation des plans de cuve
    122 123 
     t3.common.user.outputDatabases=Liste des configurations de bases de sortie
    123 124 
     t3.common.user.t3Databases=Liste des configurations de bases de travail

  • t3-web/src/main/webapp/WEB-INF/jsp/data/level2/level2ConfigurationResume.jsp
    ... ... @@ -41,7 +41,7 @@
    41 41 
                 list="zoneVersions" label='%{getText("t3.common.zoneVersion")}'/>
    42 42
    43 43 
       <%-- selected catch fleet --%>
    44 
    -  <s:select key="configuration.catchFleetId" list="catchFleets" disabled="true"
    44 
    +  <s:select key="configuration.catchFleetIds" list="catchFleets" disabled="true"
    45 45 
                 label='%{getText("t3.common.catchFleet")}'/>
    46 46
    47 47 
       <%-- selected time step  --%>
    ... ... @@ -90,6 +90,11 @@
    90 90 
                    label="%{getText('t3.common.stratumMinimumSampleCountFreeSchoolType')}"/>
    91 91
    92 92 
       <div class="formSeparator"></div>
    93 
    +
    94 
    +  <%--use weight categories in stratum--%>
    95 
    +  <s:checkbox key="configuration.useWeightCategoriesInStratum" disabled="true"
    96 
    +              label='%{getText("t3.common.useWeightCategoriesInStratum")}'/>
    97 
    +
    93 98 
       <%-- use all samples --%>
    94 99 
       <s:radio key="configuration.useAllSamplesOfStratum" list="useSamplesOrNot" disabled="true"
    95 100 
                label='%{getText("t3.label.data.level2.configuration.samplesToUse")}'/>

  • t3-web/src/main/webapp/WEB-INF/jsp/data/level2/level2ConfigurationStep2.jsp
    ... ... @@ -68,6 +68,10 @@
    68 68 
         <s:radio key="configuration.useAllSamplesOfStratum" requiredLabel="true" list="useSamplesOrNot"
    69 69 
                  label='%{getText("t3.label.data.level2.configuration.samplesToUse")}'/>
    70 70
    71 
    +    <%--use weight categories in stratum--%>
    72 
    +    <s:checkbox key="configuration.useWeightCategoriesInStratum" label='%{getText("t3.common.useWeightCategoriesInStratum")}'/>
    73 
    +
    74 
    +
    71 75 
       </fieldset>
    72 76 
       <br/>
    73 77

  • t3-web/src/main/webapp/WEB-INF/jsp/data/level3/level3ConfigurationResume.jsp
    ... ... @@ -38,7 +38,7 @@
    38 38 
                 label='%{getText("t3.common.zoneType")}'/>
    39 39
    40 40 
       <%-- selected catch fleet --%>
    41 
    -  <s:select key="configuration.catchFleetId" disabled="true"
    41 
    +  <s:select key="configuration.catchFleetIds" disabled="true"
    42 42 
                 list="catchFleets" label='%{getText("t3.common.catchFleet")}'/>
    43 43
    44 44 
       <%-- selected time step  --%>
    ... ... @@ -74,6 +74,10 @@
    74 74 
       <s:radio key="configuration.useAllSamplesOfStratum" list="useSamplesOrNot" disabled="true"
    75 75 
                label='%{getText("t3.label.data.level3.configuration.samplesToUse")}'/>
    76 76
    77 
    +  <%--use weight categories in stratum--%>
    78 
    +  <s:checkbox key="configuration.useWeightCategoriesInStratum" disabled="true"
    79 
    +              label='%{getText("t3.common.useWeightCategoriesInStratum")}'/>
    80 
    +
    77 81 
       <%-- use weight categories --%>
    78 82 
       <s:radio key="configuration.useWeightCategories" list="useWeightCategoriesOrNot" disabled="true"
    79 83 
                label='%{getText("t3.label.data.level3.configuration.useWeightCategoriesOrNot")}'/>

  • t3-web/src/main/webapp/WEB-INF/jsp/data/level3/level3ConfigurationStep2.jsp
    ... ... @@ -63,6 +63,10 @@
    63 63 
           <%-- use weight categories --%>
    64 64 
         <s:radio key="configuration.useWeightCategories" requiredLabel="true" list="useWeightCategoriesOrNot"
    65 65 
                  label='%{getText("t3.label.data.level3.configuration.useWeightCategoriesOrNot")}'/>
    66 
    +
    67 
    +      <%--use weight categories in stratum--%>
    68 
    +    <s:checkbox key="configuration.useWeightCategoriesInStratum" label='%{getText("t3.common.useWeightCategoriesInStratum")}'/>
    69 
    +
    66 70 
         <br/>
    67 71 
         <table class="cleanBoth">
    68 72 
           <tr>

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.