From b871cebfb2300fe327f979d3d054c76fcd1637f1 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 16 Dec 2024 20:58:00 -0800 Subject: [PATCH] content: 1.1.29 --- app_data/sheets/contents.json | 22 + app_data/sheets/data_list/efm_gloss_list.json | 60 + .../sheets/data_list/esm_strand_list.json | 4 +- app_data/sheets/template/efm_ga_start.json | 20 + app_data/sheets/template/efm_gloss_start.json | 59 + app_data/sheets/template/efm_pow_start.json | 1141 +++++++++++------ app_data/sheets/template/esm_resources.json | 353 +++++ app_data/sheets/tour/efm_gas_tour.json | 10 - config.ts | 2 +- 9 files changed, 1275 insertions(+), 396 deletions(-) create mode 100644 app_data/sheets/data_list/efm_gloss_list.json create mode 100644 app_data/sheets/template/efm_gloss_start.json diff --git a/app_data/sheets/contents.json b/app_data/sheets/contents.json index 1c4fa24..9d8a081 100644 --- a/app_data/sheets/contents.json +++ b/app_data/sheets/contents.json @@ -663,6 +663,23 @@ } } }, + "efm_gloss_list": { + "flow_type": "data_list", + "flow_name": "efm_gloss_list", + "data_list_name": "efm_glossary", + "_xlsxPath": "EFM_glossary_high_level_sheets.xlsx", + "_metadata": { + "eye_opener": { + "type": "boolean" + }, + "puzzler": { + "type": "boolean" + }, + "notes_block_start": { + "type": "number" + } + } + }, "efm_number_list_one_to_ten": { "flow_type": "data_list", "flow_name": "efm_number_list_one_to_ten", @@ -1108,6 +1125,11 @@ "flow_name": "efm_ga_template", "_xlsxPath": "EFM_gas_high_level_sheets.xlsx" }, + "efm_gloss_start": { + "flow_type": "template", + "flow_name": "efm_gloss_start", + "_xlsxPath": "EFM_glossary_high_level_sheets.xlsx" + }, "efm_pow_body_template": { "flow_type": "template", "flow_name": "efm_pow_body_template", diff --git a/app_data/sheets/data_list/efm_gloss_list.json b/app_data/sheets/data_list/efm_gloss_list.json new file mode 100644 index 0000000..b1fcdb8 --- /dev/null +++ b/app_data/sheets/data_list/efm_gloss_list.json @@ -0,0 +1,60 @@ +{ + "flow_type": "data_list", + "flow_name": "efm_gloss_list", + "data_list_name": "efm_glossary", + "status": "released", + "rows": [ + { + "id": "esm_pow_a_card_deck_ordering_1", + "level": "A", + "topic_theme_1": "NPV_QC10_QC", + "topic_theme_2": "Geom_Pat_Intro", + "eye_opener": false, + "puzzler": true, + "notes_block_start": 4, + "block1_type": "illust_below", + "block1_illust": "ESMIll/ESMPOWACardStackingIntro.svg", + "block1_illust_max_size": "400px", + "block2_type": "illust_below", + "block2_illust": "ESMIll/ESMPOWACardStackingChallenge.svg", + "block2_illust_max_size": "330px", + "block3_type": "all_text", + "name": "Card Deck Ordering - 1", + "_translations": { + "name": {}, + "block1_text": {}, + "block2_text": {}, + "block3_text": {} + }, + "_translatedFields": { + "name": { + "eng": "Card Deck Ordering - 1" + }, + "block1_text": { + "eng": "**Introduction** You are working with a stack of cards. There are **Two Steps** in this process:" + }, + "block2_text": { + "eng": "**The Challenge:** Take cards numbered 1 to 5 and stack them in some way so that if you repeat the Two Steps over and over with that stack, you will end up with a discard pile of cards in order from 5 down to 1." + }, + "block3_text": { + "eng": "**Exploration:** Can you do this for decks with cards from 1 to 6, 1 to 7, or even higher? What patterns do you notice?" + } + }, + "block1_text": "**Introduction** You are working with a stack of cards. There are **Two Steps** in this process:", + "block2_text": "**The Challenge:** Take cards numbered 1 to 5 and stack them in some way so that if you repeat the Two Steps over and over with that stack, you will end up with a discard pile of cards in order from 5 down to 1.", + "block3_text": "**Exploration:** Can you do this for decks with cards from 1 to 6, 1 to 7, or even higher? What patterns do you notice?" + } + ], + "_xlsxPath": "EFM_glossary_high_level_sheets.xlsx", + "_metadata": { + "eye_opener": { + "type": "boolean" + }, + "puzzler": { + "type": "boolean" + }, + "notes_block_start": { + "type": "number" + } + } +} \ No newline at end of file diff --git a/app_data/sheets/data_list/esm_strand_list.json b/app_data/sheets/data_list/esm_strand_list.json index a030814..dadfe1c 100644 --- a/app_data/sheets/data_list/esm_strand_list.json +++ b/app_data/sheets/data_list/esm_strand_list.json @@ -8,13 +8,13 @@ "id": "MT", "theme_id_1": "MT_EAA_", "theme_id_2": "MT_RWC_", - "name": "Math Talk", + "name": "Family Math Talk", "_translations": { "name": {} }, "_translatedFields": { "name": { - "eng": "Math Talk" + "eng": "Family Math Talk" } } }, diff --git a/app_data/sheets/template/efm_ga_start.json b/app_data/sheets/template/efm_ga_start.json index 7a79851..a23e2f6 100644 --- a/app_data/sheets/template/efm_ga_start.json +++ b/app_data/sheets/template/efm_ga_start.json @@ -49,6 +49,26 @@ ], "_nested_name": "dg_top_of_page" }, + { + "type": "display_group", + "name": "dg_info", + "rows": [ + { + "type": "text", + "name": "help_button", + "value": "In addition to their use during classroom lessons, these games have other specialty uses that you can choose.\n\n* **Tutoring:** These games are good for focused practice with a particular skill.\n* **Breaks:** These are quick to set up and play games that are ideal for short breaks between longer activities.\n* **Home:** These are good games to send home for families to play together and practice the skills being learned in the classroom.", + "_translations": { + "value": {} + }, + "parameter_list": { + "icon_src": "help", + "style": "navigation" + }, + "_nested_name": "dg_info.help_button" + } + ], + "_nested_name": "dg_info" + }, { "type": "display_group", "name": "dg_types", diff --git a/app_data/sheets/template/efm_gloss_start.json b/app_data/sheets/template/efm_gloss_start.json new file mode 100644 index 0000000..1373d54 --- /dev/null +++ b/app_data/sheets/template/efm_gloss_start.json @@ -0,0 +1,59 @@ +{ + "flow_type": "template", + "flow_name": "efm_gloss_start", + "status": "released", + "rows": [ + { + "type": "display_group", + "name": "dg_top_of_page", + "rows": [ + { + "type": "title", + "name": "spacer", + "value": "Glossary", + "_translations": { + "value": {} + }, + "style_list": [ + "flex:1" + ], + "_nested_name": "dg_top_of_page.spacer" + } + ], + "_nested_name": "dg_top_of_page" + }, + { + "type": "display_group", + "name": "dg_info", + "rows": [ + { + "type": "text", + "name": "help_button", + "value": "This will be a glossary that contains definitions of mathematical and teaching terms.", + "_translations": { + "value": {} + }, + "parameter_list": { + "icon_src": "help", + "style": "navigation" + }, + "_nested_name": "dg_info.help_button" + } + ], + "_nested_name": "dg_info" + }, + { + "type": "display_group", + "name": "fake_group", + "rows": [ + { + "type": "text", + "name": "spacer", + "_nested_name": "fake_group.spacer" + } + ], + "_nested_name": "fake_group" + } + ], + "_xlsxPath": "EFM_glossary_high_level_sheets.xlsx" +} \ No newline at end of file diff --git a/app_data/sheets/template/efm_pow_start.json b/app_data/sheets/template/efm_pow_start.json index 20f4cd2..3ca12a4 100644 --- a/app_data/sheets/template/efm_pow_start.json +++ b/app_data/sheets/template/efm_pow_start.json @@ -56,7 +56,7 @@ { "type": "text", "name": "help_button", - "value": "These puzzles are separated into increasing levels of difficulty and not by grade level. With each increase in level there will tend to be more difficult puzzles and the mathematics is more advanced.", + "value": "These puzzles are separated into dropdown menus with increasing levels of difficulty and math content.\n\nSelect from two types of puzzles. \n* **Eye Openers** are puzzles that open one's eyes and can probably be done quickly during a single class session.\n* **Puzzlers** are puzzles that will take time, quite possibly several days to work through thoroughly.", "_translations": { "value": {} }, @@ -69,6 +69,137 @@ ], "_nested_name": "dg_info" }, + { + "type": "display_group", + "name": "dg_types", + "parameter_list": { + "style": "column" + }, + "rows": [ + { + "name": "description_0", + "value": "Eye Opener", + "_translations": { + "value": {} + }, + "type": "set_variable", + "_nested_name": "dg_types.description_0" + }, + { + "name": "description_1", + "value": "Puzzler", + "_translations": { + "value": {} + }, + "type": "set_variable", + "_nested_name": "dg_types.description_1" + }, + { + "type": "display_group", + "name": "dg_puzzle_types", + "parameter_list": { + "style": "column" + }, + "rows": [ + { + "type": "display_group", + "name": "dg_first_pair_puzzle_types", + "rows": [ + { + "type": "toggle_bar", + "name": "checkbox_eye_opener", + "value": true, + "parameter_list": { + "true_text": "@local.description_0", + "false_text": "@local.description_0" + }, + "_nested_name": "dg_types.dg_puzzle_types.dg_first_pair_puzzle_types.checkbox_eye_opener", + "_dynamicFields": { + "parameter_list": { + "true_text": [ + { + "fullExpression": "@local.description_0", + "matchedExpression": "@local.description_0", + "type": "local", + "fieldName": "description_0" + } + ], + "false_text": [ + { + "fullExpression": "@local.description_0", + "matchedExpression": "@local.description_0", + "type": "local", + "fieldName": "description_0" + } + ] + } + }, + "_dynamicDependencies": { + "@local.description_0": [ + "parameter_list.true_text", + "parameter_list.false_text" + ] + } + }, + { + "type": "toggle_bar", + "name": "checkbox_puzzler", + "value": true, + "parameter_list": { + "true_text": "@local.description_1", + "false_text": "@local.description_1" + }, + "_nested_name": "dg_types.dg_puzzle_types.dg_first_pair_puzzle_types.checkbox_puzzler", + "_dynamicFields": { + "parameter_list": { + "true_text": [ + { + "fullExpression": "@local.description_1", + "matchedExpression": "@local.description_1", + "type": "local", + "fieldName": "description_1" + } + ], + "false_text": [ + { + "fullExpression": "@local.description_1", + "matchedExpression": "@local.description_1", + "type": "local", + "fieldName": "description_1" + } + ] + } + }, + "_dynamicDependencies": { + "@local.description_1": [ + "parameter_list.true_text", + "parameter_list.false_text" + ] + } + } + ], + "_nested_name": "dg_types.dg_puzzle_types.dg_first_pair_puzzle_types" + }, + { + "type": "text", + "name": "blank", + "style_list": [ + "flex: 1" + ], + "_nested_name": "dg_types.dg_puzzle_types.blank" + } + ], + "_nested_name": "dg_types.dg_puzzle_types" + }, + { + "type": "display_group", + "name": "dg_spacer", + "rows": [], + "_nested_name": "dg_types.dg_spacer" + } + ], + "_nested_name": "dg_types" + }, { "name": "now", "value": "@calc(timestamp())", @@ -114,7 +245,7 @@ { "type": "accordion_section", "name": "level_a", - "value": "Level A", + "value": "Count to 15; One-digit Add", "parameter_list": { "text_align": "center", "style": "large emphasised" @@ -160,287 +291,409 @@ } }, { - "name": "click_history_field_name", - "value": "@local.pow_id@local.pow_click_history", + "name": "okay_eye_opener", + "value": "@local.checkbox_eye_opener && @item.eye_opener", "_translations": { "value": {} }, - "exclude_from_translation": true, "type": "set_variable", - "_nested_name": "accordion_for_pows.level_a.dg_powlist_a.activity_buttons_a.click_history_field_name", + "_nested_name": "accordion_for_pows.level_a.dg_powlist_a.activity_buttons_a.okay_eye_opener", "_dynamicFields": { "value": [ { - "fullExpression": "@local.pow_id@local.pow_click_history", - "matchedExpression": "@local.pow_id", + "fullExpression": "@local.checkbox_eye_opener && @item.eye_opener", + "matchedExpression": "@local.checkbox_eye_opener", "type": "local", - "fieldName": "pow_id" + "fieldName": "checkbox_eye_opener" }, { - "fullExpression": "@local.pow_id@local.pow_click_history", - "matchedExpression": "@local.pow_click_history", - "type": "local", - "fieldName": "pow_click_history" + "fullExpression": "@local.checkbox_eye_opener && @item.eye_opener", + "matchedExpression": "@item.eye_opener", + "type": "item", + "fieldName": "eye_opener" } ] }, "_dynamicDependencies": { - "@local.pow_id": [ + "@local.checkbox_eye_opener": [ "value" ], - "@local.pow_click_history": [ + "@item.eye_opener": [ "value" ] } }, { - "name": "pows_click_history", - "value": "@fields.@local.click_history_field_name ; @local.now", + "name": "okay_puzzler", + "value": "@local.checkbox_puzzler && @item.puzzler", "_translations": { "value": {} }, - "condition": "!!(@fields.@local.click_history_field_name)", - "exclude_from_translation": true, "type": "set_variable", - "_nested_name": "accordion_for_pows.level_a.dg_powlist_a.activity_buttons_a.pows_click_history", + "_nested_name": "accordion_for_pows.level_a.dg_powlist_a.activity_buttons_a.okay_puzzler", "_dynamicFields": { "value": [ { - "fullExpression": "@fields.@local.click_history_field_name ; @local.now", - "matchedExpression": "@local.click_history_field_name", + "fullExpression": "@local.checkbox_puzzler && @item.puzzler", + "matchedExpression": "@local.checkbox_puzzler", "type": "local", - "fieldName": "click_history_field_name" + "fieldName": "checkbox_puzzler" }, { - "fullExpression": "@fields.@local.click_history_field_name ; @local.now", - "matchedExpression": "@local.now", - "type": "local", - "fieldName": "now" - } - ], - "condition": [ - { - "fullExpression": "!!(@fields.@local.click_history_field_name)", - "matchedExpression": "@local.click_history_field_name", - "type": "local", - "fieldName": "click_history_field_name" + "fullExpression": "@local.checkbox_puzzler && @item.puzzler", + "matchedExpression": "@item.puzzler", + "type": "item", + "fieldName": "puzzler" } ] }, "_dynamicDependencies": { - "@local.click_history_field_name": [ - "value", - "condition" + "@local.checkbox_puzzler": [ + "value" ], - "@local.now": [ + "@item.puzzler": [ "value" ] } }, { - "name": "pows_click_history", - "value": "@local.now", + "name": "its_an_okay_puzzle", + "value": "@local.okay_eye_opener || @local.okay_puzzler", "_translations": { "value": {} }, - "condition": "!(@fields.@local.click_history_field_name)", - "exclude_from_translation": true, "type": "set_variable", - "_nested_name": "accordion_for_pows.level_a.dg_powlist_a.activity_buttons_a.pows_click_history", + "_nested_name": "accordion_for_pows.level_a.dg_powlist_a.activity_buttons_a.its_an_okay_puzzle", "_dynamicFields": { "value": [ { - "fullExpression": "@local.now", - "matchedExpression": "@local.now", + "fullExpression": "@local.okay_eye_opener || @local.okay_puzzler", + "matchedExpression": "@local.okay_eye_opener", "type": "local", - "fieldName": "now" - } - ], - "condition": [ + "fieldName": "okay_eye_opener" + }, { - "fullExpression": "!(@fields.@local.click_history_field_name)", - "matchedExpression": "@local.click_history_field_name", + "fullExpression": "@local.okay_eye_opener || @local.okay_puzzler", + "matchedExpression": "@local.okay_puzzler", "type": "local", - "fieldName": "click_history_field_name" + "fieldName": "okay_puzzler" } ] }, "_dynamicDependencies": { - "@local.now": [ + "@local.okay_eye_opener": [ "value" ], - "@local.click_history_field_name": [ - "condition" + "@local.okay_puzzler": [ + "value" ] } }, { - "type": "button", - "name": "button_pow_@item.id", - "value": "@item.name", - "_translations": { - "value": {} - }, - "action_list": [ - { - "trigger": "click", - "action_id": "set_field", - "args": [ - "current_pow", - "data.efm_pows.@item.id" - ], - "_raw": "click | set_field:current_pow: data.efm_pows.@item.id", - "_cleaned": "click | set_field:current_pow: data.efm_pows.@item.id" - }, - { - "trigger": "click", - "action_id": "go_to", - "args": [ - "efm_pow_template" - ], - "_raw": "click | go_to: efm_pow_template", - "_cleaned": "click | go_to: efm_pow_template" - }, + "type": "display_group", + "name": "dg_ok_puzzle_a", + "condition": "@local.its_an_okay_puzzle", + "rows": [ { - "trigger": "click", - "action_id": "set_field", - "args": [ - "@local.click_history_field_name", - "@local.pows_click_history" - ], - "_raw": "click | set_field:@local.click_history_field_name: @local.pows_click_history", - "_cleaned": "click | set_field:@local.click_history_field_name: @local.pows_click_history" - } - ], - "parameter_list": { - "style": "short", - "text_align": "center" - }, - "_nested_name": "accordion_for_pows.level_a.dg_powlist_a.activity_buttons_a.button_pow_@item.id", - "_dynamicFields": { - "name": [ - { - "fullExpression": "button_pow_@item.id", - "matchedExpression": "@item.id", - "type": "item", - "fieldName": "id" - } - ], - "value": [ - { - "fullExpression": "@item.name", - "matchedExpression": "@item.name", - "type": "item", - "fieldName": "name" - } - ], - "action_list": { - "0": { - "args": { - "1": [ - { - "fullExpression": "data.efm_pows.@item.id", - "matchedExpression": "@item.id", - "type": "item", - "fieldName": "id" - } - ] - }, - "_raw": [ + "name": "click_history_field_name", + "value": "@local.pow_id@local.pow_click_history", + "_translations": { + "value": {} + }, + "exclude_from_translation": true, + "type": "set_variable", + "_nested_name": "accordion_for_pows.level_a.dg_powlist_a.activity_buttons_a.dg_ok_puzzle_a.click_history_field_name", + "_dynamicFields": { + "value": [ { - "fullExpression": "click | set_field:current_pow: data.efm_pows.@item.id", - "matchedExpression": "@item.id", - "type": "item", - "fieldName": "id" - } - ], - "_cleaned": [ + "fullExpression": "@local.pow_id@local.pow_click_history", + "matchedExpression": "@local.pow_id", + "type": "local", + "fieldName": "pow_id" + }, { - "fullExpression": "click | set_field:current_pow: data.efm_pows.@item.id", - "matchedExpression": "@item.id", - "type": "item", - "fieldName": "id" + "fullExpression": "@local.pow_id@local.pow_click_history", + "matchedExpression": "@local.pow_click_history", + "type": "local", + "fieldName": "pow_click_history" } ] }, - "2": { - "args": { - "0": [ - { - "fullExpression": "@local.click_history_field_name", - "matchedExpression": "@local.click_history_field_name", - "type": "local", - "fieldName": "click_history_field_name" - } - ], - "1": [ - { - "fullExpression": "@local.pows_click_history", - "matchedExpression": "@local.pows_click_history", - "type": "local", - "fieldName": "pows_click_history" - } - ] - }, - "_raw": [ + "_dynamicDependencies": { + "@local.pow_id": [ + "value" + ], + "@local.pow_click_history": [ + "value" + ] + } + }, + { + "name": "pows_click_history", + "value": "@fields.@local.click_history_field_name ; @local.now", + "_translations": { + "value": {} + }, + "condition": "!!(@fields.@local.click_history_field_name)", + "exclude_from_translation": true, + "type": "set_variable", + "_nested_name": "accordion_for_pows.level_a.dg_powlist_a.activity_buttons_a.dg_ok_puzzle_a.pows_click_history", + "_dynamicFields": { + "value": [ { - "fullExpression": "click | set_field:@local.click_history_field_name: @local.pows_click_history", + "fullExpression": "@fields.@local.click_history_field_name ; @local.now", "matchedExpression": "@local.click_history_field_name", "type": "local", "fieldName": "click_history_field_name" }, { - "fullExpression": "click | set_field:@local.click_history_field_name: @local.pows_click_history", - "matchedExpression": "@local.pows_click_history", + "fullExpression": "@fields.@local.click_history_field_name ; @local.now", + "matchedExpression": "@local.now", "type": "local", - "fieldName": "pows_click_history" + "fieldName": "now" } ], - "_cleaned": [ + "condition": [ { - "fullExpression": "click | set_field:@local.click_history_field_name: @local.pows_click_history", + "fullExpression": "!!(@fields.@local.click_history_field_name)", "matchedExpression": "@local.click_history_field_name", "type": "local", "fieldName": "click_history_field_name" - }, + } + ] + }, + "_dynamicDependencies": { + "@local.click_history_field_name": [ + "value", + "condition" + ], + "@local.now": [ + "value" + ] + } + }, + { + "name": "pows_click_history", + "value": "@local.now", + "_translations": { + "value": {} + }, + "condition": "!(@fields.@local.click_history_field_name)", + "exclude_from_translation": true, + "type": "set_variable", + "_nested_name": "accordion_for_pows.level_a.dg_powlist_a.activity_buttons_a.dg_ok_puzzle_a.pows_click_history", + "_dynamicFields": { + "value": [ { - "fullExpression": "click | set_field:@local.click_history_field_name: @local.pows_click_history", - "matchedExpression": "@local.pows_click_history", + "fullExpression": "@local.now", + "matchedExpression": "@local.now", "type": "local", - "fieldName": "pows_click_history" + "fieldName": "now" } + ], + "condition": [ + { + "fullExpression": "!(@fields.@local.click_history_field_name)", + "matchedExpression": "@local.click_history_field_name", + "type": "local", + "fieldName": "click_history_field_name" + } + ] + }, + "_dynamicDependencies": { + "@local.now": [ + "value" + ], + "@local.click_history_field_name": [ + "condition" ] } }, - "_nested_name": [ + { + "type": "button", + "name": "button_pow_@item.id", + "value": "@item.name", + "_translations": { + "value": {} + }, + "action_list": [ + { + "trigger": "click", + "action_id": "set_field", + "args": [ + "current_pow", + "data.efm_pows.@item.id" + ], + "_raw": "click | set_field:current_pow: data.efm_pows.@item.id", + "_cleaned": "click | set_field:current_pow: data.efm_pows.@item.id" + }, + { + "trigger": "click", + "action_id": "go_to", + "args": [ + "efm_pow_template" + ], + "_raw": "click | go_to: efm_pow_template", + "_cleaned": "click | go_to: efm_pow_template" + }, + { + "trigger": "click", + "action_id": "set_field", + "args": [ + "@local.click_history_field_name", + "@local.pows_click_history" + ], + "_raw": "click | set_field:@local.click_history_field_name: @local.pows_click_history", + "_cleaned": "click | set_field:@local.click_history_field_name: @local.pows_click_history" + } + ], + "parameter_list": { + "style": "short", + "text_align": "center" + }, + "_nested_name": "accordion_for_pows.level_a.dg_powlist_a.activity_buttons_a.dg_ok_puzzle_a.button_pow_@item.id", + "_dynamicFields": { + "name": [ + { + "fullExpression": "button_pow_@item.id", + "matchedExpression": "@item.id", + "type": "item", + "fieldName": "id" + } + ], + "value": [ + { + "fullExpression": "@item.name", + "matchedExpression": "@item.name", + "type": "item", + "fieldName": "name" + } + ], + "action_list": { + "0": { + "args": { + "1": [ + { + "fullExpression": "data.efm_pows.@item.id", + "matchedExpression": "@item.id", + "type": "item", + "fieldName": "id" + } + ] + }, + "_raw": [ + { + "fullExpression": "click | set_field:current_pow: data.efm_pows.@item.id", + "matchedExpression": "@item.id", + "type": "item", + "fieldName": "id" + } + ], + "_cleaned": [ + { + "fullExpression": "click | set_field:current_pow: data.efm_pows.@item.id", + "matchedExpression": "@item.id", + "type": "item", + "fieldName": "id" + } + ] + }, + "2": { + "args": { + "0": [ + { + "fullExpression": "@local.click_history_field_name", + "matchedExpression": "@local.click_history_field_name", + "type": "local", + "fieldName": "click_history_field_name" + } + ], + "1": [ + { + "fullExpression": "@local.pows_click_history", + "matchedExpression": "@local.pows_click_history", + "type": "local", + "fieldName": "pows_click_history" + } + ] + }, + "_raw": [ + { + "fullExpression": "click | set_field:@local.click_history_field_name: @local.pows_click_history", + "matchedExpression": "@local.click_history_field_name", + "type": "local", + "fieldName": "click_history_field_name" + }, + { + "fullExpression": "click | set_field:@local.click_history_field_name: @local.pows_click_history", + "matchedExpression": "@local.pows_click_history", + "type": "local", + "fieldName": "pows_click_history" + } + ], + "_cleaned": [ + { + "fullExpression": "click | set_field:@local.click_history_field_name: @local.pows_click_history", + "matchedExpression": "@local.click_history_field_name", + "type": "local", + "fieldName": "click_history_field_name" + }, + { + "fullExpression": "click | set_field:@local.click_history_field_name: @local.pows_click_history", + "matchedExpression": "@local.pows_click_history", + "type": "local", + "fieldName": "pows_click_history" + } + ] + } + }, + "_nested_name": [ + { + "fullExpression": "accordion_for_pows.level_a.dg_powlist_a.activity_buttons_a.dg_ok_puzzle_a.button_pow_@item.id", + "matchedExpression": "@item.id", + "type": "item", + "fieldName": "id" + } + ] + }, + "_dynamicDependencies": { + "@item.id": [ + "name", + "action_list.0.args.1", + "action_list.0._raw", + "action_list.0._cleaned", + "_nested_name" + ], + "@item.name": [ + "value" + ], + "@local.click_history_field_name": [ + "action_list.2.args.0", + "action_list.2._raw", + "action_list.2._cleaned" + ], + "@local.pows_click_history": [ + "action_list.2.args.1", + "action_list.2._raw", + "action_list.2._cleaned" + ] + } + } + ], + "_nested_name": "accordion_for_pows.level_a.dg_powlist_a.activity_buttons_a.dg_ok_puzzle_a", + "_dynamicFields": { + "condition": [ { - "fullExpression": "accordion_for_pows.level_a.dg_powlist_a.activity_buttons_a.button_pow_@item.id", - "matchedExpression": "@item.id", - "type": "item", - "fieldName": "id" + "fullExpression": "@local.its_an_okay_puzzle", + "matchedExpression": "@local.its_an_okay_puzzle", + "type": "local", + "fieldName": "its_an_okay_puzzle" } ] }, "_dynamicDependencies": { - "@item.id": [ - "name", - "action_list.0.args.1", - "action_list.0._raw", - "action_list.0._cleaned", - "_nested_name" - ], - "@item.name": [ - "value" - ], - "@local.click_history_field_name": [ - "action_list.2.args.0", - "action_list.2._raw", - "action_list.2._cleaned" - ], - "@local.pows_click_history": [ - "action_list.2.args.1", - "action_list.2._raw", - "action_list.2._cleaned" + "@local.its_an_okay_puzzle": [ + "condition" ] } } @@ -484,7 +737,7 @@ { "type": "accordion_section", "name": "level_b", - "value": "Level B", + "value": "Count to 100; One-digit Add / Sub", "parameter_list": { "text_align": "center", "style": "large emphasised" @@ -530,287 +783,409 @@ } }, { - "name": "click_history_field_name", - "value": "@local.pow_id@local.pow_click_history", + "name": "okay_eye_opener", + "value": "@local.checkbox_eye_opener && @item.eye_opener", "_translations": { "value": {} }, - "exclude_from_translation": true, "type": "set_variable", - "_nested_name": "accordion_for_pows.level_b.dg_powlist_b.activity_buttons_b.click_history_field_name", + "_nested_name": "accordion_for_pows.level_b.dg_powlist_b.activity_buttons_b.okay_eye_opener", "_dynamicFields": { "value": [ { - "fullExpression": "@local.pow_id@local.pow_click_history", - "matchedExpression": "@local.pow_id", + "fullExpression": "@local.checkbox_eye_opener && @item.eye_opener", + "matchedExpression": "@local.checkbox_eye_opener", "type": "local", - "fieldName": "pow_id" + "fieldName": "checkbox_eye_opener" }, { - "fullExpression": "@local.pow_id@local.pow_click_history", - "matchedExpression": "@local.pow_click_history", - "type": "local", - "fieldName": "pow_click_history" + "fullExpression": "@local.checkbox_eye_opener && @item.eye_opener", + "matchedExpression": "@item.eye_opener", + "type": "item", + "fieldName": "eye_opener" } ] }, "_dynamicDependencies": { - "@local.pow_id": [ + "@local.checkbox_eye_opener": [ "value" ], - "@local.pow_click_history": [ + "@item.eye_opener": [ "value" ] } }, { - "name": "pows_click_history", - "value": "@fields.@local.click_history_field_name ; @local.now", + "name": "okay_puzzler", + "value": "@local.checkbox_puzzler && @item.puzzler", "_translations": { "value": {} }, - "condition": "!!(@fields.@local.click_history_field_name)", - "exclude_from_translation": true, "type": "set_variable", - "_nested_name": "accordion_for_pows.level_b.dg_powlist_b.activity_buttons_b.pows_click_history", + "_nested_name": "accordion_for_pows.level_b.dg_powlist_b.activity_buttons_b.okay_puzzler", "_dynamicFields": { "value": [ { - "fullExpression": "@fields.@local.click_history_field_name ; @local.now", - "matchedExpression": "@local.click_history_field_name", + "fullExpression": "@local.checkbox_puzzler && @item.puzzler", + "matchedExpression": "@local.checkbox_puzzler", "type": "local", - "fieldName": "click_history_field_name" + "fieldName": "checkbox_puzzler" }, { - "fullExpression": "@fields.@local.click_history_field_name ; @local.now", - "matchedExpression": "@local.now", - "type": "local", - "fieldName": "now" - } - ], - "condition": [ - { - "fullExpression": "!!(@fields.@local.click_history_field_name)", - "matchedExpression": "@local.click_history_field_name", - "type": "local", - "fieldName": "click_history_field_name" + "fullExpression": "@local.checkbox_puzzler && @item.puzzler", + "matchedExpression": "@item.puzzler", + "type": "item", + "fieldName": "puzzler" } ] }, "_dynamicDependencies": { - "@local.click_history_field_name": [ - "value", - "condition" + "@local.checkbox_puzzler": [ + "value" ], - "@local.now": [ + "@item.puzzler": [ "value" ] } }, { - "name": "pows_click_history", - "value": "@local.now", + "name": "its_an_okay_puzzle", + "value": "@local.okay_eye_opener || @local.okay_puzzler", "_translations": { "value": {} }, - "condition": "!(@fields.@local.click_history_field_name)", - "exclude_from_translation": true, "type": "set_variable", - "_nested_name": "accordion_for_pows.level_b.dg_powlist_b.activity_buttons_b.pows_click_history", + "_nested_name": "accordion_for_pows.level_b.dg_powlist_b.activity_buttons_b.its_an_okay_puzzle", "_dynamicFields": { "value": [ { - "fullExpression": "@local.now", - "matchedExpression": "@local.now", + "fullExpression": "@local.okay_eye_opener || @local.okay_puzzler", + "matchedExpression": "@local.okay_eye_opener", "type": "local", - "fieldName": "now" - } - ], - "condition": [ + "fieldName": "okay_eye_opener" + }, { - "fullExpression": "!(@fields.@local.click_history_field_name)", - "matchedExpression": "@local.click_history_field_name", + "fullExpression": "@local.okay_eye_opener || @local.okay_puzzler", + "matchedExpression": "@local.okay_puzzler", "type": "local", - "fieldName": "click_history_field_name" + "fieldName": "okay_puzzler" } ] }, "_dynamicDependencies": { - "@local.now": [ + "@local.okay_eye_opener": [ "value" ], - "@local.click_history_field_name": [ - "condition" + "@local.okay_puzzler": [ + "value" ] } }, { - "type": "button", - "name": "button_pow_@item.id", - "value": "@item.name", - "_translations": { - "value": {} - }, - "action_list": [ - { - "trigger": "click", - "action_id": "set_field", - "args": [ - "current_pow", - "data.efm_pows.@item.id" - ], - "_raw": "click | set_field:current_pow: data.efm_pows.@item.id", - "_cleaned": "click | set_field:current_pow: data.efm_pows.@item.id" - }, - { - "trigger": "click", - "action_id": "go_to", - "args": [ - "efm_pow_template" - ], - "_raw": "click | go_to: efm_pow_template", - "_cleaned": "click | go_to: efm_pow_template" - }, + "type": "display_group", + "name": "dg_ok_puzzle_b", + "condition": "@local.its_an_okay_puzzle", + "rows": [ { - "trigger": "click", - "action_id": "set_field", - "args": [ - "@local.click_history_field_name", - "@local.pows_click_history" - ], - "_raw": "click | set_field:@local.click_history_field_name: @local.pows_click_history", - "_cleaned": "click | set_field:@local.click_history_field_name: @local.pows_click_history" - } - ], - "parameter_list": { - "style": "short", - "text_align": "center" - }, - "_nested_name": "accordion_for_pows.level_b.dg_powlist_b.activity_buttons_b.button_pow_@item.id", - "_dynamicFields": { - "name": [ - { - "fullExpression": "button_pow_@item.id", - "matchedExpression": "@item.id", - "type": "item", - "fieldName": "id" - } - ], - "value": [ - { - "fullExpression": "@item.name", - "matchedExpression": "@item.name", - "type": "item", - "fieldName": "name" - } - ], - "action_list": { - "0": { - "args": { - "1": [ - { - "fullExpression": "data.efm_pows.@item.id", - "matchedExpression": "@item.id", - "type": "item", - "fieldName": "id" - } - ] - }, - "_raw": [ + "name": "click_history_field_name", + "value": "@local.pow_id@local.pow_click_history", + "_translations": { + "value": {} + }, + "exclude_from_translation": true, + "type": "set_variable", + "_nested_name": "accordion_for_pows.level_b.dg_powlist_b.activity_buttons_b.dg_ok_puzzle_b.click_history_field_name", + "_dynamicFields": { + "value": [ { - "fullExpression": "click | set_field:current_pow: data.efm_pows.@item.id", - "matchedExpression": "@item.id", - "type": "item", - "fieldName": "id" - } - ], - "_cleaned": [ + "fullExpression": "@local.pow_id@local.pow_click_history", + "matchedExpression": "@local.pow_id", + "type": "local", + "fieldName": "pow_id" + }, { - "fullExpression": "click | set_field:current_pow: data.efm_pows.@item.id", - "matchedExpression": "@item.id", - "type": "item", - "fieldName": "id" + "fullExpression": "@local.pow_id@local.pow_click_history", + "matchedExpression": "@local.pow_click_history", + "type": "local", + "fieldName": "pow_click_history" } ] }, - "2": { - "args": { - "0": [ - { - "fullExpression": "@local.click_history_field_name", - "matchedExpression": "@local.click_history_field_name", - "type": "local", - "fieldName": "click_history_field_name" - } - ], - "1": [ - { - "fullExpression": "@local.pows_click_history", - "matchedExpression": "@local.pows_click_history", - "type": "local", - "fieldName": "pows_click_history" - } - ] - }, - "_raw": [ + "_dynamicDependencies": { + "@local.pow_id": [ + "value" + ], + "@local.pow_click_history": [ + "value" + ] + } + }, + { + "name": "pows_click_history", + "value": "@fields.@local.click_history_field_name ; @local.now", + "_translations": { + "value": {} + }, + "condition": "!!(@fields.@local.click_history_field_name)", + "exclude_from_translation": true, + "type": "set_variable", + "_nested_name": "accordion_for_pows.level_b.dg_powlist_b.activity_buttons_b.dg_ok_puzzle_b.pows_click_history", + "_dynamicFields": { + "value": [ { - "fullExpression": "click | set_field:@local.click_history_field_name: @local.pows_click_history", + "fullExpression": "@fields.@local.click_history_field_name ; @local.now", "matchedExpression": "@local.click_history_field_name", "type": "local", "fieldName": "click_history_field_name" }, { - "fullExpression": "click | set_field:@local.click_history_field_name: @local.pows_click_history", - "matchedExpression": "@local.pows_click_history", + "fullExpression": "@fields.@local.click_history_field_name ; @local.now", + "matchedExpression": "@local.now", "type": "local", - "fieldName": "pows_click_history" + "fieldName": "now" } ], - "_cleaned": [ + "condition": [ { - "fullExpression": "click | set_field:@local.click_history_field_name: @local.pows_click_history", + "fullExpression": "!!(@fields.@local.click_history_field_name)", "matchedExpression": "@local.click_history_field_name", "type": "local", "fieldName": "click_history_field_name" - }, + } + ] + }, + "_dynamicDependencies": { + "@local.click_history_field_name": [ + "value", + "condition" + ], + "@local.now": [ + "value" + ] + } + }, + { + "name": "pows_click_history", + "value": "@local.now", + "_translations": { + "value": {} + }, + "condition": "!(@fields.@local.click_history_field_name)", + "exclude_from_translation": true, + "type": "set_variable", + "_nested_name": "accordion_for_pows.level_b.dg_powlist_b.activity_buttons_b.dg_ok_puzzle_b.pows_click_history", + "_dynamicFields": { + "value": [ + { + "fullExpression": "@local.now", + "matchedExpression": "@local.now", + "type": "local", + "fieldName": "now" + } + ], + "condition": [ { - "fullExpression": "click | set_field:@local.click_history_field_name: @local.pows_click_history", - "matchedExpression": "@local.pows_click_history", + "fullExpression": "!(@fields.@local.click_history_field_name)", + "matchedExpression": "@local.click_history_field_name", "type": "local", - "fieldName": "pows_click_history" + "fieldName": "click_history_field_name" } ] + }, + "_dynamicDependencies": { + "@local.now": [ + "value" + ], + "@local.click_history_field_name": [ + "condition" + ] } }, - "_nested_name": [ + { + "type": "button", + "name": "button_pow_@item.id", + "value": "@item.name", + "_translations": { + "value": {} + }, + "action_list": [ + { + "trigger": "click", + "action_id": "set_field", + "args": [ + "current_pow", + "data.efm_pows.@item.id" + ], + "_raw": "click | set_field:current_pow: data.efm_pows.@item.id", + "_cleaned": "click | set_field:current_pow: data.efm_pows.@item.id" + }, + { + "trigger": "click", + "action_id": "go_to", + "args": [ + "efm_pow_template" + ], + "_raw": "click | go_to: efm_pow_template", + "_cleaned": "click | go_to: efm_pow_template" + }, + { + "trigger": "click", + "action_id": "set_field", + "args": [ + "@local.click_history_field_name", + "@local.pows_click_history" + ], + "_raw": "click | set_field:@local.click_history_field_name: @local.pows_click_history", + "_cleaned": "click | set_field:@local.click_history_field_name: @local.pows_click_history" + } + ], + "parameter_list": { + "style": "short", + "text_align": "center" + }, + "_nested_name": "accordion_for_pows.level_b.dg_powlist_b.activity_buttons_b.dg_ok_puzzle_b.button_pow_@item.id", + "_dynamicFields": { + "name": [ + { + "fullExpression": "button_pow_@item.id", + "matchedExpression": "@item.id", + "type": "item", + "fieldName": "id" + } + ], + "value": [ + { + "fullExpression": "@item.name", + "matchedExpression": "@item.name", + "type": "item", + "fieldName": "name" + } + ], + "action_list": { + "0": { + "args": { + "1": [ + { + "fullExpression": "data.efm_pows.@item.id", + "matchedExpression": "@item.id", + "type": "item", + "fieldName": "id" + } + ] + }, + "_raw": [ + { + "fullExpression": "click | set_field:current_pow: data.efm_pows.@item.id", + "matchedExpression": "@item.id", + "type": "item", + "fieldName": "id" + } + ], + "_cleaned": [ + { + "fullExpression": "click | set_field:current_pow: data.efm_pows.@item.id", + "matchedExpression": "@item.id", + "type": "item", + "fieldName": "id" + } + ] + }, + "2": { + "args": { + "0": [ + { + "fullExpression": "@local.click_history_field_name", + "matchedExpression": "@local.click_history_field_name", + "type": "local", + "fieldName": "click_history_field_name" + } + ], + "1": [ + { + "fullExpression": "@local.pows_click_history", + "matchedExpression": "@local.pows_click_history", + "type": "local", + "fieldName": "pows_click_history" + } + ] + }, + "_raw": [ + { + "fullExpression": "click | set_field:@local.click_history_field_name: @local.pows_click_history", + "matchedExpression": "@local.click_history_field_name", + "type": "local", + "fieldName": "click_history_field_name" + }, + { + "fullExpression": "click | set_field:@local.click_history_field_name: @local.pows_click_history", + "matchedExpression": "@local.pows_click_history", + "type": "local", + "fieldName": "pows_click_history" + } + ], + "_cleaned": [ + { + "fullExpression": "click | set_field:@local.click_history_field_name: @local.pows_click_history", + "matchedExpression": "@local.click_history_field_name", + "type": "local", + "fieldName": "click_history_field_name" + }, + { + "fullExpression": "click | set_field:@local.click_history_field_name: @local.pows_click_history", + "matchedExpression": "@local.pows_click_history", + "type": "local", + "fieldName": "pows_click_history" + } + ] + } + }, + "_nested_name": [ + { + "fullExpression": "accordion_for_pows.level_b.dg_powlist_b.activity_buttons_b.dg_ok_puzzle_b.button_pow_@item.id", + "matchedExpression": "@item.id", + "type": "item", + "fieldName": "id" + } + ] + }, + "_dynamicDependencies": { + "@item.id": [ + "name", + "action_list.0.args.1", + "action_list.0._raw", + "action_list.0._cleaned", + "_nested_name" + ], + "@item.name": [ + "value" + ], + "@local.click_history_field_name": [ + "action_list.2.args.0", + "action_list.2._raw", + "action_list.2._cleaned" + ], + "@local.pows_click_history": [ + "action_list.2.args.1", + "action_list.2._raw", + "action_list.2._cleaned" + ] + } + } + ], + "_nested_name": "accordion_for_pows.level_b.dg_powlist_b.activity_buttons_b.dg_ok_puzzle_b", + "_dynamicFields": { + "condition": [ { - "fullExpression": "accordion_for_pows.level_b.dg_powlist_b.activity_buttons_b.button_pow_@item.id", - "matchedExpression": "@item.id", - "type": "item", - "fieldName": "id" + "fullExpression": "@local.its_an_okay_puzzle", + "matchedExpression": "@local.its_an_okay_puzzle", + "type": "local", + "fieldName": "its_an_okay_puzzle" } ] }, "_dynamicDependencies": { - "@item.id": [ - "name", - "action_list.0.args.1", - "action_list.0._raw", - "action_list.0._cleaned", - "_nested_name" - ], - "@item.name": [ - "value" - ], - "@local.click_history_field_name": [ - "action_list.2.args.0", - "action_list.2._raw", - "action_list.2._cleaned" - ], - "@local.pows_click_history": [ - "action_list.2.args.1", - "action_list.2._raw", - "action_list.2._cleaned" + "@local.its_an_okay_puzzle": [ + "condition" ] } } diff --git a/app_data/sheets/template/esm_resources.json b/app_data/sheets/template/esm_resources.json index f138534..965b95b 100644 --- a/app_data/sheets/template/esm_resources.json +++ b/app_data/sheets/template/esm_resources.json @@ -1121,6 +1121,359 @@ } ], "_nested_name": "dg_storybooks" + }, + { + "name": "now", + "value": "@calc(timestamp())", + "_translations": { + "value": {} + }, + "exclude_from_translation": true, + "type": "set_variable", + "_nested_name": "now", + "_dynamicFields": { + "value": [ + { + "fullExpression": "@calc(timestamp())", + "matchedExpression": "@calc(timestamp())", + "type": "calc", + "fieldName": "timestamp()" + } + ] + }, + "_dynamicDependencies": { + "@calc(timestamp())": [ + "value" + ] + } + }, + { + "name": "click_history_field_name", + "value": "glossary_button_click_history", + "_translations": { + "value": {} + }, + "exclude_from_translation": true, + "type": "set_variable", + "_nested_name": "click_history_field_name" + }, + { + "name": "button_click_history", + "value": "@fields.@local.click_history_field_name ; @local.now", + "_translations": { + "value": {} + }, + "condition": "!!(@fields.@local.click_history_field_name)", + "exclude_from_translation": true, + "type": "set_variable", + "_nested_name": "button_click_history", + "_dynamicFields": { + "value": [ + { + "fullExpression": "@fields.@local.click_history_field_name ; @local.now", + "matchedExpression": "@local.click_history_field_name", + "type": "local", + "fieldName": "click_history_field_name" + }, + { + "fullExpression": "@fields.@local.click_history_field_name ; @local.now", + "matchedExpression": "@local.now", + "type": "local", + "fieldName": "now" + } + ], + "condition": [ + { + "fullExpression": "!!(@fields.@local.click_history_field_name)", + "matchedExpression": "@local.click_history_field_name", + "type": "local", + "fieldName": "click_history_field_name" + } + ] + }, + "_dynamicDependencies": { + "@local.click_history_field_name": [ + "value", + "condition" + ], + "@local.now": [ + "value" + ] + } + }, + { + "name": "button_click_history", + "value": "@local.now", + "_translations": { + "value": {} + }, + "condition": "!(@fields.@local.click_history_field_name)", + "exclude_from_translation": true, + "type": "set_variable", + "_nested_name": "button_click_history", + "_dynamicFields": { + "value": [ + { + "fullExpression": "@local.now", + "matchedExpression": "@local.now", + "type": "local", + "fieldName": "now" + } + ], + "condition": [ + { + "fullExpression": "!(@fields.@local.click_history_field_name)", + "matchedExpression": "@local.click_history_field_name", + "type": "local", + "fieldName": "click_history_field_name" + } + ] + }, + "_dynamicDependencies": { + "@local.now": [ + "value" + ], + "@local.click_history_field_name": [ + "condition" + ] + } + }, + { + "type": "display_group", + "name": "dg_storybooks", + "rows": [ + { + "type": "button", + "name": "button_glossary", + "value": "Glossary", + "_translations": { + "value": {} + }, + "action_list": [ + { + "trigger": "click", + "action_id": "start_tour", + "args": [ + "efm_glossary_tour" + ], + "_raw": "click | start_tour: efm_glossary_tour", + "_cleaned": "click | start_tour: efm_glossary_tour" + }, + { + "trigger": "click", + "action_id": "set_field", + "args": [ + "has_accessed_glossary", + true + ], + "_raw": "click | set_field: has_accessed_glossary: TRUE", + "_cleaned": "click | set_field: has_accessed_glossary: TRUE" + }, + { + "trigger": "click", + "action_id": "set_field", + "args": [ + "@local.click_history_field_name", + "@local.button_click_history" + ], + "_raw": "click | set_field:@local.click_history_field_name: @local.button_click_history", + "_cleaned": "click | set_field:@local.click_history_field_name: @local.button_click_history" + } + ], + "condition": "!@fields.has_accessed_glossary", + "parameter_list": { + "style": "short", + "text_align": "center" + }, + "_nested_name": "dg_storybooks.button_glossary", + "_dynamicFields": { + "action_list": { + "2": { + "args": { + "0": [ + { + "fullExpression": "@local.click_history_field_name", + "matchedExpression": "@local.click_history_field_name", + "type": "local", + "fieldName": "click_history_field_name" + } + ], + "1": [ + { + "fullExpression": "@local.button_click_history", + "matchedExpression": "@local.button_click_history", + "type": "local", + "fieldName": "button_click_history" + } + ] + }, + "_raw": [ + { + "fullExpression": "click | set_field:@local.click_history_field_name: @local.button_click_history", + "matchedExpression": "@local.click_history_field_name", + "type": "local", + "fieldName": "click_history_field_name" + }, + { + "fullExpression": "click | set_field:@local.click_history_field_name: @local.button_click_history", + "matchedExpression": "@local.button_click_history", + "type": "local", + "fieldName": "button_click_history" + } + ], + "_cleaned": [ + { + "fullExpression": "click | set_field:@local.click_history_field_name: @local.button_click_history", + "matchedExpression": "@local.click_history_field_name", + "type": "local", + "fieldName": "click_history_field_name" + }, + { + "fullExpression": "click | set_field:@local.click_history_field_name: @local.button_click_history", + "matchedExpression": "@local.button_click_history", + "type": "local", + "fieldName": "button_click_history" + } + ] + } + }, + "condition": [ + { + "fullExpression": "!@fields.has_accessed_glossary", + "matchedExpression": "!@fields.has_accessed_glossary", + "type": "fields", + "fieldName": "has_accessed_glossary" + } + ] + }, + "_dynamicDependencies": { + "@local.click_history_field_name": [ + "action_list.2.args.0", + "action_list.2._raw", + "action_list.2._cleaned" + ], + "@local.button_click_history": [ + "action_list.2.args.1", + "action_list.2._raw", + "action_list.2._cleaned" + ], + "!@fields.has_accessed_glossary": [ + "condition" + ] + } + }, + { + "type": "button", + "name": "button_glossary", + "value": "Glossary", + "_translations": { + "value": {} + }, + "action_list": [ + { + "trigger": "click", + "action_id": "go_to", + "args": [ + "efm_gloss_start" + ], + "_raw": "click | go_to: efm_gloss_start", + "_cleaned": "click | go_to: efm_gloss_start" + }, + { + "trigger": "click", + "action_id": "set_field", + "args": [ + "@local.click_history_field_name", + "@local.button_click_history" + ], + "_raw": "click | set_field:@local.click_history_field_name: @local.button_click_history", + "_cleaned": "click | set_field:@local.click_history_field_name: @local.button_click_history" + } + ], + "condition": "@fields.has_accessed_glossary", + "parameter_list": { + "style": "short", + "text_align": "center" + }, + "_nested_name": "dg_storybooks.button_glossary", + "_dynamicFields": { + "action_list": { + "1": { + "args": { + "0": [ + { + "fullExpression": "@local.click_history_field_name", + "matchedExpression": "@local.click_history_field_name", + "type": "local", + "fieldName": "click_history_field_name" + } + ], + "1": [ + { + "fullExpression": "@local.button_click_history", + "matchedExpression": "@local.button_click_history", + "type": "local", + "fieldName": "button_click_history" + } + ] + }, + "_raw": [ + { + "fullExpression": "click | set_field:@local.click_history_field_name: @local.button_click_history", + "matchedExpression": "@local.click_history_field_name", + "type": "local", + "fieldName": "click_history_field_name" + }, + { + "fullExpression": "click | set_field:@local.click_history_field_name: @local.button_click_history", + "matchedExpression": "@local.button_click_history", + "type": "local", + "fieldName": "button_click_history" + } + ], + "_cleaned": [ + { + "fullExpression": "click | set_field:@local.click_history_field_name: @local.button_click_history", + "matchedExpression": "@local.click_history_field_name", + "type": "local", + "fieldName": "click_history_field_name" + }, + { + "fullExpression": "click | set_field:@local.click_history_field_name: @local.button_click_history", + "matchedExpression": "@local.button_click_history", + "type": "local", + "fieldName": "button_click_history" + } + ] + } + }, + "condition": [ + { + "fullExpression": "@fields.has_accessed_glossary", + "matchedExpression": "@fields.has_accessed_glossary", + "type": "fields", + "fieldName": "has_accessed_glossary" + } + ] + }, + "_dynamicDependencies": { + "@local.click_history_field_name": [ + "action_list.1.args.0", + "action_list.1._raw", + "action_list.1._cleaned" + ], + "@local.button_click_history": [ + "action_list.1.args.1", + "action_list.1._raw", + "action_list.1._cleaned" + ], + "@fields.has_accessed_glossary": [ + "condition" + ] + } + } + ], + "_nested_name": "dg_storybooks" } ], "_xlsxPath": "EFM_high_level_sheets.xlsx" diff --git a/app_data/sheets/tour/efm_gas_tour.json b/app_data/sheets/tour/efm_gas_tour.json index 2ce9c12..3e98f3c 100644 --- a/app_data/sheets/tour/efm_gas_tour.json +++ b/app_data/sheets/tour/efm_gas_tour.json @@ -14,16 +14,6 @@ "template_component_name": "dg_top_of_page", "route": "template/efm_ga_start" }, - { - "type": "step", - "title": "Special Uses", - "_translations": { - "title": {}, - "message_text": {} - }, - "message_text": "Tutoring: These games are good for focused practice with a particular skill......\n\n\nBreaks: These are quick to set up and play games that are ideal for short breaks between longer activities......\n\n\nHome: These are good games to send home for families to play together and practice the skills being learned in the classroom.", - "template_component_name": "dg_types" - }, { "type": "step", "title": "Help", diff --git a/config.ts b/config.ts index 03413e2..791793e 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.28", + content_tag_latest: "1.1.29", }; config.android = {