fix(analyticstablehooks): Slightly better dynamic form and slightly b…

…etter label language
dhis2 · Sep 4, 2024 · 4fd5689 · 4fd5689
1 parent aa177ac
commit 4fd5689
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/config/field-rules.js b/src/config/field-rules.js
@@ -926,6 +926,11 @@ export default new Map([
             },
             operations: [{
                 type: 'HIDE_FIELD',
+            }, {
+                type: 'CHANGE_VALUE',
+                setValue: (model, fieldConfig) => {
+                    fieldConfig.value = model[fieldConfig.name] = undefined;
+                },
             }],
         },
         {
@@ -937,6 +942,11 @@ export default new Map([
             },
             operations: [{
                 type: 'HIDE_FIELD',
+            }, {
+                type: 'CHANGE_VALUE',
+                setValue: (model, fieldConfig) => {
+                    fieldConfig.value = model[fieldConfig.name] = undefined;
+                },
             }],
         },
     ]],

diff --git a/src/i18n/i18n_module_en.properties b/src/i18n/i18n_module_en.properties
@@ -2371,8 +2371,8 @@ skip_in_analytics=Skip in analytics
 analytics_table_hook=Analytics table hooks
 intro_analytics_table_hook=Configure hooks in SQL that run during the analytics process
 analytics_table_hook_management=Analytics table hooks management
-phase=Phase the SQL script should be invoked
-resource_table_populated=When the temporary resource tables have been populated
+phase=Phase that the SQL script should be invoked
+resource_table_populated=After the temporary resource tables have been populated
 analytics_table_populated=After the temporary analytics tables have been populated
 resource_table_type=Resource table
 org_unit_structure=Organisation unit structure