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

Commits:

3 changed files:

Changes:

  • client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateModel.java
    ... ... @@ -88,7 +88,6 @@ public class ConsolidateModel extends AdminActionModel {
    88 88
    89 89 
             setConsolidationFailIfLengthWeightParameterNotFound(getClientConfig().isConsolidationFailIfLengthWeightParameterNotFound());
    90 90 
             setConsolidationFailIfLengthLengthParameterNotFound(getClientConfig().isConsolidationFailIfLengthLengthParameterNotFound());
    91 
    -        uiModel.getConsolidateModel().setSkipForReport(getClientConfig().isSkipConsolidateStepForReport());
    92 91 
         }
    93 92
    94 93 
         @Override

  • client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportModel.java
    ... ... @@ -227,6 +227,7 @@ public class ReportModel extends AdminActionModel {
    227 227 
             };
    228 228 
             selectDataModel.getSelectionDataModel().addPropertyChangeListener(SelectionTreeModel.SELECTED_COUNT, listenerSelectedDataForReport);
    229 229 
             updateReports();
    230 
    +        uiModel.getConsolidateModel().setSkipForReport(getClientConfig().isSkipConsolidateStepForReport());
    230 231 
         }
    231 232
    232 233 
         @Override

  • toolkit/api-report/src/main/java/fr/ird/observe/report/definition/ReportDefinitionsBuilderPropertiesSupport.java
    ... ... @@ -58,32 +58,32 @@ import java.util.stream.Collectors;
    58 58 
      */
    59 59 
     public abstract class ReportDefinitionsBuilderPropertiesSupport implements ReportDefinitionsBuilder {
    60 60 
         protected static final String VARIABLE_PREFIX = "variable.";
    61 
    -    protected static final Pattern VARIABLE_NAME_PATTERN = Pattern.compile("variable.(\\w+).name");
    61 
    +    protected static final Pattern VARIABLE_NAME_PATTERN = Pattern.compile("variable.(\\d+).name");
    62 62 
         protected static final String VARIABLE_TYPE_FORMAT = "variable.%s.type";
    63 63 
         protected static final String VARIABLE_REQUEST_FORMAT = "variable.%s.request";
    64 64 
         protected static final String VARIABLE_COMMENT_FORMAT = "variable.%s.comment";
    65 65 
         protected static final String REPEAT_VARIABLE_PREFIX = "repeatVariable.";
    66 
    -    protected static final Pattern REPEAT_VARIABLE_NAME_PATTERN = Pattern.compile("repeatVariable.(\\w+).name");
    66 
    +    protected static final Pattern REPEAT_VARIABLE_NAME_PATTERN = Pattern.compile("repeatVariable.(\\d+).name");
    67 67 
         protected static final String REPEAT_VARIABLE_TYPE_FORMAT = "repeatVariable.%s.type";
    68 68 
         protected static final String REPEAT_VARIABLE_REQUEST_FORMAT = "repeatVariable.%s.request";
    69 69 
         protected static final String REPEAT_VARIABLE_ADD_NULL_FORMAT = "repeatVariable.%s.addNull";
    70 70 
         protected static final String REPEAT_VARIABLE_COMMENT_FORMAT = "repeatVariable.%s.comment";
    71 71 
         protected static final String REQUEST_PREFIX = "request.";
    72 
    -    protected static final Pattern REQUEST_LOCATION_PATTERN = Pattern.compile("request.(\\w+).location");
    72 
    +    protected static final Pattern REQUEST_LOCATION_PATTERN = Pattern.compile("request.(\\d+).location");
    73 73 
         protected static final String REQUEST_LAYOUT_FORMAT = "request.%s.layout";
    74 74 
         protected static final String REQUEST_REQUEST_FORMAT = "request.%s.request";
    75 75 
         protected static final String REQUEST_COMMENT_FORMAT = "request.%s.comment";
    76 76 
         protected static final String REQUEST_REPEAT_NAME_FORMAT = "request.%s.repeat.name";
    77 77 
         protected static final String REQUEST_REPEAT_LAYOUT_FORMAT = "request.%s.repeat.layout";
    78 78 
         protected static final String OPERATION_PREFIX = "operations.";
    79 
    -    protected static final Pattern OPERATION_TYPE_PATTERN = Pattern.compile("operations.(\\w+).type");
    79 
    +    protected static final Pattern OPERATION_TYPE_PATTERN = Pattern.compile("operations.(\\d+).type");
    80 80 
         protected static final String OPERATION_PARAMETERS_FORMAT = "operations.%s.parameters";
    81 81 
         protected static final String I18n_PREFIX = "i18n.";
    82 82 
         protected static final Pattern I18N_PATTERN = Pattern.compile("i18n\\.([^.]+)");
    83 83 
         protected static final String I18N_LABEL_EN_FORMAT = "i18n.%s.en";
    84 84 
         protected static final String I18N_LABEL_ES_FORMAT = "i18n.%s.es";
    85 85 
         protected static final String COLUMN_RENDERER_PREFIX = "columnRenderers.";
    86 
    -    protected static final Pattern COLUMN_RENDERER_TYPE_PATTERN = Pattern.compile("columnRenderers.(\\w+).type");
    86 
    +    protected static final Pattern COLUMN_RENDERER_TYPE_PATTERN = Pattern.compile("columnRenderers.(\\d+).type");
    87 87 
         protected static final String COLUMN_RENDERER_PARAMETERS_FORMAT = "columnRenderers.%s.parameters";
    88 88 
         protected static final String REPORT_MODEL_TYPE = "modelType";
    89 89 
         protected static final String REPORT_NAME = "name";

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