diff --git a/app_data/assets/contents.json b/app_data/assets/contents.json index 72ef607..b064c57 100644 --- a/app_data/assets/contents.json +++ b/app_data/assets/contents.json @@ -5896,8 +5896,8 @@ }, "ESMIll/ESMPOWAPatternBlocksTrianglesIntro.svg": { "filePath": "global/ESMIll/ESMPOWAPatternBlocksTrianglesIntro.svg", - "md5Checksum": "319dd9b198596cf6e6a72a34243d37b5", - "size_kb": 27.3 + "md5Checksum": "ad50bab1dedb6f4faaa9c9c8d8d717e7", + "size_kb": 136.4 }, "ESMIll/ESMPOWAReflectOnThisAnswer1.svg": { "filePath": "global/ESMIll/ESMPOWAReflectOnThisAnswer1.svg", diff --git a/app_data/assets/global/ESMIll/ESMPOWAPatternBlocksTrianglesIntro.svg b/app_data/assets/global/ESMIll/ESMPOWAPatternBlocksTrianglesIntro.svg index baba24c..a7d3393 100644 --- a/app_data/assets/global/ESMIll/ESMPOWAPatternBlocksTrianglesIntro.svg +++ b/app_data/assets/global/ESMIll/ESMPOWAPatternBlocksTrianglesIntro.svg @@ -2,18 +2,16 @@ - - + inkscape:current-layer="layer1" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + transform="translate(108.21458,-22.484375)"> + diff --git a/app_data/sheets/contents.json b/app_data/sheets/contents.json index 142cd9a..ae98ef0 100644 --- a/app_data/sheets/contents.json +++ b/app_data/sheets/contents.json @@ -650,7 +650,18 @@ "flow_type": "data_list", "flow_name": "efm_ga_list", "data_list_name": "efm_gas", - "_xlsxPath": "EFM_gas_high_level_sheets.xlsx" + "_xlsxPath": "EFM_gas_high_level_sheets.xlsx", + "_metadata": { + "breaks": { + "type": "boolean" + }, + "tutoring": { + "type": "boolean" + }, + "home": { + "type": "boolean" + } + } }, "efm_number_list_one_to_ten": { "flow_type": "data_list", diff --git a/app_data/sheets/data_list/efm_ga_list.json b/app_data/sheets/data_list/efm_ga_list.json index 0c05aaa..0b52de4 100644 --- a/app_data/sheets/data_list/efm_ga_list.json +++ b/app_data/sheets/data_list/efm_ga_list.json @@ -12,6 +12,9 @@ "topic_theme_3": "NPV_QC20_Count20", "type": "Activity", "uses": "Breaks", + "breaks": true, + "tutoring": false, + "home": false, "concepts": "Ordering numbers to 20", "materials": "Sticky notes and pencil", "players": "Groups", @@ -49,6 +52,9 @@ "topic_theme_1": "NPV_QC10_QC", "type": "Game", "uses": "Tutoring, Home", + "breaks": false, + "tutoring": true, + "home": true, "concepts": "Counting; Quantities to 10", "materials": "Playing cards", "players": 2, @@ -95,6 +101,9 @@ "topic_theme_2": "NPV_QC10_QC", "type": "Game", "uses": "Tutoring, Home", + "breaks": false, + "tutoring": true, + "home": true, "concepts": "Counting; Order to 10", "materials": "Playing cards", "players": 2, @@ -141,6 +150,9 @@ "topic_theme_2": "NO_ASSD_ASto10", "type": "Game", "uses": "Home", + "breaks": false, + "tutoring": false, + "home": true, "concepts": "Counting to 12; Add Sub to 6", "materials": "Paper; Colored markers; 1 die", "players": 2, @@ -196,6 +208,9 @@ "topic_theme_1": "NPV_QC10_QC", "type": "Game", "uses": "Tutoring, Home", + "breaks": false, + "tutoring": true, + "home": true, "concepts": "Counting to 10; Quantities", "materials": "Playing cards", "players": "2+", @@ -235,6 +250,9 @@ "topic_theme_1": "NPV_QC10_QC", "type": "Game", "uses": "Breaks, Tutoring, Home", + "breaks": true, + "tutoring": true, + "home": true, "concepts": "Counting, Squares, Strategy", "materials": "Paper, Pencil", "players": 2, @@ -288,6 +306,9 @@ "topic_theme_1": "NO_ASSD_ASto10", "type": "Game", "uses": "Breaks, Tutoring, Home", + "breaks": true, + "tutoring": true, + "home": true, "concepts": "Adding small numbers, Squares, Strategy", "materials": "Paper, Pencil", "players": 2, @@ -342,6 +363,9 @@ "topic_theme_2": "NPV_QC10_QC", "type": "Game", "uses": "Tutoring, Home", + "breaks": false, + "tutoring": true, + "home": true, "concepts": "Add Sub 1", "materials": "Paper, Pencil, Colored tokens", "players": 2, @@ -395,6 +419,9 @@ "topic_theme_1": "NPV_QC10_QC", "type": "Game", "uses": "Tutoring, Home", + "breaks": false, + "tutoring": true, + "home": true, "concepts": "Counting, Small Quantities", "materials": "Playing cards", "players": 2, @@ -435,6 +462,9 @@ "topic_theme_2": "NO_ASSD_ASto10", "type": "Game", "uses": "Tutoring, Home", + "breaks": false, + "tutoring": true, + "home": true, "concepts": "Adding", "materials": "Playing cards", "players": "2+", @@ -481,6 +511,9 @@ "topic_theme_2": "NO_AS10_NBFF", "type": "Game", "uses": "Tutoring, Home", + "breaks": false, + "tutoring": true, + "home": true, "concepts": "Add singe digit; Number bonds", "materials": "Game board, Colored tokens", "players": 2, @@ -518,6 +551,9 @@ "topic_theme_1": "NO_AS10_ASto10", "type": "Game", "uses": "Tutoring, Home", + "breaks": false, + "tutoring": true, + "home": true, "concepts": "Add Sub single digit", "materials": "Paper, Pencil, Colored tokens", "players": 2, @@ -572,6 +608,9 @@ "topic_theme_2": "NPV_QC20_Comp20", "type": "Activity", "uses": "Tutoring, Home", + "breaks": false, + "tutoring": true, + "home": true, "concepts": "Comparing, Number line", "materials": "Paper and pencil - or - None", "players": 2, @@ -611,6 +650,9 @@ "topic_theme_1": "NO_AS10_ASto10", "type": "Game", "uses": "Tutoring, Home", + "breaks": false, + "tutoring": true, + "home": true, "concepts": "Add Sub single digit", "materials": "Paper and Pencil", "players": 2, @@ -648,6 +690,9 @@ "topic_theme_1": "NO_AS10_AS1and2", "type": "Game", "uses": "Breaks, Tutoring, Home", + "breaks": true, + "tutoring": true, + "home": true, "concepts": "Counting, Add Sub single digit", "materials": "Paper, Pencil", "players": 2, @@ -680,5 +725,16 @@ "block3_text": "**Piles of objects:** If your players are not comfortable with numerals yet, use a pile of objects. Remove objects from the pile with each move until no objects are left and you have a winner.\n\n**Number line:** Use a marker on a number line. Start the marker at 10 and slide it one or two places to the left with each move.\n\n**Adding:** Practice adding by starting with 0 and adding 1 or 2 for each turn. The player who reaches the target number wins.\n\n**Target loses:** You can play that the player who is forced to 0 (or the target number) is the loser.\n\n**Target number:** Use smaller target numbers for beginning players and larger target numbers for more experienced players.\n\n**Different step sizes:** For the upper grades in this range, Instead of adding or subtracting 1 and 2, use other groups of numbers. Use 1, 2, and 3; or even 1, 2, and 4." } ], - "_xlsxPath": "EFM_gas_high_level_sheets.xlsx" + "_xlsxPath": "EFM_gas_high_level_sheets.xlsx", + "_metadata": { + "breaks": { + "type": "boolean" + }, + "tutoring": { + "type": "boolean" + }, + "home": { + "type": "boolean" + } + } } \ No newline at end of file diff --git a/app_data/sheets/data_list/efm_pow_list.json b/app_data/sheets/data_list/efm_pow_list.json index 9920418..376c83c 100644 --- a/app_data/sheets/data_list/efm_pow_list.json +++ b/app_data/sheets/data_list/efm_pow_list.json @@ -12,9 +12,10 @@ "notes_block_start": 4, "block1_type": "illust_below", "block1_illust": "ESMIll/ESMPOWACardStackingIntro.svg", - "block1_illust_max_size": "360px", + "block1_illust_max_size": "400px", "block2_type": "illust_below", "block2_illust": "ESMIll/ESMPOWACardStackingChallenge.svg", + "block2_illust_max_size": "330px", "block3_type": "all_text", "block4_type": "all_text", "name": "Card Deck Ordering - 1", @@ -815,6 +816,8 @@ { "id": "esm_pow_a_pan_balance_1", "level": "A", + "topic_theme_1": "NPV_QC10_QC", + "topic_theme_2": "NPV_QC10_CMQ10", "notes_block_start": 3, "block1_type": "illust_below", "block1_illust": "ESMIll/ESMPOWAPanBalanceWithCoins.svg", @@ -849,6 +852,8 @@ { "id": "esm_pow_a_pan_balance_2", "level": "A", + "topic_theme_1": "NPV_QC10_QC", + "topic_theme_2": "NPV_QC10_CMQ10", "notes_block_start": 3, "block1_type": "illust_below", "block1_illust": "ESMIll/ESMPOWAPanBalanceWithCoins.svg", @@ -883,6 +888,8 @@ { "id": "esm_pow_a_pattern_blocks_hexagons", "level": "A", + "topic_theme_1": "Geom_Shape_SN2D3D", + "topic_theme_2": "Geom_Shape_CompDecomp", "notes_block_start": 3, "block1_type": "illust_below", "block1_illust": "ESMIll/ESMPOWAPatternBlocksHexagonsIntro.svg", @@ -919,6 +926,8 @@ { "id": "esm_pow_a_pattern_blocks_triangles", "level": "A", + "topic_theme_1": "Geom_Shape_SN2D3D", + "topic_theme_2": "Geom_Shape_CompDecomp", "notes_block_start": 3, "block1_type": "illust_below", "block1_illust": "ESMIll/ESMPOWAPatternBlocksTrianglesIntro.svg", @@ -1045,13 +1054,14 @@ { "id": "esm_pow_a_stacking_hats_1", "level": "A", + "topic_theme_1": "NPV_QC10_QC", "notes_block_start": 4, "block1_type": "illust_below", "block1_illust": "ESMIll/ESMPOWAStackingHatsIntro.svg", "block1_illust_max_size": "400px", "block2_type": "illust_below", "block2_illust": "ESMIll/ESMPOWAStackingHats1Challenge.svg", - "block2_illust_max_size": "360px", + "block2_illust_max_size": "400px", "block3_type": "all_text", "block4_type": "all_text", "name": "Stacking Hats – 1", @@ -1087,13 +1097,14 @@ { "id": "esm_pow_a_stacking_hats_2", "level": "A", + "topic_theme_1": "NPV_QC10_QC", "notes_block_start": 4, "block1_type": "illust_below", "block1_illust": "ESMIll/ESMPOWAStackingHatsIntro.svg", "block1_illust_max_size": "400px", "block2_type": "illust_below", "block2_illust": "ESMIll/ESMPOWAStackingHats2Challenge.svg", - "block2_illust_max_size": "360px", + "block2_illust_max_size": "400px", "block3_type": "all_text", "block4_type": "all_text", "name": "Stacking Hats – 2", @@ -1129,6 +1140,7 @@ { "id": "esm_pow_a_treasure_map_1", "level": "A", + "topic_theme_1": "NPV_QC10_QC", "notes_block_start": 4, "block1_type": "illust_below", "block1_illust": "ESMIll/ESMPOWATreasureMapIntro.svg", @@ -1171,6 +1183,7 @@ { "id": "esm_pow_a_treasure_map_2", "level": "A", + "topic_theme_1": "NPV_QC10_QC", "notes_block_start": 4, "block1_type": "illust_below", "block1_illust": "ESMIll/ESMPOWATreasureMapIntro.svg", diff --git a/app_data/sheets/template/efm_ga_start.json b/app_data/sheets/template/efm_ga_start.json index 26fd00c..7a79851 100644 --- a/app_data/sheets/template/efm_ga_start.json +++ b/app_data/sheets/template/efm_ga_start.json @@ -49,6 +49,234 @@ ], "_nested_name": "dg_top_of_page" }, + { + "type": "display_group", + "name": "dg_types", + "parameter_list": { + "style": "column" + }, + "rows": [ + { + "name": "description_0", + "value": "All", + "_translations": { + "value": {} + }, + "type": "set_variable", + "_nested_name": "dg_types.description_0" + }, + { + "name": "description_1", + "value": "Tutoring", + "_translations": { + "value": {} + }, + "type": "set_variable", + "_nested_name": "dg_types.description_1" + }, + { + "name": "description_2", + "value": "Breaks", + "_translations": { + "value": {} + }, + "type": "set_variable", + "_nested_name": "dg_types.description_2" + }, + { + "name": "description_3", + "value": "Home", + "_translations": { + "value": {} + }, + "type": "set_variable", + "_nested_name": "dg_types.description_3" + }, + { + "type": "display_group", + "name": "dg_game_types", + "parameter_list": { + "style": "column" + }, + "rows": [ + { + "type": "display_group", + "name": "dg_first_pair_game_types", + "rows": [ + { + "type": "toggle_bar", + "name": "checkbox_all", + "value": true, + "parameter_list": { + "true_text": "@local.description_0", + "false_text": "@local.description_0" + }, + "_nested_name": "dg_types.dg_game_types.dg_first_pair_game_types.checkbox_all", + "_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_tutoring", + "value": false, + "parameter_list": { + "true_text": "@local.description_1", + "false_text": "@local.description_1" + }, + "_nested_name": "dg_types.dg_game_types.dg_first_pair_game_types.checkbox_tutoring", + "_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_game_types.dg_first_pair_game_types" + }, + { + "type": "display_group", + "name": "dg_second_pair_game_types", + "rows": [ + { + "type": "toggle_bar", + "name": "checkbox_breaks", + "value": false, + "parameter_list": { + "true_text": "@local.description_2", + "false_text": "@local.description_2" + }, + "_nested_name": "dg_types.dg_game_types.dg_second_pair_game_types.checkbox_breaks", + "_dynamicFields": { + "parameter_list": { + "true_text": [ + { + "fullExpression": "@local.description_2", + "matchedExpression": "@local.description_2", + "type": "local", + "fieldName": "description_2" + } + ], + "false_text": [ + { + "fullExpression": "@local.description_2", + "matchedExpression": "@local.description_2", + "type": "local", + "fieldName": "description_2" + } + ] + } + }, + "_dynamicDependencies": { + "@local.description_2": [ + "parameter_list.true_text", + "parameter_list.false_text" + ] + } + }, + { + "type": "toggle_bar", + "name": "checkbox_home", + "value": false, + "parameter_list": { + "true_text": "@local.description_3", + "false_text": "@local.description_3" + }, + "_nested_name": "dg_types.dg_game_types.dg_second_pair_game_types.checkbox_home", + "_dynamicFields": { + "parameter_list": { + "true_text": [ + { + "fullExpression": "@local.description_3", + "matchedExpression": "@local.description_3", + "type": "local", + "fieldName": "description_3" + } + ], + "false_text": [ + { + "fullExpression": "@local.description_3", + "matchedExpression": "@local.description_3", + "type": "local", + "fieldName": "description_3" + } + ] + } + }, + "_dynamicDependencies": { + "@local.description_3": [ + "parameter_list.true_text", + "parameter_list.false_text" + ] + } + } + ], + "_nested_name": "dg_types.dg_game_types.dg_second_pair_game_types" + }, + { + "type": "text", + "name": "blank", + "style_list": [ + "flex: 1" + ], + "_nested_name": "dg_types.dg_game_types.blank" + } + ], + "_nested_name": "dg_types.dg_game_types" + }, + { + "type": "display_group", + "name": "dg_spacer", + "rows": [], + "_nested_name": "dg_types.dg_spacer" + } + ], + "_nested_name": "dg_types" + }, { "name": "now", "value": "@calc(timestamp())", @@ -121,269 +349,445 @@ } }, { - "name": "click_history_field_name", - "value": "@local.ga_id@local.ga_click_history", + "name": "ok_tutoring", + "value": "@local.checkbox_tutoring && @item.tutoring", "_translations": { "value": {} }, - "exclude_from_translation": true, "type": "set_variable", - "_nested_name": "dg_galist.activity_buttons.click_history_field_name", + "_nested_name": "dg_galist.activity_buttons.ok_tutoring", "_dynamicFields": { "value": [ { - "fullExpression": "@local.ga_id@local.ga_click_history", - "matchedExpression": "@local.ga_id", + "fullExpression": "@local.checkbox_tutoring && @item.tutoring", + "matchedExpression": "@local.checkbox_tutoring", "type": "local", - "fieldName": "ga_id" + "fieldName": "checkbox_tutoring" }, { - "fullExpression": "@local.ga_id@local.ga_click_history", - "matchedExpression": "@local.ga_click_history", - "type": "local", - "fieldName": "ga_click_history" + "fullExpression": "@local.checkbox_tutoring && @item.tutoring", + "matchedExpression": "@item.tutoring", + "type": "item", + "fieldName": "tutoring" } ] }, "_dynamicDependencies": { - "@local.ga_id": [ + "@local.checkbox_tutoring": [ "value" ], - "@local.ga_click_history": [ + "@item.tutoring": [ "value" ] } }, { - "name": "gas_click_history", - "value": "@fields.@local.click_history_field_name ; @local.now", + "name": "ok_breaks", + "value": "@local.checkbox_breaks && @item.breaks", "_translations": { "value": {} }, - "condition": "!!(@fields.@local.click_history_field_name)", - "exclude_from_translation": true, "type": "set_variable", - "_nested_name": "dg_galist.activity_buttons.gas_click_history", + "_nested_name": "dg_galist.activity_buttons.ok_breaks", "_dynamicFields": { "value": [ { - "fullExpression": "@fields.@local.click_history_field_name ; @local.now", - "matchedExpression": "@local.click_history_field_name", + "fullExpression": "@local.checkbox_breaks && @item.breaks", + "matchedExpression": "@local.checkbox_breaks", "type": "local", - "fieldName": "click_history_field_name" + "fieldName": "checkbox_breaks" }, { - "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_breaks && @item.breaks", + "matchedExpression": "@item.breaks", + "type": "item", + "fieldName": "breaks" } ] }, "_dynamicDependencies": { - "@local.click_history_field_name": [ - "value", - "condition" + "@local.checkbox_breaks": [ + "value" ], - "@local.now": [ + "@item.breaks": [ "value" ] } }, { - "name": "gas_click_history", - "value": "@local.now", + "name": "ok_home", + "value": "@local.checkbox_home && @item.home", "_translations": { "value": {} }, - "condition": "!(@fields.@local.click_history_field_name)", - "exclude_from_translation": true, "type": "set_variable", - "_nested_name": "dg_galist.activity_buttons.gas_click_history", + "_nested_name": "dg_galist.activity_buttons.ok_home", "_dynamicFields": { "value": [ { - "fullExpression": "@local.now", - "matchedExpression": "@local.now", + "fullExpression": "@local.checkbox_home && @item.home", + "matchedExpression": "@local.checkbox_home", "type": "local", - "fieldName": "now" - } - ], - "condition": [ + "fieldName": "checkbox_home" + }, { - "fullExpression": "!(@fields.@local.click_history_field_name)", - "matchedExpression": "@local.click_history_field_name", - "type": "local", - "fieldName": "click_history_field_name" + "fullExpression": "@local.checkbox_home && @item.home", + "matchedExpression": "@item.home", + "type": "item", + "fieldName": "home" } ] }, "_dynamicDependencies": { - "@local.now": [ + "@local.checkbox_home": [ "value" ], - "@local.click_history_field_name": [ - "condition" + "@item.home": [ + "value" ] } }, { - "type": "button", - "name": "button_ga", - "value": "@item.name", + "name": "its_an_okay_game", + "value": "@local.checkbox_all || @local.ok_tutoring || @local.ok_breaks || @local.ok_home", "_translations": { "value": {} }, - "action_list": [ - { - "trigger": "click", - "action_id": "set_field", - "args": [ - "current_ga", - "data.efm_gas.@item.id" - ], - "_raw": "click | set_field:current_ga: data.efm_gas.@item.id", - "_cleaned": "click | set_field:current_ga: data.efm_gas.@item.id" - }, - { - "trigger": "click", - "action_id": "go_to", - "args": [ - "efm_ga_template" - ], - "_raw": "click | go_to: efm_ga_template", - "_cleaned": "click | go_to: efm_ga_template" - }, - { - "trigger": "click", - "action_id": "set_field", - "args": [ - "@local.click_history_field_name", - "@local.gas_click_history" - ], - "_raw": "click | set_field:@local.click_history_field_name: @local.gas_click_history", - "_cleaned": "click | set_field:@local.click_history_field_name: @local.gas_click_history" - } - ], - "parameter_list": { - "style": "short", - "text_align": "center" - }, - "_nested_name": "dg_galist.activity_buttons.button_ga", + "type": "set_variable", + "_nested_name": "dg_galist.activity_buttons.its_an_okay_game", "_dynamicFields": { "value": [ { - "fullExpression": "@item.name", - "matchedExpression": "@item.name", - "type": "item", - "fieldName": "name" + "fullExpression": "@local.checkbox_all || @local.ok_tutoring || @local.ok_breaks || @local.ok_home", + "matchedExpression": "@local.checkbox_all", + "type": "local", + "fieldName": "checkbox_all" + }, + { + "fullExpression": "@local.checkbox_all || @local.ok_tutoring || @local.ok_breaks || @local.ok_home", + "matchedExpression": "@local.ok_tutoring", + "type": "local", + "fieldName": "ok_tutoring" + }, + { + "fullExpression": "@local.checkbox_all || @local.ok_tutoring || @local.ok_breaks || @local.ok_home", + "matchedExpression": "@local.ok_breaks", + "type": "local", + "fieldName": "ok_breaks" + }, + { + "fullExpression": "@local.checkbox_all || @local.ok_tutoring || @local.ok_breaks || @local.ok_home", + "matchedExpression": "@local.ok_home", + "type": "local", + "fieldName": "ok_home" } + ] + }, + "_dynamicDependencies": { + "@local.checkbox_all": [ + "value" ], - "action_list": { - "0": { - "args": { - "1": [ - { - "fullExpression": "data.efm_gas.@item.id", - "matchedExpression": "@item.id", - "type": "item", - "fieldName": "id" - } - ] - }, - "_raw": [ + "@local.ok_tutoring": [ + "value" + ], + "@local.ok_breaks": [ + "value" + ], + "@local.ok_home": [ + "value" + ] + } + }, + { + "type": "display_group", + "name": "dg_okay_games", + "condition": "@local.its_an_okay_game", + "parameter_list": { + "style": "column" + }, + "rows": [ + { + "name": "click_history_field_name", + "value": "@local.ga_id@local.ga_click_history", + "_translations": { + "value": {} + }, + "exclude_from_translation": true, + "type": "set_variable", + "_nested_name": "dg_galist.activity_buttons.dg_okay_games.click_history_field_name", + "_dynamicFields": { + "value": [ { - "fullExpression": "click | set_field:current_ga: data.efm_gas.@item.id", - "matchedExpression": "@item.id", - "type": "item", - "fieldName": "id" - } - ], - "_cleaned": [ + "fullExpression": "@local.ga_id@local.ga_click_history", + "matchedExpression": "@local.ga_id", + "type": "local", + "fieldName": "ga_id" + }, { - "fullExpression": "click | set_field:current_ga: data.efm_gas.@item.id", - "matchedExpression": "@item.id", - "type": "item", - "fieldName": "id" + "fullExpression": "@local.ga_id@local.ga_click_history", + "matchedExpression": "@local.ga_click_history", + "type": "local", + "fieldName": "ga_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.gas_click_history", - "matchedExpression": "@local.gas_click_history", - "type": "local", - "fieldName": "gas_click_history" - } - ] - }, - "_raw": [ + "_dynamicDependencies": { + "@local.ga_id": [ + "value" + ], + "@local.ga_click_history": [ + "value" + ] + } + }, + { + "name": "gas_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": "dg_galist.activity_buttons.dg_okay_games.gas_click_history", + "_dynamicFields": { + "value": [ { - "fullExpression": "click | set_field:@local.click_history_field_name: @local.gas_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.gas_click_history", - "matchedExpression": "@local.gas_click_history", + "fullExpression": "@fields.@local.click_history_field_name ; @local.now", + "matchedExpression": "@local.now", "type": "local", - "fieldName": "gas_click_history" + "fieldName": "now" } ], - "_cleaned": [ + "condition": [ { - "fullExpression": "click | set_field:@local.click_history_field_name: @local.gas_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": "gas_click_history", + "value": "@local.now", + "_translations": { + "value": {} + }, + "condition": "!(@fields.@local.click_history_field_name)", + "exclude_from_translation": true, + "type": "set_variable", + "_nested_name": "dg_galist.activity_buttons.dg_okay_games.gas_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.gas_click_history", - "matchedExpression": "@local.gas_click_history", + "fullExpression": "!(@fields.@local.click_history_field_name)", + "matchedExpression": "@local.click_history_field_name", "type": "local", - "fieldName": "gas_click_history" + "fieldName": "click_history_field_name" + } + ] + }, + "_dynamicDependencies": { + "@local.now": [ + "value" + ], + "@local.click_history_field_name": [ + "condition" + ] + } + }, + { + "type": "button", + "name": "button_ga", + "value": "@item.name", + "_translations": { + "value": {} + }, + "action_list": [ + { + "trigger": "click", + "action_id": "set_field", + "args": [ + "current_ga", + "data.efm_gas.@item.id" + ], + "_raw": "click | set_field:current_ga: data.efm_gas.@item.id", + "_cleaned": "click | set_field:current_ga: data.efm_gas.@item.id" + }, + { + "trigger": "click", + "action_id": "go_to", + "args": [ + "efm_ga_template" + ], + "_raw": "click | go_to: efm_ga_template", + "_cleaned": "click | go_to: efm_ga_template" + }, + { + "trigger": "click", + "action_id": "set_field", + "args": [ + "@local.click_history_field_name", + "@local.gas_click_history" + ], + "_raw": "click | set_field:@local.click_history_field_name: @local.gas_click_history", + "_cleaned": "click | set_field:@local.click_history_field_name: @local.gas_click_history" + } + ], + "parameter_list": { + "style": "short", + "text_align": "center" + }, + "_nested_name": "dg_galist.activity_buttons.dg_okay_games.button_ga", + "_dynamicFields": { + "value": [ + { + "fullExpression": "@item.name", + "matchedExpression": "@item.name", + "type": "item", + "fieldName": "name" + } + ], + "action_list": { + "0": { + "args": { + "1": [ + { + "fullExpression": "data.efm_gas.@item.id", + "matchedExpression": "@item.id", + "type": "item", + "fieldName": "id" + } + ] + }, + "_raw": [ + { + "fullExpression": "click | set_field:current_ga: data.efm_gas.@item.id", + "matchedExpression": "@item.id", + "type": "item", + "fieldName": "id" + } + ], + "_cleaned": [ + { + "fullExpression": "click | set_field:current_ga: data.efm_gas.@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.gas_click_history", + "matchedExpression": "@local.gas_click_history", + "type": "local", + "fieldName": "gas_click_history" + } + ] + }, + "_raw": [ + { + "fullExpression": "click | set_field:@local.click_history_field_name: @local.gas_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.gas_click_history", + "matchedExpression": "@local.gas_click_history", + "type": "local", + "fieldName": "gas_click_history" + } + ], + "_cleaned": [ + { + "fullExpression": "click | set_field:@local.click_history_field_name: @local.gas_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.gas_click_history", + "matchedExpression": "@local.gas_click_history", + "type": "local", + "fieldName": "gas_click_history" + } + ] } + } + }, + "_dynamicDependencies": { + "@item.name": [ + "value" + ], + "@item.id": [ + "action_list.0.args.1", + "action_list.0._raw", + "action_list.0._cleaned" + ], + "@local.click_history_field_name": [ + "action_list.2.args.0", + "action_list.2._raw", + "action_list.2._cleaned" + ], + "@local.gas_click_history": [ + "action_list.2.args.1", + "action_list.2._raw", + "action_list.2._cleaned" ] } } + ], + "_nested_name": "dg_galist.activity_buttons.dg_okay_games", + "_dynamicFields": { + "condition": [ + { + "fullExpression": "@local.its_an_okay_game", + "matchedExpression": "@local.its_an_okay_game", + "type": "local", + "fieldName": "its_an_okay_game" + } + ] }, "_dynamicDependencies": { - "@item.name": [ - "value" - ], - "@item.id": [ - "action_list.0.args.1", - "action_list.0._raw", - "action_list.0._cleaned" - ], - "@local.click_history_field_name": [ - "action_list.2.args.0", - "action_list.2._raw", - "action_list.2._cleaned" - ], - "@local.gas_click_history": [ - "action_list.2.args.1", - "action_list.2._raw", - "action_list.2._cleaned" + "@local.its_an_okay_game": [ + "condition" ] } } diff --git a/app_data/sheets/template/initializations_on_startup.json b/app_data/sheets/template/initializations_on_startup.json index e0d82b6..31f6be9 100644 --- a/app_data/sheets/template/initializations_on_startup.json +++ b/app_data/sheets/template/initializations_on_startup.json @@ -11,33 +11,21 @@ }, { "type": "set_field", - "name": "see_activities_introduction", + "name": "see_games_tutoring", "value": true, - "_nested_name": "see_activities_introduction" + "_nested_name": "see_games_tutoring" }, { "type": "set_field", - "name": "see_activities_game", + "name": "see_games_breaks", "value": true, - "_nested_name": "see_activities_game" + "_nested_name": "see_games_breaks" }, { "type": "set_field", - "name": "see_activities_puzzle", + "name": "see_games_home", "value": true, - "_nested_name": "see_activities_puzzle" - }, - { - "type": "set_field", - "name": "see_activities_activity", - "value": true, - "_nested_name": "see_activities_activity" - }, - { - "type": "set_field", - "name": "see_activities_investigation", - "value": true, - "_nested_name": "see_activities_investigation" + "_nested_name": "see_games_home" } ], "_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 cbad417..2ce9c12 100644 --- a/app_data/sheets/tour/efm_gas_tour.json +++ b/app_data/sheets/tour/efm_gas_tour.json @@ -10,9 +10,20 @@ "title": {}, "message_text": {} }, - "message_text": "This is a collection of games for the classroom.", + "message_text": "This is a collection of math games for the classroom. In addition to using them in the classroom, they have some other specialized uses – set the toggles to list only the kinds of games you are interested in.", + "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 1bb82c4..1dd3979 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.26", + content_tag_latest: "1.1.27", }; config.android = { diff --git a/reports/summary.json b/reports/summary.json index f1d9a38..9893917 100644 --- a/reports/summary.json +++ b/reports/summary.json @@ -147,8 +147,8 @@ "data": [ { "assets": "total", - "KB": "38757 KB", - "MB": "38.8 MB" + "KB": "38866 KB", + "MB": "38.9 MB" }, { "assets": "unused", @@ -5825,7 +5825,7 @@ { "path": "ESMIll/ESMPOWAPatternBlocksTrianglesIntro.svg", "count": 1, - "size_kb": 27.3 + "size_kb": 136.4 }, { "path": "ESMIll/ESMPOWAReflectOnThisAnswer1.svg", diff --git a/reports/summary.md b/reports/summary.md index 484820d..d76d7c0 100644 --- a/reports/summary.md +++ b/reports/summary.md @@ -51,7 +51,7 @@ | assets | KB | MB | | --- | --- | --- | -| total | 38757 KB | 38.8 MB | +| total | 38866 KB | 38.9 MB | | unused | 21968 KB | 22 MB | @@ -1264,7 +1264,7 @@ Assets that are used within sheets and also can be found in the synced asset dat | ESMIll/ESMPOWAPatternBlocksHexagons1.svg | 448.8 | 1 | | ESMIll/ESMPOWAPatternBlocksHexagonsIntro.svg | 69.9 | 1 | | ESMIll/ESMPOWAPatternBlocksTrianglesAnswer.svg | 27.3 | 1 | -| ESMIll/ESMPOWAPatternBlocksTrianglesIntro.svg | 27.3 | 1 | +| ESMIll/ESMPOWAPatternBlocksTrianglesIntro.svg | 136.4 | 1 | | ESMIll/ESMPOWAReflectOnThisAnswer1.svg | 26.5 | 1 | | ESMIll/ESMPOWAReflectOnThisAnswer2.svg | 36.3 | 1 | | ESMIll/ESMPOWAReflectOnThisChallenge1.svg | 9.5 | 1 |