From 1d289702daca65d54036f682a97530aa9eb05108 Mon Sep 17 00:00:00 2001 From: EsmeeIDEMS Date: Mon, 23 Sep 2024 16:06:35 +0100 Subject: [PATCH] content: 1.2.41 --- app_data/sheets/contents.json | 71 ------ .../data_list/generated/task_list_1_blue.json | 15 -- .../generated/task_list_1_green.json | 6 - .../data_list/generated/task_list_1_red.json | 11 - .../generated/task_list_1_yellow.json | 15 -- .../data_list/generated/task_list_2_blue.json | 11 - .../generated/task_list_2_green.json | 19 -- .../data_list/generated/task_list_2_red.json | 6 - .../generated/task_list_2_yellow.json | 6 - .../generated/filter_blue_tasks.json | 23 -- .../generated/filter_green_tasks.json | 23 -- .../data_pipe/generated/filter_red_tasks.json | 23 -- .../generated/filter_yellow_tasks.json | 23 -- .../generator/gen_filter_tasks_by_colour.json | 30 --- .../component_demo/comp_text_bubble.json | 14 ++ .../template/debug/debug_remote_assets.json | 225 +++++++++++++++--- config.ts | 2 +- reports/summary.json | 22 +- reports/summary.md | 22 +- 19 files changed, 227 insertions(+), 340 deletions(-) delete mode 100644 app_data/sheets/data_list/generated/task_list_1_blue.json delete mode 100644 app_data/sheets/data_list/generated/task_list_1_green.json delete mode 100644 app_data/sheets/data_list/generated/task_list_1_red.json delete mode 100644 app_data/sheets/data_list/generated/task_list_1_yellow.json delete mode 100644 app_data/sheets/data_list/generated/task_list_2_blue.json delete mode 100644 app_data/sheets/data_list/generated/task_list_2_green.json delete mode 100644 app_data/sheets/data_list/generated/task_list_2_red.json delete mode 100644 app_data/sheets/data_list/generated/task_list_2_yellow.json delete mode 100644 app_data/sheets/data_pipe/generated/filter_blue_tasks.json delete mode 100644 app_data/sheets/data_pipe/generated/filter_green_tasks.json delete mode 100644 app_data/sheets/data_pipe/generated/filter_red_tasks.json delete mode 100644 app_data/sheets/data_pipe/generated/filter_yellow_tasks.json delete mode 100644 app_data/sheets/generator/gen_filter_tasks_by_colour.json diff --git a/app_data/sheets/contents.json b/app_data/sheets/contents.json index df82175..d1a182a 100644 --- a/app_data/sheets/contents.json +++ b/app_data/sheets/contents.json @@ -432,56 +432,16 @@ "flow_subtype": "generated", "flow_type": "data_list" }, - "task_list_1_blue": { - "flow_name": "task_list_1_blue", - "flow_subtype": "generated", - "flow_type": "data_list" - }, - "task_list_1_green": { - "flow_name": "task_list_1_green", - "flow_subtype": "generated", - "flow_type": "data_list" - }, - "task_list_1_red": { - "flow_name": "task_list_1_red", - "flow_subtype": "generated", - "flow_type": "data_list" - }, "task_list_1_with_completed": { "flow_name": "task_list_1_with_completed", "flow_subtype": "generated", "flow_type": "data_list" }, - "task_list_1_yellow": { - "flow_name": "task_list_1_yellow", - "flow_subtype": "generated", - "flow_type": "data_list" - }, - "task_list_2_blue": { - "flow_name": "task_list_2_blue", - "flow_subtype": "generated", - "flow_type": "data_list" - }, - "task_list_2_green": { - "flow_name": "task_list_2_green", - "flow_subtype": "generated", - "flow_type": "data_list" - }, - "task_list_2_red": { - "flow_name": "task_list_2_red", - "flow_subtype": "generated", - "flow_type": "data_list" - }, "task_list_2_with_completed": { "flow_name": "task_list_2_with_completed", "flow_subtype": "generated", "flow_type": "data_list" }, - "task_list_2_yellow": { - "flow_name": "task_list_2_yellow", - "flow_subtype": "generated", - "flow_type": "data_list" - }, "goal_data": { "flow_type": "data_list", "flow_name": "goal_data", @@ -575,26 +535,6 @@ "flow_name": "example_data_pipe_sort", "_xlsxPath": "example_sheets/example_data_pipes.xlsx" }, - "filter_blue_tasks": { - "flow_name": "filter_blue_tasks", - "flow_subtype": "generated", - "flow_type": "data_pipe" - }, - "filter_green_tasks": { - "flow_name": "filter_green_tasks", - "flow_subtype": "generated", - "flow_type": "data_pipe" - }, - "filter_red_tasks": { - "flow_name": "filter_red_tasks", - "flow_subtype": "generated", - "flow_type": "data_pipe" - }, - "filter_yellow_tasks": { - "flow_name": "filter_yellow_tasks", - "flow_subtype": "generated", - "flow_type": "data_pipe" - }, "task_list_1_add_completed": { "flow_name": "task_list_1_add_completed", "flow_subtype": "generated", @@ -642,17 +582,6 @@ }, "comments": "The only required parameter is input_data_list\nAll others will override default values", "_xlsxPath": "example_sheets/example_generator.xlsx" - }, - "gen_filter_tasks_by_colour": { - "flow_type": "generator", - "flow_name": "gen_filter_tasks_by_colour", - "parameter_list": { - "input_data_list": "colours", - "output_flow_name": "filter_{@gen.id}_tasks", - "output_flow_type": "data_pipe", - "output_flow_subtype": "generated" - }, - "_xlsxPath": "debug_sheets/debug_gen_data_pipe.xlsx" } }, "global": { diff --git a/app_data/sheets/data_list/generated/task_list_1_blue.json b/app_data/sheets/data_list/generated/task_list_1_blue.json deleted file mode 100644 index a7dafb0..0000000 --- a/app_data/sheets/data_list/generated/task_list_1_blue.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "flow_name": "task_list_1_blue", - "flow_subtype": "generated", - "flow_type": "data_list", - "rows": [ - { - "id": "task_1", - "colour": "blue" - }, - { - "id": "task_5", - "colour": "blue" - } - ] -} \ No newline at end of file diff --git a/app_data/sheets/data_list/generated/task_list_1_green.json b/app_data/sheets/data_list/generated/task_list_1_green.json deleted file mode 100644 index d320c86..0000000 --- a/app_data/sheets/data_list/generated/task_list_1_green.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "flow_name": "task_list_1_green", - "flow_subtype": "generated", - "flow_type": "data_list", - "rows": [] -} \ No newline at end of file diff --git a/app_data/sheets/data_list/generated/task_list_1_red.json b/app_data/sheets/data_list/generated/task_list_1_red.json deleted file mode 100644 index 431c32e..0000000 --- a/app_data/sheets/data_list/generated/task_list_1_red.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "flow_name": "task_list_1_red", - "flow_subtype": "generated", - "flow_type": "data_list", - "rows": [ - { - "id": "task_2", - "colour": "red" - } - ] -} \ No newline at end of file diff --git a/app_data/sheets/data_list/generated/task_list_1_yellow.json b/app_data/sheets/data_list/generated/task_list_1_yellow.json deleted file mode 100644 index b85b1ea..0000000 --- a/app_data/sheets/data_list/generated/task_list_1_yellow.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "flow_name": "task_list_1_yellow", - "flow_subtype": "generated", - "flow_type": "data_list", - "rows": [ - { - "id": "task_3", - "colour": "yellow" - }, - { - "id": "task_4", - "colour": "yellow" - } - ] -} \ No newline at end of file diff --git a/app_data/sheets/data_list/generated/task_list_2_blue.json b/app_data/sheets/data_list/generated/task_list_2_blue.json deleted file mode 100644 index 017718c..0000000 --- a/app_data/sheets/data_list/generated/task_list_2_blue.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "flow_name": "task_list_2_blue", - "flow_subtype": "generated", - "flow_type": "data_list", - "rows": [ - { - "id": "task_1", - "colour": "blue" - } - ] -} \ No newline at end of file diff --git a/app_data/sheets/data_list/generated/task_list_2_green.json b/app_data/sheets/data_list/generated/task_list_2_green.json deleted file mode 100644 index 333fd2f..0000000 --- a/app_data/sheets/data_list/generated/task_list_2_green.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "flow_name": "task_list_2_green", - "flow_subtype": "generated", - "flow_type": "data_list", - "rows": [ - { - "id": "task_2", - "colour": "green" - }, - { - "id": "task_3", - "colour": "green" - }, - { - "id": "task_4", - "colour": "green" - } - ] -} \ No newline at end of file diff --git a/app_data/sheets/data_list/generated/task_list_2_red.json b/app_data/sheets/data_list/generated/task_list_2_red.json deleted file mode 100644 index 03a48d1..0000000 --- a/app_data/sheets/data_list/generated/task_list_2_red.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "flow_name": "task_list_2_red", - "flow_subtype": "generated", - "flow_type": "data_list", - "rows": [] -} \ No newline at end of file diff --git a/app_data/sheets/data_list/generated/task_list_2_yellow.json b/app_data/sheets/data_list/generated/task_list_2_yellow.json deleted file mode 100644 index 5e28767..0000000 --- a/app_data/sheets/data_list/generated/task_list_2_yellow.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "flow_name": "task_list_2_yellow", - "flow_subtype": "generated", - "flow_type": "data_list", - "rows": [] -} \ No newline at end of file diff --git a/app_data/sheets/data_pipe/generated/filter_blue_tasks.json b/app_data/sheets/data_pipe/generated/filter_blue_tasks.json deleted file mode 100644 index 4a5ab18..0000000 --- a/app_data/sheets/data_pipe/generated/filter_blue_tasks.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "flow_name": "filter_blue_tasks", - "flow_subtype": "generated", - "flow_type": "data_pipe", - "rows": [ - { - "operation": "filter", - "args_list": [ - "colour == \"blue\"" - ], - "input_source": "task_list_1", - "output_target": "task_list_1_blue" - }, - { - "operation": "filter", - "args_list": [ - "colour == \"blue\"" - ], - "input_source": "task_list_2", - "output_target": "task_list_2_blue" - } - ] -} \ No newline at end of file diff --git a/app_data/sheets/data_pipe/generated/filter_green_tasks.json b/app_data/sheets/data_pipe/generated/filter_green_tasks.json deleted file mode 100644 index 4ef8615..0000000 --- a/app_data/sheets/data_pipe/generated/filter_green_tasks.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "flow_name": "filter_green_tasks", - "flow_subtype": "generated", - "flow_type": "data_pipe", - "rows": [ - { - "operation": "filter", - "args_list": [ - "colour == \"green\"" - ], - "input_source": "task_list_1", - "output_target": "task_list_1_green" - }, - { - "operation": "filter", - "args_list": [ - "colour == \"green\"" - ], - "input_source": "task_list_2", - "output_target": "task_list_2_green" - } - ] -} \ No newline at end of file diff --git a/app_data/sheets/data_pipe/generated/filter_red_tasks.json b/app_data/sheets/data_pipe/generated/filter_red_tasks.json deleted file mode 100644 index 27840c5..0000000 --- a/app_data/sheets/data_pipe/generated/filter_red_tasks.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "flow_name": "filter_red_tasks", - "flow_subtype": "generated", - "flow_type": "data_pipe", - "rows": [ - { - "operation": "filter", - "args_list": [ - "colour == \"red\"" - ], - "input_source": "task_list_1", - "output_target": "task_list_1_red" - }, - { - "operation": "filter", - "args_list": [ - "colour == \"red\"" - ], - "input_source": "task_list_2", - "output_target": "task_list_2_red" - } - ] -} \ No newline at end of file diff --git a/app_data/sheets/data_pipe/generated/filter_yellow_tasks.json b/app_data/sheets/data_pipe/generated/filter_yellow_tasks.json deleted file mode 100644 index cfcf892..0000000 --- a/app_data/sheets/data_pipe/generated/filter_yellow_tasks.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "flow_name": "filter_yellow_tasks", - "flow_subtype": "generated", - "flow_type": "data_pipe", - "rows": [ - { - "operation": "filter", - "args_list": [ - "colour == \"yellow\"" - ], - "input_source": "task_list_1", - "output_target": "task_list_1_yellow" - }, - { - "operation": "filter", - "args_list": [ - "colour == \"yellow\"" - ], - "input_source": "task_list_2", - "output_target": "task_list_2_yellow" - } - ] -} \ No newline at end of file diff --git a/app_data/sheets/generator/gen_filter_tasks_by_colour.json b/app_data/sheets/generator/gen_filter_tasks_by_colour.json deleted file mode 100644 index 5c82a79..0000000 --- a/app_data/sheets/generator/gen_filter_tasks_by_colour.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "flow_type": "generator", - "flow_name": "gen_filter_tasks_by_colour", - "status": "released", - "parameter_list": { - "input_data_list": "colours", - "output_flow_name": "filter_{@gen.id}_tasks", - "output_flow_type": "data_pipe", - "output_flow_subtype": "generated" - }, - "rows": [ - { - "operation": "filter", - "args_list": [ - "colour == \"@gen.id\"" - ], - "input_source": "task_list_1", - "output_target": "task_list_1_{@gen.id}" - }, - { - "operation": "filter", - "args_list": [ - "colour == \"@gen.id\"" - ], - "input_source": "task_list_2", - "output_target": "task_list_2_{@gen.id}" - } - ], - "_xlsxPath": "debug_sheets/debug_gen_data_pipe.xlsx" -} \ No newline at end of file diff --git a/app_data/sheets/template/component_demo/comp_text_bubble.json b/app_data/sheets/template/component_demo/comp_text_bubble.json index 8c2a155..88c4355 100644 --- a/app_data/sheets/template/component_demo/comp_text_bubble.json +++ b/app_data/sheets/template/component_demo/comp_text_bubble.json @@ -109,6 +109,20 @@ }, "name": "text_bubble_8", "_nested_name": "text_bubble_8" + }, + { + "type": "text_bubble", + "value": "Text bubble containing some Markdown **bold** and *italics* text", + "_translations": { + "value": {} + }, + "parameter_list": { + "speaker_image_asset": "images/avatar_1.png", + "speaker_position": "right", + "variant": "primary" + }, + "name": "text_bubble_9", + "_nested_name": "text_bubble_9" } ], "_xlsxPath": "component_sheets/component_text_bubble.xlsx" diff --git a/app_data/sheets/template/debug/debug_remote_assets.json b/app_data/sheets/template/debug/debug_remote_assets.json index 948b2d6..9841457 100644 --- a/app_data/sheets/template/debug/debug_remote_assets.json +++ b/app_data/sheets/template/debug/debug_remote_assets.json @@ -44,58 +44,213 @@ "_nested_name": "button_1" }, { - "type": "title", - "value": "Remote asset with core equivalent/fallback", - "_translations": { - "value": {} - }, - "name": "title_4", - "_nested_name": "title_4" + "type": "display_group", + "rows": [ + { + "type": "text", + "value": "Remote asset replaces core equivalent:", + "_translations": { + "value": {} + }, + "name": "text_1", + "_nested_name": "display_group_4.text_1" + }, + { + "type": "image", + "value": "debug_asset_pack_1/test_image.png", + "_translations": { + "value": {} + }, + "name": "image_2", + "_nested_name": "display_group_4.image_2" + } + ], + "name": "display_group_4", + "_nested_name": "display_group_4" }, { - "type": "image", - "value": "debug_asset_pack_1/test_image.png", - "_translations": { - "value": {} - }, - "name": "image_5", - "_nested_name": "image_5" + "type": "display_group", + "rows": [ + { + "type": "text", + "value": "Remote asset has no core equivalent:", + "_translations": { + "value": {} + }, + "name": "text_1", + "_nested_name": "display_group_6.text_1" + }, + { + "type": "image", + "value": "debug_asset_pack_1/test_remote_only.png", + "_translations": { + "value": {} + }, + "name": "image_2", + "_nested_name": "display_group_6.image_2" + } + ], + "name": "display_group_6", + "_nested_name": "display_group_6" }, { - "type": "title", - "value": "Remote asset without core equivalent/fallback", - "_translations": { - "value": {} - }, - "name": "title_6", - "_nested_name": "title_6" + "type": "display_group", + "rows": [ + { + "type": "text", + "value": "Remote asset adds an override:", + "_translations": { + "value": {} + }, + "name": "text_1", + "_nested_name": "display_group_8.text_1" + }, + { + "type": "image", + "value": "debug_asset_pack_1/country_flag.png", + "_translations": { + "value": {} + }, + "name": "image_2", + "_nested_name": "display_group_8.image_2" + } + ], + "name": "display_group_8", + "_nested_name": "display_group_8" }, { - "type": "image", - "value": "debug_asset_pack_1/test_remote_only.png", - "_translations": { - "value": {} - }, - "name": "image_7", - "_nested_name": "image_7" + "type": "display_group", + "rows": [ + { + "type": "text", + "value": "Remote asset replaces core and override:", + "_translations": { + "value": {} + }, + "name": "text_1", + "_nested_name": "display_group_10.text_1" + }, + { + "type": "image", + "value": "debug_asset_pack_1/country_flag_bw.png", + "_translations": { + "value": {} + }, + "name": "image_2", + "_nested_name": "display_group_10.image_2" + } + ], + "name": "display_group_10", + "_nested_name": "display_group_10" }, { "type": "title", - "value": "Remote asset with override", + "value": "Select language:", "_translations": { "value": {} }, - "name": "title_8", - "_nested_name": "title_8" + "name": "title_12", + "_nested_name": "title_12" }, { - "type": "image", - "value": "debug_asset_pack_1/spanish_flag.png", + "name": "language_list", + "value": [ + { + "name": "gb_en", + "text": "English" + }, + { + "name": "es_sp", + "text": "Español" + } + ], + "type": "set_variable", + "_nested_name": "language_list" + }, + { + "type": "radio_group", + "name": "language_select", + "value": "@fields._app_language", "_translations": { "value": {} }, - "name": "image_9", - "_nested_name": "image_9" + "action_list": [ + { + "trigger": "changed", + "action_id": "emit", + "args": [ + "set_language", + "this.value" + ], + "_raw": "changed | emit: set_language: @local.language_select", + "_cleaned": "changed | emit: set_language: @local.language_select" + }, + { + "trigger": "changed", + "action_id": "emit", + "args": [ + "force_reload" + ], + "_raw": "changed | emit: force_reload", + "_cleaned": "changed | emit: force_reload" + } + ], + "parameter_list": { + "answer_list": "@local.language_list" + }, + "_nested_name": "language_select", + "_dynamicFields": { + "value": [ + { + "fullExpression": "@fields._app_language", + "matchedExpression": "@fields._app_language", + "type": "fields", + "fieldName": "_app_language" + } + ], + "action_list": { + "0": { + "_raw": [ + { + "fullExpression": "changed | emit: set_language: @local.language_select", + "matchedExpression": "@local.language_select", + "type": "local", + "fieldName": "language_select" + } + ], + "_cleaned": [ + { + "fullExpression": "changed | emit: set_language: @local.language_select", + "matchedExpression": "@local.language_select", + "type": "local", + "fieldName": "language_select" + } + ] + } + }, + "parameter_list": { + "answer_list": [ + { + "fullExpression": "@local.language_list", + "matchedExpression": "@local.language_list", + "type": "local", + "fieldName": "language_list" + } + ] + } + }, + "_dynamicDependencies": { + "@fields._app_language": [ + "value" + ], + "@local.language_select": [ + "action_list.0._raw", + "action_list.0._cleaned" + ], + "@local.language_list": [ + "parameter_list.answer_list" + ] + } }, { "type": "button", diff --git a/config.ts b/config.ts index 9af3161..b69ec58 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.40", + content_tag_latest: "1.2.41", }; config.app_config.ASSET_PACKS = { diff --git a/reports/summary.json b/reports/summary.json index a95ebf5..a5d73bc 100644 --- a/reports/summary.json +++ b/reports/summary.json @@ -26,7 +26,7 @@ }, { "type": "emit: force_reload", - "count": 22 + "count": 23 }, { "type": "emit: force_reprocess", @@ -42,7 +42,7 @@ }, { "type": "emit: set_language", - "count": 3 + "count": 4 }, { "type": "emit: set_skin", @@ -196,7 +196,7 @@ }, { "type": "display_group", - "count": 107 + "count": 111 }, { "type": "drawer", @@ -212,7 +212,7 @@ }, { "type": "image", - "count": 25 + "count": 22 }, { "type": "items", @@ -272,7 +272,7 @@ }, { "type": "radio_group", - "count": 73 + "count": 74 }, { "type": "radio_group_grid", @@ -296,7 +296,7 @@ }, { "type": "set_variable", - "count": 557 + "count": 558 }, { "type": "simple_checkbox", @@ -340,7 +340,7 @@ }, { "type": "text_bubble", - "count": 6 + "count": 7 }, { "type": "tile_component", @@ -352,7 +352,7 @@ }, { "type": "title", - "count": 357 + "count": 355 }, { "type": "toggle_bar", @@ -425,7 +425,7 @@ { "type": "data_list", "subtype": "generated", - "total": 21 + "total": 13 }, { "type": "data_pipe", @@ -440,12 +440,12 @@ { "type": "data_pipe", "subtype": "generated", - "total": 6 + "total": 2 }, { "type": "generator", "subtype": null, - "total": 2 + "total": 1 }, { "type": "generator", diff --git a/reports/summary.md b/reports/summary.md index b6aa9e5..0d35503 100644 --- a/reports/summary.md +++ b/reports/summary.md @@ -9,11 +9,11 @@ | download_assets | 1 | | emit: @local.child_local_variable | 1 | | emit: completed | 36 | -| emit: force_reload | 22 | +| emit: force_reload | 23 | | emit: force_reprocess | 20 | | emit: force_restart | 2 | | emit: server_sync | 6 | -| emit: set_language | 3 | +| emit: set_language | 4 | | emit: set_skin | 1 | | emit: set_theme | 2 | | emit: translator_mode_toggle | 1 | @@ -55,11 +55,11 @@ | declare_field_default | 1 | | declare_global_constant | 1 | | display_grid | 3 | -| display_group | 107 | +| display_group | 111 | | drawer | 1 | | form | 8 | | html | 4 | -| image | 25 | +| image | 22 | | items | 45 | | latex | 1 | | lottie_animation | 11 | @@ -74,13 +74,13 @@ | progress_path | 2 | | qr_code | 1 | | radio_button_grid | 9 | -| radio_group | 73 | +| radio_group | 74 | | radio_group_grid | 5 | | round_button | 15 | | select_text | 5 | | set_default | 1 | | set_field | 26 | -| set_variable | 557 | +| set_variable | 558 | | simple_checkbox | 26 | | slider | 32 | | square_button | 8 | @@ -91,10 +91,10 @@ | text | 651 | | text_area | 5 | | text_box | 30 | -| text_bubble | 6 | +| text_bubble | 7 | | tile_component | 22 | | timer | 21 | -| title | 357 | +| title | 355 | | toggle_bar | 35 | | update_action_list | 2 | | video | 3 | @@ -113,11 +113,11 @@ | data_list | example_list_override | 2 | | data_list | example_pipe | 5 | | data_list | example_sheet_defaults | 1 | -| data_list | generated | 21 | +| data_list | generated | 13 | | data_pipe | debug | 1 | | data_pipe | example_pipe | 6 | -| data_pipe | generated | 6 | -| generator | | 2 | +| data_pipe | generated | 2 | +| generator | | 1 | | generator | example_generator | 2 | | global | | 2 | | global | debug | 9 |