[Git][ultreiaio/ird-observe][develop] 2 commits: Ajout d'une option avancée pour ne pas consolider les données sur un assistant...

9 Jan 2024


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


Commits:
da987f1e by Tony Chemit at 2024-01-09T14:26:17+01:00
Ajout d'une option avancée pour ne pas consolider les données sur un assistant de reporting - Closes #2828

- - - - -
e58a5085 by Tony Chemit at 2024-01-09T14:26:18+01:00
improve report parser

- - - - -


3 changed files:

- client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateModel.java
- client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportModel.java
- toolkit/api-report/src/main/java/fr/ird/observe/report/definition/ReportDefinitionsBuilderPropertiesSupport.java


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 {
 
         setConsolidationFailIfLengthWeightParameterNotFound(getClientConfig().isConsolidationFailIfLengthWeightParameterNotFound());
         setConsolidationFailIfLengthLengthParameterNotFound(getClientConfig().isConsolidationFailIfLengthLengthParameterNotFound());
-        uiModel.getConsolidateModel().setSkipForReport(getClientConfig().isSkipConsolidateStepForReport());
     }
 
     @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 {
         };
         selectDataModel.getSelectionDataModel().addPropertyChangeListener(SelectionTreeModel.SELECTED_COUNT, listenerSelectedDataForReport);
         updateReports();
+        uiModel.getConsolidateModel().setSkipForReport(getClientConfig().isSkipConsolidateStepForReport());
     }
 
     @Override


=====================================
toolkit/api-report/src/main/java/fr/ird/observe/report/definition/ReportDefinitionsBuilderPropertiesSupport.java
=====================================
@@ -58,32 +58,32 @@ import java.util.stream.Collectors;
  */
 public abstract class ReportDefinitionsBuilderPropertiesSupport implements ReportDefinitionsBuilder {
     protected static final String VARIABLE_PREFIX = "variable.";
-    protected static final Pattern VARIABLE_NAME_PATTERN = Pattern.compile("variable.(\\w+).name");
+    protected static final Pattern VARIABLE_NAME_PATTERN = Pattern.compile("variable.(\\d+).name");
     protected static final String VARIABLE_TYPE_FORMAT = "variable.%s.type";
     protected static final String VARIABLE_REQUEST_FORMAT = "variable.%s.request";
     protected static final String VARIABLE_COMMENT_FORMAT = "variable.%s.comment";
     protected static final String REPEAT_VARIABLE_PREFIX = "repeatVariable.";
-    protected static final Pattern REPEAT_VARIABLE_NAME_PATTERN = Pattern.compile("repeatVariable.(\\w+).name");
+    protected static final Pattern REPEAT_VARIABLE_NAME_PATTERN = Pattern.compile("repeatVariable.(\\d+).name");
     protected static final String REPEAT_VARIABLE_TYPE_FORMAT = "repeatVariable.%s.type";
     protected static final String REPEAT_VARIABLE_REQUEST_FORMAT = "repeatVariable.%s.request";
     protected static final String REPEAT_VARIABLE_ADD_NULL_FORMAT = "repeatVariable.%s.addNull";
     protected static final String REPEAT_VARIABLE_COMMENT_FORMAT = "repeatVariable.%s.comment";
     protected static final String REQUEST_PREFIX = "request.";
-    protected static final Pattern REQUEST_LOCATION_PATTERN = Pattern.compile("request.(\\w+).location");
+    protected static final Pattern REQUEST_LOCATION_PATTERN = Pattern.compile("request.(\\d+).location");
     protected static final String REQUEST_LAYOUT_FORMAT = "request.%s.layout";
     protected static final String REQUEST_REQUEST_FORMAT = "request.%s.request";
     protected static final String REQUEST_COMMENT_FORMAT = "request.%s.comment";
     protected static final String REQUEST_REPEAT_NAME_FORMAT = "request.%s.repeat.name";
     protected static final String REQUEST_REPEAT_LAYOUT_FORMAT = "request.%s.repeat.layout";
     protected static final String OPERATION_PREFIX = "operations.";
-    protected static final Pattern OPERATION_TYPE_PATTERN = Pattern.compile("operations.(\\w+).type");
+    protected static final Pattern OPERATION_TYPE_PATTERN = Pattern.compile("operations.(\\d+).type");
     protected static final String OPERATION_PARAMETERS_FORMAT = "operations.%s.parameters";
     protected static final String I18n_PREFIX = "i18n.";
     protected static final Pattern I18N_PATTERN = Pattern.compile("i18n\\.([^.]+)");
     protected static final String I18N_LABEL_EN_FORMAT = "i18n.%s.en";
     protected static final String I18N_LABEL_ES_FORMAT = "i18n.%s.es";
     protected static final String COLUMN_RENDERER_PREFIX = "columnRenderers.";
-    protected static final Pattern COLUMN_RENDERER_TYPE_PATTERN = Pattern.compile("columnRenderers.(\\w+).type");
+    protected static final Pattern COLUMN_RENDERER_TYPE_PATTERN = Pattern.compile("columnRenderers.(\\d+).type");
     protected static final String COLUMN_RENDERER_PARAMETERS_FORMAT = "columnRenderers.%s.parameters";
     protected static final String REPORT_MODEL_TYPE = "modelType";
     protected static final String REPORT_NAME = "name";



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1124039e15d227d77959476a4...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1124039e15d227d77959476a4...
You're receiving this email because of your account on gitlab.com.

    

Tony CHEMIT (＠tchemit)

tags

participants (1)