Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(analyticstablehooks): Slightly better UI and label language #2969

Merged
merged 4 commits into from
Nov 4, 2024
+7 −7
Merged

fix(analyticstablehooks): Slightly better UI and label language #2969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
df818a9
fix(analyticstablehooks): Slightly better UI and label language
benguaraldi Oct 24, 2024
ec2969a
Merge branch 'master' into DHIS2-13473/analytics-table-hooks-2
benguaraldi Oct 29, 2024
e00b175
Merge branch 'master' into DHIS2-13473/analytics-table-hooks-2
benguaraldi Nov 1, 2024
0393f6c
Merge branch 'master' into DHIS2-13473/analytics-table-hooks-2
benguaraldi Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/config/field-rules.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -925,8 +925,8 @@
type: 'CHANGE_VALUE',
setValue: (model, fieldConfig) => {
try {
if (model.dataValues.sqlQuery.includes('${_current_user_id}') ||

Check warning on line 928 in src/config/field-rules.js

View workflow job for this annotation

GitHub Actions / lint 

Unexpected template string expression
model.dataValues.sqlQuery.includes('${_current_username}')) {

Check warning on line 929 in src/config/field-rules.js

View workflow job for this annotation

GitHub Actions / lint 

Unexpected template string expression
fieldConfig.value = model[fieldConfig.name] = 'NO_CACHE';
fieldConfig.props.disabled = true;
} else {
Expand All @@ -945,7 +945,7 @@
when: {
field: 'phase',
operator: 'PREDICATE',
value: (phase) => phase === 'ANALYTICS_TABLE_POPULATED'
value: (phase) => phase != 'RESOURCE_TABLE_POPULATED'
},
operations: [{
type: 'HIDE_FIELD',
Expand All @@ -961,7 +961,7 @@
when: {
field: 'phase',
operator: 'PREDICATE',
value: (phase) => phase === 'RESOURCE_TABLE_POPULATED'
value: (phase) => phase != 'ANALYTICS_TABLE_POPULATED'
},
operations: [{
type: 'HIDE_FIELD',
Expand Down
10 changes: 5 additions & 5 deletions src/i18n/i18n_module_en.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2377,17 +2377,17 @@ 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 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
phase=After population of which temporary tables should the SQL script be invoked?
resource_table_populated=Resource tables
analytics_table_populated=Analytics tables
resource_table_type=Which resource table
org_unit_structure=Organisation unit structure
data_set_org_unit_category=Data set organisation unit category
category_option_combo_name=Category option combo name
org_unit_group_set_structure=Organisation unit group set structure
data_approval_remap_level=Data approval remap level
data_approval_min_level=Data approval minimum level
analytics_table_type=Analytics table
analytics_table_type=Which analytics table
data_value=Data value
completeness=Completeness
completeness_target=Completeness target
Expand Down
Loading