From de455d7bb11cd0d5299c0cae4cfa4c4881f2a335 Mon Sep 17 00:00:00 2001 From: EsmeeIDEMS Date: Mon, 23 Sep 2024 15:50:53 +0100 Subject: [PATCH] content: 1.1.60 --- .../generated/play_article_tasks.json | 31 +++--- .../play_power_play_article_tasks.json | 17 ++- .../play_why_play_article_tasks.json | 14 +-- app_data/sheets/data_list/organisation.json | 8 +- app_data/sheets/data_list/play_articles.json | 31 +++--- .../sheets/global/deployment_global_tz.json | 8 ++ app_data/sheets/template/article.json | 103 ++++++++++++++++-- app_data/sheets/template/feedback.json | 45 +++++++- config.ts | 2 +- reports/summary.json | 10 +- reports/summary.md | 7 +- 11 files changed, 209 insertions(+), 67 deletions(-) diff --git a/app_data/sheets/data_list/generated/play_article_tasks.json b/app_data/sheets/data_list/generated/play_article_tasks.json index c8308cf8..1e170ae5 100644 --- a/app_data/sheets/data_list/generated/play_article_tasks.json +++ b/app_data/sheets/data_list/generated/play_article_tasks.json @@ -35,26 +35,26 @@ "id": "why_play_2", "category_id": "why_play", "image_asset": "images/modules/play/why_play_2.svg", - "text_2": "In ParentApp for Kids, we use the image of a garden to think about what children need in their lives to grow and thrive. \nLet’s see how play forms a part of the garden image.", + "text_2": "In @global.app_name, we use the image of a garden to think about what children need in their lives to grow and thrive. \nLet’s see how play forms a part of the garden image.", "_translations": { "text_2": {}, "title": {} }, "_translatedFields": { "title": { - "eng": "**The ParentApp Garden**" + "eng": "The ParentApp Garden" }, "text_2": { - "eng": "In ParentApp for Kids, we use the image of a garden to think about what children need in their lives to grow and thrive. \nLet’s see how play forms a part of the garden image." + "eng": "In @global.app_name, we use the image of a garden to think about what children need in their lives to grow and thrive. \nLet’s see how play forms a part of the garden image." } }, - "title": "**The ParentApp Garden**", + "title": "The ParentApp Garden", "completed": false }, { "id": "why_play_3", "category_id": "why_play", - "image_asset": "images/modules/play/new_fertaliser.gif", + "image_asset": "images/modules/play/new_fertiliser.gif", "media_type": "audio", "media_asset": "audio/modules/play/play_02.m4a", "text_2": "In the same way that fertiliser boosts plant growth, playing with your child is the magic ingredient that supercharges their learning and development.", @@ -66,7 +66,7 @@ }, "_translatedFields": { "title": { - "eng": "**The ParentApp Garden**" + "eng": "The ParentApp Garden" }, "text_2": { "eng": "In the same way that fertiliser boosts plant growth, playing with your child is the magic ingredient that supercharges their learning and development." @@ -80,7 +80,7 @@ }, "media_title": "Listen to learn more:", "media_transcript": "Fertiliser or “plant food” boosts the quality of the soil around the plant and the plant’s growth. When you sprinkle playfulness throughout your interactions with your child, it will make a big difference to their development. It doesn’t have to be a lot at once, but doing it regularly can improve your relationship while also helping your child learn important skills.", - "title": "**The ParentApp Garden**", + "title": "The ParentApp Garden", "completed": false }, { @@ -382,8 +382,11 @@ "category_id": "power_play", "image_asset": "images/modules/play/question_time.svg", "_translatedFields": { + "title": { + "eng": "Question time" + }, "text_1": { - "eng": "**Question time:**\n\nLet’s think about what happened in this story." + "eng": "Let’s think about what happened in this story." }, "quiz_1_question": { "eng": "How did the mother feel when Nandi didn’t want to go to sleep?" @@ -407,8 +410,9 @@ "eng": "Yes, the mother may have been feeling all of these things. It can be really difficult when our children do not want to go to sleep." } }, - "text_1": "**Question time:**\n\nLet’s think about what happened in this story.", + "title": "Question time", "_translations": { + "title": {}, "text_1": {}, "quiz_1_question": {}, "quiz_1_option_1_text": {}, @@ -418,6 +422,7 @@ "quiz_1_option_3_text": {}, "quiz_1_feedback_3": {} }, + "text_1": "Let’s think about what happened in this story.", "quiz_1_option_1_image_asset": "images/modules/play/frustrated_emoji.svg", "quiz_1_option_2_image_asset": "images/modules/play/angry_emoji.svg", "quiz_1_option_3_image_asset": "images/modules/play/tired_emoji.svg", @@ -434,8 +439,8 @@ "id": "the_power_of_play_16", "category_id": "power_play", "_translatedFields": { - "text_1": { - "eng": "**Question time:**" + "title": { + "eng": "Question time" }, "quiz_1_question": { "eng": "What did her mother do to help her fall asleep?" @@ -480,9 +485,9 @@ "eng": "Yes, all of these are true. Nandi was struggling to sleep, and yelling would not have helped Nandi to fall asleep." } }, - "text_1": "**Question time:**", + "title": "Question time", "_translations": { - "text_1": {}, + "title": {}, "quiz_1_question": {}, "quiz_1_option_1_text": {}, "quiz_1_feedback_1": {}, diff --git a/app_data/sheets/data_list/generated/play_power_play_article_tasks.json b/app_data/sheets/data_list/generated/play_power_play_article_tasks.json index 280b73aa..e7f1bb06 100644 --- a/app_data/sheets/data_list/generated/play_power_play_article_tasks.json +++ b/app_data/sheets/data_list/generated/play_power_play_article_tasks.json @@ -231,8 +231,11 @@ "category_id": "power_play", "image_asset": "images/modules/play/question_time.svg", "_translatedFields": { + "title": { + "eng": "Question time" + }, "text_1": { - "eng": "**Question time:**\n\nLet’s think about what happened in this story." + "eng": "Let’s think about what happened in this story." }, "quiz_1_question": { "eng": "How did the mother feel when Nandi didn’t want to go to sleep?" @@ -256,8 +259,9 @@ "eng": "Yes, the mother may have been feeling all of these things. It can be really difficult when our children do not want to go to sleep." } }, - "text_1": "**Question time:**\n\nLet’s think about what happened in this story.", + "title": "Question time", "_translations": { + "title": {}, "text_1": {}, "quiz_1_question": {}, "quiz_1_option_1_text": {}, @@ -267,6 +271,7 @@ "quiz_1_option_3_text": {}, "quiz_1_feedback_3": {} }, + "text_1": "Let’s think about what happened in this story.", "quiz_1_option_1_image_asset": "images/modules/play/frustrated_emoji.svg", "quiz_1_option_2_image_asset": "images/modules/play/angry_emoji.svg", "quiz_1_option_3_image_asset": "images/modules/play/tired_emoji.svg", @@ -283,8 +288,8 @@ "id": "the_power_of_play_16", "category_id": "power_play", "_translatedFields": { - "text_1": { - "eng": "**Question time:**" + "title": { + "eng": "Question time" }, "quiz_1_question": { "eng": "What did her mother do to help her fall asleep?" @@ -329,9 +334,9 @@ "eng": "Yes, all of these are true. Nandi was struggling to sleep, and yelling would not have helped Nandi to fall asleep." } }, - "text_1": "**Question time:**", + "title": "Question time", "_translations": { - "text_1": {}, + "title": {}, "quiz_1_question": {}, "quiz_1_option_1_text": {}, "quiz_1_feedback_1": {}, diff --git a/app_data/sheets/data_list/generated/play_why_play_article_tasks.json b/app_data/sheets/data_list/generated/play_why_play_article_tasks.json index 9dee3090..b1a66c3a 100644 --- a/app_data/sheets/data_list/generated/play_why_play_article_tasks.json +++ b/app_data/sheets/data_list/generated/play_why_play_article_tasks.json @@ -35,26 +35,26 @@ "id": "why_play_2", "category_id": "why_play", "image_asset": "images/modules/play/why_play_2.svg", - "text_2": "In ParentApp for Kids, we use the image of a garden to think about what children need in their lives to grow and thrive. \nLet’s see how play forms a part of the garden image.", + "text_2": "In @global.app_name, we use the image of a garden to think about what children need in their lives to grow and thrive. \nLet’s see how play forms a part of the garden image.", "_translations": { "text_2": {}, "title": {} }, "_translatedFields": { "title": { - "eng": "**The ParentApp Garden**" + "eng": "The ParentApp Garden" }, "text_2": { - "eng": "In ParentApp for Kids, we use the image of a garden to think about what children need in their lives to grow and thrive. \nLet’s see how play forms a part of the garden image." + "eng": "In @global.app_name, we use the image of a garden to think about what children need in their lives to grow and thrive. \nLet’s see how play forms a part of the garden image." } }, - "title": "**The ParentApp Garden**", + "title": "The ParentApp Garden", "completed": false }, { "id": "why_play_3", "category_id": "why_play", - "image_asset": "images/modules/play/new_fertaliser.gif", + "image_asset": "images/modules/play/new_fertiliser.gif", "media_type": "audio", "media_asset": "audio/modules/play/play_02.m4a", "text_2": "In the same way that fertiliser boosts plant growth, playing with your child is the magic ingredient that supercharges their learning and development.", @@ -66,7 +66,7 @@ }, "_translatedFields": { "title": { - "eng": "**The ParentApp Garden**" + "eng": "The ParentApp Garden" }, "text_2": { "eng": "In the same way that fertiliser boosts plant growth, playing with your child is the magic ingredient that supercharges their learning and development." @@ -80,7 +80,7 @@ }, "media_title": "Listen to learn more:", "media_transcript": "Fertiliser or “plant food” boosts the quality of the soil around the plant and the plant’s growth. When you sprinkle playfulness throughout your interactions with your child, it will make a big difference to their development. It doesn’t have to be a lot at once, but doing it regularly can improve your relationship while also helping your child learn important skills.", - "title": "**The ParentApp Garden**", + "title": "The ParentApp Garden", "completed": false } ] diff --git a/app_data/sheets/data_list/organisation.json b/app_data/sheets/data_list/organisation.json index 299f39eb..84ea84d5 100644 --- a/app_data/sheets/data_list/organisation.json +++ b/app_data/sheets/data_list/organisation.json @@ -16,16 +16,10 @@ "image_asset": "images/logos/IDEMS.png", "group": "partners" }, - { - "id": "organisation_9", - "name": "THSN", - "image_asset": "images/logos/thsn.png", - "group": "funders" - }, { "id": "organisation_11", "name": "LEGO", - "image_asset": "images/logos/lego.png", + "image_asset": "images/logos/lego_foundation.png", "group": "funders" } ], diff --git a/app_data/sheets/data_list/play_articles.json b/app_data/sheets/data_list/play_articles.json index 1defc3ae..e1a057f2 100644 --- a/app_data/sheets/data_list/play_articles.json +++ b/app_data/sheets/data_list/play_articles.json @@ -35,28 +35,28 @@ "id": "why_play_2", "category_id": "why_play", "image_asset": "images/modules/play/why_play_2.svg", - "title": "**The ParentApp Garden**", + "title": "The ParentApp Garden", "_translations": { "title": {}, "text_2": {} }, "_translatedFields": { "title": { - "eng": "**The ParentApp Garden**" + "eng": "The ParentApp Garden" }, "text_2": { - "eng": "In ParentApp for Kids, we use the image of a garden to think about what children need in their lives to grow and thrive. \nLet’s see how play forms a part of the garden image." + "eng": "In @global.app_name, we use the image of a garden to think about what children need in their lives to grow and thrive. \nLet’s see how play forms a part of the garden image." } }, - "text_2": "In ParentApp for Kids, we use the image of a garden to think about what children need in their lives to grow and thrive. \nLet’s see how play forms a part of the garden image." + "text_2": "In @global.app_name, we use the image of a garden to think about what children need in their lives to grow and thrive. \nLet’s see how play forms a part of the garden image." }, { "id": "why_play_3", "category_id": "why_play", - "image_asset": "images/modules/play/new_fertaliser.gif", + "image_asset": "images/modules/play/new_fertiliser.gif", "media_type": "audio", "media_asset": "audio/modules/play/play_02.m4a", - "title": "**The ParentApp Garden**", + "title": "The ParentApp Garden", "_translations": { "title": {}, "text_2": {}, @@ -65,7 +65,7 @@ }, "_translatedFields": { "title": { - "eng": "**The ParentApp Garden**" + "eng": "The ParentApp Garden" }, "text_2": { "eng": "In the same way that fertiliser boosts plant growth, playing with your child is the magic ingredient that supercharges their learning and development." @@ -364,8 +364,9 @@ "quiz_1_option_1_image_asset": "images/modules/play/frustrated_emoji.svg", "quiz_1_option_2_image_asset": "images/modules/play/angry_emoji.svg", "quiz_1_option_3_image_asset": "images/modules/play/tired_emoji.svg", - "text_1": "**Question time:**\n\nLet’s think about what happened in this story.", + "title": "Question time", "_translations": { + "title": {}, "text_1": {}, "quiz_1_question": {}, "quiz_1_option_1_text": {}, @@ -376,8 +377,11 @@ "quiz_1_feedback_3": {} }, "_translatedFields": { + "title": { + "eng": "Question time" + }, "text_1": { - "eng": "**Question time:**\n\nLet’s think about what happened in this story." + "eng": "Let’s think about what happened in this story." }, "quiz_1_question": { "eng": "How did the mother feel when Nandi didn’t want to go to sleep?" @@ -401,6 +405,7 @@ "eng": "Yes, the mother may have been feeling all of these things. It can be really difficult when our children do not want to go to sleep." } }, + "text_1": "Let’s think about what happened in this story.", "quiz_1_question": "How did the mother feel when Nandi didn’t want to go to sleep?", "quiz_1_option_1_text": "Frustrated", "quiz_1_feedback_1": "Yes, the mother may have been feeling all of these things. It can be really difficult when our children do not want to go to sleep.", @@ -415,9 +420,9 @@ "quiz_2_option_1_image_asset": "images/modules/play/sad_emoji.svg", "quiz_2_option_2_image_asset": "images/modules/play/scared_emoji.svg", "quiz_2_option_3_image_asset": "images/modules/play/awake_emoji.svg", - "text_1": "**Question time:**", + "title": "Question time", "_translations": { - "text_1": {}, + "title": {}, "quiz_1_question": {}, "quiz_1_option_1_text": {}, "quiz_1_feedback_1": {}, @@ -436,8 +441,8 @@ "quiz_2_feedback_3": {} }, "_translatedFields": { - "text_1": { - "eng": "**Question time:**" + "title": { + "eng": "Question time" }, "quiz_1_question": { "eng": "What did her mother do to help her fall asleep?" diff --git a/app_data/sheets/global/deployment_global_tz.json b/app_data/sheets/global/deployment_global_tz.json index f726e833..608a83ea 100644 --- a/app_data/sheets/global/deployment_global_tz.json +++ b/app_data/sheets/global/deployment_global_tz.json @@ -36,6 +36,14 @@ "type": "declare_global_constant", "name": "has_multiple_languages", "value": true + }, + { + "type": "declare_global_constant", + "name": "facilitator_face_asset", + "value": "images/facilitators_face.svg", + "_translations": { + "value": {} + } } ], "_xlsxPath": "deployment_data_tz.xlsx" diff --git a/app_data/sheets/template/article.json b/app_data/sheets/template/article.json index 2e2292ef..5912a55d 100644 --- a/app_data/sheets/template/article.json +++ b/app_data/sheets/template/article.json @@ -359,13 +359,40 @@ } }, { - "type": "text", + "name": "speaker_image_asset", + "value": "@global.facilitator_face_asset", + "_translations": { + "value": {} + }, + "type": "set_variable", + "_nested_name": "speaker_image_asset", + "_dynamicFields": { + "value": [ + { + "fullExpression": "@global.facilitator_face_asset", + "matchedExpression": "@global.facilitator_face_asset", + "type": "global", + "fieldName": "facilitator_face_asset" + } + ] + }, + "_dynamicDependencies": { + "@global.facilitator_face_asset": [ + "value" + ] + } + }, + { + "type": "text_bubble", "name": "text_1", "value": "@local.article_data.text_1", "_translations": { "value": {} }, "condition": "!!(@local.article_data.text_1)", + "parameter_list": { + "speaker_image_asset": "@local.speaker_image_asset" + }, "exclude_from_translation": true, "_nested_name": "text_1", "_dynamicFields": { @@ -384,22 +411,78 @@ "type": "local", "fieldName": "article_data" } - ] + ], + "parameter_list": { + "speaker_image_asset": [ + { + "fullExpression": "@local.speaker_image_asset", + "matchedExpression": "@local.speaker_image_asset", + "type": "local", + "fieldName": "speaker_image_asset" + } + ] + } }, "_dynamicDependencies": { "@local.article_data.text_1": [ "value", "condition" + ], + "@local.speaker_image_asset": [ + "parameter_list.speaker_image_asset" + ] + } + }, + { + "type": "image", + "name": "image_asset", + "value": "@local.article_data.image_asset", + "_translations": { + "value": {} + }, + "condition": "!(@local.article_data.image_text)", + "parameter_list": { + "style": "rounded_corners" + }, + "exclude_from_translation": true, + "_nested_name": "image_asset", + "_dynamicFields": { + "value": [ + { + "fullExpression": "@local.article_data.image_asset", + "matchedExpression": "@local.article_data.image_asset", + "type": "local", + "fieldName": "article_data" + } + ], + "condition": [ + { + "fullExpression": "!(@local.article_data.image_text)", + "matchedExpression": "@local.article_data.image_text", + "type": "local", + "fieldName": "article_data" + } + ] + }, + "_dynamicDependencies": { + "@local.article_data.image_asset": [ + "value" + ], + "@local.article_data.image_text": [ + "condition" ] } }, { "type": "display_group", - "name": "dg_box", - "condition": "!!(@local.article_data.image_asset)", + "name": "dg_image_box", + "condition": "!!(@local.article_data.image_text)", "style_list": [ "min_height: 40px" ], + "parameter_list": { + "style": "white_box" + }, "exclude_from_translation": true, "rows": [ { @@ -414,7 +497,7 @@ "style": "rounded_corners" }, "exclude_from_translation": true, - "_nested_name": "dg_box.image_asset", + "_nested_name": "dg_image_box.image_asset", "_dynamicFields": { "value": [ { @@ -451,7 +534,7 @@ "parameter_list": { "text_align": "left" }, - "_nested_name": "dg_box.image_text", + "_nested_name": "dg_image_box.image_text", "_dynamicFields": { "value": [ { @@ -478,19 +561,19 @@ } } ], - "_nested_name": "dg_box", + "_nested_name": "dg_image_box", "_dynamicFields": { "condition": [ { - "fullExpression": "!!(@local.article_data.image_asset)", - "matchedExpression": "@local.article_data.image_asset", + "fullExpression": "!!(@local.article_data.image_text)", + "matchedExpression": "@local.article_data.image_text", "type": "local", "fieldName": "article_data" } ] }, "_dynamicDependencies": { - "@local.article_data.image_asset": [ + "@local.article_data.image_text": [ "condition" ] } diff --git a/app_data/sheets/template/feedback.json b/app_data/sheets/template/feedback.json index c7f89dd4..c5a974c2 100644 --- a/app_data/sheets/template/feedback.json +++ b/app_data/sheets/template/feedback.json @@ -251,18 +251,42 @@ ] } }, + { + "name": "speaker_image_asset", + "value": "@global.facilitator_face_asset", + "_translations": { + "value": {} + }, + "type": "set_variable", + "_nested_name": "speaker_image_asset", + "_dynamicFields": { + "value": [ + { + "fullExpression": "@global.facilitator_face_asset", + "matchedExpression": "@global.facilitator_face_asset", + "type": "global", + "fieldName": "facilitator_face_asset" + } + ] + }, + "_dynamicDependencies": { + "@global.facilitator_face_asset": [ + "value" + ] + } + }, { "type": "text_bubble", + "name": "text_bubble", "value": "@local.@local.concat_feedback", "_translations": { "value": {} }, "parameter_list": { - "speaker_image_asset": "images/kw_facilitator_rd.png" + "speaker_image_asset": "@local.speaker_image_asset" }, "exclude_from_translation": true, - "name": "text_bubble_14", - "_nested_name": "text_bubble_14", + "_nested_name": "text_bubble", "_dynamicFields": { "value": [ { @@ -271,11 +295,24 @@ "type": "local", "fieldName": "concat_feedback" } - ] + ], + "parameter_list": { + "speaker_image_asset": [ + { + "fullExpression": "@local.speaker_image_asset", + "matchedExpression": "@local.speaker_image_asset", + "type": "local", + "fieldName": "speaker_image_asset" + } + ] + } }, "_dynamicDependencies": { "@local.concat_feedback": [ "value" + ], + "@local.speaker_image_asset": [ + "parameter_list.speaker_image_asset" ] } } diff --git a/config.ts b/config.ts index 98904e6a..ec5fb0db 100644 --- a/config.ts +++ b/config.ts @@ -5,7 +5,7 @@ const config = extendDeploymentConfig({ name: "plh_kids_tz", parent: "plh_kids" config.git = { content_repo: "https://github.com/IDEMSInternational/plh-kids-app-tz-content.git", - content_tag_latest: "1.1.59", + content_tag_latest: "1.1.60", }; config.google_drive.sheets_folder_ids = [ diff --git a/reports/summary.json b/reports/summary.json index 8e12d30e..3a751138 100644 --- a/reports/summary.json +++ b/reports/summary.json @@ -94,6 +94,10 @@ "type": "display_group", "count": 35 }, + { + "type": "image", + "count": 1 + }, { "type": "items", "count": 8 @@ -112,7 +116,7 @@ }, { "type": "set_variable", - "count": 415 + "count": 417 }, { "type": "task_card", @@ -128,7 +132,7 @@ }, { "type": "text", - "count": 45 + "count": 44 }, { "type": "text_area", @@ -140,7 +144,7 @@ }, { "type": "text_bubble", - "count": 1 + "count": 2 }, { "type": "title", diff --git a/reports/summary.md b/reports/summary.md index 508e86d9..e5d0d455 100644 --- a/reports/summary.md +++ b/reports/summary.md @@ -30,18 +30,19 @@ | data_items | 1 | | display_grid | 2 | | display_group | 35 | +| image | 1 | | items | 8 | | lottie_animation | 2 | | navigation_bar | 1 | | radio_button_grid | 4 | -| set_variable | 415 | +| set_variable | 417 | | task_card | 3 | | task_progress_bar | 1 | | template | 295 | -| text | 45 | +| text | 44 | | text_area | 2 | | text_box | 5 | -| text_bubble | 1 | +| text_bubble | 2 | | title | 19 | | update_action_list | 1 |