From 4083388f2ebe12860e86a047d5324be78f0b0554 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Tue, 3 Dec 2024 13:00:39 -0800 Subject: [PATCH] content: 1.1.18 --- app_data/sheets/data_list/esm_topic_list.json | 7 +- app_data/sheets/template/efm_ga_start.json | 2 +- app_data/sheets/template/efm_pow_start.json | 2 +- app_data/sheets/template/esm_resources.json | 10 +- .../sheets/template/esm_resources_finder.json | 188 +--- .../template/esm_topic_body_template.json | 897 ++++++++++++++++++ app_data/sheets/template/home_screen.json | 2 +- app_data/sheets/tour/efm_gas_tour.json | 4 +- app_data/sheets/tour/efm_pows_tour.json | 4 +- config.ts | 2 +- 10 files changed, 918 insertions(+), 200 deletions(-) diff --git a/app_data/sheets/data_list/esm_topic_list.json b/app_data/sheets/data_list/esm_topic_list.json index 674813a..8eee748 100644 --- a/app_data/sheets/data_list/esm_topic_list.json +++ b/app_data/sheets/data_list/esm_topic_list.json @@ -182,6 +182,7 @@ "id": "MT_RWC_DRP", "theme_id": "MT_RWC", "strand_id": "MT", + "next_topic_1": "MT_RWC_DRV", "block1_type": "all_text", "name": "Dialogic Reading – Preverbal", "_translations": { @@ -202,6 +203,7 @@ "id": "MT_RWC_DRV", "theme_id": "MT_RWC", "strand_id": "MT", + "prev_topic_1": "MT_RWC_DRP", "block1_type": "all_text", "name": "Dialogic Reading – Verbal", "_translations": { @@ -355,6 +357,7 @@ "id": "Geom_Shape_SN2D3D", "theme_id": "Geom_Shape", "strand_id": "Geom", + "prev_topic_1": "Geom_Shape_DS", "block1_type": "all_text", "name": "Shape Names – 2D & 3D", "_translations": { @@ -526,10 +529,10 @@ "eng": "Ordinal Numbers" }, "block1_text": { - "eng": "**Everyday use:** Learning the words, first, second, third, fourth, fifth and last is similar to learning the number names – it is just a matter of exposure and practice.\n\nUse these words when discussing daily routines by asking what should be done first, second, and third. Also, ask questions such as \"What are the last things to do when you leave a room?\" (turn off the lights and close the door)" + "eng": "**Everyday use:** Learning the words first, second, third, fourth, fifth, and last is similar to learning the number names – it is just a matter of exposure and practice.\n\nUse these words when discussing daily routines by asking what should be done first, second, and third. Also, ask questions such as \"What are the last things to do when you leave a room?\" (turn off the lights and close the door)" } }, - "block1_text": "**Everyday use:** Learning the words, first, second, third, fourth, fifth and last is similar to learning the number names – it is just a matter of exposure and practice.\n\nUse these words when discussing daily routines by asking what should be done first, second, and third. Also, ask questions such as \"What are the last things to do when you leave a room?\" (turn off the lights and close the door)" + "block1_text": "**Everyday use:** Learning the words first, second, third, fourth, fifth, and last is similar to learning the number names – it is just a matter of exposure and practice.\n\nUse these words when discussing daily routines by asking what should be done first, second, and third. Also, ask questions such as \"What are the last things to do when you leave a room?\" (turn off the lights and close the door)" }, { "id": "NPV_QC10_WN10", diff --git a/app_data/sheets/template/efm_ga_start.json b/app_data/sheets/template/efm_ga_start.json index 26bc56b..a0d8056 100644 --- a/app_data/sheets/template/efm_ga_start.json +++ b/app_data/sheets/template/efm_ga_start.json @@ -10,7 +10,7 @@ { "type": "title", "name": "spacer", - "value": "Games and Activities", + "value": "Games", "_translations": { "value": {} }, diff --git a/app_data/sheets/template/efm_pow_start.json b/app_data/sheets/template/efm_pow_start.json index 6f9ddfd..8d13e67 100644 --- a/app_data/sheets/template/efm_pow_start.json +++ b/app_data/sheets/template/efm_pow_start.json @@ -10,7 +10,7 @@ { "type": "title", "name": "spacer", - "value": "Puzzles of the Week", + "value": "Puzzles", "_translations": { "value": {} }, diff --git a/app_data/sheets/template/esm_resources.json b/app_data/sheets/template/esm_resources.json index fe50001..079dba0 100644 --- a/app_data/sheets/template/esm_resources.json +++ b/app_data/sheets/template/esm_resources.json @@ -29,7 +29,7 @@ { "type": "button", "name": "button_resources_finder", - "value": "Resources Finder", + "value": "Resource Finder", "_translations": { "value": {} }, @@ -176,7 +176,7 @@ { "type": "button", "name": "button_pows", - "value": "Puzzles of the Week", + "value": "Puzzles", "_translations": { "value": {} }, @@ -296,7 +296,7 @@ { "type": "button", "name": "button_pows", - "value": "Puzzles of the Week", + "value": "Puzzles", "_translations": { "value": {} }, @@ -529,7 +529,7 @@ { "type": "button", "name": "button_gas", - "value": "Games and Activities", + "value": "Games", "_translations": { "value": {} }, @@ -649,7 +649,7 @@ { "type": "button", "name": "button_gas", - "value": "Games and Activities", + "value": "Games", "_translations": { "value": {} }, diff --git a/app_data/sheets/template/esm_resources_finder.json b/app_data/sheets/template/esm_resources_finder.json index 3722a64..9bf7cd6 100644 --- a/app_data/sheets/template/esm_resources_finder.json +++ b/app_data/sheets/template/esm_resources_finder.json @@ -10,7 +10,7 @@ { "type": "Title", "name": "ta_da", - "value": "Resources Finder", + "value": "Resource Finder", "_translations": { "value": {} }, @@ -87,15 +87,6 @@ "type": "set_variable", "_nested_name": "accordion1.sect1.dg_types1.description_4" }, - { - "name": "description_5", - "value": "Dot Cards", - "_translations": { - "value": {} - }, - "type": "set_variable", - "_nested_name": "accordion1.sect1.dg_types1.description_5" - }, { "type": "display_group", "name": "first2", @@ -357,83 +348,6 @@ } ], "_nested_name": "accordion1.sect1.dg_types1.second2" - }, - { - "type": "display_group", - "name": "last_one", - "rows": [ - { - "type": "toggle_bar", - "name": "checkbox_dot_cards", - "value": "@fields.see_resources_dot_cards", - "_translations": { - "value": {} - }, - "condition": "changed | set_field:see_resources_dot_cards: @local.checkbox_dot_cards;", - "parameter_list": { - "true_text": "@local.description_5", - "false_text": "@local.description_5" - }, - "_nested_name": "accordion1.sect1.dg_types1.last_one.checkbox_dot_cards", - "_dynamicFields": { - "value": [ - { - "fullExpression": "@fields.see_resources_dot_cards", - "matchedExpression": "@fields.see_resources_dot_cards", - "type": "fields", - "fieldName": "see_resources_dot_cards" - } - ], - "condition": [ - { - "fullExpression": "changed | set_field:see_resources_dot_cards: @local.checkbox_dot_cards;", - "matchedExpression": "@local.checkbox_dot_cards", - "type": "local", - "fieldName": "checkbox_dot_cards" - } - ], - "parameter_list": { - "true_text": [ - { - "fullExpression": "@local.description_5", - "matchedExpression": "@local.description_5", - "type": "local", - "fieldName": "description_5" - } - ], - "false_text": [ - { - "fullExpression": "@local.description_5", - "matchedExpression": "@local.description_5", - "type": "local", - "fieldName": "description_5" - } - ] - } - }, - "_dynamicDependencies": { - "@fields.see_resources_dot_cards": [ - "value" - ], - "@local.checkbox_dot_cards": [ - "condition" - ], - "@local.description_5": [ - "parameter_list.true_text", - "parameter_list.false_text" - ] - } - }, - { - "type": "text", - "name": "blank", - "style_list": [ - "flex: 1" - ], - "_nested_name": "accordion1.sect1.dg_types1.last_one.blank" - } - ], - "_nested_name": "accordion1.sect1.dg_types1.last_one" } ], "_nested_name": "accordion1.sect1.dg_types1" @@ -453,12 +367,12 @@ "rows": [ { "type": "text", - "name": "dbg_topics", + "name": "dbggg_topics", "value": "Topics: @local.checkbox_topics", "_translations": { "value": {} }, - "_nested_name": "results1.dbg_topics", + "_nested_name": "results1.dbggg_topics", "_dynamicFields": { "value": [ { @@ -474,102 +388,6 @@ "value" ] } - }, - { - "type": "text", - "name": "dbg_games", - "value": "Games: @local.checkbox_games", - "_translations": { - "value": {} - }, - "_nested_name": "results1.dbg_games", - "_dynamicFields": { - "value": [ - { - "fullExpression": "Games: @local.checkbox_games", - "matchedExpression": "@local.checkbox_games", - "type": "local", - "fieldName": "checkbox_games" - } - ] - }, - "_dynamicDependencies": { - "@local.checkbox_games": [ - "value" - ] - } - }, - { - "type": "text", - "name": "dbg_puzzles", - "value": "Puzzles: @local.checkbox_puzzles", - "_translations": { - "value": {} - }, - "_nested_name": "results1.dbg_puzzles", - "_dynamicFields": { - "value": [ - { - "fullExpression": "Puzzles: @local.checkbox_puzzles", - "matchedExpression": "@local.checkbox_puzzles", - "type": "local", - "fieldName": "checkbox_puzzles" - } - ] - }, - "_dynamicDependencies": { - "@local.checkbox_puzzles": [ - "value" - ] - } - }, - { - "type": "text", - "name": "dbg_stories", - "value": "Stories: @local.checkbox_stories", - "_translations": { - "value": {} - }, - "_nested_name": "results1.dbg_stories", - "_dynamicFields": { - "value": [ - { - "fullExpression": "Stories: @local.checkbox_stories", - "matchedExpression": "@local.checkbox_stories", - "type": "local", - "fieldName": "checkbox_stories" - } - ] - }, - "_dynamicDependencies": { - "@local.checkbox_stories": [ - "value" - ] - } - }, - { - "type": "text", - "name": "dbg_dot_cards", - "value": "Dot Cards: @local.checkbox_dot_cards", - "_translations": { - "value": {} - }, - "_nested_name": "results1.dbg_dot_cards", - "_dynamicFields": { - "value": [ - { - "fullExpression": "Dot Cards: @local.checkbox_dot_cards", - "matchedExpression": "@local.checkbox_dot_cards", - "type": "local", - "fieldName": "checkbox_dot_cards" - } - ] - }, - "_dynamicDependencies": { - "@local.checkbox_dot_cards": [ - "value" - ] - } } ], "_nested_name": "results1" diff --git a/app_data/sheets/template/esm_topic_body_template.json b/app_data/sheets/template/esm_topic_body_template.json index 3177b28..fd09e93 100644 --- a/app_data/sheets/template/esm_topic_body_template.json +++ b/app_data/sheets/template/esm_topic_body_template.json @@ -1055,6 +1055,903 @@ "value" ] } + }, + { + "type": "display_group", + "rows": [ + { + "type": "button", + "name": "resources", + "value": "Find Resources", + "_translations": { + "value": {} + }, + "action_list": [ + { + "trigger": "click", + "action_id": "set_field", + "args": [ + "resources_topic", + "@local.topic_id" + ], + "_raw": "click | set_field:resources_topic:@local.topic_id", + "_cleaned": "click | set_field:resources_topic:@local.topic_id" + }, + { + "trigger": "click", + "action_id": "go_to", + "args": [ + "esm_resources_finder" + ], + "_raw": "click | go_to: esm_resources_finder", + "_cleaned": "click | go_to: esm_resources_finder" + } + ], + "parameter_list": { + "style": "short", + "text_align": "center" + }, + "_nested_name": "display_group_14.resources", + "_dynamicFields": { + "action_list": { + "0": { + "args": { + "1": [ + { + "fullExpression": "@local.topic_id", + "matchedExpression": "@local.topic_id", + "type": "local", + "fieldName": "topic_id" + } + ] + }, + "_raw": [ + { + "fullExpression": "click | set_field:resources_topic:@local.topic_id", + "matchedExpression": "@local.topic_id", + "type": "local", + "fieldName": "topic_id" + } + ], + "_cleaned": [ + { + "fullExpression": "click | set_field:resources_topic:@local.topic_id", + "matchedExpression": "@local.topic_id", + "type": "local", + "fieldName": "topic_id" + } + ] + } + } + }, + "_dynamicDependencies": { + "@local.topic_id": [ + "action_list.0.args.1", + "action_list.0._raw", + "action_list.0._cleaned" + ] + } + } + ], + "name": "display_group_14", + "_nested_name": "display_group_14" + }, + { + "name": "prev_topic1", + "value": "local.esm_topic_ptr.prev_topic_1", + "_translations": { + "value": {} + }, + "type": "set_variable", + "_nested_name": "prev_topic1" + }, + { + "name": "next_topic1", + "value": "local.esm_topic_ptr.next_topic_1", + "_translations": { + "value": {} + }, + "type": "set_variable", + "_nested_name": "next_topic1" + }, + { + "type": "display_group", + "condition": "@@local.prev_topic1 || @@local.next_topic1", + "parameter_list": { + "style": "column" + }, + "rows": [ + { + "type": "accordion", + "name": "accordion_related_topics", + "rows": [ + { + "type": "accordion_section", + "name": "required_topics_block", + "value": "Related Topics", + "exclude_from_translation": true, + "rows": [ + { + "type": "display_group", + "name": "related_topics_content", + "parameter_list": { + "style": "column" + }, + "rows": [ + { + "type": "display_group", + "name": "previous_topics_content", + "condition": "@@local.prev_topic1", + "parameter_list": { + "style": "column" + }, + "rows": [ + { + "type": "text", + "name": "previous_topics_start", + "value": "Previous Topics", + "_translations": { + "value": {} + }, + "_nested_name": "display_group_18.accordion_related_topics.required_topics_block.related_topics_content.previous_topics_content.previous_topics_start" + }, + { + "name": "temp_ptr", + "value": "local.esm_topic_ptr.prev_topic_text", + "_translations": { + "value": {} + }, + "type": "set_variable", + "_nested_name": "display_group_18.accordion_related_topics.required_topics_block.related_topics_content.previous_topics_content.temp_ptr" + }, + { + "type": "text", + "name": "previous_topics_intro", + "value": "@@local.temp_ptr", + "_translations": { + "value": {} + }, + "condition": "@@local.temp_ptr", + "_nested_name": "display_group_18.accordion_related_topics.required_topics_block.related_topics_content.previous_topics_content.previous_topics_intro", + "_dynamicFields": { + "value": [ + { + "fullExpression": "@@local.temp_ptr", + "matchedExpression": "@local.temp_ptr", + "type": "local", + "fieldName": "temp_ptr" + } + ], + "condition": [ + { + "fullExpression": "@@local.temp_ptr", + "matchedExpression": "@local.temp_ptr", + "type": "local", + "fieldName": "temp_ptr" + } + ] + }, + "_dynamicDependencies": { + "@local.temp_ptr": [ + "value", + "condition" + ] + } + }, + { + "type": "items", + "name": "run_through_previous_topics", + "value": "@data.efm_num_list_one_to_ten", + "rows": [ + { + "name": "prev_topic_n", + "value": "local.esm_topic_ptr.prev_topic_@item.number", + "_translations": { + "value": {} + }, + "type": "set_variable", + "_nested_name": "display_group_18.accordion_related_topics.required_topics_block.related_topics_content.previous_topics_content.run_through_previous_topics.prev_topic_n", + "_dynamicFields": { + "value": [ + { + "fullExpression": "local.esm_topic_ptr.prev_topic_@item.number", + "matchedExpression": "@item.number", + "type": "item", + "fieldName": "number" + } + ] + }, + "_dynamicDependencies": { + "@item.number": [ + "value" + ] + } + }, + { + "name": "prev_id", + "value": "@@local.prev_topic_n", + "_translations": { + "value": {} + }, + "type": "set_variable", + "_nested_name": "display_group_18.accordion_related_topics.required_topics_block.related_topics_content.previous_topics_content.run_through_previous_topics.prev_id", + "_dynamicFields": { + "value": [ + { + "fullExpression": "@@local.prev_topic_n", + "matchedExpression": "@local.prev_topic_n", + "type": "local", + "fieldName": "prev_topic_n" + } + ] + }, + "_dynamicDependencies": { + "@local.prev_topic_n": [ + "value" + ] + } + }, + { + "name": "prev_row", + "value": "data.esm_topics.@local.prev_id", + "_translations": { + "value": {} + }, + "condition": "@local.prev_id", + "type": "set_variable", + "_nested_name": "display_group_18.accordion_related_topics.required_topics_block.related_topics_content.previous_topics_content.run_through_previous_topics.prev_row", + "_dynamicFields": { + "value": [ + { + "fullExpression": "data.esm_topics.@local.prev_id", + "matchedExpression": "@local.prev_id", + "type": "local", + "fieldName": "prev_id" + } + ], + "condition": [ + { + "fullExpression": "@local.prev_id", + "matchedExpression": "@local.prev_id", + "type": "local", + "fieldName": "prev_id" + } + ] + }, + "_dynamicDependencies": { + "@local.prev_id": [ + "value", + "condition" + ] + } + }, + { + "name": "prev_row_ptr", + "value": "@@local.prev_row", + "_translations": { + "value": {} + }, + "condition": "@local.prev_id", + "type": "set_variable", + "_nested_name": "display_group_18.accordion_related_topics.required_topics_block.related_topics_content.previous_topics_content.run_through_previous_topics.prev_row_ptr", + "_dynamicFields": { + "value": [ + { + "fullExpression": "@@local.prev_row", + "matchedExpression": "@local.prev_row", + "type": "local", + "fieldName": "prev_row" + } + ], + "condition": [ + { + "fullExpression": "@local.prev_id", + "matchedExpression": "@local.prev_id", + "type": "local", + "fieldName": "prev_id" + } + ] + }, + "_dynamicDependencies": { + "@local.prev_row": [ + "value" + ], + "@local.prev_id": [ + "condition" + ] + } + }, + { + "name": "prev_name", + "value": "@local.prev_row_ptr.name", + "_translations": { + "value": {} + }, + "condition": "@local.prev_id", + "type": "set_variable", + "_nested_name": "display_group_18.accordion_related_topics.required_topics_block.related_topics_content.previous_topics_content.run_through_previous_topics.prev_name", + "_dynamicFields": { + "value": [ + { + "fullExpression": "@local.prev_row_ptr.name", + "matchedExpression": "@local.prev_row_ptr.name", + "type": "local", + "fieldName": "prev_row_ptr" + } + ], + "condition": [ + { + "fullExpression": "@local.prev_id", + "matchedExpression": "@local.prev_id", + "type": "local", + "fieldName": "prev_id" + } + ] + }, + "_dynamicDependencies": { + "@local.prev_row_ptr.name": [ + "value" + ], + "@local.prev_id": [ + "condition" + ] + } + }, + { + "type": "button", + "name": "previous_@item.number", + "value": "@local.prev_name", + "_translations": { + "value": {} + }, + "action_list": [ + { + "trigger": "click", + "action_id": "set_field", + "args": [ + "current_topic", + "@local.prev_id" + ], + "_raw": "click | set_field:current_topic:@local.prev_id", + "_cleaned": "click | set_field:current_topic:@local.prev_id" + }, + { + "trigger": "click", + "action_id": "emit", + "args": [ + "force_reload" + ], + "_raw": "click | emit:force_reload", + "_cleaned": "click | emit:force_reload" + } + ], + "condition": "@local.prev_id", + "parameter_list": { + "style": "short", + "text_align": "center" + }, + "_nested_name": "display_group_18.accordion_related_topics.required_topics_block.related_topics_content.previous_topics_content.run_through_previous_topics.previous_@item.number", + "_dynamicFields": { + "name": [ + { + "fullExpression": "previous_@item.number", + "matchedExpression": "@item.number", + "type": "item", + "fieldName": "number" + } + ], + "value": [ + { + "fullExpression": "@local.prev_name", + "matchedExpression": "@local.prev_name", + "type": "local", + "fieldName": "prev_name" + } + ], + "action_list": { + "0": { + "args": { + "1": [ + { + "fullExpression": "@local.prev_id", + "matchedExpression": "@local.prev_id", + "type": "local", + "fieldName": "prev_id" + } + ] + }, + "_raw": [ + { + "fullExpression": "click | set_field:current_topic:@local.prev_id", + "matchedExpression": "@local.prev_id", + "type": "local", + "fieldName": "prev_id" + } + ], + "_cleaned": [ + { + "fullExpression": "click | set_field:current_topic:@local.prev_id", + "matchedExpression": "@local.prev_id", + "type": "local", + "fieldName": "prev_id" + } + ] + } + }, + "condition": [ + { + "fullExpression": "@local.prev_id", + "matchedExpression": "@local.prev_id", + "type": "local", + "fieldName": "prev_id" + } + ], + "_nested_name": [ + { + "fullExpression": "display_group_18.accordion_related_topics.required_topics_block.related_topics_content.previous_topics_content.run_through_previous_topics.previous_@item.number", + "matchedExpression": "@item.number", + "type": "item", + "fieldName": "number" + } + ] + }, + "_dynamicDependencies": { + "@item.number": [ + "name", + "_nested_name" + ], + "@local.prev_name": [ + "value" + ], + "@local.prev_id": [ + "action_list.0.args.1", + "action_list.0._raw", + "action_list.0._cleaned", + "condition" + ] + } + } + ], + "_nested_name": "display_group_18.accordion_related_topics.required_topics_block.related_topics_content.previous_topics_content.run_through_previous_topics", + "_dynamicFields": { + "value": [ + { + "fullExpression": "@data.efm_num_list_one_to_ten", + "matchedExpression": "@data.efm_num_list_one_to_ten", + "type": "data", + "fieldName": "efm_num_list_one_to_ten" + } + ] + }, + "_dynamicDependencies": { + "@data.efm_num_list_one_to_ten": [ + "value" + ] + } + } + ], + "_nested_name": "display_group_18.accordion_related_topics.required_topics_block.related_topics_content.previous_topics_content", + "_dynamicFields": { + "condition": [ + { + "fullExpression": "@@local.prev_topic1", + "matchedExpression": "@local.prev_topic1", + "type": "local", + "fieldName": "prev_topic1" + } + ] + }, + "_dynamicDependencies": { + "@local.prev_topic1": [ + "condition" + ] + } + }, + { + "type": "display_group", + "name": "next_topics_content", + "condition": "@@local.next_topic1", + "parameter_list": { + "style": "column" + }, + "rows": [ + { + "type": "text", + "name": "next_topics_start", + "value": "Next Topics", + "_translations": { + "value": {} + }, + "_nested_name": "display_group_18.accordion_related_topics.required_topics_block.related_topics_content.next_topics_content.next_topics_start" + }, + { + "name": "temp_ptr", + "value": "local.esm_topic_ptr.next_topic_text", + "_translations": { + "value": {} + }, + "type": "set_variable", + "_nested_name": "display_group_18.accordion_related_topics.required_topics_block.related_topics_content.next_topics_content.temp_ptr" + }, + { + "type": "text", + "name": "next_topics_intro", + "value": "@@local.temp_ptr", + "_translations": { + "value": {} + }, + "condition": "@@local.temp_ptr", + "_nested_name": "display_group_18.accordion_related_topics.required_topics_block.related_topics_content.next_topics_content.next_topics_intro", + "_dynamicFields": { + "value": [ + { + "fullExpression": "@@local.temp_ptr", + "matchedExpression": "@local.temp_ptr", + "type": "local", + "fieldName": "temp_ptr" + } + ], + "condition": [ + { + "fullExpression": "@@local.temp_ptr", + "matchedExpression": "@local.temp_ptr", + "type": "local", + "fieldName": "temp_ptr" + } + ] + }, + "_dynamicDependencies": { + "@local.temp_ptr": [ + "value", + "condition" + ] + } + }, + { + "type": "items", + "name": "run_through_next_topics", + "value": "@data.efm_num_list_one_to_ten", + "rows": [ + { + "name": "next_topic_n", + "value": "local.esm_topic_ptr.next_topic_@item.number", + "_translations": { + "value": {} + }, + "type": "set_variable", + "_nested_name": "display_group_18.accordion_related_topics.required_topics_block.related_topics_content.next_topics_content.run_through_next_topics.next_topic_n", + "_dynamicFields": { + "value": [ + { + "fullExpression": "local.esm_topic_ptr.next_topic_@item.number", + "matchedExpression": "@item.number", + "type": "item", + "fieldName": "number" + } + ] + }, + "_dynamicDependencies": { + "@item.number": [ + "value" + ] + } + }, + { + "name": "next_id", + "value": "@@local.next_topic_n", + "_translations": { + "value": {} + }, + "type": "set_variable", + "_nested_name": "display_group_18.accordion_related_topics.required_topics_block.related_topics_content.next_topics_content.run_through_next_topics.next_id", + "_dynamicFields": { + "value": [ + { + "fullExpression": "@@local.next_topic_n", + "matchedExpression": "@local.next_topic_n", + "type": "local", + "fieldName": "next_topic_n" + } + ] + }, + "_dynamicDependencies": { + "@local.next_topic_n": [ + "value" + ] + } + }, + { + "name": "next_row", + "value": "data.esm_topics.@local.next_id", + "_translations": { + "value": {} + }, + "condition": "@local.next_id", + "type": "set_variable", + "_nested_name": "display_group_18.accordion_related_topics.required_topics_block.related_topics_content.next_topics_content.run_through_next_topics.next_row", + "_dynamicFields": { + "value": [ + { + "fullExpression": "data.esm_topics.@local.next_id", + "matchedExpression": "@local.next_id", + "type": "local", + "fieldName": "next_id" + } + ], + "condition": [ + { + "fullExpression": "@local.next_id", + "matchedExpression": "@local.next_id", + "type": "local", + "fieldName": "next_id" + } + ] + }, + "_dynamicDependencies": { + "@local.next_id": [ + "value", + "condition" + ] + } + }, + { + "name": "next_row_ptr", + "value": "@@local.next_row", + "_translations": { + "value": {} + }, + "condition": "@local.next_id", + "type": "set_variable", + "_nested_name": "display_group_18.accordion_related_topics.required_topics_block.related_topics_content.next_topics_content.run_through_next_topics.next_row_ptr", + "_dynamicFields": { + "value": [ + { + "fullExpression": "@@local.next_row", + "matchedExpression": "@local.next_row", + "type": "local", + "fieldName": "next_row" + } + ], + "condition": [ + { + "fullExpression": "@local.next_id", + "matchedExpression": "@local.next_id", + "type": "local", + "fieldName": "next_id" + } + ] + }, + "_dynamicDependencies": { + "@local.next_row": [ + "value" + ], + "@local.next_id": [ + "condition" + ] + } + }, + { + "name": "next_name", + "value": "@local.next_row_ptr.name", + "_translations": { + "value": {} + }, + "condition": "@local.next_id", + "type": "set_variable", + "_nested_name": "display_group_18.accordion_related_topics.required_topics_block.related_topics_content.next_topics_content.run_through_next_topics.next_name", + "_dynamicFields": { + "value": [ + { + "fullExpression": "@local.next_row_ptr.name", + "matchedExpression": "@local.next_row_ptr.name", + "type": "local", + "fieldName": "next_row_ptr" + } + ], + "condition": [ + { + "fullExpression": "@local.next_id", + "matchedExpression": "@local.next_id", + "type": "local", + "fieldName": "next_id" + } + ] + }, + "_dynamicDependencies": { + "@local.next_row_ptr.name": [ + "value" + ], + "@local.next_id": [ + "condition" + ] + } + }, + { + "type": "button", + "name": "next_@item.number", + "value": "@local.next_name", + "_translations": { + "value": {} + }, + "action_list": [ + { + "trigger": "click", + "action_id": "set_field", + "args": [ + "current_topic", + "@local.next_id" + ], + "_raw": "click | set_field:current_topic:@local.next_id", + "_cleaned": "click | set_field:current_topic:@local.next_id" + }, + { + "trigger": "click", + "action_id": "emit", + "args": [ + "force_reload" + ], + "_raw": "click | emit:force_reload", + "_cleaned": "click | emit:force_reload" + } + ], + "condition": "@local.next_id", + "parameter_list": { + "style": "short", + "text_align": "center" + }, + "_nested_name": "display_group_18.accordion_related_topics.required_topics_block.related_topics_content.next_topics_content.run_through_next_topics.next_@item.number", + "_dynamicFields": { + "name": [ + { + "fullExpression": "next_@item.number", + "matchedExpression": "@item.number", + "type": "item", + "fieldName": "number" + } + ], + "value": [ + { + "fullExpression": "@local.next_name", + "matchedExpression": "@local.next_name", + "type": "local", + "fieldName": "next_name" + } + ], + "action_list": { + "0": { + "args": { + "1": [ + { + "fullExpression": "@local.next_id", + "matchedExpression": "@local.next_id", + "type": "local", + "fieldName": "next_id" + } + ] + }, + "_raw": [ + { + "fullExpression": "click | set_field:current_topic:@local.next_id", + "matchedExpression": "@local.next_id", + "type": "local", + "fieldName": "next_id" + } + ], + "_cleaned": [ + { + "fullExpression": "click | set_field:current_topic:@local.next_id", + "matchedExpression": "@local.next_id", + "type": "local", + "fieldName": "next_id" + } + ] + } + }, + "condition": [ + { + "fullExpression": "@local.next_id", + "matchedExpression": "@local.next_id", + "type": "local", + "fieldName": "next_id" + } + ], + "_nested_name": [ + { + "fullExpression": "display_group_18.accordion_related_topics.required_topics_block.related_topics_content.next_topics_content.run_through_next_topics.next_@item.number", + "matchedExpression": "@item.number", + "type": "item", + "fieldName": "number" + } + ] + }, + "_dynamicDependencies": { + "@item.number": [ + "name", + "_nested_name" + ], + "@local.next_name": [ + "value" + ], + "@local.next_id": [ + "action_list.0.args.1", + "action_list.0._raw", + "action_list.0._cleaned", + "condition" + ] + } + } + ], + "_nested_name": "display_group_18.accordion_related_topics.required_topics_block.related_topics_content.next_topics_content.run_through_next_topics", + "_dynamicFields": { + "value": [ + { + "fullExpression": "@data.efm_num_list_one_to_ten", + "matchedExpression": "@data.efm_num_list_one_to_ten", + "type": "data", + "fieldName": "efm_num_list_one_to_ten" + } + ] + }, + "_dynamicDependencies": { + "@data.efm_num_list_one_to_ten": [ + "value" + ] + } + } + ], + "_nested_name": "display_group_18.accordion_related_topics.required_topics_block.related_topics_content.next_topics_content", + "_dynamicFields": { + "condition": [ + { + "fullExpression": "@@local.next_topic1", + "matchedExpression": "@local.next_topic1", + "type": "local", + "fieldName": "next_topic1" + } + ] + }, + "_dynamicDependencies": { + "@local.next_topic1": [ + "condition" + ] + } + } + ], + "_nested_name": "display_group_18.accordion_related_topics.required_topics_block.related_topics_content" + } + ], + "_nested_name": "display_group_18.accordion_related_topics.required_topics_block" + } + ], + "_nested_name": "display_group_18.accordion_related_topics" + } + ], + "name": "display_group_18", + "_nested_name": "display_group_18", + "_dynamicFields": { + "condition": [ + { + "fullExpression": "@@local.prev_topic1 || @@local.next_topic1", + "matchedExpression": "@local.prev_topic1", + "type": "local", + "fieldName": "prev_topic1" + }, + { + "fullExpression": "@@local.prev_topic1 || @@local.next_topic1", + "matchedExpression": "@local.next_topic1", + "type": "local", + "fieldName": "next_topic1" + } + ] + }, + "_dynamicDependencies": { + "@local.prev_topic1": [ + "condition" + ], + "@local.next_topic1": [ + "condition" + ] + } } ], "_xlsxPath": "EFM_topics_high_level_sheets.xlsx" diff --git a/app_data/sheets/template/home_screen.json b/app_data/sheets/template/home_screen.json index c206446..246571c 100644 --- a/app_data/sheets/template/home_screen.json +++ b/app_data/sheets/template/home_screen.json @@ -98,7 +98,7 @@ { "type": "text", "name": "alert_message", - "value": "**NB:** This is a **very early** prototype. We welcome and encourage feedback. There are many, many features and resources we plan to add, and much polishing to be done. We will be adding much in the way of graphics and linking between elements.", + "value": "**NB:** This is a **very early** prototype. We welcome and encourage feedback. There are many, many features, graphics, and resources we plan to add, and much revising and polishing to be done.", "_translations": { "value": {} }, diff --git a/app_data/sheets/tour/efm_gas_tour.json b/app_data/sheets/tour/efm_gas_tour.json index e675759..cbad417 100644 --- a/app_data/sheets/tour/efm_gas_tour.json +++ b/app_data/sheets/tour/efm_gas_tour.json @@ -5,12 +5,12 @@ "rows": [ { "type": "step", - "title": "Games and Activities", + "title": "Games", "_translations": { "title": {}, "message_text": {} }, - "message_text": "This is a collection of games and activities for the classroom.", + "message_text": "This is a collection of games for the classroom.", "route": "template/efm_ga_start" }, { diff --git a/app_data/sheets/tour/efm_pows_tour.json b/app_data/sheets/tour/efm_pows_tour.json index 39ff0e0..d9d0830 100644 --- a/app_data/sheets/tour/efm_pows_tour.json +++ b/app_data/sheets/tour/efm_pows_tour.json @@ -5,12 +5,12 @@ "rows": [ { "type": "step", - "title": "Puzzles of the Week", + "title": "Puzzles", "_translations": { "title": {}, "message_text": {} }, - "message_text": "These are Puzzles of the Week. Have fun!", + "message_text": "Have fun with these math puzzles!", "route": "template/efm_pow_start" }, { diff --git a/config.ts b/config.ts index f0db93b..ed3c83a 100644 --- a/config.ts +++ b/config.ts @@ -8,7 +8,7 @@ config.google_drive = { config.git = { content_repo: "https://github.com/IDEMSInternational/early-school-math-app-content.git", - content_tag_latest: "1.1.17", + content_tag_latest: "1.1.18", }; config.android = {