diff --git a/app_data/assets/lottie/bulging_circles.txt b/app_data/assets/lottie/bulging_circles.txt index 2b51967..f88242c 100644 --- a/app_data/assets/lottie/bulging_circles.txt +++ b/app_data/assets/lottie/bulging_circles.txt @@ -1,3 +1,3 @@ -Bulging circles link: https://lottiefiles.com/animations/calming-circle-DdeyyoVZeC -Licence https://lottiefiles.com/page/license +Bulging circles link: https://lottiefiles.com/animations/calming-circle-DdeyyoVZeC +Licence https://lottiefiles.com/page/license Created by: https://www.flatlineagency.com/ \ No newline at end of file diff --git a/app_data/assets/lottie/well_done.txt b/app_data/assets/lottie/well_done.txt index 16efdcc..d6f6790 100644 --- a/app_data/assets/lottie/well_done.txt +++ b/app_data/assets/lottie/well_done.txt @@ -1,3 +1,3 @@ -Animation for Congratulations message link: https://lottiefiles.com/animations/winner-zxgcG1apJN -Licence https://lottiefiles.com/page/license +Animation for Congratulations message link: https://lottiefiles.com/animations/winner-zxgcG1apJN +Licence https://lottiefiles.com/page/license Created by: https://lottiefiles.com/5kytlz90rlmcm95b \ No newline at end of file diff --git a/app_data/sheets/contents.json b/app_data/sheets/contents.json index 4ef8991..f23e92f 100644 --- a/app_data/sheets/contents.json +++ b/app_data/sheets/contents.json @@ -694,6 +694,11 @@ "flow_subtype": "generated", "flow_type": "template" }, + "conclusion_praise": { + "flow_name": "conclusion_praise", + "flow_subtype": "generated", + "flow_type": "template" + }, "conclusion_relax": { "flow_name": "conclusion_relax", "flow_subtype": "generated", @@ -764,16 +769,6 @@ "flow_subtype": "generated", "flow_type": "template" }, - "discipline_interaction_1_tbg": { - "flow_name": "discipline_interaction_1_tbg", - "flow_subtype": "generated", - "flow_type": "template" - }, - "discipline_interaction_2_tbg": { - "flow_name": "discipline_interaction_2_tbg", - "flow_subtype": "generated", - "flow_type": "template" - }, "discipline_interaction_children_tbg": { "flow_name": "discipline_interaction_children_tbg", "flow_subtype": "generated", diff --git a/app_data/sheets/data_list/child_dev.json b/app_data/sheets/data_list/child_dev.json index 166173b..297ab7c 100644 --- a/app_data/sheets/data_list/child_dev.json +++ b/app_data/sheets/data_list/child_dev.json @@ -5,52 +5,72 @@ "rows": [ { "id": "child_dev_relax", - "data_list_name": "relax", + "data_list_name": [ + "relax" + ], "row_id": "id_1" }, { "id": "child_dev_check_in", - "data_list_name": "check_in", + "data_list_name": [ + "check_in" + ], "row_id": "id_1" }, { "id": "current_pract_review_hp", - "data_list_name": "review_hp", + "data_list_name": [ + "review_hp" + ], "row_id": "current_pract" }, { "id": "child_dev_stages_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "dev_stages" }, { "id": "child_dev_tips_1", - "data_list_name": "tips", + "data_list_name": [ + "tips" + ], "row_id": "child_needs" }, { "id": "child_dev_distracted_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "interactive_play_distracted" }, { "id": "child_dev_control_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "interactive_play_control" }, { "id": "child_dev_tips_2", - "data_list_name": "tips", + "data_list_name": [ + "tips" + ], "row_id": "parents_attitude" }, { "id": "child_dev_set_hp", - "data_list_name": "set_hp", + "data_list_name": [ + "set_hp" + ], "row_id": "child_dev" }, { "id": "child_dev_praise", - "data_list_name": "praise", + "data_list_name": [ + "praise" + ], "row_id": "child_dev" } ], diff --git a/app_data/sheets/data_list/conclusion.json b/app_data/sheets/data_list/conclusion.json index d4ccd3f..63a1879 100644 --- a/app_data/sheets/data_list/conclusion.json +++ b/app_data/sheets/data_list/conclusion.json @@ -5,38 +5,52 @@ "rows": [ { "id": "conclusion_relax", - "data_list_name": "relax", + "data_list_name": [ + "relax" + ], "row_id": "id_1" }, { "id": "conclusion_check_in", - "data_list_name": "check_in", + "data_list_name": [ + "check_in" + ], "row_id": "id_1" }, { "id": "conclusion_tbg_1", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "conclusion" }, { "id": "parents_web_tbg_2", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "parents_web" }, { "id": "future_group_tbg_3", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "future_group" }, { "id": "closing_tips", - "data_list_name": "tips", - "row_id": "reduce_conflict_tips" + "data_list_name": [ + "tips" + ], + "row_id": "closing" }, { - "id": "reduce_conflict_praise", - "data_list_name": "praise", - "row_id": "reduce_conflict" + "id": "conclusion_praise", + "data_list_name": [ + "praise" + ], + "row_id": "conclusion" } ], "_xlsxPath": "global/data_lists/session_tasks.xlsx" diff --git a/app_data/sheets/data_list/current_pract.json b/app_data/sheets/data_list/current_pract.json index 6370038..3f68bee 100644 --- a/app_data/sheets/data_list/current_pract.json +++ b/app_data/sheets/data_list/current_pract.json @@ -5,47 +5,65 @@ "rows": [ { "id": "current_pract_relax", - "data_list_name": "relax", + "data_list_name": [ + "relax" + ], "row_id": "id_1" }, { "id": "current_pract_check_in", - "data_list_name": "check_in", + "data_list_name": [ + "check_in" + ], "row_id": "id_1" }, { "id": "family_relation_review_hp", - "data_list_name": "review_hp", + "data_list_name": [ + "review_hp" + ], "row_id": "family_relation" }, { "id": "current_pract_tips_1", - "data_list_name": "tips", + "data_list_name": [ + "tips" + ], "row_id": "child_perception" }, { "id": "current_pract_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "child_20" }, { "id": "current_pract_quiz", - "data_list_name": "quiz", + "data_list_name": [ + "quiz" + ], "row_id": "picture_quiz" }, { "id": "current_pract_tips_2", - "data_list_name": "tips", + "data_list_name": [ + "tips" + ], "row_id": "raise_child" }, { "id": "current_pract_set_hp", - "data_list_name": "set_hp", + "data_list_name": [ + "set_hp" + ], "row_id": "current_pract" }, { "id": "current_pract_praise", - "data_list_name": "praise", + "data_list_name": [ + "praise" + ], "row_id": "current_pract" } ], diff --git a/app_data/sheets/data_list/discipline.json b/app_data/sheets/data_list/discipline.json index 5abebe7..efed392 100644 --- a/app_data/sheets/data_list/discipline.json +++ b/app_data/sheets/data_list/discipline.json @@ -5,47 +5,51 @@ "rows": [ { "id": "discipline_relax", - "data_list_name": "relax", + "data_list_name": [ + "relax" + ], "row_id": "id_1" }, { "id": "discipline_check_in", - "data_list_name": "check_in", + "data_list_name": [ + "check_in" + ], "row_id": "id_1" }, { "id": "discipline_conflict_children_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "conflict_children" }, { "id": "discipline_interaction_children_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "interaction_children" }, - { - "id": "discipline_interaction_1_tbg", - "data_list_name": "topic_block_group", - "row_id": "interaction_children_1" - }, - { - "id": "discipline_interaction_2_tbg", - "data_list_name": "topic_block_group", - "row_id": "interaction_children_2" - }, { "id": "discipline_communication", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "communication" }, { "id": "discipline_set_hp", - "data_list_name": "set_hp", + "data_list_name": [ + "set_hp" + ], "row_id": "discipline" }, { "id": "discipline_praise", - "data_list_name": "praise", + "data_list_name": [ + "praise" + ], "row_id": "discipline" } ], diff --git a/app_data/sheets/data_list/education.json b/app_data/sheets/data_list/education.json index f36de4a..b248f75 100644 --- a/app_data/sheets/data_list/education.json +++ b/app_data/sheets/data_list/education.json @@ -5,47 +5,65 @@ "rows": [ { "id": "education_relax", - "data_list_name": "relax", + "data_list_name": [ + "relax" + ], "row_id": "id_1" }, { "id": "education_check_in", - "data_list_name": "check_in", + "data_list_name": [ + "check_in" + ], "row_id": "id_1" }, { "id": "discipline_review_hp", - "data_list_name": "review_hp", + "data_list_name": [ + "review_hp" + ], "row_id": "discipline" }, { "id": "education_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "education" }, { "id": "education_needs_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "school_needs" }, { "id": "education_encourage_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "encourage_school" }, { "id": "education_tips", - "data_list_name": "tips", + "data_list_name": [ + "tips" + ], "row_id": "education" }, { "id": "education_set_hp", - "data_list_name": "set_hp", + "data_list_name": [ + "set_hp" + ], "row_id": "education" }, { "id": "education_praise", - "data_list_name": "praise", + "data_list_name": [ + "praise" + ], "row_id": "education" } ], diff --git a/app_data/sheets/data_list/family_relation.json b/app_data/sheets/data_list/family_relation.json index 306ab06..d7276f4 100644 --- a/app_data/sheets/data_list/family_relation.json +++ b/app_data/sheets/data_list/family_relation.json @@ -5,32 +5,44 @@ "rows": [ { "id": "family_relation_relax", - "data_list_name": "relax", + "data_list_name": [ + "relax" + ], "row_id": "id_1" }, { "id": "family_relation_check_in", - "data_list_name": "check_in", + "data_list_name": [ + "check_in" + ], "row_id": "id_1" }, { "id": "family_relation_reflect", - "data_list_name": "reflect", + "data_list_name": [ + "reflect" + ], "row_id": "future_now" }, { "id": "family_relation_tips_1", - "data_list_name": "tips", + "data_list_name": [ + "tips" + ], "row_id": "rel_vacuum" }, { "id": "family_relation_set_hp", - "data_list_name": "set_hp", + "data_list_name": [ + "set_hp" + ], "row_id": "family_relation" }, { "id": "family_relation_praise", - "data_list_name": "praise", + "data_list_name": [ + "praise" + ], "row_id": "family_relation" } ], diff --git a/app_data/sheets/data_list/gender_equal.json b/app_data/sheets/data_list/gender_equal.json index 498c211..5a90ce3 100644 --- a/app_data/sheets/data_list/gender_equal.json +++ b/app_data/sheets/data_list/gender_equal.json @@ -5,42 +5,58 @@ "rows": [ { "id": "gender_equal_check_in", - "data_list_name": "check_in", + "data_list_name": [ + "check_in" + ], "row_id": "id_1" }, { "id": "gender_equal_relax", - "data_list_name": "relax", + "data_list_name": [ + "relax" + ], "row_id": "id_1" }, { "id": "education_review_hp", - "data_list_name": "review_hp", + "data_list_name": [ + "review_hp" + ], "row_id": "education" }, { "id": "gender_equal_tbg_1", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "gender_equal" }, { "id": "gender_equal_tbg_2", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "partnership_parenting" }, { "id": "gender_equal_tips_2", - "data_list_name": "tips", + "data_list_name": [ + "tips" + ], "row_id": "patnership_parenting" }, { "id": "gender_equal_set_hp", - "data_list_name": "set_hp", + "data_list_name": [ + "set_hp" + ], "row_id": "gender_equal" }, { "id": "gender_equal_praise", - "data_list_name": "praise", + "data_list_name": [ + "praise" + ], "row_id": "gender_equal" } ], diff --git a/app_data/sheets/data_list/gender_power.json b/app_data/sheets/data_list/gender_power.json index c3dcf80..3dcc68c 100644 --- a/app_data/sheets/data_list/gender_power.json +++ b/app_data/sheets/data_list/gender_power.json @@ -5,27 +5,37 @@ "rows": [ { "id": "gender_power_relax", - "data_list_name": "relax", + "data_list_name": [ + "relax" + ], "row_id": "id_1" }, { "id": "gender_power_check_in", - "data_list_name": "check_in", + "data_list_name": [ + "check_in" + ], "row_id": "id_1" }, { "id": "gender_power_stereotypes_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "gender_stereotypes" }, { "id": "gender_power_tips", - "data_list_name": "tips", + "data_list_name": [ + "tips" + ], "row_id": "gender_power" }, { "id": "gender_power_praise", - "data_list_name": "praise", + "data_list_name": [ + "praise" + ], "row_id": "gender_power" } ], diff --git a/app_data/sheets/data_list/generated/child_dev_tasks.json b/app_data/sheets/data_list/generated/child_dev_tasks.json index e9b214f..8a74322 100644 --- a/app_data/sheets/data_list/generated/child_dev_tasks.json +++ b/app_data/sheets/data_list/generated/child_dev_tasks.json @@ -5,70 +5,90 @@ "rows": [ { "id": "child_dev_relax", - "data_list_name": "relax", + "data_list_name": [ + "relax" + ], "row_id": "id_1", "completed_field": "task_child_dev_relax_completed", "completed": "@fields.task_child_dev_relax_completed" }, { "id": "child_dev_check_in", - "data_list_name": "check_in", + "data_list_name": [ + "check_in" + ], "row_id": "id_1", "completed_field": "task_child_dev_check_in_completed", "completed": "@fields.task_child_dev_check_in_completed" }, { "id": "current_pract_review_hp", - "data_list_name": "review_hp", + "data_list_name": [ + "review_hp" + ], "row_id": "current_pract", "completed_field": "task_current_pract_review_hp_completed", "completed": "@fields.task_current_pract_review_hp_completed" }, { "id": "child_dev_stages_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "dev_stages", "completed_field": "task_child_dev_stages_tbg_completed", "completed": "@fields.task_child_dev_stages_tbg_completed" }, { "id": "child_dev_tips_1", - "data_list_name": "tips", + "data_list_name": [ + "tips" + ], "row_id": "child_needs", "completed_field": "task_child_dev_tips_1_completed", "completed": "@fields.task_child_dev_tips_1_completed" }, { "id": "child_dev_distracted_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "interactive_play_distracted", "completed_field": "task_child_dev_distracted_tbg_completed", "completed": "@fields.task_child_dev_distracted_tbg_completed" }, { "id": "child_dev_control_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "interactive_play_control", "completed_field": "task_child_dev_control_tbg_completed", "completed": "@fields.task_child_dev_control_tbg_completed" }, { "id": "child_dev_tips_2", - "data_list_name": "tips", + "data_list_name": [ + "tips" + ], "row_id": "parents_attitude", "completed_field": "task_child_dev_tips_2_completed", "completed": "@fields.task_child_dev_tips_2_completed" }, { "id": "child_dev_set_hp", - "data_list_name": "set_hp", + "data_list_name": [ + "set_hp" + ], "row_id": "child_dev", "completed_field": "task_child_dev_set_hp_completed", "completed": "@fields.task_child_dev_set_hp_completed" }, { "id": "child_dev_praise", - "data_list_name": "praise", + "data_list_name": [ + "praise" + ], "row_id": "child_dev", "completed_field": "task_child_dev_praise_completed", "completed": "@fields.task_child_dev_praise_completed" diff --git a/app_data/sheets/data_list/generated/conclusion_tasks.json b/app_data/sheets/data_list/generated/conclusion_tasks.json index 5e09591..30c65f5 100644 --- a/app_data/sheets/data_list/generated/conclusion_tasks.json +++ b/app_data/sheets/data_list/generated/conclusion_tasks.json @@ -5,52 +5,66 @@ "rows": [ { "id": "conclusion_relax", - "data_list_name": "relax", + "data_list_name": [ + "relax" + ], "row_id": "id_1", "completed_field": "task_conclusion_relax_completed", "completed": "@fields.task_conclusion_relax_completed" }, { "id": "conclusion_check_in", - "data_list_name": "check_in", + "data_list_name": [ + "check_in" + ], "row_id": "id_1", "completed_field": "task_conclusion_check_in_completed", "completed": "@fields.task_conclusion_check_in_completed" }, { "id": "conclusion_tbg_1", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "conclusion", "completed_field": "task_conclusion_tbg_1_completed", "completed": "@fields.task_conclusion_tbg_1_completed" }, { "id": "parents_web_tbg_2", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "parents_web", "completed_field": "task_parents_web_tbg_2_completed", "completed": "@fields.task_parents_web_tbg_2_completed" }, { "id": "future_group_tbg_3", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "future_group", "completed_field": "task_future_group_tbg_3_completed", "completed": "@fields.task_future_group_tbg_3_completed" }, { "id": "closing_tips", - "data_list_name": "tips", - "row_id": "reduce_conflict_tips", + "data_list_name": [ + "tips" + ], + "row_id": "closing", "completed_field": "task_closing_tips_completed", "completed": "@fields.task_closing_tips_completed" }, { - "id": "reduce_conflict_praise", - "data_list_name": "praise", - "row_id": "reduce_conflict", - "completed_field": "task_reduce_conflict_praise_completed", - "completed": "@fields.task_reduce_conflict_praise_completed" + "id": "conclusion_praise", + "data_list_name": [ + "praise" + ], + "row_id": "conclusion", + "completed_field": "task_conclusion_praise_completed", + "completed": "@fields.task_conclusion_praise_completed" } ] } \ No newline at end of file diff --git a/app_data/sheets/data_list/generated/current_pract_tasks.json b/app_data/sheets/data_list/generated/current_pract_tasks.json index 1ff2668..db05f57 100644 --- a/app_data/sheets/data_list/generated/current_pract_tasks.json +++ b/app_data/sheets/data_list/generated/current_pract_tasks.json @@ -5,63 +5,81 @@ "rows": [ { "id": "current_pract_relax", - "data_list_name": "relax", + "data_list_name": [ + "relax" + ], "row_id": "id_1", "completed_field": "task_current_pract_relax_completed", "completed": "@fields.task_current_pract_relax_completed" }, { "id": "current_pract_check_in", - "data_list_name": "check_in", + "data_list_name": [ + "check_in" + ], "row_id": "id_1", "completed_field": "task_current_pract_check_in_completed", "completed": "@fields.task_current_pract_check_in_completed" }, { "id": "family_relation_review_hp", - "data_list_name": "review_hp", + "data_list_name": [ + "review_hp" + ], "row_id": "family_relation", "completed_field": "task_family_relation_review_hp_completed", "completed": "@fields.task_family_relation_review_hp_completed" }, { "id": "current_pract_tips_1", - "data_list_name": "tips", + "data_list_name": [ + "tips" + ], "row_id": "child_perception", "completed_field": "task_current_pract_tips_1_completed", "completed": "@fields.task_current_pract_tips_1_completed" }, { "id": "current_pract_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "child_20", "completed_field": "task_current_pract_tbg_completed", "completed": "@fields.task_current_pract_tbg_completed" }, { "id": "current_pract_quiz", - "data_list_name": "quiz", + "data_list_name": [ + "quiz" + ], "row_id": "picture_quiz", "completed_field": "task_current_pract_quiz_completed", "completed": "@fields.task_current_pract_quiz_completed" }, { "id": "current_pract_tips_2", - "data_list_name": "tips", + "data_list_name": [ + "tips" + ], "row_id": "raise_child", "completed_field": "task_current_pract_tips_2_completed", "completed": "@fields.task_current_pract_tips_2_completed" }, { "id": "current_pract_set_hp", - "data_list_name": "set_hp", + "data_list_name": [ + "set_hp" + ], "row_id": "current_pract", "completed_field": "task_current_pract_set_hp_completed", "completed": "@fields.task_current_pract_set_hp_completed" }, { "id": "current_pract_praise", - "data_list_name": "praise", + "data_list_name": [ + "praise" + ], "row_id": "current_pract", "completed_field": "task_current_pract_praise_completed", "completed": "@fields.task_current_pract_praise_completed" diff --git a/app_data/sheets/data_list/generated/discipline_tasks.json b/app_data/sheets/data_list/generated/discipline_tasks.json index 8196432..bf94abf 100644 --- a/app_data/sheets/data_list/generated/discipline_tasks.json +++ b/app_data/sheets/data_list/generated/discipline_tasks.json @@ -5,63 +5,63 @@ "rows": [ { "id": "discipline_relax", - "data_list_name": "relax", + "data_list_name": [ + "relax" + ], "row_id": "id_1", "completed_field": "task_discipline_relax_completed", "completed": "@fields.task_discipline_relax_completed" }, { "id": "discipline_check_in", - "data_list_name": "check_in", + "data_list_name": [ + "check_in" + ], "row_id": "id_1", "completed_field": "task_discipline_check_in_completed", "completed": "@fields.task_discipline_check_in_completed" }, { "id": "discipline_conflict_children_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "conflict_children", "completed_field": "task_discipline_conflict_children_tbg_completed", "completed": "@fields.task_discipline_conflict_children_tbg_completed" }, { "id": "discipline_interaction_children_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "interaction_children", "completed_field": "task_discipline_interaction_children_tbg_completed", "completed": "@fields.task_discipline_interaction_children_tbg_completed" }, - { - "id": "discipline_interaction_1_tbg", - "data_list_name": "topic_block_group", - "row_id": "interaction_children_1", - "completed_field": "task_discipline_interaction_1_tbg_completed", - "completed": "@fields.task_discipline_interaction_1_tbg_completed" - }, - { - "id": "discipline_interaction_2_tbg", - "data_list_name": "topic_block_group", - "row_id": "interaction_children_2", - "completed_field": "task_discipline_interaction_2_tbg_completed", - "completed": "@fields.task_discipline_interaction_2_tbg_completed" - }, { "id": "discipline_communication", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "communication", "completed_field": "task_discipline_communication_completed", "completed": "@fields.task_discipline_communication_completed" }, { "id": "discipline_set_hp", - "data_list_name": "set_hp", + "data_list_name": [ + "set_hp" + ], "row_id": "discipline", "completed_field": "task_discipline_set_hp_completed", "completed": "@fields.task_discipline_set_hp_completed" }, { "id": "discipline_praise", - "data_list_name": "praise", + "data_list_name": [ + "praise" + ], "row_id": "discipline", "completed_field": "task_discipline_praise_completed", "completed": "@fields.task_discipline_praise_completed" diff --git a/app_data/sheets/data_list/generated/education_tasks.json b/app_data/sheets/data_list/generated/education_tasks.json index a701acf..87b6190 100644 --- a/app_data/sheets/data_list/generated/education_tasks.json +++ b/app_data/sheets/data_list/generated/education_tasks.json @@ -5,63 +5,81 @@ "rows": [ { "id": "education_relax", - "data_list_name": "relax", + "data_list_name": [ + "relax" + ], "row_id": "id_1", "completed_field": "task_education_relax_completed", "completed": "@fields.task_education_relax_completed" }, { "id": "education_check_in", - "data_list_name": "check_in", + "data_list_name": [ + "check_in" + ], "row_id": "id_1", "completed_field": "task_education_check_in_completed", "completed": "@fields.task_education_check_in_completed" }, { "id": "discipline_review_hp", - "data_list_name": "review_hp", + "data_list_name": [ + "review_hp" + ], "row_id": "discipline", "completed_field": "task_discipline_review_hp_completed", "completed": "@fields.task_discipline_review_hp_completed" }, { "id": "education_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "education", "completed_field": "task_education_tbg_completed", "completed": "@fields.task_education_tbg_completed" }, { "id": "education_needs_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "school_needs", "completed_field": "task_education_needs_tbg_completed", "completed": "@fields.task_education_needs_tbg_completed" }, { "id": "education_encourage_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "encourage_school", "completed_field": "task_education_encourage_tbg_completed", "completed": "@fields.task_education_encourage_tbg_completed" }, { "id": "education_tips", - "data_list_name": "tips", + "data_list_name": [ + "tips" + ], "row_id": "education", "completed_field": "task_education_tips_completed", "completed": "@fields.task_education_tips_completed" }, { "id": "education_set_hp", - "data_list_name": "set_hp", + "data_list_name": [ + "set_hp" + ], "row_id": "education", "completed_field": "task_education_set_hp_completed", "completed": "@fields.task_education_set_hp_completed" }, { "id": "education_praise", - "data_list_name": "praise", + "data_list_name": [ + "praise" + ], "row_id": "education", "completed_field": "task_education_praise_completed", "completed": "@fields.task_education_praise_completed" diff --git a/app_data/sheets/data_list/generated/family_relation_tasks.json b/app_data/sheets/data_list/generated/family_relation_tasks.json index 94e424b..d586cae 100644 --- a/app_data/sheets/data_list/generated/family_relation_tasks.json +++ b/app_data/sheets/data_list/generated/family_relation_tasks.json @@ -5,42 +5,54 @@ "rows": [ { "id": "family_relation_relax", - "data_list_name": "relax", + "data_list_name": [ + "relax" + ], "row_id": "id_1", "completed_field": "task_family_relation_relax_completed", "completed": "@fields.task_family_relation_relax_completed" }, { "id": "family_relation_check_in", - "data_list_name": "check_in", + "data_list_name": [ + "check_in" + ], "row_id": "id_1", "completed_field": "task_family_relation_check_in_completed", "completed": "@fields.task_family_relation_check_in_completed" }, { "id": "family_relation_reflect", - "data_list_name": "reflect", + "data_list_name": [ + "reflect" + ], "row_id": "future_now", "completed_field": "task_family_relation_reflect_completed", "completed": "@fields.task_family_relation_reflect_completed" }, { "id": "family_relation_tips_1", - "data_list_name": "tips", + "data_list_name": [ + "tips" + ], "row_id": "rel_vacuum", "completed_field": "task_family_relation_tips_1_completed", "completed": "@fields.task_family_relation_tips_1_completed" }, { "id": "family_relation_set_hp", - "data_list_name": "set_hp", + "data_list_name": [ + "set_hp" + ], "row_id": "family_relation", "completed_field": "task_family_relation_set_hp_completed", "completed": "@fields.task_family_relation_set_hp_completed" }, { "id": "family_relation_praise", - "data_list_name": "praise", + "data_list_name": [ + "praise" + ], "row_id": "family_relation", "completed_field": "task_family_relation_praise_completed", "completed": "@fields.task_family_relation_praise_completed" diff --git a/app_data/sheets/data_list/generated/gender_equal_tasks.json b/app_data/sheets/data_list/generated/gender_equal_tasks.json index f6dfcec..fb1572d 100644 --- a/app_data/sheets/data_list/generated/gender_equal_tasks.json +++ b/app_data/sheets/data_list/generated/gender_equal_tasks.json @@ -5,56 +5,72 @@ "rows": [ { "id": "gender_equal_check_in", - "data_list_name": "check_in", + "data_list_name": [ + "check_in" + ], "row_id": "id_1", "completed_field": "task_gender_equal_check_in_completed", "completed": "@fields.task_gender_equal_check_in_completed" }, { "id": "gender_equal_relax", - "data_list_name": "relax", + "data_list_name": [ + "relax" + ], "row_id": "id_1", "completed_field": "task_gender_equal_relax_completed", "completed": "@fields.task_gender_equal_relax_completed" }, { "id": "education_review_hp", - "data_list_name": "review_hp", + "data_list_name": [ + "review_hp" + ], "row_id": "education", "completed_field": "task_education_review_hp_completed", "completed": "@fields.task_education_review_hp_completed" }, { "id": "gender_equal_tbg_1", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "gender_equal", "completed_field": "task_gender_equal_tbg_1_completed", "completed": "@fields.task_gender_equal_tbg_1_completed" }, { "id": "gender_equal_tbg_2", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "partnership_parenting", "completed_field": "task_gender_equal_tbg_2_completed", "completed": "@fields.task_gender_equal_tbg_2_completed" }, { "id": "gender_equal_tips_2", - "data_list_name": "tips", + "data_list_name": [ + "tips" + ], "row_id": "patnership_parenting", "completed_field": "task_gender_equal_tips_2_completed", "completed": "@fields.task_gender_equal_tips_2_completed" }, { "id": "gender_equal_set_hp", - "data_list_name": "set_hp", + "data_list_name": [ + "set_hp" + ], "row_id": "gender_equal", "completed_field": "task_gender_equal_set_hp_completed", "completed": "@fields.task_gender_equal_set_hp_completed" }, { "id": "gender_equal_praise", - "data_list_name": "praise", + "data_list_name": [ + "praise" + ], "row_id": "gender_equal", "completed_field": "task_gender_equal_praise_completed", "completed": "@fields.task_gender_equal_praise_completed" diff --git a/app_data/sheets/data_list/generated/gender_power_tasks.json b/app_data/sheets/data_list/generated/gender_power_tasks.json index c1c3388..22187c1 100644 --- a/app_data/sheets/data_list/generated/gender_power_tasks.json +++ b/app_data/sheets/data_list/generated/gender_power_tasks.json @@ -5,35 +5,45 @@ "rows": [ { "id": "gender_power_relax", - "data_list_name": "relax", + "data_list_name": [ + "relax" + ], "row_id": "id_1", "completed_field": "task_gender_power_relax_completed", "completed": "@fields.task_gender_power_relax_completed" }, { "id": "gender_power_check_in", - "data_list_name": "check_in", + "data_list_name": [ + "check_in" + ], "row_id": "id_1", "completed_field": "task_gender_power_check_in_completed", "completed": "@fields.task_gender_power_check_in_completed" }, { "id": "gender_power_stereotypes_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "gender_stereotypes", "completed_field": "task_gender_power_stereotypes_tbg_completed", "completed": "@fields.task_gender_power_stereotypes_tbg_completed" }, { "id": "gender_power_tips", - "data_list_name": "tips", + "data_list_name": [ + "tips" + ], "row_id": "gender_power", "completed_field": "task_gender_power_tips_completed", "completed": "@fields.task_gender_power_tips_completed" }, { "id": "gender_power_praise", - "data_list_name": "praise", + "data_list_name": [ + "praise" + ], "row_id": "gender_power", "completed_field": "task_gender_power_praise_completed", "completed": "@fields.task_gender_power_praise_completed" diff --git a/app_data/sheets/data_list/generated/healthy_relation_tasks.json b/app_data/sheets/data_list/generated/healthy_relation_tasks.json index 58e8054..a901508 100644 --- a/app_data/sheets/data_list/generated/healthy_relation_tasks.json +++ b/app_data/sheets/data_list/generated/healthy_relation_tasks.json @@ -5,49 +5,63 @@ "rows": [ { "id": "healthy_relation_relax", - "data_list_name": "relax", + "data_list_name": [ + "relax" + ], "row_id": "id_1", "completed_field": "task_healthy_relation_relax_completed", "completed": "@fields.task_healthy_relation_relax_completed" }, { "id": "healthy_relation_check_in", - "data_list_name": "check_in", + "data_list_name": [ + "check_in" + ], "row_id": "id_1", "completed_field": "task_healthy_relation_check_in_completed", "completed": "@fields.task_healthy_relation_check_in_completed" }, { "id": "sharing_care_review_hp", - "data_list_name": "review_hp", + "data_list_name": [ + "review_hp" + ], "row_id": "sharing_care", "completed_field": "task_sharing_care_review_hp_completed", "completed": "@fields.task_sharing_care_review_hp_completed" }, { "id": "healthy_relation_tbg_1", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "healthy_relation", "completed_field": "task_healthy_relation_tbg_1_completed", "completed": "@fields.task_healthy_relation_tbg_1_completed" }, { "id": "healthy_relation_tbg_2", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "rships_communication", "completed_field": "task_healthy_relation_tbg_2_completed", "completed": "@fields.task_healthy_relation_tbg_2_completed" }, { "id": "healthy_relation_set_hp", - "data_list_name": "set_hp", + "data_list_name": [ + "set_hp" + ], "row_id": "healthy_relation", "completed_field": "task_healthy_relation_set_hp_completed", "completed": "@fields.task_healthy_relation_set_hp_completed" }, { "id": "healthy_relation_praise", - "data_list_name": "praise", + "data_list_name": [ + "praise" + ], "row_id": "healthy_relation", "completed_field": "task_healthy_relation_praise_completed", "completed": "@fields.task_healthy_relation_praise_completed" diff --git a/app_data/sheets/data_list/generated/impact_conflict_tasks.json b/app_data/sheets/data_list/generated/impact_conflict_tasks.json index 32ab394..3f2a506 100644 --- a/app_data/sheets/data_list/generated/impact_conflict_tasks.json +++ b/app_data/sheets/data_list/generated/impact_conflict_tasks.json @@ -5,42 +5,54 @@ "rows": [ { "id": "impact_conflict_relax", - "data_list_name": "relax", + "data_list_name": [ + "relax" + ], "row_id": "id_1", "completed_field": "task_impact_conflict_relax_completed", "completed": "@fields.task_impact_conflict_relax_completed" }, { "id": "impact_conflict_check_in", - "data_list_name": "check_in", + "data_list_name": [ + "check_in" + ], "row_id": "id_1", "completed_field": "task_impact_conflict_check_in_completed", "completed": "@fields.task_impact_conflict_check_in_completed" }, { "id": "impact_conflict_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "impact_conflict", "completed_field": "task_impact_conflict_tbg_completed", "completed": "@fields.task_impact_conflict_tbg_completed" }, { "id": "impact_conflict_tips", - "data_list_name": "tips", + "data_list_name": [ + "tips" + ], "row_id": "parents_involvement", "completed_field": "task_impact_conflict_tips_completed", "completed": "@fields.task_impact_conflict_tips_completed" }, { "id": "impact_conflict_set_hp", - "data_list_name": "set_hp", + "data_list_name": [ + "set_hp" + ], "row_id": "impact_conflict", "completed_field": "task_impact_conflict_set_hp_completed", "completed": "@fields.task_impact_conflict_set_hp_completed" }, { "id": "impact_conflict_praise", - "data_list_name": "praise", + "data_list_name": [ + "praise" + ], "row_id": "impact_conflict", "completed_field": "task_impact_conflict_praise_completed", "completed": "@fields.task_impact_conflict_praise_completed" diff --git a/app_data/sheets/data_list/generated/onboarding_tasks.json b/app_data/sheets/data_list/generated/onboarding_tasks.json index 87776d0..4fafdf5 100644 --- a/app_data/sheets/data_list/generated/onboarding_tasks.json +++ b/app_data/sheets/data_list/generated/onboarding_tasks.json @@ -5,35 +5,45 @@ "rows": [ { "id": "onboarding_relax", - "data_list_name": "relax", + "data_list_name": [ + "relax" + ], "row_id": "id_1", "completed_field": "task_onboarding_relax_completed", "completed": "@fields.task_onboarding_relax_completed" }, { "id": "onboarding_check_in", - "data_list_name": "check_in", + "data_list_name": [ + "check_in" + ], "row_id": "id_1", "completed_field": "task_onboarding_check_in_completed", "completed": "@fields.task_onboarding_check_in_completed" }, { "id": "onboarding_pfr_goals", - "data_list_name": "onboarding_content", + "data_list_name": [ + "onboarding_content" + ], "row_id": "pfr_goals", "completed_field": "task_onboarding_pfr_goals_completed", "completed": "@fields.task_onboarding_pfr_goals_completed" }, { "id": "onboarding_ground_rules", - "data_list_name": "onboarding_content", + "data_list_name": [ + "onboarding_content" + ], "row_id": "ground_rules", "completed_field": "task_onboarding_ground_rules_completed", "completed": "@fields.task_onboarding_ground_rules_completed" }, { "id": "onboarding_praise", - "data_list_name": "praise", + "data_list_name": [ + "praise" + ], "row_id": "onboarding", "completed_field": "task_onboarding_praise_completed", "completed": "@fields.task_onboarding_praise_completed" diff --git a/app_data/sheets/data_list/generated/parent_childhood_tasks.json b/app_data/sheets/data_list/generated/parent_childhood_tasks.json index f5d04d7..4673d58 100644 --- a/app_data/sheets/data_list/generated/parent_childhood_tasks.json +++ b/app_data/sheets/data_list/generated/parent_childhood_tasks.json @@ -5,49 +5,63 @@ "rows": [ { "id": "parent_childhood_relax", - "data_list_name": "relax", + "data_list_name": [ + "relax" + ], "row_id": "id_1", "completed_field": "task_parent_childhood_relax_completed", "completed": "@fields.task_parent_childhood_relax_completed" }, { "id": "parent_childhood_check_in", - "data_list_name": "check_in", + "data_list_name": [ + "check_in" + ], "row_id": "id_1", "completed_field": "task_parent_childhood_check_in_completed", "completed": "@fields.task_parent_childhood_check_in_completed" }, { "id": "child_dev_review_hp", - "data_list_name": "review_hp", + "data_list_name": [ + "review_hp" + ], "row_id": "child_dev", "completed_field": "task_child_dev_review_hp_completed", "completed": "@fields.task_child_dev_review_hp_completed" }, { "id": "parent_childhood_legacy_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "caregiver_legacy", "completed_field": "task_parent_childhood_legacy_tbg_completed", "completed": "@fields.task_parent_childhood_legacy_tbg_completed" }, { "id": "parent_childhood_abilities_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "outstanding_abilities", "completed_field": "task_parent_childhood_abilities_tbg_completed", "completed": "@fields.task_parent_childhood_abilities_tbg_completed" }, { "id": "parent_childhood_set_hp", - "data_list_name": "set_hp", + "data_list_name": [ + "set_hp" + ], "row_id": "parent_childhood", "completed_field": "task_parent_childhood_set_hp_completed", "completed": "@fields.task_parent_childhood_set_hp_completed" }, { "id": "parent_childhood_praise", - "data_list_name": "praise", + "data_list_name": [ + "praise" + ], "row_id": "parent_childhood", "completed_field": "task_parent_childhood_praise_completed", "completed": "@fields.task_parent_childhood_praise_completed" diff --git a/app_data/sheets/data_list/generated/positive_parenting_tasks.json b/app_data/sheets/data_list/generated/positive_parenting_tasks.json index 15d9554..e0f0a57 100644 --- a/app_data/sheets/data_list/generated/positive_parenting_tasks.json +++ b/app_data/sheets/data_list/generated/positive_parenting_tasks.json @@ -5,63 +5,81 @@ "rows": [ { "id": "positive_parenting_relax", - "data_list_name": "relax", + "data_list_name": [ + "relax" + ], "row_id": "id_1", "completed_field": "task_positive_parenting_relax_completed", "completed": "@fields.task_positive_parenting_relax_completed" }, { "id": "positive_parenting_check_in", - "data_list_name": "check_in", + "data_list_name": [ + "check_in" + ], "row_id": "id_1", "completed_field": "task_positive_parenting_check_in_completed", "completed": "@fields.task_positive_parenting_check_in_completed" }, { "id": "parent_childhood_review_hp", - "data_list_name": "review_hp", + "data_list_name": [ + "review_hp" + ], "row_id": "parent_childhood", "completed_field": "task_parent_childhood_review_hp_completed", "completed": "@fields.task_parent_childhood_review_hp_completed" }, { "id": "positive_parenting_behavior_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "managing_behaviour", "completed_field": "task_positive_parenting_behavior_tbg_completed", "completed": "@fields.task_positive_parenting_behavior_tbg_completed" }, { "id": "positive_parenting_limits_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "setting_limits", "completed_field": "task_positive_parenting_limits_tbg_completed", "completed": "@fields.task_positive_parenting_limits_tbg_completed" }, { "id": "positive_parenting_how_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "setting_limits_how", "completed_field": "task_positive_parenting_how_tbg_completed", "completed": "@fields.task_positive_parenting_how_tbg_completed" }, { "id": "positive_parenting_style_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "parenting_style", "completed_field": "task_positive_parenting_style_tbg_completed", "completed": "@fields.task_positive_parenting_style_tbg_completed" }, { "id": "positive_parenting_tips", - "data_list_name": "tips", + "data_list_name": [ + "tips" + ], "row_id": "parenting_relationships", "completed_field": "task_positive_parenting_tips_completed", "completed": "@fields.task_positive_parenting_tips_completed" }, { "id": "positive_parenting_praise", - "data_list_name": "praise", + "data_list_name": [ + "praise" + ], "row_id": "positive_parenting", "completed_field": "task_positive_parenting_praise_completed", "completed": "@fields.task_positive_parenting_praise_completed" diff --git a/app_data/sheets/data_list/generated/prevent_abuse_tasks.json b/app_data/sheets/data_list/generated/prevent_abuse_tasks.json index 46816e8..08907e7 100644 --- a/app_data/sheets/data_list/generated/prevent_abuse_tasks.json +++ b/app_data/sheets/data_list/generated/prevent_abuse_tasks.json @@ -5,56 +5,72 @@ "rows": [ { "id": "prevent_abuse_relax", - "data_list_name": "relax", + "data_list_name": [ + "relax" + ], "row_id": "id_1", "completed_field": "task_prevent_abuse_relax_completed", "completed": "@fields.task_prevent_abuse_relax_completed" }, { "id": "prevent_abuse_check_in", - "data_list_name": "check_in", + "data_list_name": [ + "check_in" + ], "row_id": "id_1", "completed_field": "task_prevent_abuse_check_in_completed", "completed": "@fields.task_prevent_abuse_check_in_completed" }, { "id": "gender_equal_review_hp", - "data_list_name": "review_hp", + "data_list_name": [ + "review_hp" + ], "row_id": "gender_equal", "completed_field": "task_gender_equal_review_hp_completed", "completed": "@fields.task_gender_equal_review_hp_completed" }, { "id": "prevent_abuse_tbg_1", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "prevent_abuse", "completed_field": "task_prevent_abuse_tbg_1_completed", "completed": "@fields.task_prevent_abuse_tbg_1_completed" }, { "id": "prevent_abuse_tbg_2", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "info_puberty", "completed_field": "task_prevent_abuse_tbg_2_completed", "completed": "@fields.task_prevent_abuse_tbg_2_completed" }, { "id": "prevent_abuse_tips", - "data_list_name": "tips", + "data_list_name": [ + "tips" + ], "row_id": "values_behaviours", "completed_field": "task_prevent_abuse_tips_completed", "completed": "@fields.task_prevent_abuse_tips_completed" }, { "id": "prevent_abuse_set_hp", - "data_list_name": "set_hp", + "data_list_name": [ + "set_hp" + ], "row_id": "prevent_abuse", "completed_field": "task_prevent_abuse_set_hp_completed", "completed": "@fields.task_prevent_abuse_set_hp_completed" }, { "id": "prevent_abuse_praise", - "data_list_name": "praise", + "data_list_name": [ + "praise" + ], "row_id": "prevent_abuse", "completed_field": "task_prevent_abuse_praise_completed", "completed": "@fields.task_prevent_abuse_praise_completed" diff --git a/app_data/sheets/data_list/generated/reduce_conflict_tasks.json b/app_data/sheets/data_list/generated/reduce_conflict_tasks.json index bd2d90b..513561e 100644 --- a/app_data/sheets/data_list/generated/reduce_conflict_tasks.json +++ b/app_data/sheets/data_list/generated/reduce_conflict_tasks.json @@ -5,49 +5,63 @@ "rows": [ { "id": "reduce_conflict_relax", - "data_list_name": "relax", + "data_list_name": [ + "relax" + ], "row_id": "id_1", "completed_field": "task_reduce_conflict_relax_completed", "completed": "@fields.task_reduce_conflict_relax_completed" }, { "id": "reduce_conflict_check_in", - "data_list_name": "check_in", + "data_list_name": [ + "check_in" + ], "row_id": "id_1", "completed_field": "task_reduce_conflict_check_in_completed", "completed": "@fields.task_reduce_conflict_check_in_completed" }, { "id": "prevent_abuse_review_hp", - "data_list_name": "review_hp", + "data_list_name": [ + "review_hp" + ], "row_id": "prevent_abuse", "completed_field": "task_prevent_abuse_review_hp_completed", "completed": "@fields.task_prevent_abuse_review_hp_completed" }, { "id": "reduce_conflict_tbg_1", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "reduce_conflict", "completed_field": "task_reduce_conflict_tbg_1_completed", "completed": "@fields.task_reduce_conflict_tbg_1_completed" }, { "id": "reduce_conflict_tips", - "data_list_name": "tips", + "data_list_name": [ + "tips" + ], "row_id": "reduce_conflict_tips", "completed_field": "task_reduce_conflict_tips_completed", "completed": "@fields.task_reduce_conflict_tips_completed" }, { "id": "reduce_conflict_set_hp", - "data_list_name": "set_hp", + "data_list_name": [ + "set_hp" + ], "row_id": "reduce_conflict", "completed_field": "task_reduce_conflict_set_hp_completed", "completed": "@fields.task_reduce_conflict_set_hp_completed" }, { "id": "reduce_conflict_praise", - "data_list_name": "praise", + "data_list_name": [ + "praise" + ], "row_id": "reduce_conflict", "completed_field": "task_reduce_conflict_praise_completed", "completed": "@fields.task_reduce_conflict_praise_completed" diff --git a/app_data/sheets/data_list/generated/review_tasks.json b/app_data/sheets/data_list/generated/review_tasks.json index 5e65ccb..191b47d 100644 --- a/app_data/sheets/data_list/generated/review_tasks.json +++ b/app_data/sheets/data_list/generated/review_tasks.json @@ -5,35 +5,45 @@ "rows": [ { "id": "review_relax", - "data_list_name": "relax", + "data_list_name": [ + "relax" + ], "row_id": "id_1", "completed_field": "task_review_relax_completed", "completed": "@fields.task_review_relax_completed" }, { "id": "review_check_in", - "data_list_name": "check_in", + "data_list_name": [ + "check_in" + ], "row_id": "id_1", "completed_field": "task_review_check_in_completed", "completed": "@fields.task_review_check_in_completed" }, { "id": "review_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "session_review", "completed_field": "task_review_tbg_completed", "completed": "@fields.task_review_tbg_completed" }, { "id": "review_ball_change_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "ball_change", "completed_field": "task_review_ball_change_tbg_completed", "completed": "@fields.task_review_ball_change_tbg_completed" }, { "id": "review_praise", - "data_list_name": "praise", + "data_list_name": [ + "praise" + ], "row_id": "review", "completed_field": "task_review_praise_completed", "completed": "@fields.task_review_praise_completed" diff --git a/app_data/sheets/data_list/generated/sharing_care_tasks.json b/app_data/sheets/data_list/generated/sharing_care_tasks.json index 8bd03d1..5287b10 100644 --- a/app_data/sheets/data_list/generated/sharing_care_tasks.json +++ b/app_data/sheets/data_list/generated/sharing_care_tasks.json @@ -5,56 +5,72 @@ "rows": [ { "id": "sharing_care_relax", - "data_list_name": "relax", + "data_list_name": [ + "relax" + ], "row_id": "id_1", "completed_field": "task_sharing_care_relax_completed", "completed": "@fields.task_sharing_care_relax_completed" }, { "id": "sharing_care_check_in", - "data_list_name": "check_in", + "data_list_name": [ + "check_in" + ], "row_id": "id_1", "completed_field": "task_sharing_care_check_in_completed", "completed": "@fields.task_sharing_care_check_in_completed" }, { "id": "impact_conflict_review_hp", - "data_list_name": "review_hp", + "data_list_name": [ + "review_hp" + ], "row_id": "impact_conflict", "completed_field": "task_impact_conflict_review_hp_completed", "completed": "@fields.task_impact_conflict_review_hp_completed" }, { "id": "sharing_care_tbg_1", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "sharing_care", "completed_field": "task_sharing_care_tbg_1_completed", "completed": "@fields.task_sharing_care_tbg_1_completed" }, { "id": "sharing_care_tbg_2", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "caregiving", "completed_field": "task_sharing_care_tbg_2_completed", "completed": "@fields.task_sharing_care_tbg_2_completed" }, { "id": "sharing_care_tips", - "data_list_name": "tips", + "data_list_name": [ + "tips" + ], "row_id": "caregiving", "completed_field": "task_sharing_care_tips_completed", "completed": "@fields.task_sharing_care_tips_completed" }, { "id": "sharing_care_set_hp", - "data_list_name": "set_hp", + "data_list_name": [ + "set_hp" + ], "row_id": "sharing_care", "completed_field": "task_sharing_care_set_hp_completed", "completed": "@fields.task_sharing_care_set_hp_completed" }, { "id": "sharing_care_praise", - "data_list_name": "praise", + "data_list_name": [ + "praise" + ], "row_id": "sharing_care", "completed_field": "task_sharing_care_praise_completed", "completed": "@fields.task_sharing_care_praise_completed" diff --git a/app_data/sheets/data_list/healthy_relation.json b/app_data/sheets/data_list/healthy_relation.json index 3cc2f71..ddb1529 100644 --- a/app_data/sheets/data_list/healthy_relation.json +++ b/app_data/sheets/data_list/healthy_relation.json @@ -5,37 +5,51 @@ "rows": [ { "id": "healthy_relation_relax", - "data_list_name": "relax", + "data_list_name": [ + "relax" + ], "row_id": "id_1" }, { "id": "healthy_relation_check_in", - "data_list_name": "check_in", + "data_list_name": [ + "check_in" + ], "row_id": "id_1" }, { "id": "sharing_care_review_hp", - "data_list_name": "review_hp", + "data_list_name": [ + "review_hp" + ], "row_id": "sharing_care" }, { "id": "healthy_relation_tbg_1", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "healthy_relation" }, { "id": "healthy_relation_tbg_2", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "rships_communication" }, { "id": "healthy_relation_set_hp", - "data_list_name": "set_hp", + "data_list_name": [ + "set_hp" + ], "row_id": "healthy_relation" }, { "id": "healthy_relation_praise", - "data_list_name": "praise", + "data_list_name": [ + "praise" + ], "row_id": "healthy_relation" } ], diff --git a/app_data/sheets/data_list/impact_conflict.json b/app_data/sheets/data_list/impact_conflict.json index 94d616d..acf0c74 100644 --- a/app_data/sheets/data_list/impact_conflict.json +++ b/app_data/sheets/data_list/impact_conflict.json @@ -5,32 +5,44 @@ "rows": [ { "id": "impact_conflict_relax", - "data_list_name": "relax", + "data_list_name": [ + "relax" + ], "row_id": "id_1" }, { "id": "impact_conflict_check_in", - "data_list_name": "check_in", + "data_list_name": [ + "check_in" + ], "row_id": "id_1" }, { "id": "impact_conflict_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "impact_conflict" }, { "id": "impact_conflict_tips", - "data_list_name": "tips", + "data_list_name": [ + "tips" + ], "row_id": "parents_involvement" }, { "id": "impact_conflict_set_hp", - "data_list_name": "set_hp", + "data_list_name": [ + "set_hp" + ], "row_id": "impact_conflict" }, { "id": "impact_conflict_praise", - "data_list_name": "praise", + "data_list_name": [ + "praise" + ], "row_id": "impact_conflict" } ], diff --git a/app_data/sheets/data_list/onboarding.json b/app_data/sheets/data_list/onboarding.json index 8abec91..b326ef7 100644 --- a/app_data/sheets/data_list/onboarding.json +++ b/app_data/sheets/data_list/onboarding.json @@ -5,27 +5,37 @@ "rows": [ { "id": "onboarding_relax", - "data_list_name": "relax", + "data_list_name": [ + "relax" + ], "row_id": "id_1" }, { "id": "onboarding_check_in", - "data_list_name": "check_in", + "data_list_name": [ + "check_in" + ], "row_id": "id_1" }, { "id": "onboarding_pfr_goals", - "data_list_name": "onboarding_content", + "data_list_name": [ + "onboarding_content" + ], "row_id": "pfr_goals" }, { "id": "onboarding_ground_rules", - "data_list_name": "onboarding_content", + "data_list_name": [ + "onboarding_content" + ], "row_id": "ground_rules" }, { "id": "onboarding_praise", - "data_list_name": "praise", + "data_list_name": [ + "praise" + ], "row_id": "onboarding" } ], diff --git a/app_data/sheets/data_list/organisation.json b/app_data/sheets/data_list/organisation.json index cb6609c..f662cfb 100644 --- a/app_data/sheets/data_list/organisation.json +++ b/app_data/sheets/data_list/organisation.json @@ -8,7 +8,7 @@ "id": "organisation_1", "name": "Child Health and Development Centre (CDHC)", "group": "partners", - "attached_single_doc": "https://docs.google.com/document/d/1PWD0URrev1bVlK8SnK3LeU_lvEXbao7Jm43hegGVMGk" + "attached_single_doc": "https://docs.google.com/document/d/1aUMQXgDpGCRkhDW0ywTws3xMtMiQTnSnw1klzB8LT4A" }, { "id": "organisation_2", diff --git a/app_data/sheets/data_list/parent_childhood.json b/app_data/sheets/data_list/parent_childhood.json index 30da2f2..4c603a8 100644 --- a/app_data/sheets/data_list/parent_childhood.json +++ b/app_data/sheets/data_list/parent_childhood.json @@ -5,37 +5,51 @@ "rows": [ { "id": "parent_childhood_relax", - "data_list_name": "relax", + "data_list_name": [ + "relax" + ], "row_id": "id_1" }, { "id": "parent_childhood_check_in", - "data_list_name": "check_in", + "data_list_name": [ + "check_in" + ], "row_id": "id_1" }, { "id": "child_dev_review_hp", - "data_list_name": "review_hp", + "data_list_name": [ + "review_hp" + ], "row_id": "child_dev" }, { "id": "parent_childhood_legacy_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "caregiver_legacy" }, { "id": "parent_childhood_abilities_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "outstanding_abilities" }, { "id": "parent_childhood_set_hp", - "data_list_name": "set_hp", + "data_list_name": [ + "set_hp" + ], "row_id": "parent_childhood" }, { "id": "parent_childhood_praise", - "data_list_name": "praise", + "data_list_name": [ + "praise" + ], "row_id": "parent_childhood" } ], diff --git a/app_data/sheets/data_list/positive_parenting.json b/app_data/sheets/data_list/positive_parenting.json index 1d2f9b3..852c2c1 100644 --- a/app_data/sheets/data_list/positive_parenting.json +++ b/app_data/sheets/data_list/positive_parenting.json @@ -5,47 +5,65 @@ "rows": [ { "id": "positive_parenting_relax", - "data_list_name": "relax", + "data_list_name": [ + "relax" + ], "row_id": "id_1" }, { "id": "positive_parenting_check_in", - "data_list_name": "check_in", + "data_list_name": [ + "check_in" + ], "row_id": "id_1" }, { "id": "parent_childhood_review_hp", - "data_list_name": "review_hp", + "data_list_name": [ + "review_hp" + ], "row_id": "parent_childhood" }, { "id": "positive_parenting_behavior_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "managing_behaviour" }, { "id": "positive_parenting_limits_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "setting_limits" }, { "id": "positive_parenting_how_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "setting_limits_how" }, { "id": "positive_parenting_style_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "parenting_style" }, { "id": "positive_parenting_tips", - "data_list_name": "tips", + "data_list_name": [ + "tips" + ], "row_id": "parenting_relationships" }, { "id": "positive_parenting_praise", - "data_list_name": "praise", + "data_list_name": [ + "praise" + ], "row_id": "positive_parenting" } ], diff --git a/app_data/sheets/data_list/prevent_abuse.json b/app_data/sheets/data_list/prevent_abuse.json index 52b9c3d..34e2a3f 100644 --- a/app_data/sheets/data_list/prevent_abuse.json +++ b/app_data/sheets/data_list/prevent_abuse.json @@ -5,42 +5,58 @@ "rows": [ { "id": "prevent_abuse_relax", - "data_list_name": "relax", + "data_list_name": [ + "relax" + ], "row_id": "id_1" }, { "id": "prevent_abuse_check_in", - "data_list_name": "check_in", + "data_list_name": [ + "check_in" + ], "row_id": "id_1" }, { "id": "gender_equal_review_hp", - "data_list_name": "review_hp", + "data_list_name": [ + "review_hp" + ], "row_id": "gender_equal" }, { "id": "prevent_abuse_tbg_1", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "prevent_abuse" }, { "id": "prevent_abuse_tbg_2", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "info_puberty" }, { "id": "prevent_abuse_tips", - "data_list_name": "tips", + "data_list_name": [ + "tips" + ], "row_id": "values_behaviours" }, { "id": "prevent_abuse_set_hp", - "data_list_name": "set_hp", + "data_list_name": [ + "set_hp" + ], "row_id": "prevent_abuse" }, { "id": "prevent_abuse_praise", - "data_list_name": "praise", + "data_list_name": [ + "praise" + ], "row_id": "prevent_abuse" } ], diff --git a/app_data/sheets/data_list/quiz_question.json b/app_data/sheets/data_list/quiz_question.json index 517d301..1bbb66a 100644 --- a/app_data/sheets/data_list/quiz_question.json +++ b/app_data/sheets/data_list/quiz_question.json @@ -105,25 +105,25 @@ "id": "dev_stage_physical", "topic": "child_dev", "question_type": "text_input_long", - "question_text": "How will you ensure that this child will grow well physically (growth)?" + "question_text": "What will you do to ensure that this child will grow well physically (growth)?" }, { "id": "dev_stage_think", "topic": "child_dev", "question_type": "text_input_long", - "question_text": "How will you ensure that this child will grow well cognitively (thinking)?" + "question_text": "What will you do to ensure that this child will grow well cognitively (thinking)?" }, { "id": "dev_stage_feel", "topic": "child_dev", "question_type": "text_input_long", - "question_text": "How will you ensure that this child will grow well emotionally (feelings)?" + "question_text": "What will you do to ensure that this child will grow well emotionally (feelings)?" }, { "id": "dev_stage_social", "topic": "child_dev", "question_type": "text_input_long", - "question_text": "How will you ensure that this child will grow well socially (social awareness)?" + "question_text": "What will you do to ensure that this child will grow well socially (social awareness)?" }, { "id": "similar_experience", diff --git a/app_data/sheets/data_list/reduce_conflict.json b/app_data/sheets/data_list/reduce_conflict.json index 8eb4c69..7364944 100644 --- a/app_data/sheets/data_list/reduce_conflict.json +++ b/app_data/sheets/data_list/reduce_conflict.json @@ -5,37 +5,51 @@ "rows": [ { "id": "reduce_conflict_relax", - "data_list_name": "relax", + "data_list_name": [ + "relax" + ], "row_id": "id_1" }, { "id": "reduce_conflict_check_in", - "data_list_name": "check_in", + "data_list_name": [ + "check_in" + ], "row_id": "id_1" }, { "id": "prevent_abuse_review_hp", - "data_list_name": "review_hp", + "data_list_name": [ + "review_hp" + ], "row_id": "prevent_abuse" }, { "id": "reduce_conflict_tbg_1", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "reduce_conflict" }, { "id": "reduce_conflict_tips", - "data_list_name": "tips", + "data_list_name": [ + "tips" + ], "row_id": "reduce_conflict_tips" }, { "id": "reduce_conflict_set_hp", - "data_list_name": "set_hp", + "data_list_name": [ + "set_hp" + ], "row_id": "reduce_conflict" }, { "id": "reduce_conflict_praise", - "data_list_name": "praise", + "data_list_name": [ + "praise" + ], "row_id": "reduce_conflict" } ], diff --git a/app_data/sheets/data_list/reflect.json b/app_data/sheets/data_list/reflect.json index 7a0197f..611f27c 100644 --- a/app_data/sheets/data_list/reflect.json +++ b/app_data/sheets/data_list/reflect.json @@ -7,15 +7,16 @@ "id": "future_now", "topic": "family_relation", "title": "50 years and 3 months", - "intro_text": "Take a minute to think about what you would do if you had 50 or more years to live and note them down on a piece of paper. Take time to reflect on what you have written down. Are these the most important relationships in your life?\n\nAnd what would you do if you had only 3 months left?", - "audio_transcript": "Take a minute to think about what you would do if you had 50 or more years to live and note them down on a piece of paper. Take time to reflect on what you have written down. Are these the most important relationships in your life? \n\nAnd what would you do if you had only 3 months left?", + "intro_text": "Take a minute to think about what you would do if you had 50 or more years to live; full of plenty and good health. Note them down on a piece of paper. Take time to reflect on what you have written down.\n\nAnd what would you do if you had only 3 months left to live? In your current status, what would you do for your children and family? Note them down on a piece of paper. Take time to reflect on what you have written down. \n \nWhat is your comment on the two sets of responses - Look for any differences and assess which set of achievements is more important to growing relationships.", + "audio_transcript": "Take a minute to think about what you would do if you had 50 or more years to live; full of plenty and good health. Note them down on a piece of paper. Take time to reflect on what you have written down. \n\n\nAnd what would you do if you had only 3 months left to live? In your current status, what would you do for your children and family? Note them down on a piece of paper. Take time to reflect on what you have written down. \n\nWhat is your comment on the two sets of responses - Look for any differences and assess which set of achievements is more important to growing relationships.", "icon_asset": "images/icons/thought_bubble.svg", "attached_single_doc": "https://docs.google.com/document/d/1zNu4exkPFgVGAbR_vpqNQ8sYLslVxgBDaw72e_TuAw0" }, { "id": "child_20", "topic": "current_pract", - "audio_transcript": "Close your eyes and imagine the following: Your child or grandchild is grown up. You are about to celebrate his/her 20th birthday. Imagine what he or she will look like at that age. What kind of person do you hope he/she will be? What kind of relationship will you have with your child?", + "audio_transcript": "Close your eyes and imagine the following: Your child or grandchild is grown up. You are about to celebrate his/her 20th birthday. Imagine what he or she will look like at that age. What kind of person do you hope he/she will be? What kind of relationship will you have with your child? Note them down on a piece of paper.", + "suggestion_1": "What have you consistently put in place to ensure that your child/ren attains what you desire?\nThere are two main elements of parenting i.e. love and discipline which should be provided in equal measures. When parenting it's important to think about the long-term goals and allow your child to adjust your life pattern..", "icon_asset": "images/icons/thought_bubble.svg", "intro_text": "Let's imagine the following situation.", "attached_single_doc": "https://docs.google.com/document/d/1zNu4exkPFgVGAbR_vpqNQ8sYLslVxgBDaw72e_TuAw0" @@ -181,7 +182,7 @@ "attached_single_doc": "https://docs.google.com/document/d/1zNu4exkPFgVGAbR_vpqNQ8sYLslVxgBDaw72e_TuAw0" }, { - "id": "gendered_rulesgendered_rules_1", + "id": "gendered_rules_1", "topic": "gender_equal", "audio_transcript": "* How do you feel when told to act like a man/woman?\n* Why do you think they said this?\n* Which of these messages above can be potentially harmful? Why?", "outro_text": "In this session, we will continue to see how society sustains very different rules for how men and women are supposed to behave. \nThese rules are called “gender norms” because they define what is supposed to be ‘normal’ for how men and women “ought to” think, feel, and act. However, these rules sometimes restrict the lives of both women and men.", diff --git a/app_data/sheets/data_list/review.json b/app_data/sheets/data_list/review.json index c94280b..bfbbc03 100644 --- a/app_data/sheets/data_list/review.json +++ b/app_data/sheets/data_list/review.json @@ -5,27 +5,37 @@ "rows": [ { "id": "review_relax", - "data_list_name": "relax", + "data_list_name": [ + "relax" + ], "row_id": "id_1" }, { "id": "review_check_in", - "data_list_name": "check_in", + "data_list_name": [ + "check_in" + ], "row_id": "id_1" }, { "id": "review_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "session_review" }, { "id": "review_ball_change_tbg", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "ball_change" }, { "id": "review_praise", - "data_list_name": "praise", + "data_list_name": [ + "praise" + ], "row_id": "review" } ], diff --git a/app_data/sheets/data_list/review_hp.json b/app_data/sheets/data_list/review_hp.json index 81159e4..dcf916a 100644 --- a/app_data/sheets/data_list/review_hp.json +++ b/app_data/sheets/data_list/review_hp.json @@ -6,7 +6,7 @@ { "id": "family_relation", "topic": "family_relation", - "question_done": "Were you able to invite your partner/ other family members to reflect with you on the importance of close family relationships and practice an activity that made you come closer in love and relationship as a family?", + "question_done": "Were you able to invite your partner/ other family members to reflect with you on the importance of close family relationships?", "title": "Review your home practice: @data.topic.family_relation.title", "icon_asset": "images/icons/paper_pencil.svg", "intro_text": "Your home practice for this week was to:\n@data.set_hp.family_relation.text", @@ -26,10 +26,10 @@ { "id": "current_pract", "topic": "current_pract", - "question_done": "Did you get a chance to discuss the importance of parenting measures with your partner/other family members?", + "question_done": "* Did you try out parenting practices that can help your child to become the child you desire to have at 20 years.\n* Did you develop family goals and objectives that will support you in nurturing the children.", "feedback_no": "You can always find this home practice activity in our session on @data.topic.current_pract.title", - "feedback_happy": "Good job on getting you and your family to talk about parenting measures.", - "outro_text": "Parenting measures will help you model positive behavior that helps in supporting your children to become responsible adults.", + "feedback_happy": "Good job on getting you and your family to talk about parenting family goals and objectives.", + "outro_text": "To achieve your dream child in 20 years, there is need for every parent to be deliberate in their parenting and to invest time and care from the start.", "title": "Review your home practice: @data.topic.current_pract.title", "icon_asset": "images/icons/paper_pencil.svg", "intro_text": "Your home practice for this week was to:\n@data.set_hp.current_pract.text", diff --git a/app_data/sheets/data_list/session.json b/app_data/sheets/data_list/session.json index 5aab2eb..1d84d8f 100644 --- a/app_data/sheets/data_list/session.json +++ b/app_data/sheets/data_list/session.json @@ -40,8 +40,7 @@ "number": 3, "session_type": "topic", "goal_1": "* Explore the basic developmental needs and behaviors of children 0 – 17 years.", - "goal_2": "* Discuss the importance of fathers’ supportiveness during pregnancy and childhood.", - "goal_3": "* Importance of parenting practices for children to reach their full potential.", + "goal_2": "* Importance of parenting practices for children to reach their full potential.", "manual_pdf_asset": "pdf/facilitator_manual/3_child_dev_pfr_manual_2021.pdf", "title": "@data.topic.child_dev.title", "image_asset": "@data.topic.child_dev.image_asset", @@ -132,7 +131,7 @@ "number": 11, "session_type": "topic", "goal_1": "* Identify the differences between punishment and discipline while exploring the effects of punishment on children’s development.", - "goal_2": "*Practising effective strategies for managing anger and disappointment.", + "goal_2": "* Practising effective strategies for managing anger and disappointment.", "goal_3": "* Explore how to positively and sensitively engage with children to promote respect.", "manual_pdf_asset": "pdf/facilitator_manual/11_discipline_pfr_manual_2021.pdf", "title": "@data.topic.discipline.title", diff --git a/app_data/sheets/data_list/set_hp.json b/app_data/sheets/data_list/set_hp.json index 23095bf..acb6cc1 100644 --- a/app_data/sheets/data_list/set_hp.json +++ b/app_data/sheets/data_list/set_hp.json @@ -15,7 +15,7 @@ { "id": "current_pract", "topic": "current_pract", - "text": "* Discuss with your partner and other family members the importance of having a defined parenting approach- refer back to the session.\n* Practice parenting measures you were not doing before with your children during the week.", + "text": "* Try out four parenting practices that can help your child to become the child you desire to have at 20 years.\n* Discuss with your family members and draw family goals and objectives that will support you in nurturing the children.", "title": "Home practice", "icon_asset": "images/icons/parent_child_heart.svg", "intro_text": "Time to try this at home with your family.", @@ -24,7 +24,7 @@ { "id": "child_dev", "topic": "child_dev", - "text": "* Reflect on what you learned from this topic about yourself as a parent and your parenting style. \n* Take 5 minutes every day and practice interactive play with your children in any game of their choice.", + "text": "* Take 5 minutes every day and practice interactive play with your children in any game of their choice.", "title": "Home practice", "icon_asset": "images/icons/parent_child_heart.svg", "intro_text": "Time to try this at home with your family.", diff --git a/app_data/sheets/data_list/sharing_care.json b/app_data/sheets/data_list/sharing_care.json index ab19ed7..94b3f81 100644 --- a/app_data/sheets/data_list/sharing_care.json +++ b/app_data/sheets/data_list/sharing_care.json @@ -5,42 +5,58 @@ "rows": [ { "id": "sharing_care_relax", - "data_list_name": "relax", + "data_list_name": [ + "relax" + ], "row_id": "id_1" }, { "id": "sharing_care_check_in", - "data_list_name": "check_in", + "data_list_name": [ + "check_in" + ], "row_id": "id_1" }, { "id": "impact_conflict_review_hp", - "data_list_name": "review_hp", + "data_list_name": [ + "review_hp" + ], "row_id": "impact_conflict" }, { "id": "sharing_care_tbg_1", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "sharing_care" }, { "id": "sharing_care_tbg_2", - "data_list_name": "topic_block_group", + "data_list_name": [ + "topic_block_group" + ], "row_id": "caregiving" }, { "id": "sharing_care_tips", - "data_list_name": "tips", + "data_list_name": [ + "tips" + ], "row_id": "caregiving" }, { "id": "sharing_care_set_hp", - "data_list_name": "set_hp", + "data_list_name": [ + "set_hp" + ], "row_id": "sharing_care" }, { "id": "sharing_care_praise", - "data_list_name": "praise", + "data_list_name": [ + "praise" + ], "row_id": "sharing_care" } ], diff --git a/app_data/sheets/data_list/tips.json b/app_data/sheets/data_list/tips.json index 5ec90c6..2da8d03 100644 --- a/app_data/sheets/data_list/tips.json +++ b/app_data/sheets/data_list/tips.json @@ -39,7 +39,7 @@ "id": "child_dev_needs", "topic": "child_dev", "title": "Needs of children in different developmental stages", - "intro_text": "Here are a few suggestions on how you can ensure you child grows in specific developmental stages:", + "intro_text": "Here are a few suggestions on how you can ensure your child grows in specific developmental stages:", "title_1": "Physical development", "text_1": "* Proper nutrition\n* Shelter\n* Play \n* Protection from violence", "title_2": "Cognitive development/thinking", @@ -266,7 +266,7 @@ { "id": "gender_power", "topic": "gender_power", - "title": "Key highlights on @data.topic_group.gender_relations: @data.topic.gender_power.title", + "title": "Key highlights on @data.topic.gender_power.title", "text_1": "In our families/communities there are many unquestioned differences and inequalities between women and men, parents and children", "text_2": "Abuse of power can make individuals vulnerable to gender based violence and mistreatment, and this negatively affect family relationships", "text_3": "Both women and men can adopt non-violent means of resolving conflict without losing respect, and instead become admired role models", @@ -390,13 +390,20 @@ "id": "harsh_communication", "topic": "discipline", "title": "Harsh communication", - "text_1": "Emphasize the power of personal authority, make demands:\nFor example: Kato, turn off the music,\nWe are taking a rest.", - "text_2": "Arbitrary, indirectly related to situation\nor not related at all:\nFor example: Why do you have to turn\non the music when we are taking a\nrest? You are now not allowed to listen\nto any music from now on.", - "text_3": "Identify children’s behavior with\npersonality, imply moral judgment:\nFor example: You acted like a thief\nwhen you used my motorbike without\nasking for permission. From now on you\nare not allowed to touch it!", - "text_4": "Concerned with past behavior:\nFor example: You are not allowed to\ninvite your friends to our house again.\nLast time you made a big mess and\nyour friends used bad language", - "text_5": "Threaten, disrespect, or put the child\ndown:\nFor example: Last time you made me\ni lost face with my friend. You know\nwhat will happen if your friends come to\nour house next time......", - "text_6": "Demand obedience and does not\naccept child’s choice:\nFor example: Do it now, go! If you don’t\ndo it now, I will beat you!", - "text_7": "Angry, unfriendly voice and expression:\nFor example: If you don’t go to be now,\nyou will see what I will do to you.", + "title_1": "Emphasize the power of personal authority, make demands:", + "text_1": "For example: Kato, turn off the music. We are taking a rest.", + "title_2": "Arbitrary, indirectly related to situation or not related at all:", + "text_2": "For example: Why do you have to turn on the music when we are taking a rest? You are now not allowed to listen to any music from now on.", + "title_3": "Identify children’s behavior with personality, imply moral judgment:", + "text_3": "For example: You acted like a thief when you used my motorbike without asking for permission. From now on you are not allowed to touch it!", + "title_4": "Concerned with past behavior:", + "text_4": "For example: You are not allowed to invite your friends to our house again. Last time you made a big mess and your friends used bad language", + "title_5": "Threaten, disrespect, or put the child down:", + "text_5": "For example: Last time you made me i lost face with my friend. You know what will happen if your friends come to our house next time......", + "title_6": "Demand obedience and does not accept child’s choice:", + "text_6": "For example: Do it now, go! If you don’t do it now, I will beat you!", + "title_7": "Angry, unfriendly voice and expression:", + "text_7": "For example: If you don’t go to be now, you will see what I will do to you.", "icon_asset": "images/icons/light_bulb.svg", "attached_single_doc": "https://docs.google.com/document/d/1TiHK00kbAhSC69bAizH257vlK0w6SmvYdtnGNwLBN-Q" }, @@ -404,13 +411,20 @@ "id": "positive_communication", "topic": "discipline", "title": "Positive communication", - "text_1": "Express the reality of the life, showing\nmutual respect:\nFor example: Kato, I know that you like\nthat song but we are taking a rest. So\nplease either you turn the volume down\nor you turn the music off.", - "text_2": "Directly related to the child’s\nmisbehavior:\nFor example: You should not turn the\nmusic up so loud at noon when people\nare taking a rest.", - "text_3": "Separate the deed from the doer, no\nmoral judgment:\nFor example: You use my motorbike\nwithout my permission. It is not right.\nFrom now on, you must ask me before\ntaking it.", - "text_4": "Concerned only with present and future\nbehaviors:\nFor example: You can invite your friends\nto our house if you tidy up yourselves\nand nobody uses bad language.", - "text_5": "Discuss the behavior in a friendly\nmanner, after the adult and the child\nhave calmed down; imply good will:\nFor example: Because you were not\nrespectful to my guest, next time may\nyou stay in your room when I talk with\nmy guest?", - "text_6": "Permit choices:\nFor example: You can do it whenever you want but it should be completed before I come back.", - "text_7": "Calm, friendly but determined voice and\nexpression:\nFor example: You can continue reading\nbut do not stay up after 10 o’clock.", + "title_1": "Express the reality of the life, showing mutual respect:", + "text_1": "For example: Kato, I know that you like that song but we are taking a rest. So please either you turn the volume down or you turn the music off.", + "title_2": "Directly related to the child’s misbehavior:", + "text_2": "For example: You should not turn the music up so loud at noon when people are taking a rest.", + "title_3": "Separate the deed from the doer, no moral judgment:", + "text_3": "For example: You use my motorbike without my permission. It is not right. From now on, you must ask me before taking it.", + "title_4": "Concerned only with present and future behaviors:", + "text_4": "For example: You can invite your friends to our house if you tidy up yourselves and nobody uses bad language.", + "title_5": "Discuss the behavior in a friendly manner, after the adult and the child have calmed down; imply good will:", + "text_5": "For example: Because you were not respectful to my guest, next time may you stay in your room when I talk with my guest?", + "title_6": "Permit choices:", + "text_6": "For example: You can do it whenever you want but it should be completed before I come back.", + "title_7": "Calm, friendly but determined voice and expression:", + "text_7": "For example: You can continue reading but do not stay up after 10 o’clock.", "icon_asset": "images/icons/light_bulb.svg", "attached_single_doc": "https://docs.google.com/document/d/1TiHK00kbAhSC69bAizH257vlK0w6SmvYdtnGNwLBN-Q" }, diff --git a/app_data/sheets/data_list/topic_block_group.json b/app_data/sheets/data_list/topic_block_group.json index 768e71e..1f8d945 100644 --- a/app_data/sheets/data_list/topic_block_group.json +++ b/app_data/sheets/data_list/topic_block_group.json @@ -274,11 +274,12 @@ "id": "interaction_children", "topic": "discipline", "title": "Positive and sensitive interaction with children", + "icon_asset": "images/icons/picture_book.svg", "intro_text": "In this activity we are going to: \n* Discuss how to positively and sensitively engage with our children to promote respect.", "task_1_data": "topic_block_group", "task_1_id": "interaction_children_1", "task_2_data": "topic_block_group", - "task_2_id": "interaction_children_1", + "task_2_id": "interaction_children_2", "task_3_data": "tips", "task_3_id": "sensitive_interaction" }, diff --git a/app_data/sheets/template/app_about.json b/app_data/sheets/template/app_about.json index 4780cbf..ceae4cd 100644 --- a/app_data/sheets/template/app_about.json +++ b/app_data/sheets/template/app_about.json @@ -39,7 +39,7 @@ "value": {} }, "condition": "@item.text", - "_nested_name": "items.text", + "_nested_name": "items_3.text", "_dynamicFields": { "value": [ { @@ -66,8 +66,8 @@ } } ], - "name": "items", - "_nested_name": "items", + "name": "items_3", + "_nested_name": "items_3", "_dynamicFields": { "value": [ { @@ -98,7 +98,7 @@ "parameter_list": { "style": "emphasised" }, - "_nested_name": "items.title_@item.id", + "_nested_name": "items_5.title_@item.id", "_dynamicFields": { "name": [ { @@ -118,7 +118,7 @@ ], "_nested_name": [ { - "fullExpression": "items.title_@item.id", + "fullExpression": "items_5.title_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -142,7 +142,7 @@ "value": {} }, "type": "set_variable", - "_nested_name": "items.this_group", + "_nested_name": "items_5.this_group", "_dynamicFields": { "value": [ { @@ -187,7 +187,7 @@ "_translations": { "value": {} }, - "_nested_name": "items.display_grid.items.dg_@item.id.image_asset", + "_nested_name": "items_5.display_grid_3.items_1.dg_@item.id.image_asset", "_dynamicFields": { "value": [ { @@ -199,7 +199,7 @@ ], "_nested_name": [ { - "fullExpression": "items.display_grid.items.dg_@item.id.image_asset", + "fullExpression": "items_5.display_grid_3.items_1.dg_@item.id.image_asset", "matchedExpression": "@item.id.image_asset", "type": "item", "fieldName": "id" @@ -223,7 +223,7 @@ "value": {} }, "condition": "!@item.image_asset", - "_nested_name": "items.display_grid.items.dg_@item.id.name", + "_nested_name": "items_5.display_grid_3.items_1.dg_@item.id.name", "_dynamicFields": { "value": [ { @@ -243,7 +243,7 @@ ], "_nested_name": [ { - "fullExpression": "items.display_grid.items.dg_@item.id.name", + "fullExpression": "items_5.display_grid_3.items_1.dg_@item.id.name", "matchedExpression": "@item.id.name", "type": "item", "fieldName": "id" @@ -263,7 +263,7 @@ } } ], - "_nested_name": "items.display_grid.items.dg_@item.id", + "_nested_name": "items_5.display_grid_3.items_1.dg_@item.id", "_dynamicFields": { "name": [ { @@ -289,7 +289,7 @@ ], "_nested_name": [ { - "fullExpression": "items.display_grid.items.dg_@item.id", + "fullExpression": "items_5.display_grid_3.items_1.dg_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -310,8 +310,8 @@ } } ], - "name": "items", - "_nested_name": "items.display_grid.items", + "name": "items_1", + "_nested_name": "items_5.display_grid_3.items_1", "_dynamicFields": { "value": [ { @@ -329,12 +329,12 @@ } } ], - "name": "display_grid", - "_nested_name": "items.display_grid" + "name": "display_grid_3", + "_nested_name": "items_5.display_grid_3" } ], - "name": "items", - "_nested_name": "items", + "name": "items_5", + "_nested_name": "items_5", "_dynamicFields": { "value": [ { diff --git a/app_data/sheets/template/check_in.json b/app_data/sheets/template/check_in.json index 35a4785..96b6253 100644 --- a/app_data/sheets/template/check_in.json +++ b/app_data/sheets/template/check_in.json @@ -5,9 +5,10 @@ "rows": [ { "name": "data_list_name", - "value": [ - "check_in" - ], + "value": "check_in", + "_translations": { + "value": {} + }, "type": "set_variable", "_nested_name": "data_list_name" }, @@ -22,35 +23,34 @@ }, { "name": "data_list_name_id", - "value": [ - "@local.data_list_name.@local.id" - ], + "value": "@local.data_list_name.@local.id", + "_translations": { + "value": {} + }, "type": "set_variable", "_nested_name": "data_list_name_id", "_dynamicFields": { - "value": { - "0": [ - { - "fullExpression": "@local.data_list_name.@local.id", - "matchedExpression": "@local.data_list_name", - "type": "local", - "fieldName": "data_list_name" - }, - { - "fullExpression": "@local.data_list_name.@local.id", - "matchedExpression": "@local.id", - "type": "local", - "fieldName": "id" - } - ] - } + "value": [ + { + "fullExpression": "@local.data_list_name.@local.id", + "matchedExpression": "@local.data_list_name", + "type": "local", + "fieldName": "data_list_name" + }, + { + "fullExpression": "@local.data_list_name.@local.id", + "matchedExpression": "@local.id", + "type": "local", + "fieldName": "id" + } + ] }, "_dynamicDependencies": { "@local.data_list_name": [ - "value.0" + "value" ], "@local.id": [ - "value.0" + "value" ] } }, @@ -229,76 +229,100 @@ { "name": "answer_list", "value": [ - "name: happy | image: @local.row_data.option_happy_image_asset | text: @local.row_data.option_happy_text", - "name: ok | image: @local.row_data.option_ok_image_asset | text: @local.row_data.option_ok_text", - "name: sad | image: @local.row_data.option_sad_image_asset | text: @local.row_data.option_sad_text" + { + "name": "happy", + "image": "@local.row_data.option_happy_image_asset", + "text": "@local.row_data.option_happy_text" + }, + { + "name": "ok", + "image": "@local.row_data.option_ok_image_asset", + "text": "@local.row_data.option_ok_text" + }, + { + "name": "sad", + "image": "@local.row_data.option_sad_image_asset", + "text": "@local.row_data.option_sad_text" + } ], "type": "set_variable", "_nested_name": "answer_list", "_dynamicFields": { "value": { - "0": [ - { - "fullExpression": "name: happy | image: @local.row_data.option_happy_image_asset | text: @local.row_data.option_happy_text", - "matchedExpression": "@local.row_data.option_happy_image_asset", - "type": "local", - "fieldName": "row_data" - }, - { - "fullExpression": "name: happy | image: @local.row_data.option_happy_image_asset | text: @local.row_data.option_happy_text", - "matchedExpression": "@local.row_data.option_happy_text", - "type": "local", - "fieldName": "row_data" - } - ], - "1": [ - { - "fullExpression": "name: ok | image: @local.row_data.option_ok_image_asset | text: @local.row_data.option_ok_text", - "matchedExpression": "@local.row_data.option_ok_image_asset", - "type": "local", - "fieldName": "row_data" - }, - { - "fullExpression": "name: ok | image: @local.row_data.option_ok_image_asset | text: @local.row_data.option_ok_text", - "matchedExpression": "@local.row_data.option_ok_text", - "type": "local", - "fieldName": "row_data" - } - ], - "2": [ - { - "fullExpression": "name: sad | image: @local.row_data.option_sad_image_asset | text: @local.row_data.option_sad_text", - "matchedExpression": "@local.row_data.option_sad_image_asset", - "type": "local", - "fieldName": "row_data" - }, - { - "fullExpression": "name: sad | image: @local.row_data.option_sad_image_asset | text: @local.row_data.option_sad_text", - "matchedExpression": "@local.row_data.option_sad_text", - "type": "local", - "fieldName": "row_data" - } - ] + "0": { + "image": [ + { + "fullExpression": "@local.row_data.option_happy_image_asset", + "matchedExpression": "@local.row_data.option_happy_image_asset", + "type": "local", + "fieldName": "row_data" + } + ], + "text": [ + { + "fullExpression": "@local.row_data.option_happy_text", + "matchedExpression": "@local.row_data.option_happy_text", + "type": "local", + "fieldName": "row_data" + } + ] + }, + "1": { + "image": [ + { + "fullExpression": "@local.row_data.option_ok_image_asset", + "matchedExpression": "@local.row_data.option_ok_image_asset", + "type": "local", + "fieldName": "row_data" + } + ], + "text": [ + { + "fullExpression": "@local.row_data.option_ok_text", + "matchedExpression": "@local.row_data.option_ok_text", + "type": "local", + "fieldName": "row_data" + } + ] + }, + "2": { + "image": [ + { + "fullExpression": "@local.row_data.option_sad_image_asset", + "matchedExpression": "@local.row_data.option_sad_image_asset", + "type": "local", + "fieldName": "row_data" + } + ], + "text": [ + { + "fullExpression": "@local.row_data.option_sad_text", + "matchedExpression": "@local.row_data.option_sad_text", + "type": "local", + "fieldName": "row_data" + } + ] + } } }, "_dynamicDependencies": { "@local.row_data.option_happy_image_asset": [ - "value.0" + "value.0.image" ], "@local.row_data.option_happy_text": [ - "value.0" + "value.0.text" ], "@local.row_data.option_ok_image_asset": [ - "value.1" + "value.1.image" ], "@local.row_data.option_ok_text": [ - "value.1" + "value.1.text" ], "@local.row_data.option_sad_image_asset": [ - "value.2" + "value.2.image" ], "@local.row_data.option_sad_text": [ - "value.2" + "value.2.text" ] } }, diff --git a/app_data/sheets/template/footer.json b/app_data/sheets/template/footer.json index b3c832a..550acea 100644 --- a/app_data/sheets/template/footer.json +++ b/app_data/sheets/template/footer.json @@ -6,103 +6,133 @@ { "name": "button_list", "value": [ - "image: @data.app_section.sessions.icon_asset | text: @data.app_section.sessions.title_modular | target_template: @data.app_section.sessions.template_modular", - "image: @data.app_section.habits.icon_asset | text: @data.app_section.habits.title_modular | target_template: @data.app_section.habits.template_modular", - "image: @data.app_section.library.icon_asset | text: @data.app_section.library.title_modular | target_template: @data.app_section.library.template_modular" + { + "image": "@data.app_section.sessions.icon_asset", + "text": "@data.app_section.sessions.title_modular", + "target_template": "@data.app_section.sessions.template_modular" + }, + { + "image": "@data.app_section.habits.icon_asset", + "text": "@data.app_section.habits.title_modular", + "target_template": "@data.app_section.habits.template_modular" + }, + { + "image": "@data.app_section.library.icon_asset", + "text": "@data.app_section.library.title_modular", + "target_template": "@data.app_section.library.template_modular" + } ], "type": "set_variable", "_nested_name": "button_list", "_dynamicFields": { "value": { - "0": [ - { - "fullExpression": "image: @data.app_section.sessions.icon_asset | text: @data.app_section.sessions.title_modular | target_template: @data.app_section.sessions.template_modular", - "matchedExpression": "@data.app_section.sessions.icon_asset", - "type": "data", - "fieldName": "app_section" - }, - { - "fullExpression": "image: @data.app_section.sessions.icon_asset | text: @data.app_section.sessions.title_modular | target_template: @data.app_section.sessions.template_modular", - "matchedExpression": "@data.app_section.sessions.title_modular", - "type": "data", - "fieldName": "app_section" - }, - { - "fullExpression": "image: @data.app_section.sessions.icon_asset | text: @data.app_section.sessions.title_modular | target_template: @data.app_section.sessions.template_modular", - "matchedExpression": "@data.app_section.sessions.template_modular", - "type": "data", - "fieldName": "app_section" - } - ], - "1": [ - { - "fullExpression": "image: @data.app_section.habits.icon_asset | text: @data.app_section.habits.title_modular | target_template: @data.app_section.habits.template_modular", - "matchedExpression": "@data.app_section.habits.icon_asset", - "type": "data", - "fieldName": "app_section" - }, - { - "fullExpression": "image: @data.app_section.habits.icon_asset | text: @data.app_section.habits.title_modular | target_template: @data.app_section.habits.template_modular", - "matchedExpression": "@data.app_section.habits.title_modular", - "type": "data", - "fieldName": "app_section" - }, - { - "fullExpression": "image: @data.app_section.habits.icon_asset | text: @data.app_section.habits.title_modular | target_template: @data.app_section.habits.template_modular", - "matchedExpression": "@data.app_section.habits.template_modular", - "type": "data", - "fieldName": "app_section" - } - ], - "2": [ - { - "fullExpression": "image: @data.app_section.library.icon_asset | text: @data.app_section.library.title_modular | target_template: @data.app_section.library.template_modular", - "matchedExpression": "@data.app_section.library.icon_asset", - "type": "data", - "fieldName": "app_section" - }, - { - "fullExpression": "image: @data.app_section.library.icon_asset | text: @data.app_section.library.title_modular | target_template: @data.app_section.library.template_modular", - "matchedExpression": "@data.app_section.library.title_modular", - "type": "data", - "fieldName": "app_section" - }, - { - "fullExpression": "image: @data.app_section.library.icon_asset | text: @data.app_section.library.title_modular | target_template: @data.app_section.library.template_modular", - "matchedExpression": "@data.app_section.library.template_modular", - "type": "data", - "fieldName": "app_section" - } - ] + "0": { + "image": [ + { + "fullExpression": "@data.app_section.sessions.icon_asset", + "matchedExpression": "@data.app_section.sessions.icon_asset", + "type": "data", + "fieldName": "app_section" + } + ], + "text": [ + { + "fullExpression": "@data.app_section.sessions.title_modular", + "matchedExpression": "@data.app_section.sessions.title_modular", + "type": "data", + "fieldName": "app_section" + } + ], + "target_template": [ + { + "fullExpression": "@data.app_section.sessions.template_modular", + "matchedExpression": "@data.app_section.sessions.template_modular", + "type": "data", + "fieldName": "app_section" + } + ] + }, + "1": { + "image": [ + { + "fullExpression": "@data.app_section.habits.icon_asset", + "matchedExpression": "@data.app_section.habits.icon_asset", + "type": "data", + "fieldName": "app_section" + } + ], + "text": [ + { + "fullExpression": "@data.app_section.habits.title_modular", + "matchedExpression": "@data.app_section.habits.title_modular", + "type": "data", + "fieldName": "app_section" + } + ], + "target_template": [ + { + "fullExpression": "@data.app_section.habits.template_modular", + "matchedExpression": "@data.app_section.habits.template_modular", + "type": "data", + "fieldName": "app_section" + } + ] + }, + "2": { + "image": [ + { + "fullExpression": "@data.app_section.library.icon_asset", + "matchedExpression": "@data.app_section.library.icon_asset", + "type": "data", + "fieldName": "app_section" + } + ], + "text": [ + { + "fullExpression": "@data.app_section.library.title_modular", + "matchedExpression": "@data.app_section.library.title_modular", + "type": "data", + "fieldName": "app_section" + } + ], + "target_template": [ + { + "fullExpression": "@data.app_section.library.template_modular", + "matchedExpression": "@data.app_section.library.template_modular", + "type": "data", + "fieldName": "app_section" + } + ] + } } }, "_dynamicDependencies": { "@data.app_section.sessions.icon_asset": [ - "value.0" + "value.0.image" ], "@data.app_section.sessions.title_modular": [ - "value.0" + "value.0.text" ], "@data.app_section.sessions.template_modular": [ - "value.0" + "value.0.target_template" ], "@data.app_section.habits.icon_asset": [ - "value.1" + "value.1.image" ], "@data.app_section.habits.title_modular": [ - "value.1" + "value.1.text" ], "@data.app_section.habits.template_modular": [ - "value.1" + "value.1.target_template" ], "@data.app_section.library.icon_asset": [ - "value.2" + "value.2.image" ], "@data.app_section.library.title_modular": [ - "value.2" + "value.2.text" ], "@data.app_section.library.template_modular": [ - "value.2" + "value.2.target_template" ] } }, @@ -111,8 +141,8 @@ "parameter_list": { "button_list": "@local.button_list" }, - "name": "navigation_bar", - "_nested_name": "navigation_bar", + "name": "navigation_bar_3", + "_nested_name": "navigation_bar_3", "_dynamicFields": { "parameter_list": { "button_list": [ diff --git a/app_data/sheets/template/generated/closing_tips.json b/app_data/sheets/template/generated/closing_tips.json index 479eaf4..9c68cd3 100644 --- a/app_data/sheets/template/generated/closing_tips.json +++ b/app_data/sheets/template/generated/closing_tips.json @@ -30,7 +30,7 @@ "rows": [ { "name": "id", - "value": "reduce_conflict_tips", + "value": "closing", "_translations": { "value": {} }, diff --git a/app_data/sheets/template/generated/discipline_interaction_1_tbg.json b/app_data/sheets/template/generated/conclusion_praise.json similarity index 76% rename from app_data/sheets/template/generated/discipline_interaction_1_tbg.json rename to app_data/sheets/template/generated/conclusion_praise.json index 6e589ac..6089333 100644 --- a/app_data/sheets/template/generated/discipline_interaction_1_tbg.json +++ b/app_data/sheets/template/generated/conclusion_praise.json @@ -1,12 +1,12 @@ { - "flow_name": "discipline_interaction_1_tbg", + "flow_name": "conclusion_praise", "flow_subtype": "generated", "flow_type": "template", "rows": [ { "type": "template", - "name": "topic_block_group", - "value": "topic_block_group", + "name": "praise", + "value": "praise", "action_list": [ { "trigger": "completed", @@ -30,15 +30,15 @@ "rows": [ { "name": "id", - "value": "interaction_children_1", + "value": "conclusion", "_translations": { "value": {} }, "type": "set_variable", - "_nested_name": "topic_block_group.id" + "_nested_name": "praise.id" } ], - "_nested_name": "topic_block_group" + "_nested_name": "praise" } ] } \ No newline at end of file diff --git a/app_data/sheets/template/generated/discipline_interaction_2_tbg.json b/app_data/sheets/template/generated/discipline_interaction_2_tbg.json deleted file mode 100644 index 87d6fe2..0000000 --- a/app_data/sheets/template/generated/discipline_interaction_2_tbg.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "flow_name": "discipline_interaction_2_tbg", - "flow_subtype": "generated", - "flow_type": "template", - "rows": [ - { - "type": "template", - "name": "topic_block_group", - "value": "topic_block_group", - "action_list": [ - { - "trigger": "completed", - "action_id": "emit", - "args": [ - "completed" - ], - "_raw": "completed | emit: completed", - "_cleaned": "completed | emit: completed" - }, - { - "trigger": "uncompleted", - "action_id": "emit", - "args": [ - "uncompleted" - ], - "_raw": "uncompleted | emit: uncompleted", - "_cleaned": "uncompleted | emit: uncompleted" - } - ], - "rows": [ - { - "name": "id", - "value": "interaction_children_2", - "_translations": { - "value": {} - }, - "type": "set_variable", - "_nested_name": "topic_block_group.id" - } - ], - "_nested_name": "topic_block_group" - } - ] -} \ No newline at end of file diff --git a/app_data/sheets/template/home_screen.json b/app_data/sheets/template/home_screen.json index 2c45100..f90231d 100644 --- a/app_data/sheets/template/home_screen.json +++ b/app_data/sheets/template/home_screen.json @@ -45,7 +45,7 @@ }, "exclude_from_translation": true, "type": "set_variable", - "_nested_name": "dg_all_sessions.items.session_card_@item.id.session_id", + "_nested_name": "dg_all_sessions.items_1.session_card_@item.id.session_id", "_dynamicFields": { "value": [ { @@ -57,7 +57,7 @@ ], "_nested_name": [ { - "fullExpression": "dg_all_sessions.items.session_card_@item.id.session_id", + "fullExpression": "dg_all_sessions.items_1.session_card_@item.id.session_id", "matchedExpression": "@item.id.session_id", "type": "item", "fieldName": "id" @@ -81,11 +81,11 @@ }, "exclude_from_translation": true, "type": "set_variable", - "_nested_name": "dg_all_sessions.items.session_card_@item.id.card_style", + "_nested_name": "dg_all_sessions.items_1.session_card_@item.id.card_style", "_dynamicFields": { "_nested_name": [ { - "fullExpression": "dg_all_sessions.items.session_card_@item.id.card_style", + "fullExpression": "dg_all_sessions.items_1.session_card_@item.id.card_style", "matchedExpression": "@item.id.card_style", "type": "item", "fieldName": "id" @@ -99,7 +99,7 @@ } } ], - "_nested_name": "dg_all_sessions.items.session_card_@item.id", + "_nested_name": "dg_all_sessions.items_1.session_card_@item.id", "_dynamicFields": { "name": [ { @@ -111,7 +111,7 @@ ], "_nested_name": [ { - "fullExpression": "dg_all_sessions.items.session_card_@item.id", + "fullExpression": "dg_all_sessions.items_1.session_card_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -126,8 +126,8 @@ } } ], - "name": "items", - "_nested_name": "dg_all_sessions.items", + "name": "items_1", + "_nested_name": "dg_all_sessions.items_1", "_dynamicFields": { "value": [ { diff --git a/app_data/sheets/template/home_screen_modular.json b/app_data/sheets/template/home_screen_modular.json index 8e64de0..8f29ce1 100644 --- a/app_data/sheets/template/home_screen_modular.json +++ b/app_data/sheets/template/home_screen_modular.json @@ -119,7 +119,7 @@ }, "exclude_from_translation": true, "type": "set_variable", - "_nested_name": "dg_all_session.carousel.items.session_card_@item.id.session_id", + "_nested_name": "dg_all_session.carousel.items_1.session_card_@item.id.session_id", "_dynamicFields": { "value": [ { @@ -131,7 +131,7 @@ ], "_nested_name": [ { - "fullExpression": "dg_all_session.carousel.items.session_card_@item.id.session_id", + "fullExpression": "dg_all_session.carousel.items_1.session_card_@item.id.session_id", "matchedExpression": "@item.id.session_id", "type": "item", "fieldName": "id" @@ -148,7 +148,7 @@ } } ], - "_nested_name": "dg_all_session.carousel.items.session_card_@item.id", + "_nested_name": "dg_all_session.carousel.items_1.session_card_@item.id", "_dynamicFields": { "name": [ { @@ -160,7 +160,7 @@ ], "_nested_name": [ { - "fullExpression": "dg_all_session.carousel.items.session_card_@item.id", + "fullExpression": "dg_all_session.carousel.items_1.session_card_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -175,8 +175,8 @@ } } ], - "name": "items", - "_nested_name": "dg_all_session.carousel.items", + "name": "items_1", + "_nested_name": "dg_all_session.carousel.items_1", "_dynamicFields": { "value": [ { diff --git a/app_data/sheets/template/intro.json b/app_data/sheets/template/intro.json index 2b13c84..c15790e 100644 --- a/app_data/sheets/template/intro.json +++ b/app_data/sheets/template/intro.json @@ -5,9 +5,10 @@ "rows": [ { "name": "data_list_name", - "value": [ - "intro" - ], + "value": "intro", + "_translations": { + "value": {} + }, "type": "set_variable", "_nested_name": "data_list_name" }, @@ -22,35 +23,34 @@ }, { "name": "data_list_name_id", - "value": [ - "@local.data_list_name.@local.id" - ], + "value": "@local.data_list_name.@local.id", + "_translations": { + "value": {} + }, "type": "set_variable", "_nested_name": "data_list_name_id", "_dynamicFields": { - "value": { - "0": [ - { - "fullExpression": "@local.data_list_name.@local.id", - "matchedExpression": "@local.data_list_name", - "type": "local", - "fieldName": "data_list_name" - }, - { - "fullExpression": "@local.data_list_name.@local.id", - "matchedExpression": "@local.id", - "type": "local", - "fieldName": "id" - } - ] - } + "value": [ + { + "fullExpression": "@local.data_list_name.@local.id", + "matchedExpression": "@local.data_list_name", + "type": "local", + "fieldName": "data_list_name" + }, + { + "fullExpression": "@local.data_list_name.@local.id", + "matchedExpression": "@local.id", + "type": "local", + "fieldName": "id" + } + ] }, "_dynamicDependencies": { "@local.data_list_name": [ - "value.0" + "value" ], "@local.id": [ - "value.0" + "value" ] } }, diff --git a/app_data/sheets/template/legal_terms/app_menu_privacy_policy.json b/app_data/sheets/template/legal_terms/app_menu_privacy_policy.json index 5c34fa5..dcc6e70 100644 --- a/app_data/sheets/template/legal_terms/app_menu_privacy_policy.json +++ b/app_data/sheets/template/legal_terms/app_menu_privacy_policy.json @@ -43,7 +43,7 @@ "parameter_list": { "style": "emphasised" }, - "_nested_name": "items.title_@item.id", + "_nested_name": "items_3.title_@item.id", "_dynamicFields": { "name": [ { @@ -71,7 +71,7 @@ ], "_nested_name": [ { - "fullExpression": "items.title_@item.id", + "fullExpression": "items_3.title_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -97,7 +97,7 @@ "value": {} }, "condition": "@item.text", - "_nested_name": "items.text_@item.id", + "_nested_name": "items_3.text_@item.id", "_dynamicFields": { "name": [ { @@ -125,7 +125,7 @@ ], "_nested_name": [ { - "fullExpression": "items.text_@item.id", + "fullExpression": "items_3.text_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -144,8 +144,8 @@ } } ], - "name": "items", - "_nested_name": "items", + "name": "items_3", + "_nested_name": "items_3", "_dynamicFields": { "value": [ { diff --git a/app_data/sheets/template/legal_terms/app_menu_terms.json b/app_data/sheets/template/legal_terms/app_menu_terms.json index 1e2c760..933b77e 100644 --- a/app_data/sheets/template/legal_terms/app_menu_terms.json +++ b/app_data/sheets/template/legal_terms/app_menu_terms.json @@ -43,7 +43,7 @@ "parameter_list": { "style": "emphasised" }, - "_nested_name": "items.title_@item.id", + "_nested_name": "items_3.title_@item.id", "_dynamicFields": { "name": [ { @@ -71,7 +71,7 @@ ], "_nested_name": [ { - "fullExpression": "items.title_@item.id", + "fullExpression": "items_3.title_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -97,7 +97,7 @@ "value": {} }, "condition": "@item.text", - "_nested_name": "items.text_@item.id", + "_nested_name": "items_3.text_@item.id", "_dynamicFields": { "name": [ { @@ -125,7 +125,7 @@ ], "_nested_name": [ { - "fullExpression": "items.text_@item.id", + "fullExpression": "items_3.text_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -144,8 +144,8 @@ } } ], - "name": "items", - "_nested_name": "items", + "name": "items_3", + "_nested_name": "items_3", "_dynamicFields": { "value": [ { diff --git a/app_data/sheets/template/library.json b/app_data/sheets/template/library.json index 55857a3..18b04ce 100644 --- a/app_data/sheets/template/library.json +++ b/app_data/sheets/template/library.json @@ -101,7 +101,7 @@ "icon_src": "@item.icon_asset", "first_line_text": "@item.title" }, - "_nested_name": "tiles.items.dg_@item.id.pc_@item.id", + "_nested_name": "tiles.items_1.dg_@item.id.pc_@item.id", "_dynamicFields": { "name": [ { @@ -169,13 +169,13 @@ }, "_nested_name": [ { - "fullExpression": "tiles.items.dg_@item.id.pc_@item.id", + "fullExpression": "tiles.items_1.dg_@item.id.pc_@item.id", "matchedExpression": "@item.id.pc_", "type": "item", "fieldName": "id" }, { - "fullExpression": "tiles.items.dg_@item.id.pc_@item.id", + "fullExpression": "tiles.items_1.dg_@item.id.pc_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -207,7 +207,7 @@ } } ], - "_nested_name": "tiles.items.dg_@item.id", + "_nested_name": "tiles.items_1.dg_@item.id", "_dynamicFields": { "name": [ { @@ -227,7 +227,7 @@ ], "_nested_name": [ { - "fullExpression": "tiles.items.dg_@item.id", + "fullExpression": "tiles.items_1.dg_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -245,8 +245,8 @@ } } ], - "name": "items", - "_nested_name": "tiles.items", + "name": "items_1", + "_nested_name": "tiles.items_1", "_dynamicFields": { "value": [ { diff --git a/app_data/sheets/template/onboarding_content.json b/app_data/sheets/template/onboarding_content.json index 4fe7bc9..77c6179 100644 --- a/app_data/sheets/template/onboarding_content.json +++ b/app_data/sheets/template/onboarding_content.json @@ -5,9 +5,10 @@ "rows": [ { "name": "session_data_list_name", - "value": [ - "onboarding" - ], + "value": "onboarding", + "_translations": { + "value": {} + }, "type": "set_variable", "_nested_name": "session_data_list_name" }, @@ -88,26 +89,25 @@ }, { "name": "data_list_name", - "value": [ - "@local.session_task_row_data.data_list_name" - ], + "value": "@local.session_task_row_data.data_list_name", + "_translations": { + "value": {} + }, "type": "set_variable", "_nested_name": "data_list_name", "_dynamicFields": { - "value": { - "0": [ - { - "fullExpression": "@local.session_task_row_data.data_list_name", - "matchedExpression": "@local.session_task_row_data.data_list_name", - "type": "local", - "fieldName": "session_task_row_data" - } - ] - } + "value": [ + { + "fullExpression": "@local.session_task_row_data.data_list_name", + "matchedExpression": "@local.session_task_row_data.data_list_name", + "type": "local", + "fieldName": "session_task_row_data" + } + ] }, "_dynamicDependencies": { "@local.session_task_row_data.data_list_name": [ - "value.0" + "value" ] } }, @@ -137,35 +137,34 @@ }, { "name": "data_list_name_id", - "value": [ - "@local.data_list_name.@local.id" - ], + "value": "@local.data_list_name.@local.id", + "_translations": { + "value": {} + }, "type": "set_variable", "_nested_name": "data_list_name_id", "_dynamicFields": { - "value": { - "0": [ - { - "fullExpression": "@local.data_list_name.@local.id", - "matchedExpression": "@local.data_list_name", - "type": "local", - "fieldName": "data_list_name" - }, - { - "fullExpression": "@local.data_list_name.@local.id", - "matchedExpression": "@local.id", - "type": "local", - "fieldName": "id" - } - ] - } + "value": [ + { + "fullExpression": "@local.data_list_name.@local.id", + "matchedExpression": "@local.data_list_name", + "type": "local", + "fieldName": "data_list_name" + }, + { + "fullExpression": "@local.data_list_name.@local.id", + "matchedExpression": "@local.id", + "type": "local", + "fieldName": "id" + } + ] }, "_dynamicDependencies": { "@local.data_list_name": [ - "value.0" + "value" ], "@local.id": [ - "value.0" + "value" ] } }, diff --git a/app_data/sheets/template/praise.json b/app_data/sheets/template/praise.json index 03eb17f..8177d46 100644 --- a/app_data/sheets/template/praise.json +++ b/app_data/sheets/template/praise.json @@ -5,9 +5,10 @@ "rows": [ { "name": "data_list_name", - "value": [ - "praise" - ], + "value": "praise", + "_translations": { + "value": {} + }, "type": "set_variable", "_nested_name": "data_list_name" }, @@ -22,35 +23,34 @@ }, { "name": "data_list_name_id", - "value": [ - "@local.data_list_name.@local.id" - ], + "value": "@local.data_list_name.@local.id", + "_translations": { + "value": {} + }, "type": "set_variable", "_nested_name": "data_list_name_id", "_dynamicFields": { - "value": { - "0": [ - { - "fullExpression": "@local.data_list_name.@local.id", - "matchedExpression": "@local.data_list_name", - "type": "local", - "fieldName": "data_list_name" - }, - { - "fullExpression": "@local.data_list_name.@local.id", - "matchedExpression": "@local.id", - "type": "local", - "fieldName": "id" - } - ] - } + "value": [ + { + "fullExpression": "@local.data_list_name.@local.id", + "matchedExpression": "@local.data_list_name", + "type": "local", + "fieldName": "data_list_name" + }, + { + "fullExpression": "@local.data_list_name.@local.id", + "matchedExpression": "@local.id", + "type": "local", + "fieldName": "id" + } + ] }, "_dynamicDependencies": { "@local.data_list_name": [ - "value.0" + "value" ], "@local.id": [ - "value.0" + "value" ] } }, @@ -205,8 +205,8 @@ "value": {} }, "type": "set_variable", - "name": "set_variable", - "_nested_name": "set_variable" + "name": "set_variable_11", + "_nested_name": "set_variable_11" } ], "_xlsxPath": "global/templates/blocks/session_blocks.xlsx" diff --git a/app_data/sheets/template/quiz.json b/app_data/sheets/template/quiz.json index 89d0da6..ca07695 100644 --- a/app_data/sheets/template/quiz.json +++ b/app_data/sheets/template/quiz.json @@ -5,9 +5,10 @@ "rows": [ { "name": "data_list_name", - "value": [ - "quiz" - ], + "value": "quiz", + "_translations": { + "value": {} + }, "type": "set_variable", "_nested_name": "data_list_name" }, @@ -540,11 +541,11 @@ "value": {} }, "type": "set_variable", - "_nested_name": "items.dg_@item.id.join_id", + "_nested_name": "items_20.dg_@item.id.join_id", "_dynamicFields": { "_nested_name": [ { - "fullExpression": "items.dg_@item.id.join_id", + "fullExpression": "items_20.dg_@item.id.join_id", "matchedExpression": "@item.id.join_id", "type": "item", "fieldName": "id" @@ -564,11 +565,11 @@ "value": {} }, "type": "set_variable", - "_nested_name": "items.dg_@item.id.join_data", + "_nested_name": "items_20.dg_@item.id.join_data", "_dynamicFields": { "_nested_name": [ { - "fullExpression": "items.dg_@item.id.join_data", + "fullExpression": "items_20.dg_@item.id.join_data", "matchedExpression": "@item.id.join_data", "type": "item", "fieldName": "id" @@ -588,7 +589,7 @@ "value": {} }, "type": "set_variable", - "_nested_name": "items.dg_@item.id.question_id_temp_1", + "_nested_name": "items_20.dg_@item.id.question_id_temp_1", "_dynamicFields": { "value": [ { @@ -606,7 +607,7 @@ ], "_nested_name": [ { - "fullExpression": "items.dg_@item.id.question_id_temp_1", + "fullExpression": "items_20.dg_@item.id.question_id_temp_1", "matchedExpression": "@item.id.question_id_temp_1", "type": "item", "fieldName": "id" @@ -632,7 +633,7 @@ "value": {} }, "type": "set_variable", - "_nested_name": "items.dg_@item.id.question_id_temp_2", + "_nested_name": "items_20.dg_@item.id.question_id_temp_2", "_dynamicFields": { "value": [ { @@ -650,7 +651,7 @@ ], "_nested_name": [ { - "fullExpression": "items.dg_@item.id.question_id_temp_2", + "fullExpression": "items_20.dg_@item.id.question_id_temp_2", "matchedExpression": "@item.id.question_id_temp_2", "type": "item", "fieldName": "id" @@ -676,7 +677,7 @@ "value": {} }, "type": "set_variable", - "_nested_name": "items.dg_@item.id.question_id", + "_nested_name": "items_20.dg_@item.id.question_id", "_dynamicFields": { "value": [ { @@ -688,7 +689,7 @@ ], "_nested_name": [ { - "fullExpression": "items.dg_@item.id.question_id", + "fullExpression": "items_20.dg_@item.id.question_id", "matchedExpression": "@item.id.question_id", "type": "item", "fieldName": "id" @@ -716,7 +717,7 @@ "value": {} }, "type": "set_variable", - "_nested_name": "items.dg_@item.id.template_@item.id.id", + "_nested_name": "items_20.dg_@item.id.template_@item.id.id", "_dynamicFields": { "value": [ { @@ -728,13 +729,13 @@ ], "_nested_name": [ { - "fullExpression": "items.dg_@item.id.template_@item.id.id", + "fullExpression": "items_20.dg_@item.id.template_@item.id.id", "matchedExpression": "@item.id.template_", "type": "item", "fieldName": "id" }, { - "fullExpression": "items.dg_@item.id.template_@item.id.id", + "fullExpression": "items_20.dg_@item.id.template_@item.id.id", "matchedExpression": "@item.id.id", "type": "item", "fieldName": "id" @@ -754,7 +755,7 @@ } } ], - "_nested_name": "items.dg_@item.id.template_@item.id", + "_nested_name": "items_20.dg_@item.id.template_@item.id", "_dynamicFields": { "name": [ { @@ -766,13 +767,13 @@ ], "_nested_name": [ { - "fullExpression": "items.dg_@item.id.template_@item.id", + "fullExpression": "items_20.dg_@item.id.template_@item.id", "matchedExpression": "@item.id.template_", "type": "item", "fieldName": "id" }, { - "fullExpression": "items.dg_@item.id.template_@item.id", + "fullExpression": "items_20.dg_@item.id.template_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -790,7 +791,7 @@ } } ], - "_nested_name": "items.dg_@item.id", + "_nested_name": "items_20.dg_@item.id", "_dynamicFields": { "name": [ { @@ -816,7 +817,7 @@ ], "_nested_name": [ { - "fullExpression": "items.dg_@item.id", + "fullExpression": "items_20.dg_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -835,8 +836,8 @@ } } ], - "name": "items", - "_nested_name": "items", + "name": "items_20", + "_nested_name": "items_20", "_dynamicFields": { "value": [ { diff --git a/app_data/sheets/template/quiz_question.json b/app_data/sheets/template/quiz_question.json index 27a0668..ba2d38c 100644 --- a/app_data/sheets/template/quiz_question.json +++ b/app_data/sheets/template/quiz_question.json @@ -5,9 +5,10 @@ "rows": [ { "name": "data_list_name", - "value": [ - "quiz_question" - ], + "value": "quiz_question", + "_translations": { + "value": {} + }, "type": "set_variable", "_nested_name": "data_list_name" }, @@ -424,30 +425,40 @@ { "name": "answer_list", "value": [ - "name: option_1 | text: @local.option_1_text", - "name: option_2 | text: @local.option_2_text" + { + "name": "option_1", + "text": "@local.option_1_text" + }, + { + "name": "option_2", + "text": "@local.option_2_text" + } ], "condition": "@local.no_of_options <= 2", "type": "set_variable", "_nested_name": "answer_list", "_dynamicFields": { "value": { - "0": [ - { - "fullExpression": "name: option_1 | text: @local.option_1_text", - "matchedExpression": "@local.option_1_text", - "type": "local", - "fieldName": "option_1_text" - } - ], - "1": [ - { - "fullExpression": "name: option_2 | text: @local.option_2_text", - "matchedExpression": "@local.option_2_text", - "type": "local", - "fieldName": "option_2_text" - } - ] + "0": { + "text": [ + { + "fullExpression": "@local.option_1_text", + "matchedExpression": "@local.option_1_text", + "type": "local", + "fieldName": "option_1_text" + } + ] + }, + "1": { + "text": [ + { + "fullExpression": "@local.option_2_text", + "matchedExpression": "@local.option_2_text", + "type": "local", + "fieldName": "option_2_text" + } + ] + } }, "condition": [ { @@ -460,10 +471,10 @@ }, "_dynamicDependencies": { "@local.option_1_text": [ - "value.0" + "value.0.text" ], "@local.option_2_text": [ - "value.1" + "value.1.text" ], "@local.no_of_options": [ "condition" @@ -473,39 +484,54 @@ { "name": "answer_list", "value": [ - "name: option_1 | text: @local.option_1_text", - "name: option_2 | text: @local.option_2_text", - "name: option_3 | text: @local.option_3_text" + { + "name": "option_1", + "text": "@local.option_1_text" + }, + { + "name": "option_2", + "text": "@local.option_2_text" + }, + { + "name": "option_3", + "text": "@local.option_3_text" + } ], "condition": "@local.no_of_options == 3", "type": "set_variable", "_nested_name": "answer_list", "_dynamicFields": { "value": { - "0": [ - { - "fullExpression": "name: option_1 | text: @local.option_1_text", - "matchedExpression": "@local.option_1_text", - "type": "local", - "fieldName": "option_1_text" - } - ], - "1": [ - { - "fullExpression": "name: option_2 | text: @local.option_2_text", - "matchedExpression": "@local.option_2_text", - "type": "local", - "fieldName": "option_2_text" - } - ], - "2": [ - { - "fullExpression": "name: option_3 | text: @local.option_3_text", - "matchedExpression": "@local.option_3_text", - "type": "local", - "fieldName": "option_3_text" - } - ] + "0": { + "text": [ + { + "fullExpression": "@local.option_1_text", + "matchedExpression": "@local.option_1_text", + "type": "local", + "fieldName": "option_1_text" + } + ] + }, + "1": { + "text": [ + { + "fullExpression": "@local.option_2_text", + "matchedExpression": "@local.option_2_text", + "type": "local", + "fieldName": "option_2_text" + } + ] + }, + "2": { + "text": [ + { + "fullExpression": "@local.option_3_text", + "matchedExpression": "@local.option_3_text", + "type": "local", + "fieldName": "option_3_text" + } + ] + } }, "condition": [ { @@ -518,13 +544,13 @@ }, "_dynamicDependencies": { "@local.option_1_text": [ - "value.0" + "value.0.text" ], "@local.option_2_text": [ - "value.1" + "value.1.text" ], "@local.option_3_text": [ - "value.2" + "value.2.text" ], "@local.no_of_options": [ "condition" @@ -534,48 +560,68 @@ { "name": "answer_list", "value": [ - "name: option_1 | text: @local.option_1_text", - "name: option_2 | text: @local.option_2_text", - "name: option_3 | text: @local.option_3_text", - "name: option_4 | text: @local.option_4_text" + { + "name": "option_1", + "text": "@local.option_1_text" + }, + { + "name": "option_2", + "text": "@local.option_2_text" + }, + { + "name": "option_3", + "text": "@local.option_3_text" + }, + { + "name": "option_4", + "text": "@local.option_4_text" + } ], "condition": "@local.no_of_options == 4", "type": "set_variable", "_nested_name": "answer_list", "_dynamicFields": { "value": { - "0": [ - { - "fullExpression": "name: option_1 | text: @local.option_1_text", - "matchedExpression": "@local.option_1_text", - "type": "local", - "fieldName": "option_1_text" - } - ], - "1": [ - { - "fullExpression": "name: option_2 | text: @local.option_2_text", - "matchedExpression": "@local.option_2_text", - "type": "local", - "fieldName": "option_2_text" - } - ], - "2": [ - { - "fullExpression": "name: option_3 | text: @local.option_3_text", - "matchedExpression": "@local.option_3_text", - "type": "local", - "fieldName": "option_3_text" - } - ], - "3": [ - { - "fullExpression": "name: option_4 | text: @local.option_4_text", - "matchedExpression": "@local.option_4_text", - "type": "local", - "fieldName": "option_4_text" - } - ] + "0": { + "text": [ + { + "fullExpression": "@local.option_1_text", + "matchedExpression": "@local.option_1_text", + "type": "local", + "fieldName": "option_1_text" + } + ] + }, + "1": { + "text": [ + { + "fullExpression": "@local.option_2_text", + "matchedExpression": "@local.option_2_text", + "type": "local", + "fieldName": "option_2_text" + } + ] + }, + "2": { + "text": [ + { + "fullExpression": "@local.option_3_text", + "matchedExpression": "@local.option_3_text", + "type": "local", + "fieldName": "option_3_text" + } + ] + }, + "3": { + "text": [ + { + "fullExpression": "@local.option_4_text", + "matchedExpression": "@local.option_4_text", + "type": "local", + "fieldName": "option_4_text" + } + ] + } }, "condition": [ { @@ -588,16 +634,16 @@ }, "_dynamicDependencies": { "@local.option_1_text": [ - "value.0" + "value.0.text" ], "@local.option_2_text": [ - "value.1" + "value.1.text" ], "@local.option_3_text": [ - "value.2" + "value.2.text" ], "@local.option_4_text": [ - "value.3" + "value.3.text" ], "@local.no_of_options": [ "condition" @@ -607,57 +653,82 @@ { "name": "answer_list", "value": [ - "name: option_1 | text: @local.option_1_text", - "name: option_2 | text: @local.option_2_text", - "name: option_3 | text: @local.option_3_text", - "name: option_4 | text: @local.option_4_text", - "name: option_5 | text: @local.option_5_text" + { + "name": "option_1", + "text": "@local.option_1_text" + }, + { + "name": "option_2", + "text": "@local.option_2_text" + }, + { + "name": "option_3", + "text": "@local.option_3_text" + }, + { + "name": "option_4", + "text": "@local.option_4_text" + }, + { + "name": "option_5", + "text": "@local.option_5_text" + } ], "condition": "@local.no_of_options == 5", "type": "set_variable", "_nested_name": "answer_list", "_dynamicFields": { "value": { - "0": [ - { - "fullExpression": "name: option_1 | text: @local.option_1_text", - "matchedExpression": "@local.option_1_text", - "type": "local", - "fieldName": "option_1_text" - } - ], - "1": [ - { - "fullExpression": "name: option_2 | text: @local.option_2_text", - "matchedExpression": "@local.option_2_text", - "type": "local", - "fieldName": "option_2_text" - } - ], - "2": [ - { - "fullExpression": "name: option_3 | text: @local.option_3_text", - "matchedExpression": "@local.option_3_text", - "type": "local", - "fieldName": "option_3_text" - } - ], - "3": [ - { - "fullExpression": "name: option_4 | text: @local.option_4_text", - "matchedExpression": "@local.option_4_text", - "type": "local", - "fieldName": "option_4_text" - } - ], - "4": [ - { - "fullExpression": "name: option_5 | text: @local.option_5_text", - "matchedExpression": "@local.option_5_text", - "type": "local", - "fieldName": "option_5_text" - } - ] + "0": { + "text": [ + { + "fullExpression": "@local.option_1_text", + "matchedExpression": "@local.option_1_text", + "type": "local", + "fieldName": "option_1_text" + } + ] + }, + "1": { + "text": [ + { + "fullExpression": "@local.option_2_text", + "matchedExpression": "@local.option_2_text", + "type": "local", + "fieldName": "option_2_text" + } + ] + }, + "2": { + "text": [ + { + "fullExpression": "@local.option_3_text", + "matchedExpression": "@local.option_3_text", + "type": "local", + "fieldName": "option_3_text" + } + ] + }, + "3": { + "text": [ + { + "fullExpression": "@local.option_4_text", + "matchedExpression": "@local.option_4_text", + "type": "local", + "fieldName": "option_4_text" + } + ] + }, + "4": { + "text": [ + { + "fullExpression": "@local.option_5_text", + "matchedExpression": "@local.option_5_text", + "type": "local", + "fieldName": "option_5_text" + } + ] + } }, "condition": [ { @@ -670,19 +741,19 @@ }, "_dynamicDependencies": { "@local.option_1_text": [ - "value.0" + "value.0.text" ], "@local.option_2_text": [ - "value.1" + "value.1.text" ], "@local.option_3_text": [ - "value.2" + "value.2.text" ], "@local.option_4_text": [ - "value.3" + "value.3.text" ], "@local.option_5_text": [ - "value.4" + "value.4.text" ], "@local.no_of_options": [ "condition" @@ -692,66 +763,96 @@ { "name": "answer_list", "value": [ - "name: option_1 | text: @local.option_1_text", - "name: option_2 | text: @local.option_2_text", - "name: option_3 | text: @local.option_3_text", - "name: option_4 | text: @local.option_4_text", - "name: option_5 | text: @local.option_5_text", - "name: option_6 | text: @local.option_6_text" + { + "name": "option_1", + "text": "@local.option_1_text" + }, + { + "name": "option_2", + "text": "@local.option_2_text" + }, + { + "name": "option_3", + "text": "@local.option_3_text" + }, + { + "name": "option_4", + "text": "@local.option_4_text" + }, + { + "name": "option_5", + "text": "@local.option_5_text" + }, + { + "name": "option_6", + "text": "@local.option_6_text" + } ], "condition": "@local.no_of_options >= 6", "type": "set_variable", "_nested_name": "answer_list", "_dynamicFields": { "value": { - "0": [ - { - "fullExpression": "name: option_1 | text: @local.option_1_text", - "matchedExpression": "@local.option_1_text", - "type": "local", - "fieldName": "option_1_text" - } - ], - "1": [ - { - "fullExpression": "name: option_2 | text: @local.option_2_text", - "matchedExpression": "@local.option_2_text", - "type": "local", - "fieldName": "option_2_text" - } - ], - "2": [ - { - "fullExpression": "name: option_3 | text: @local.option_3_text", - "matchedExpression": "@local.option_3_text", - "type": "local", - "fieldName": "option_3_text" - } - ], - "3": [ - { - "fullExpression": "name: option_4 | text: @local.option_4_text", - "matchedExpression": "@local.option_4_text", - "type": "local", - "fieldName": "option_4_text" - } - ], - "4": [ - { - "fullExpression": "name: option_5 | text: @local.option_5_text", - "matchedExpression": "@local.option_5_text", - "type": "local", - "fieldName": "option_5_text" - } - ], - "5": [ - { - "fullExpression": "name: option_6 | text: @local.option_6_text", - "matchedExpression": "@local.option_6_text", - "type": "local", - "fieldName": "option_6_text" - } - ] + "0": { + "text": [ + { + "fullExpression": "@local.option_1_text", + "matchedExpression": "@local.option_1_text", + "type": "local", + "fieldName": "option_1_text" + } + ] + }, + "1": { + "text": [ + { + "fullExpression": "@local.option_2_text", + "matchedExpression": "@local.option_2_text", + "type": "local", + "fieldName": "option_2_text" + } + ] + }, + "2": { + "text": [ + { + "fullExpression": "@local.option_3_text", + "matchedExpression": "@local.option_3_text", + "type": "local", + "fieldName": "option_3_text" + } + ] + }, + "3": { + "text": [ + { + "fullExpression": "@local.option_4_text", + "matchedExpression": "@local.option_4_text", + "type": "local", + "fieldName": "option_4_text" + } + ] + }, + "4": { + "text": [ + { + "fullExpression": "@local.option_5_text", + "matchedExpression": "@local.option_5_text", + "type": "local", + "fieldName": "option_5_text" + } + ] + }, + "5": { + "text": [ + { + "fullExpression": "@local.option_6_text", + "matchedExpression": "@local.option_6_text", + "type": "local", + "fieldName": "option_6_text" + } + ] + } }, "condition": [ { @@ -764,22 +865,22 @@ }, "_dynamicDependencies": { "@local.option_1_text": [ - "value.0" + "value.0.text" ], "@local.option_2_text": [ - "value.1" + "value.1.text" ], "@local.option_3_text": [ - "value.2" + "value.2.text" ], "@local.option_4_text": [ - "value.3" + "value.3.text" ], "@local.option_5_text": [ - "value.4" + "value.4.text" ], "@local.option_6_text": [ - "value.5" + "value.5.text" ], "@local.no_of_options": [ "condition" @@ -811,8 +912,8 @@ "_cleaned": "changed | set_local: show_feedback: true" } ], - "name": "combo_box", - "_nested_name": "combo_box", + "name": "combo_box_23", + "_nested_name": "combo_box_23", "_dynamicFields": { "condition": [ { @@ -878,8 +979,8 @@ "_cleaned": "changed | set_local: show_feedback: true" } ], - "name": "text_box", - "_nested_name": "text_box", + "name": "text_box_24", + "_nested_name": "text_box_24", "_dynamicFields": { "condition": [ { @@ -914,8 +1015,8 @@ "_cleaned": "changed | set_local: show_feedback: true" } ], - "name": "text_area", - "_nested_name": "text_area", + "name": "text_area_25", + "_nested_name": "text_area_25", "_dynamicFields": { "condition": [ { diff --git a/app_data/sheets/template/reflect.json b/app_data/sheets/template/reflect.json index b5ee0af..a2acc4c 100644 --- a/app_data/sheets/template/reflect.json +++ b/app_data/sheets/template/reflect.json @@ -5,9 +5,10 @@ "rows": [ { "name": "data_list_name", - "value": [ - "reflect" - ], + "value": "reflect", + "_translations": { + "value": {} + }, "type": "set_variable", "_nested_name": "data_list_name" }, @@ -22,35 +23,34 @@ }, { "name": "data_list_name_id", - "value": [ - "@local.data_list_name.@local.id" - ], + "value": "@local.data_list_name.@local.id", + "_translations": { + "value": {} + }, "type": "set_variable", "_nested_name": "data_list_name_id", "_dynamicFields": { - "value": { - "0": [ - { - "fullExpression": "@local.data_list_name.@local.id", - "matchedExpression": "@local.data_list_name", - "type": "local", - "fieldName": "data_list_name" - }, - { - "fullExpression": "@local.data_list_name.@local.id", - "matchedExpression": "@local.id", - "type": "local", - "fieldName": "id" - } - ] - } + "value": [ + { + "fullExpression": "@local.data_list_name.@local.id", + "matchedExpression": "@local.data_list_name", + "type": "local", + "fieldName": "data_list_name" + }, + { + "fullExpression": "@local.data_list_name.@local.id", + "matchedExpression": "@local.id", + "type": "local", + "fieldName": "id" + } + ] }, "_dynamicDependencies": { "@local.data_list_name": [ - "value.0" + "value" ], "@local.id": [ - "value.0" + "value" ] } }, diff --git a/app_data/sheets/template/relax.json b/app_data/sheets/template/relax.json index 617f146..5c5a14c 100644 --- a/app_data/sheets/template/relax.json +++ b/app_data/sheets/template/relax.json @@ -5,9 +5,10 @@ "rows": [ { "name": "data_list_name", - "value": [ - "relax" - ], + "value": "relax", + "_translations": { + "value": {} + }, "type": "set_variable", "_nested_name": "data_list_name" }, @@ -22,35 +23,34 @@ }, { "name": "data_list_name_id", - "value": [ - "@local.data_list_name.@local.id" - ], + "value": "@local.data_list_name.@local.id", + "_translations": { + "value": {} + }, "type": "set_variable", "_nested_name": "data_list_name_id", "_dynamicFields": { - "value": { - "0": [ - { - "fullExpression": "@local.data_list_name.@local.id", - "matchedExpression": "@local.data_list_name", - "type": "local", - "fieldName": "data_list_name" - }, - { - "fullExpression": "@local.data_list_name.@local.id", - "matchedExpression": "@local.id", - "type": "local", - "fieldName": "id" - } - ] - } + "value": [ + { + "fullExpression": "@local.data_list_name.@local.id", + "matchedExpression": "@local.data_list_name", + "type": "local", + "fieldName": "data_list_name" + }, + { + "fullExpression": "@local.data_list_name.@local.id", + "matchedExpression": "@local.id", + "type": "local", + "fieldName": "id" + } + ] }, "_dynamicDependencies": { "@local.data_list_name": [ - "value.0" + "value" ], "@local.id": [ - "value.0" + "value" ] } }, diff --git a/app_data/sheets/template/relax_card.json b/app_data/sheets/template/relax_card.json index 48db7a9..6b5646d 100644 --- a/app_data/sheets/template/relax_card.json +++ b/app_data/sheets/template/relax_card.json @@ -5,9 +5,10 @@ "rows": [ { "name": "data_list_name", - "value": [ - "relax" - ], + "value": "relax", + "_translations": { + "value": {} + }, "type": "set_variable", "_nested_name": "data_list_name" }, @@ -22,35 +23,34 @@ }, { "name": "data_list_name_id", - "value": [ - "@local.data_list_name.@local.id" - ], + "value": "@local.data_list_name.@local.id", + "_translations": { + "value": {} + }, "type": "set_variable", "_nested_name": "data_list_name_id", "_dynamicFields": { - "value": { - "0": [ - { - "fullExpression": "@local.data_list_name.@local.id", - "matchedExpression": "@local.data_list_name", - "type": "local", - "fieldName": "data_list_name" - }, - { - "fullExpression": "@local.data_list_name.@local.id", - "matchedExpression": "@local.id", - "type": "local", - "fieldName": "id" - } - ] - } + "value": [ + { + "fullExpression": "@local.data_list_name.@local.id", + "matchedExpression": "@local.data_list_name", + "type": "local", + "fieldName": "data_list_name" + }, + { + "fullExpression": "@local.data_list_name.@local.id", + "matchedExpression": "@local.id", + "type": "local", + "fieldName": "id" + } + ] }, "_dynamicDependencies": { "@local.data_list_name": [ - "value.0" + "value" ], "@local.id": [ - "value.0" + "value" ] } }, diff --git a/app_data/sheets/template/review_hp.json b/app_data/sheets/template/review_hp.json index 6da8219..c955d2b 100644 --- a/app_data/sheets/template/review_hp.json +++ b/app_data/sheets/template/review_hp.json @@ -5,9 +5,10 @@ "rows": [ { "name": "data_list_name", - "value": [ - "review_hp" - ], + "value": "review_hp", + "_translations": { + "value": {} + }, "type": "set_variable", "_nested_name": "data_list_name" }, @@ -22,35 +23,34 @@ }, { "name": "data_list_name_id", - "value": [ - "@local.data_list_name.@local.id" - ], + "value": "@local.data_list_name.@local.id", + "_translations": { + "value": {} + }, "type": "set_variable", "_nested_name": "data_list_name_id", "_dynamicFields": { - "value": { - "0": [ - { - "fullExpression": "@local.data_list_name.@local.id", - "matchedExpression": "@local.data_list_name", - "type": "local", - "fieldName": "data_list_name" - }, - { - "fullExpression": "@local.data_list_name.@local.id", - "matchedExpression": "@local.id", - "type": "local", - "fieldName": "id" - } - ] - } + "value": [ + { + "fullExpression": "@local.data_list_name.@local.id", + "matchedExpression": "@local.data_list_name", + "type": "local", + "fieldName": "data_list_name" + }, + { + "fullExpression": "@local.data_list_name.@local.id", + "matchedExpression": "@local.id", + "type": "local", + "fieldName": "id" + } + ] }, "_dynamicDependencies": { "@local.data_list_name": [ - "value.0" + "value" ], "@local.id": [ - "value.0" + "value" ] } }, @@ -192,37 +192,47 @@ { "name": "answer_list", "value": [ - "name: yes | text: @local.row_data.option_yes", - "name: no | text: @local.row_data.option_no" + { + "name": "yes", + "text": "@local.row_data.option_yes" + }, + { + "name": "no", + "text": "@local.row_data.option_no" + } ], "type": "set_variable", "_nested_name": "answer_list", "_dynamicFields": { "value": { - "0": [ - { - "fullExpression": "name: yes | text: @local.row_data.option_yes", - "matchedExpression": "@local.row_data.option_yes", - "type": "local", - "fieldName": "row_data" - } - ], - "1": [ - { - "fullExpression": "name: no | text: @local.row_data.option_no", - "matchedExpression": "@local.row_data.option_no", - "type": "local", - "fieldName": "row_data" - } - ] + "0": { + "text": [ + { + "fullExpression": "@local.row_data.option_yes", + "matchedExpression": "@local.row_data.option_yes", + "type": "local", + "fieldName": "row_data" + } + ] + }, + "1": { + "text": [ + { + "fullExpression": "@local.row_data.option_no", + "matchedExpression": "@local.row_data.option_no", + "type": "local", + "fieldName": "row_data" + } + ] + } } }, "_dynamicDependencies": { "@local.row_data.option_yes": [ - "value.0" + "value.0.text" ], "@local.row_data.option_no": [ - "value.1" + "value.1.text" ] } }, diff --git a/app_data/sheets/template/review_hp_yes.json b/app_data/sheets/template/review_hp_yes.json index 55e4a1b..e3cc3f8 100644 --- a/app_data/sheets/template/review_hp_yes.json +++ b/app_data/sheets/template/review_hp_yes.json @@ -5,9 +5,10 @@ "rows": [ { "name": "data_list_name", - "value": [ - "review_hp" - ], + "value": "review_hp", + "_translations": { + "value": {} + }, "type": "set_variable", "_nested_name": "data_list_name" }, @@ -22,35 +23,34 @@ }, { "name": "data_list_name_id", - "value": [ - "@local.data_list_name.@local.id" - ], + "value": "@local.data_list_name.@local.id", + "_translations": { + "value": {} + }, "type": "set_variable", "_nested_name": "data_list_name_id", "_dynamicFields": { - "value": { - "0": [ - { - "fullExpression": "@local.data_list_name.@local.id", - "matchedExpression": "@local.data_list_name", - "type": "local", - "fieldName": "data_list_name" - }, - { - "fullExpression": "@local.data_list_name.@local.id", - "matchedExpression": "@local.id", - "type": "local", - "fieldName": "id" - } - ] - } + "value": [ + { + "fullExpression": "@local.data_list_name.@local.id", + "matchedExpression": "@local.data_list_name", + "type": "local", + "fieldName": "data_list_name" + }, + { + "fullExpression": "@local.data_list_name.@local.id", + "matchedExpression": "@local.id", + "type": "local", + "fieldName": "id" + } + ] }, "_dynamicDependencies": { "@local.data_list_name": [ - "value.0" + "value" ], "@local.id": [ - "value.0" + "value" ] } }, @@ -114,49 +114,64 @@ { "name": "answer_list_how", "value": [ - "name: happy | text: @local.row_data.how_happy", - "name: okay | text: @local.row_data.how_okay", - "name: sad | text: @local.row_data.how_sad" + { + "name": "happy", + "text": "@local.row_data.how_happy" + }, + { + "name": "okay", + "text": "@local.row_data.how_okay" + }, + { + "name": "sad", + "text": "@local.row_data.how_sad" + } ], "type": "set_variable", "_nested_name": "answer_list_how", "_dynamicFields": { "value": { - "0": [ - { - "fullExpression": "name: happy | text: @local.row_data.how_happy", - "matchedExpression": "@local.row_data.how_happy", - "type": "local", - "fieldName": "row_data" - } - ], - "1": [ - { - "fullExpression": "name: okay | text: @local.row_data.how_okay", - "matchedExpression": "@local.row_data.how_okay", - "type": "local", - "fieldName": "row_data" - } - ], - "2": [ - { - "fullExpression": "name: sad | text: @local.row_data.how_sad", - "matchedExpression": "@local.row_data.how_sad", - "type": "local", - "fieldName": "row_data" - } - ] + "0": { + "text": [ + { + "fullExpression": "@local.row_data.how_happy", + "matchedExpression": "@local.row_data.how_happy", + "type": "local", + "fieldName": "row_data" + } + ] + }, + "1": { + "text": [ + { + "fullExpression": "@local.row_data.how_okay", + "matchedExpression": "@local.row_data.how_okay", + "type": "local", + "fieldName": "row_data" + } + ] + }, + "2": { + "text": [ + { + "fullExpression": "@local.row_data.how_sad", + "matchedExpression": "@local.row_data.how_sad", + "type": "local", + "fieldName": "row_data" + } + ] + } } }, "_dynamicDependencies": { "@local.row_data.how_happy": [ - "value.0" + "value.0.text" ], "@local.row_data.how_okay": [ - "value.1" + "value.1.text" ], "@local.row_data.how_sad": [ - "value.2" + "value.2.text" ] } }, diff --git a/app_data/sheets/template/session_card.json b/app_data/sheets/template/session_card.json index 3527dec..832ca12 100644 --- a/app_data/sheets/template/session_card.json +++ b/app_data/sheets/template/session_card.json @@ -713,6 +713,16 @@ ], "_raw": "completed | emit: server_sync", "_cleaned": "completed | emit: server_sync" + }, + { + "trigger": "click", + "action_id": "set_field", + "args": [ + "@local.click_history_field_name", + "@local.session_card_click_history" + ], + "_raw": "click | set_field:@local.click_history_field_name: @local.session_card_click_history", + "_cleaned": "click | set_field:@local.click_history_field_name: @local.session_card_click_history" } ], "parameter_list": { @@ -786,6 +796,54 @@ "fieldName": "click_template" } ] + }, + "4": { + "args": { + "0": [ + { + "fullExpression": "@local.click_history_field_name", + "matchedExpression": "@local.click_history_field_name", + "type": "local", + "fieldName": "click_history_field_name" + } + ], + "1": [ + { + "fullExpression": "@local.session_card_click_history", + "matchedExpression": "@local.session_card_click_history", + "type": "local", + "fieldName": "session_card_click_history" + } + ] + }, + "_raw": [ + { + "fullExpression": "click | set_field:@local.click_history_field_name: @local.session_card_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.session_card_click_history", + "matchedExpression": "@local.session_card_click_history", + "type": "local", + "fieldName": "session_card_click_history" + } + ], + "_cleaned": [ + { + "fullExpression": "click | set_field:@local.click_history_field_name: @local.session_card_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.session_card_click_history", + "matchedExpression": "@local.session_card_click_history", + "type": "local", + "fieldName": "session_card_click_history" + } + ] } }, "parameter_list": { @@ -880,6 +938,16 @@ "action_list.1._raw", "action_list.1._cleaned" ], + "@local.click_history_field_name": [ + "action_list.4.args.0", + "action_list.4._raw", + "action_list.4._cleaned" + ], + "@local.session_card_click_history": [ + "action_list.4.args.1", + "action_list.4._raw", + "action_list.4._cleaned" + ], "@local.tasks": [ "parameter_list.task_group_id", "parameter_list.task_group_data" diff --git a/app_data/sheets/template/session_overview.json b/app_data/sheets/template/session_overview.json index fa01477..f3b6492 100644 --- a/app_data/sheets/template/session_overview.json +++ b/app_data/sheets/template/session_overview.json @@ -523,7 +523,7 @@ "value": {} }, "exclude_from_translation": true, - "_nested_name": "top.display_group.title", + "_nested_name": "top.display_group_2.title", "_dynamicFields": { "value": [ { @@ -547,7 +547,7 @@ "_translations": { "value": {} }, - "_nested_name": "top.display_group.image", + "_nested_name": "top.display_group_2.image", "_dynamicFields": { "value": [ { @@ -565,8 +565,8 @@ } } ], - "name": "display_group", - "_nested_name": "top.display_group" + "name": "display_group_2", + "_nested_name": "top.display_group_2" } ], "_nested_name": "top" @@ -796,7 +796,7 @@ }, "style_list": true, "type": "set_variable", - "_nested_name": "items.now", + "_nested_name": "items_17.now", "_dynamicFields": { "value": [ { @@ -820,7 +820,7 @@ "value": {} }, "type": "set_variable", - "_nested_name": "items.join" + "_nested_name": "items_17.join" }, { "name": "card_click_history", @@ -830,7 +830,7 @@ }, "style_list": true, "type": "set_variable", - "_nested_name": "items.card_click_history" + "_nested_name": "items_17.card_click_history" }, { "name": "click_history_field_name", @@ -840,7 +840,7 @@ }, "style_list": true, "type": "set_variable", - "_nested_name": "items.click_history_field_name", + "_nested_name": "items_17.click_history_field_name", "_dynamicFields": { "value": [ { @@ -893,7 +893,7 @@ "condition": "!!(@fields.@local.click_history_field_name)", "style_list": true, "type": "set_variable", - "_nested_name": "items.item_card_click_history", + "_nested_name": "items_17.item_card_click_history", "_dynamicFields": { "value": [ { @@ -937,7 +937,7 @@ "condition": "!(@fields.@local.click_history_field_name)", "style_list": true, "type": "set_variable", - "_nested_name": "items.item_card_click_history", + "_nested_name": "items_17.item_card_click_history", "_dynamicFields": { "value": [ { @@ -979,7 +979,7 @@ }, "exclude_from_translation": true, "type": "set_variable", - "_nested_name": "items.card_@item.id.session_id", + "_nested_name": "items_17.card_@item.id.session_id", "_dynamicFields": { "value": [ { @@ -991,7 +991,7 @@ ], "_nested_name": [ { - "fullExpression": "items.card_@item.id.session_id", + "fullExpression": "items_17.card_@item.id.session_id", "matchedExpression": "@item.id.session_id", "type": "item", "fieldName": "id" @@ -1015,7 +1015,7 @@ }, "exclude_from_translation": true, "type": "set_variable", - "_nested_name": "items.card_@item.id.task_id", + "_nested_name": "items_17.card_@item.id.task_id", "_dynamicFields": { "value": [ { @@ -1027,7 +1027,7 @@ ], "_nested_name": [ { - "fullExpression": "items.card_@item.id.task_id", + "fullExpression": "items_17.card_@item.id.task_id", "matchedExpression": "@item.id.task_id", "type": "item", "fieldName": "id" @@ -1044,7 +1044,7 @@ } } ], - "_nested_name": "items.card_@item.id", + "_nested_name": "items_17.card_@item.id", "_dynamicFields": { "name": [ { @@ -1056,7 +1056,7 @@ ], "_nested_name": [ { - "fullExpression": "items.card_@item.id", + "fullExpression": "items_17.card_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -1071,8 +1071,8 @@ } } ], - "name": "items", - "_nested_name": "items", + "name": "items_17", + "_nested_name": "items_17", "_dynamicFields": { "value": [ { diff --git a/app_data/sheets/template/set_hp.json b/app_data/sheets/template/set_hp.json index 745871e..8632b86 100644 --- a/app_data/sheets/template/set_hp.json +++ b/app_data/sheets/template/set_hp.json @@ -5,9 +5,10 @@ "rows": [ { "name": "data_list_name", - "value": [ - "set_hp" - ], + "value": "set_hp", + "_translations": { + "value": {} + }, "type": "set_variable", "_nested_name": "data_list_name" }, @@ -22,35 +23,34 @@ }, { "name": "data_list_name_id", - "value": [ - "@local.data_list_name.@local.id" - ], + "value": "@local.data_list_name.@local.id", + "_translations": { + "value": {} + }, "type": "set_variable", "_nested_name": "data_list_name_id", "_dynamicFields": { - "value": { - "0": [ - { - "fullExpression": "@local.data_list_name.@local.id", - "matchedExpression": "@local.data_list_name", - "type": "local", - "fieldName": "data_list_name" - }, - { - "fullExpression": "@local.data_list_name.@local.id", - "matchedExpression": "@local.id", - "type": "local", - "fieldName": "id" - } - ] - } + "value": [ + { + "fullExpression": "@local.data_list_name.@local.id", + "matchedExpression": "@local.data_list_name", + "type": "local", + "fieldName": "data_list_name" + }, + { + "fullExpression": "@local.data_list_name.@local.id", + "matchedExpression": "@local.id", + "type": "local", + "fieldName": "id" + } + ] }, "_dynamicDependencies": { "@local.data_list_name": [ - "value.0" + "value" ], "@local.id": [ - "value.0" + "value" ] } }, diff --git a/app_data/sheets/template/splash_partners.json b/app_data/sheets/template/splash_partners.json index 80b24ae..2f0d916 100644 --- a/app_data/sheets/template/splash_partners.json +++ b/app_data/sheets/template/splash_partners.json @@ -12,8 +12,8 @@ "parameter_list": { "style": "large center" }, - "name": "text", - "_nested_name": "text", + "name": "text_2", + "_nested_name": "text_2", "_dynamicFields": { "value": [ { @@ -44,7 +44,7 @@ "parameter_list": { "style": "emphasised" }, - "_nested_name": "items.title_@item.id", + "_nested_name": "items_3.title_@item.id", "_dynamicFields": { "name": [ { @@ -64,7 +64,7 @@ ], "_nested_name": [ { - "fullExpression": "items.title_@item.id", + "fullExpression": "items_3.title_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -88,7 +88,7 @@ "value": {} }, "type": "set_variable", - "_nested_name": "items.this_group", + "_nested_name": "items_3.this_group", "_dynamicFields": { "value": [ { @@ -133,7 +133,7 @@ "_translations": { "value": {} }, - "_nested_name": "items.display_grid.items.dg_@item.id.image_asset", + "_nested_name": "items_3.display_grid_3.items_1.dg_@item.id.image_asset", "_dynamicFields": { "value": [ { @@ -145,7 +145,7 @@ ], "_nested_name": [ { - "fullExpression": "items.display_grid.items.dg_@item.id.image_asset", + "fullExpression": "items_3.display_grid_3.items_1.dg_@item.id.image_asset", "matchedExpression": "@item.id.image_asset", "type": "item", "fieldName": "id" @@ -169,7 +169,7 @@ "value": {} }, "condition": "!@item.image_asset", - "_nested_name": "items.display_grid.items.dg_@item.id.name", + "_nested_name": "items_3.display_grid_3.items_1.dg_@item.id.name", "_dynamicFields": { "value": [ { @@ -189,7 +189,7 @@ ], "_nested_name": [ { - "fullExpression": "items.display_grid.items.dg_@item.id.name", + "fullExpression": "items_3.display_grid_3.items_1.dg_@item.id.name", "matchedExpression": "@item.id.name", "type": "item", "fieldName": "id" @@ -209,7 +209,7 @@ } } ], - "_nested_name": "items.display_grid.items.dg_@item.id", + "_nested_name": "items_3.display_grid_3.items_1.dg_@item.id", "_dynamicFields": { "name": [ { @@ -235,7 +235,7 @@ ], "_nested_name": [ { - "fullExpression": "items.display_grid.items.dg_@item.id", + "fullExpression": "items_3.display_grid_3.items_1.dg_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -256,8 +256,8 @@ } } ], - "name": "items", - "_nested_name": "items.display_grid.items", + "name": "items_1", + "_nested_name": "items_3.display_grid_3.items_1", "_dynamicFields": { "value": [ { @@ -275,12 +275,12 @@ } } ], - "name": "display_grid", - "_nested_name": "items.display_grid" + "name": "display_grid_3", + "_nested_name": "items_3.display_grid_3" } ], - "name": "items", - "_nested_name": "items", + "name": "items_3", + "_nested_name": "items_3", "_dynamicFields": { "value": [ { diff --git a/app_data/sheets/template/splash_screens.json b/app_data/sheets/template/splash_screens.json index 0e49dae..b7b27d8 100644 --- a/app_data/sheets/template/splash_screens.json +++ b/app_data/sheets/template/splash_screens.json @@ -60,7 +60,7 @@ "value": {} }, "exclude_from_translation": true, - "_nested_name": "animated_slides.animated_section.image" + "_nested_name": "animated_slides_4.animated_section_1.image" }, { "type": "text", @@ -72,11 +72,11 @@ "parameter_list": { "text_align": "center" }, - "_nested_name": "animated_slides.animated_section.slogan" + "_nested_name": "animated_slides_4.animated_section_1.slogan" } ], - "name": "animated_section", - "_nested_name": "animated_slides.animated_section" + "name": "animated_section_1", + "_nested_name": "animated_slides_4.animated_section_1" }, { "type": "animated_section", @@ -89,15 +89,15 @@ "name": "splash_partners", "value": "splash_partners", "rows": [], - "_nested_name": "animated_slides.animated_section.splash_partners" + "_nested_name": "animated_slides_4.animated_section_2.splash_partners" } ], - "name": "animated_section", - "_nested_name": "animated_slides.animated_section" + "name": "animated_section_2", + "_nested_name": "animated_slides_4.animated_section_2" } ], - "name": "animated_slides", - "_nested_name": "animated_slides", + "name": "animated_slides_4", + "_nested_name": "animated_slides_4", "_dynamicFields": { "parameter_list": { "skip_text": [ diff --git a/app_data/sheets/template/story.json b/app_data/sheets/template/story.json index c7b8269..e9cc61b 100644 --- a/app_data/sheets/template/story.json +++ b/app_data/sheets/template/story.json @@ -5,9 +5,10 @@ "rows": [ { "name": "data_list_name", - "value": [ - "story" - ], + "value": "story", + "_translations": { + "value": {} + }, "type": "set_variable", "_nested_name": "data_list_name" }, @@ -174,7 +175,7 @@ "value": {} }, "type": "set_variable", - "_nested_name": "items.image_src_temp", + "_nested_name": "items_10.image_src_temp", "_dynamicFields": { "value": [ { @@ -207,7 +208,7 @@ "value": {} }, "type": "set_variable", - "_nested_name": "items.image_src", + "_nested_name": "items_10.image_src", "_dynamicFields": { "value": [ { @@ -249,7 +250,7 @@ "value": {} }, "type": "set_variable", - "_nested_name": "items.text_temp", + "_nested_name": "items_10.text_temp", "_dynamicFields": { "value": [ { @@ -282,7 +283,7 @@ "value": {} }, "type": "set_variable", - "_nested_name": "items.text", + "_nested_name": "items_10.text", "_dynamicFields": { "value": [ { @@ -333,7 +334,7 @@ "value": {} }, "condition": "!!(@data.@local.image_src)", - "_nested_name": "items.dashed_box_@item.id.image_@item.id", + "_nested_name": "items_10.dashed_box_@item.id.image_@item.id", "_dynamicFields": { "name": [ { @@ -361,13 +362,13 @@ ], "_nested_name": [ { - "fullExpression": "items.dashed_box_@item.id.image_@item.id", + "fullExpression": "items_10.dashed_box_@item.id.image_@item.id", "matchedExpression": "@item.id.image_", "type": "item", "fieldName": "id" }, { - "fullExpression": "items.dashed_box_@item.id.image_@item.id", + "fullExpression": "items_10.dashed_box_@item.id.image_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -396,7 +397,7 @@ "value": {} }, "condition": "!!(@data.@local.text)", - "_nested_name": "items.dashed_box_@item.id.text_@item.id", + "_nested_name": "items_10.dashed_box_@item.id.text_@item.id", "_dynamicFields": { "name": [ { @@ -424,13 +425,13 @@ ], "_nested_name": [ { - "fullExpression": "items.dashed_box_@item.id.text_@item.id", + "fullExpression": "items_10.dashed_box_@item.id.text_@item.id", "matchedExpression": "@item.id.text_", "type": "item", "fieldName": "id" }, { - "fullExpression": "items.dashed_box_@item.id.text_@item.id", + "fullExpression": "items_10.dashed_box_@item.id.text_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -452,7 +453,7 @@ } } ], - "_nested_name": "items.dashed_box_@item.id", + "_nested_name": "items_10.dashed_box_@item.id", "_dynamicFields": { "name": [ { @@ -478,7 +479,7 @@ ], "_nested_name": [ { - "fullExpression": "items.dashed_box_@item.id", + "fullExpression": "items_10.dashed_box_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -499,8 +500,8 @@ } } ], - "name": "items", - "_nested_name": "items", + "name": "items_10", + "_nested_name": "items_10", "_dynamicFields": { "value": [ { diff --git a/app_data/sheets/template/task_card.json b/app_data/sheets/template/task_card.json index cfa401b..103d1b3 100644 --- a/app_data/sheets/template/task_card.json +++ b/app_data/sheets/template/task_card.json @@ -34,36 +34,35 @@ }, { "name": "task_data_list_name", - "value": [ - "@local.session_id@local.tasks" - ], + "value": "@local.session_id@local.tasks", + "_translations": { + "value": {} + }, "exclude_from_translation": true, "type": "set_variable", "_nested_name": "task_data_list_name", "_dynamicFields": { - "value": { - "0": [ - { - "fullExpression": "@local.session_id@local.tasks", - "matchedExpression": "@local.session_id", - "type": "local", - "fieldName": "session_id" - }, - { - "fullExpression": "@local.session_id@local.tasks", - "matchedExpression": "@local.tasks", - "type": "local", - "fieldName": "tasks" - } - ] - } + "value": [ + { + "fullExpression": "@local.session_id@local.tasks", + "matchedExpression": "@local.session_id", + "type": "local", + "fieldName": "session_id" + }, + { + "fullExpression": "@local.session_id@local.tasks", + "matchedExpression": "@local.tasks", + "type": "local", + "fieldName": "tasks" + } + ] }, "_dynamicDependencies": { "@local.session_id": [ - "value.0" + "value" ], "@local.tasks": [ - "value.0" + "value" ] } }, @@ -173,27 +172,26 @@ }, { "name": "content_data_list_name", - "value": [ - "@local.task_row.data_list_name" - ], + "value": "@local.task_row.data_list_name", + "_translations": { + "value": {} + }, "exclude_from_translation": true, "type": "set_variable", "_nested_name": "content_data_list_name", "_dynamicFields": { - "value": { - "0": [ - { - "fullExpression": "@local.task_row.data_list_name", - "matchedExpression": "@local.task_row.data_list_name", - "type": "local", - "fieldName": "task_row" - } - ] - } + "value": [ + { + "fullExpression": "@local.task_row.data_list_name", + "matchedExpression": "@local.task_row.data_list_name", + "type": "local", + "fieldName": "task_row" + } + ] }, "_dynamicDependencies": { "@local.task_row.data_list_name": [ - "value.0" + "value" ] } }, @@ -352,6 +350,174 @@ ] } }, + { + "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": "card_click_history", + "value": "_card_click_history", + "_translations": { + "value": {} + }, + "exclude_from_translation": true, + "type": "set_variable", + "_nested_name": "card_click_history" + }, + { + "name": "click_history_field_name", + "value": "@local.session_id@local.join@local.task_id@local.card_click_history", + "_translations": { + "value": {} + }, + "exclude_from_translation": true, + "type": "set_variable", + "_nested_name": "click_history_field_name", + "_dynamicFields": { + "value": [ + { + "fullExpression": "@local.session_id@local.join@local.task_id@local.card_click_history", + "matchedExpression": "@local.session_id", + "type": "local", + "fieldName": "session_id" + }, + { + "fullExpression": "@local.session_id@local.join@local.task_id@local.card_click_history", + "matchedExpression": "@local.join", + "type": "local", + "fieldName": "join" + }, + { + "fullExpression": "@local.session_id@local.join@local.task_id@local.card_click_history", + "matchedExpression": "@local.task_id", + "type": "local", + "fieldName": "task_id" + }, + { + "fullExpression": "@local.session_id@local.join@local.task_id@local.card_click_history", + "matchedExpression": "@local.card_click_history", + "type": "local", + "fieldName": "card_click_history" + } + ] + }, + "_dynamicDependencies": { + "@local.session_id": [ + "value" + ], + "@local.join": [ + "value" + ], + "@local.task_id": [ + "value" + ], + "@local.card_click_history": [ + "value" + ] + } + }, + { + "name": "session_card_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": "session_card_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": "session_card_click_history", + "value": "@local.now", + "_translations": { + "value": {} + }, + "condition": "!(@fields.@local.click_history_field_name)", + "exclude_from_translation": true, + "type": "set_variable", + "_nested_name": "session_card_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": "task_card", "name": "task_card", @@ -383,6 +549,16 @@ ], "_raw": "click | go_to: @local.template", "_cleaned": "click | go_to: @local.template" + }, + { + "trigger": "click", + "action_id": "set_field", + "args": [ + "@local.click_history_field_name", + "@local.session_card_click_history" + ], + "_raw": "click | set_field:@local.click_history_field_name: @local.session_card_click_history", + "_cleaned": "click | set_field:@local.click_history_field_name: @local.session_card_click_history" } ], "parameter_list": { @@ -453,6 +629,54 @@ "fieldName": "template" } ] + }, + "3": { + "args": { + "0": [ + { + "fullExpression": "@local.click_history_field_name", + "matchedExpression": "@local.click_history_field_name", + "type": "local", + "fieldName": "click_history_field_name" + } + ], + "1": [ + { + "fullExpression": "@local.session_card_click_history", + "matchedExpression": "@local.session_card_click_history", + "type": "local", + "fieldName": "session_card_click_history" + } + ] + }, + "_raw": [ + { + "fullExpression": "click | set_field:@local.click_history_field_name: @local.session_card_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.session_card_click_history", + "matchedExpression": "@local.session_card_click_history", + "type": "local", + "fieldName": "session_card_click_history" + } + ], + "_cleaned": [ + { + "fullExpression": "click | set_field:@local.click_history_field_name: @local.session_card_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.session_card_click_history", + "matchedExpression": "@local.session_card_click_history", + "type": "local", + "fieldName": "session_card_click_history" + } + ] } }, "parameter_list": { @@ -502,6 +726,16 @@ "action_list.2._raw", "action_list.2._cleaned" ], + "@local.click_history_field_name": [ + "action_list.3.args.0", + "action_list.3._raw", + "action_list.3._cleaned" + ], + "@local.session_card_click_history": [ + "action_list.3.args.1", + "action_list.3._raw", + "action_list.3._cleaned" + ], "@local.task_id": [ "parameter_list.task_id" ], diff --git a/app_data/sheets/template/tips.json b/app_data/sheets/template/tips.json index 733ad99..ad65427 100644 --- a/app_data/sheets/template/tips.json +++ b/app_data/sheets/template/tips.json @@ -5,9 +5,10 @@ "rows": [ { "name": "data_list_name", - "value": [ - "tips" - ], + "value": "tips", + "_translations": { + "value": {} + }, "type": "set_variable", "_nested_name": "data_list_name" }, @@ -255,7 +256,7 @@ "value": {} }, "type": "set_variable", - "_nested_name": "items.text_temp", + "_nested_name": "items_12.text_temp", "_dynamicFields": { "value": [ { @@ -279,7 +280,7 @@ "value": {} }, "type": "set_variable", - "_nested_name": "items.text", + "_nested_name": "items_12.text", "_dynamicFields": { "value": [ { @@ -321,7 +322,7 @@ "value": {} }, "type": "set_variable", - "_nested_name": "items.subtitle_temp", + "_nested_name": "items_12.subtitle_temp", "_dynamicFields": { "value": [ { @@ -345,7 +346,7 @@ "value": {} }, "type": "set_variable", - "_nested_name": "items.subtitle", + "_nested_name": "items_12.subtitle", "_dynamicFields": { "value": [ { @@ -395,7 +396,7 @@ "_translations": { "value": {} }, - "_nested_name": "items.dashed_box_@item.id.title_@item.id", + "_nested_name": "items_12.dashed_box_@item.id.title_@item.id", "_dynamicFields": { "name": [ { @@ -415,13 +416,13 @@ ], "_nested_name": [ { - "fullExpression": "items.dashed_box_@item.id.title_@item.id", + "fullExpression": "items_12.dashed_box_@item.id.title_@item.id", "matchedExpression": "@item.id.title_", "type": "item", "fieldName": "id" }, { - "fullExpression": "items.dashed_box_@item.id.title_@item.id", + "fullExpression": "items_12.dashed_box_@item.id.title_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -448,7 +449,7 @@ "_translations": { "value": {} }, - "_nested_name": "items.dashed_box_@item.id.text_@item.id", + "_nested_name": "items_12.dashed_box_@item.id.text_@item.id", "_dynamicFields": { "name": [ { @@ -468,13 +469,13 @@ ], "_nested_name": [ { - "fullExpression": "items.dashed_box_@item.id.text_@item.id", + "fullExpression": "items_12.dashed_box_@item.id.text_@item.id", "matchedExpression": "@item.id.text_", "type": "item", "fieldName": "id" }, { - "fullExpression": "items.dashed_box_@item.id.text_@item.id", + "fullExpression": "items_12.dashed_box_@item.id.text_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -495,7 +496,7 @@ } } ], - "_nested_name": "items.dashed_box_@item.id", + "_nested_name": "items_12.dashed_box_@item.id", "_dynamicFields": { "name": [ { @@ -515,7 +516,7 @@ ], "_nested_name": [ { - "fullExpression": "items.dashed_box_@item.id", + "fullExpression": "items_12.dashed_box_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -533,8 +534,8 @@ } } ], - "name": "items", - "_nested_name": "items", + "name": "items_12", + "_nested_name": "items_12", "_dynamicFields": { "value": [ { diff --git a/app_data/sheets/template/topic_block_group.json b/app_data/sheets/template/topic_block_group.json index a908bc9..e8d5c6c 100644 --- a/app_data/sheets/template/topic_block_group.json +++ b/app_data/sheets/template/topic_block_group.json @@ -5,9 +5,10 @@ "rows": [ { "name": "data_list_name", - "value": [ - "topic_block_group" - ], + "value": "topic_block_group", + "_translations": { + "value": {} + }, "type": "set_variable", "_nested_name": "data_list_name" }, @@ -361,11 +362,11 @@ "value": {} }, "type": "set_variable", - "_nested_name": "items.dg_@item.id.join_id", + "_nested_name": "items_15.dg_@item.id.join_id", "_dynamicFields": { "_nested_name": [ { - "fullExpression": "items.dg_@item.id.join_id", + "fullExpression": "items_15.dg_@item.id.join_id", "matchedExpression": "@item.id.join_id", "type": "item", "fieldName": "id" @@ -385,11 +386,11 @@ "value": {} }, "type": "set_variable", - "_nested_name": "items.dg_@item.id.join_data", + "_nested_name": "items_15.dg_@item.id.join_data", "_dynamicFields": { "_nested_name": [ { - "fullExpression": "items.dg_@item.id.join_data", + "fullExpression": "items_15.dg_@item.id.join_data", "matchedExpression": "@item.id.join_data", "type": "item", "fieldName": "id" @@ -409,7 +410,7 @@ "value": {} }, "type": "set_variable", - "_nested_name": "items.dg_@item.id.task_id_temp_1", + "_nested_name": "items_15.dg_@item.id.task_id_temp_1", "_dynamicFields": { "value": [ { @@ -427,7 +428,7 @@ ], "_nested_name": [ { - "fullExpression": "items.dg_@item.id.task_id_temp_1", + "fullExpression": "items_15.dg_@item.id.task_id_temp_1", "matchedExpression": "@item.id.task_id_temp_1", "type": "item", "fieldName": "id" @@ -453,7 +454,7 @@ "value": {} }, "type": "set_variable", - "_nested_name": "items.dg_@item.id.task_id_temp_2", + "_nested_name": "items_15.dg_@item.id.task_id_temp_2", "_dynamicFields": { "value": [ { @@ -471,7 +472,7 @@ ], "_nested_name": [ { - "fullExpression": "items.dg_@item.id.task_id_temp_2", + "fullExpression": "items_15.dg_@item.id.task_id_temp_2", "matchedExpression": "@item.id.task_id_temp_2", "type": "item", "fieldName": "id" @@ -497,7 +498,7 @@ "value": {} }, "type": "set_variable", - "_nested_name": "items.dg_@item.id.task_id", + "_nested_name": "items_15.dg_@item.id.task_id", "_dynamicFields": { "value": [ { @@ -509,7 +510,7 @@ ], "_nested_name": [ { - "fullExpression": "items.dg_@item.id.task_id", + "fullExpression": "items_15.dg_@item.id.task_id", "matchedExpression": "@item.id.task_id", "type": "item", "fieldName": "id" @@ -532,7 +533,7 @@ "value": {} }, "type": "set_variable", - "_nested_name": "items.dg_@item.id.task_data_temp_1", + "_nested_name": "items_15.dg_@item.id.task_data_temp_1", "_dynamicFields": { "value": [ { @@ -550,7 +551,7 @@ ], "_nested_name": [ { - "fullExpression": "items.dg_@item.id.task_data_temp_1", + "fullExpression": "items_15.dg_@item.id.task_data_temp_1", "matchedExpression": "@item.id.task_data_temp_1", "type": "item", "fieldName": "id" @@ -576,7 +577,7 @@ "value": {} }, "type": "set_variable", - "_nested_name": "items.dg_@item.id.task_data_temp_2", + "_nested_name": "items_15.dg_@item.id.task_data_temp_2", "_dynamicFields": { "value": [ { @@ -594,7 +595,7 @@ ], "_nested_name": [ { - "fullExpression": "items.dg_@item.id.task_data_temp_2", + "fullExpression": "items_15.dg_@item.id.task_data_temp_2", "matchedExpression": "@item.id.task_data_temp_2", "type": "item", "fieldName": "id" @@ -620,7 +621,7 @@ "value": {} }, "type": "set_variable", - "_nested_name": "items.dg_@item.id.task_data", + "_nested_name": "items_15.dg_@item.id.task_data", "_dynamicFields": { "value": [ { @@ -632,7 +633,7 @@ ], "_nested_name": [ { - "fullExpression": "items.dg_@item.id.task_data", + "fullExpression": "items_15.dg_@item.id.task_data", "matchedExpression": "@item.id.task_data", "type": "item", "fieldName": "id" @@ -677,31 +678,30 @@ "rows": [ { "name": "data_list_name", - "value": [ - "@local.task_data" - ], + "value": "@local.task_data", + "_translations": { + "value": {} + }, "type": "set_variable", - "_nested_name": "items.dg_@item.id.template_@item.id.data_list_name", + "_nested_name": "items_15.dg_@item.id.template_@item.id.data_list_name", "_dynamicFields": { - "value": { - "0": [ - { - "fullExpression": "@local.task_data", - "matchedExpression": "@local.task_data", - "type": "local", - "fieldName": "task_data" - } - ] - }, + "value": [ + { + "fullExpression": "@local.task_data", + "matchedExpression": "@local.task_data", + "type": "local", + "fieldName": "task_data" + } + ], "_nested_name": [ { - "fullExpression": "items.dg_@item.id.template_@item.id.data_list_name", + "fullExpression": "items_15.dg_@item.id.template_@item.id.data_list_name", "matchedExpression": "@item.id.template_", "type": "item", "fieldName": "id" }, { - "fullExpression": "items.dg_@item.id.template_@item.id.data_list_name", + "fullExpression": "items_15.dg_@item.id.template_@item.id.data_list_name", "matchedExpression": "@item.id.data_list_name", "type": "item", "fieldName": "id" @@ -710,7 +710,7 @@ }, "_dynamicDependencies": { "@local.task_data": [ - "value.0" + "value" ], "@item.id.template_": [ "_nested_name" @@ -727,7 +727,7 @@ "value": {} }, "type": "set_variable", - "_nested_name": "items.dg_@item.id.template_@item.id.id", + "_nested_name": "items_15.dg_@item.id.template_@item.id.id", "_dynamicFields": { "value": [ { @@ -739,13 +739,13 @@ ], "_nested_name": [ { - "fullExpression": "items.dg_@item.id.template_@item.id.id", + "fullExpression": "items_15.dg_@item.id.template_@item.id.id", "matchedExpression": "@item.id.template_", "type": "item", "fieldName": "id" }, { - "fullExpression": "items.dg_@item.id.template_@item.id.id", + "fullExpression": "items_15.dg_@item.id.template_@item.id.id", "matchedExpression": "@item.id.id", "type": "item", "fieldName": "id" @@ -765,7 +765,7 @@ } } ], - "_nested_name": "items.dg_@item.id.template_@item.id", + "_nested_name": "items_15.dg_@item.id.template_@item.id", "_dynamicFields": { "name": [ { @@ -823,13 +823,13 @@ }, "_nested_name": [ { - "fullExpression": "items.dg_@item.id.template_@item.id", + "fullExpression": "items_15.dg_@item.id.template_@item.id", "matchedExpression": "@item.id.template_", "type": "item", "fieldName": "id" }, { - "fullExpression": "items.dg_@item.id.template_@item.id", + "fullExpression": "items_15.dg_@item.id.template_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -885,31 +885,30 @@ "rows": [ { "name": "data_list_name", - "value": [ - "@local.task_data" - ], + "value": "@local.task_data", + "_translations": { + "value": {} + }, "type": "set_variable", - "_nested_name": "items.dg_@item.id.template_@item.id.data_list_name", + "_nested_name": "items_15.dg_@item.id.template_@item.id.data_list_name", "_dynamicFields": { - "value": { - "0": [ - { - "fullExpression": "@local.task_data", - "matchedExpression": "@local.task_data", - "type": "local", - "fieldName": "task_data" - } - ] - }, + "value": [ + { + "fullExpression": "@local.task_data", + "matchedExpression": "@local.task_data", + "type": "local", + "fieldName": "task_data" + } + ], "_nested_name": [ { - "fullExpression": "items.dg_@item.id.template_@item.id.data_list_name", + "fullExpression": "items_15.dg_@item.id.template_@item.id.data_list_name", "matchedExpression": "@item.id.template_", "type": "item", "fieldName": "id" }, { - "fullExpression": "items.dg_@item.id.template_@item.id.data_list_name", + "fullExpression": "items_15.dg_@item.id.template_@item.id.data_list_name", "matchedExpression": "@item.id.data_list_name", "type": "item", "fieldName": "id" @@ -918,7 +917,7 @@ }, "_dynamicDependencies": { "@local.task_data": [ - "value.0" + "value" ], "@item.id.template_": [ "_nested_name" @@ -935,7 +934,7 @@ "value": {} }, "type": "set_variable", - "_nested_name": "items.dg_@item.id.template_@item.id.id", + "_nested_name": "items_15.dg_@item.id.template_@item.id.id", "_dynamicFields": { "value": [ { @@ -947,13 +946,13 @@ ], "_nested_name": [ { - "fullExpression": "items.dg_@item.id.template_@item.id.id", + "fullExpression": "items_15.dg_@item.id.template_@item.id.id", "matchedExpression": "@item.id.template_", "type": "item", "fieldName": "id" }, { - "fullExpression": "items.dg_@item.id.template_@item.id.id", + "fullExpression": "items_15.dg_@item.id.template_@item.id.id", "matchedExpression": "@item.id.id", "type": "item", "fieldName": "id" @@ -973,7 +972,7 @@ } } ], - "_nested_name": "items.dg_@item.id.template_@item.id", + "_nested_name": "items_15.dg_@item.id.template_@item.id", "_dynamicFields": { "name": [ { @@ -1071,13 +1070,13 @@ }, "_nested_name": [ { - "fullExpression": "items.dg_@item.id.template_@item.id", + "fullExpression": "items_15.dg_@item.id.template_@item.id", "matchedExpression": "@item.id.template_", "type": "item", "fieldName": "id" }, { - "fullExpression": "items.dg_@item.id.template_@item.id", + "fullExpression": "items_15.dg_@item.id.template_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -1139,31 +1138,30 @@ "rows": [ { "name": "data_list_name", - "value": [ - "@local.task_data" - ], + "value": "@local.task_data", + "_translations": { + "value": {} + }, "type": "set_variable", - "_nested_name": "items.dg_@item.id.template_@item.id.data_list_name", + "_nested_name": "items_15.dg_@item.id.template_@item.id.data_list_name", "_dynamicFields": { - "value": { - "0": [ - { - "fullExpression": "@local.task_data", - "matchedExpression": "@local.task_data", - "type": "local", - "fieldName": "task_data" - } - ] - }, + "value": [ + { + "fullExpression": "@local.task_data", + "matchedExpression": "@local.task_data", + "type": "local", + "fieldName": "task_data" + } + ], "_nested_name": [ { - "fullExpression": "items.dg_@item.id.template_@item.id.data_list_name", + "fullExpression": "items_15.dg_@item.id.template_@item.id.data_list_name", "matchedExpression": "@item.id.template_", "type": "item", "fieldName": "id" }, { - "fullExpression": "items.dg_@item.id.template_@item.id.data_list_name", + "fullExpression": "items_15.dg_@item.id.template_@item.id.data_list_name", "matchedExpression": "@item.id.data_list_name", "type": "item", "fieldName": "id" @@ -1172,7 +1170,7 @@ }, "_dynamicDependencies": { "@local.task_data": [ - "value.0" + "value" ], "@item.id.template_": [ "_nested_name" @@ -1189,7 +1187,7 @@ "value": {} }, "type": "set_variable", - "_nested_name": "items.dg_@item.id.template_@item.id.id", + "_nested_name": "items_15.dg_@item.id.template_@item.id.id", "_dynamicFields": { "value": [ { @@ -1201,13 +1199,13 @@ ], "_nested_name": [ { - "fullExpression": "items.dg_@item.id.template_@item.id.id", + "fullExpression": "items_15.dg_@item.id.template_@item.id.id", "matchedExpression": "@item.id.template_", "type": "item", "fieldName": "id" }, { - "fullExpression": "items.dg_@item.id.template_@item.id.id", + "fullExpression": "items_15.dg_@item.id.template_@item.id.id", "matchedExpression": "@item.id.id", "type": "item", "fieldName": "id" @@ -1242,7 +1240,7 @@ } ], "type": "set_variable", - "_nested_name": "items.dg_@item.id.template_@item.id.outro_text", + "_nested_name": "items_15.dg_@item.id.template_@item.id.outro_text", "_dynamicFields": { "value": [ { @@ -1282,13 +1280,13 @@ }, "_nested_name": [ { - "fullExpression": "items.dg_@item.id.template_@item.id.outro_text", + "fullExpression": "items_15.dg_@item.id.template_@item.id.outro_text", "matchedExpression": "@item.id.template_", "type": "item", "fieldName": "id" }, { - "fullExpression": "items.dg_@item.id.template_@item.id.outro_text", + "fullExpression": "items_15.dg_@item.id.template_@item.id.outro_text", "matchedExpression": "@item.id.outro_text", "type": "item", "fieldName": "id" @@ -1311,7 +1309,7 @@ } } ], - "_nested_name": "items.dg_@item.id.template_@item.id", + "_nested_name": "items_15.dg_@item.id.template_@item.id", "_dynamicFields": { "name": [ { @@ -1375,13 +1373,13 @@ }, "_nested_name": [ { - "fullExpression": "items.dg_@item.id.template_@item.id", + "fullExpression": "items_15.dg_@item.id.template_@item.id", "matchedExpression": "@item.id.template_", "type": "item", "fieldName": "id" }, { - "fullExpression": "items.dg_@item.id.template_@item.id", + "fullExpression": "items_15.dg_@item.id.template_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -1411,7 +1409,7 @@ } } ], - "_nested_name": "items.dg_@item.id", + "_nested_name": "items_15.dg_@item.id", "_dynamicFields": { "name": [ { @@ -1451,7 +1449,7 @@ ], "_nested_name": [ { - "fullExpression": "items.dg_@item.id", + "fullExpression": "items_15.dg_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -1474,8 +1472,8 @@ } } ], - "name": "items", - "_nested_name": "items", + "name": "items_15", + "_nested_name": "items_15", "_dynamicFields": { "value": [ { diff --git a/app_data/sheets/template/user_code.json b/app_data/sheets/template/user_code.json index dd7af3b..dba6103 100644 --- a/app_data/sheets/template/user_code.json +++ b/app_data/sheets/template/user_code.json @@ -122,8 +122,8 @@ "_translations": { "value": {} }, - "name": "qr_code", - "_nested_name": "has_ever_been_synced.qr_code", + "name": "qr_code_1", + "_nested_name": "has_ever_been_synced.qr_code_1", "_dynamicFields": { "value": [ { diff --git a/app_data/sheets/template/user_info.json b/app_data/sheets/template/user_info.json index 0676d98..66cd04b 100644 --- a/app_data/sheets/template/user_info.json +++ b/app_data/sheets/template/user_info.json @@ -183,9 +183,18 @@ { "name": "answer_list", "value": [ - "name:male | text: Man", - "name:female | text: Woman", - "name:prefer_not_to_say | text: Prefer not to say" + { + "name": "male", + "text": "Man" + }, + { + "name": "female", + "text": "Woman" + }, + { + "name": "prefer_not_to_say", + "text": "Prefer not to say" + } ], "type": "set_variable", "_nested_name": "answer_list" diff --git a/config.ts b/config.ts index e34a817..e614bf3 100644 --- a/config.ts +++ b/config.ts @@ -13,7 +13,7 @@ config.google_drive = { config.git = { content_repo: "https://github.com/IDEMSInternational/pfr-app-content.git", - content_tag_latest: "1.1.10", + content_tag_latest: "1.1.11", }; config.error_logging = {