From b18be85d53068fde47a08f3722aef13db1b298fd Mon Sep 17 00:00:00 2001 From: EsmeeIDEMS Date: Thu, 6 Jun 2024 18:02:59 +0100 Subject: [PATCH 1/2] content: 1.2.32 --- app_data/sheets/contents.json | 10 ++ .../data_list/debug/debug_data_list.json | 1 - .../data_list/generated/debug_filtered.json | 1 - .../sheets/template/check_field_value.json | 170 ++++++++++++++++++ .../debug/debug_data_items_translate.json | 45 +++++ .../template/debug_task_group_completion.json | 107 +++++++++++ config.ts | 2 +- 7 files changed, 333 insertions(+), 3 deletions(-) create mode 100644 app_data/sheets/template/check_field_value.json create mode 100644 app_data/sheets/template/debug_task_group_completion.json diff --git a/app_data/sheets/contents.json b/app_data/sheets/contents.json index 9a575e4..e7b3bdc 100644 --- a/app_data/sheets/contents.json +++ b/app_data/sheets/contents.json @@ -570,6 +570,11 @@ "flow_name": "assets_demo", "_xlsxPath": "doc_sheets/assets_demo.xlsx" }, + "check_field_value": { + "flow_type": "template", + "flow_name": "check_field_value", + "_xlsxPath": "library_sheets/library_field_values.xlsx" + }, "comp_odk_form": { "flow_type": "template", "flow_name": "comp_odk_form", @@ -2800,6 +2805,11 @@ "flow_name": "debug_sync_id", "_xlsxPath": "debug_sheets/debug_sync.xlsx" }, + "debug_task_group_completion": { + "flow_type": "template", + "flow_name": "debug_task_group_completion", + "_xlsxPath": "debug_sheets/debug_task_group_completion.xlsx" + }, "doc_field": { "flow_type": "template", "flow_name": "doc_field", diff --git a/app_data/sheets/data_list/debug/debug_data_list.json b/app_data/sheets/data_list/debug/debug_data_list.json index 715a858..beabe3e 100644 --- a/app_data/sheets/data_list/debug/debug_data_list.json +++ b/app_data/sheets/data_list/debug/debug_data_list.json @@ -9,7 +9,6 @@ "id": "item_1", "text": "Item 1 text", "image_asset": "images/example/jasper_1.jpg", - "breaking": "", "to_translate": "Hello", "_translations": { "to_translate": {} diff --git a/app_data/sheets/data_list/generated/debug_filtered.json b/app_data/sheets/data_list/generated/debug_filtered.json index 442ee41..8198716 100644 --- a/app_data/sheets/data_list/generated/debug_filtered.json +++ b/app_data/sheets/data_list/generated/debug_filtered.json @@ -7,7 +7,6 @@ "id": "item_1", "text": "Item 1 text", "image_asset": "images/example/jasper_1.jpg", - "breaking": "", "to_translate": "Hello", "_translations": { "to_translate": {} diff --git a/app_data/sheets/template/check_field_value.json b/app_data/sheets/template/check_field_value.json new file mode 100644 index 0000000..beb26b5 --- /dev/null +++ b/app_data/sheets/template/check_field_value.json @@ -0,0 +1,170 @@ +{ + "flow_type": "template", + "flow_name": "check_field_value", + "status": "released", + "rows": [ + { + "type": "title", + "name": "title", + "value": "Check the value of a field", + "_translations": { + "value": {} + }, + "_nested_name": "title" + }, + { + "type": "text", + "name": "text", + "value": "Field name", + "_translations": { + "value": {} + }, + "_nested_name": "text" + }, + { + "type": "text_box", + "name": "field_name", + "_nested_name": "field_name" + }, + { + "type": "text", + "name": "text", + "value": "Value of the field @local.field_name: @fields.@local.field_name", + "_translations": { + "value": {} + }, + "_nested_name": "text", + "_dynamicFields": { + "value": [ + { + "fullExpression": "Value of the field @local.field_name: @fields.@local.field_name", + "matchedExpression": "@local.field_name", + "type": "local", + "fieldName": "field_name" + }, + { + "fullExpression": "Value of the field @local.field_name: @fields.@local.field_name", + "matchedExpression": "@local.field_name", + "type": "local", + "fieldName": "field_name" + } + ] + }, + "_dynamicDependencies": { + "@local.field_name": [ + "value", + "value" + ] + } + }, + { + "type": "title", + "name": "title", + "value": "Change the value of a field", + "_translations": { + "value": {} + }, + "_nested_name": "title" + }, + { + "type": "text", + "name": "text", + "value": "New field value", + "_translations": { + "value": {} + }, + "_nested_name": "text" + }, + { + "type": "text_box", + "name": "field_value", + "_nested_name": "field_value" + }, + { + "type": "button", + "name": "button", + "value": "Update", + "_translations": { + "value": {} + }, + "action_list": [ + { + "trigger": "click", + "action_id": "set_field", + "args": [ + "@local.field_name", + "@local.field_value" + ], + "_raw": "click | set_field: @local.field_name: @local.field_value", + "_cleaned": "click | set_field: @local.field_name: @local.field_value" + } + ], + "_nested_name": "button", + "_dynamicFields": { + "action_list": { + "0": { + "args": { + "0": [ + { + "fullExpression": "@local.field_name", + "matchedExpression": "@local.field_name", + "type": "local", + "fieldName": "field_name" + } + ], + "1": [ + { + "fullExpression": "@local.field_value", + "matchedExpression": "@local.field_value", + "type": "local", + "fieldName": "field_value" + } + ] + }, + "_raw": [ + { + "fullExpression": "click | set_field: @local.field_name: @local.field_value", + "matchedExpression": "@local.field_name", + "type": "local", + "fieldName": "field_name" + }, + { + "fullExpression": "click | set_field: @local.field_name: @local.field_value", + "matchedExpression": "@local.field_value", + "type": "local", + "fieldName": "field_value" + } + ], + "_cleaned": [ + { + "fullExpression": "click | set_field: @local.field_name: @local.field_value", + "matchedExpression": "@local.field_name", + "type": "local", + "fieldName": "field_name" + }, + { + "fullExpression": "click | set_field: @local.field_name: @local.field_value", + "matchedExpression": "@local.field_value", + "type": "local", + "fieldName": "field_value" + } + ] + } + } + }, + "_dynamicDependencies": { + "@local.field_name": [ + "action_list.0.args.0", + "action_list.0._raw", + "action_list.0._cleaned" + ], + "@local.field_value": [ + "action_list.0.args.1", + "action_list.0._raw", + "action_list.0._cleaned" + ] + } + } + ], + "_xlsxPath": "library_sheets/library_field_values.xlsx" +} \ No newline at end of file diff --git a/app_data/sheets/template/debug/debug_data_items_translate.json b/app_data/sheets/template/debug/debug_data_items_translate.json index 732caa4..2fa1708 100644 --- a/app_data/sheets/template/debug/debug_data_items_translate.json +++ b/app_data/sheets/template/debug/debug_data_items_translate.json @@ -112,6 +112,51 @@ "value" ] } + }, + { + "type": "button", + "name": "button_@item.id", + "value": "Add \"updated\" property", + "_translations": { + "value": {} + }, + "action_list": [ + { + "trigger": "click", + "action_id": "set_item", + "args": [], + "_raw": "click | set_item | updated: true", + "_cleaned": "click | set_item | updated: true", + "params": { + "updated": true + } + } + ], + "_nested_name": "data_items.button_@item.id", + "_dynamicFields": { + "name": [ + { + "fullExpression": "button_@item.id", + "matchedExpression": "@item.id", + "type": "item", + "fieldName": "id" + } + ], + "_nested_name": [ + { + "fullExpression": "data_items.button_@item.id", + "matchedExpression": "@item.id", + "type": "item", + "fieldName": "id" + } + ] + }, + "_dynamicDependencies": { + "@item.id": [ + "name", + "_nested_name" + ] + } } ], "_nested_name": "data_items", diff --git a/app_data/sheets/template/debug_task_group_completion.json b/app_data/sheets/template/debug_task_group_completion.json new file mode 100644 index 0000000..9543696 --- /dev/null +++ b/app_data/sheets/template/debug_task_group_completion.json @@ -0,0 +1,107 @@ +{ + "flow_type": "template", + "flow_name": "debug_task_group_completion", + "status": "released", + "rows": [ + { + "type": "text", + "name": "text", + "value": "Debug task group completion feature", + "_translations": { + "value": {} + }, + "_nested_name": "text" + }, + { + "type": "button", + "name": "button", + "value": "Evaluate task group completion 1", + "_translations": { + "value": {} + }, + "action_list": [ + { + "trigger": "click", + "action_id": "task", + "args": [ + "evaluate_group_completion", + "data_list_c, data_list_b, data_list_a" + ], + "_raw": "click | task: evaluate_group_completion: data_list_c, data_list_b, data_list_a", + "_cleaned": "click | task: evaluate_group_completion: data_list_c, data_list_b, data_list_a" + } + ], + "_nested_name": "button" + }, + { + "type": "button", + "name": "button", + "value": "Evaluate task group completion 2", + "_translations": { + "value": {} + }, + "action_list": [ + { + "trigger": "click", + "action_id": "task", + "args": [ + "evaluate_group_completion" + ], + "_raw": "click | task: evaluate_group_completion | data_lists: data_list_c, data_list_b, data_list_a", + "_cleaned": "click | task: evaluate_group_completion | data_lists: data_list_c, data_list_b, data_list_a", + "params": { + "data_lists": "data_list_c" + } + } + ], + "_nested_name": "button" + }, + { + "type": "button", + "name": "button", + "value": "Evaluate task group completion 3", + "_translations": { + "value": {} + }, + "action_list": [ + { + "trigger": "click", + "action_id": "task", + "args": [ + "evaluate_group_completion" + ], + "_raw": "click | task: evaluate_group_completion | data_lists: data_list_c data_list_b data_list_a", + "_cleaned": "click | task: evaluate_group_completion | data_lists: data_list_c data_list_b data_list_a", + "params": { + "data_lists": "data_list_c data_list_b data_list_a" + } + } + ], + "_nested_name": "button" + }, + { + "type": "button", + "name": "button", + "value": "Evaluate task group completion 4", + "_translations": { + "value": {} + }, + "action_list": [ + { + "trigger": "click", + "action_id": "task", + "args": [ + "evaluate_group_completion" + ], + "_raw": "click | task: evaluate_group_completion | task_groups: data_list_c data_list_b.row_3 data_list_a.row_5", + "_cleaned": "click | task: evaluate_group_completion | task_groups: data_list_c data_list_b.row_3 data_list_a.row_5", + "params": { + "task_groups": "data_list_c data_list_b.row_3 data_list_a.row_5" + } + } + ], + "_nested_name": "button" + } + ], + "_xlsxPath": "debug_sheets/debug_task_group_completion.xlsx" +} \ No newline at end of file diff --git a/config.ts b/config.ts index ae9e042..65ff634 100644 --- a/config.ts +++ b/config.ts @@ -14,7 +14,7 @@ config.web.favicon_asset = "images/icons/favicon.svg"; config.git = { content_repo: "https://github.com/IDEMSInternational/app-debug-content.git", - content_tag_latest: "1.2.31", + content_tag_latest: "1.2.32", }; config.app_config.ASSET_PACKS = { From 4baacd6b02cc9907c917b6fdcb89bc2a4cd0cea7 Mon Sep 17 00:00:00 2001 From: EsmeeIDEMS Date: Thu, 6 Jun 2024 18:04:46 +0100 Subject: [PATCH 2/2] content: 1.2.33 --- app_data/sheets/contents.json | 2 +- app_data/sheets/template/check_field_value.json | 2 +- config.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app_data/sheets/contents.json b/app_data/sheets/contents.json index e7b3bdc..504cede 100644 --- a/app_data/sheets/contents.json +++ b/app_data/sheets/contents.json @@ -573,7 +573,7 @@ "check_field_value": { "flow_type": "template", "flow_name": "check_field_value", - "_xlsxPath": "library_sheets/library_field_values.xlsx" + "_xlsxPath": "library_sheets/library_field_values/library_field_values.xlsx" }, "comp_odk_form": { "flow_type": "template", diff --git a/app_data/sheets/template/check_field_value.json b/app_data/sheets/template/check_field_value.json index beb26b5..15d4d55 100644 --- a/app_data/sheets/template/check_field_value.json +++ b/app_data/sheets/template/check_field_value.json @@ -166,5 +166,5 @@ } } ], - "_xlsxPath": "library_sheets/library_field_values.xlsx" + "_xlsxPath": "library_sheets/library_field_values/library_field_values.xlsx" } \ No newline at end of file diff --git a/config.ts b/config.ts index 65ff634..158075c 100644 --- a/config.ts +++ b/config.ts @@ -14,7 +14,7 @@ config.web.favicon_asset = "images/icons/favicon.svg"; config.git = { content_repo: "https://github.com/IDEMSInternational/app-debug-content.git", - content_tag_latest: "1.2.32", + content_tag_latest: "1.2.33", }; config.app_config.ASSET_PACKS = {