sync

ParentingForLifelongHealth · Nov 4, 2024 · 2094a0f · 2094a0f
1 parent 96b7f9b
commit 2094a0f
Show file tree

Hide file tree

Showing 5 changed files with 77 additions and 19 deletions.
diff --git a/app_data/sheets/data_list/book_tags.json b/app_data/sheets/data_list/book_tags.json
@@ -6,6 +6,7 @@
   "rows": [
     {
       "id": "animals",
+      "name": "animals",
       "text": "Animals",
       "_translations": {
         "text": {}
@@ -18,6 +19,7 @@
     },
     {
       "id": "nature",
+      "name": "nature",
       "text": "Nature",
       "_translations": {
         "text": {}
@@ -30,6 +32,7 @@
     },
     {
       "id": "emotions",
+      "name": "emotions",
       "text": "Emotions",
       "_translations": {
         "text": {}
@@ -42,6 +45,7 @@
     },
     {
       "id": "life_skills",
+      "name": "life_skills",
       "text": "Life Skills",
       "_translations": {
         "text": {}
@@ -54,6 +58,7 @@
     },
     {
       "id": "adventure",
+      "name": "adventure",
       "text": "Adventure",
       "_translations": {
         "text": {}
@@ -66,6 +71,7 @@
     },
     {
       "id": "learn",
+      "name": "learn",
       "text": "Let's Learn",
       "_translations": {
         "text": {}
@@ -78,6 +84,7 @@
     },
     {
       "id": "family",
+      "name": "family",
       "text": "Family",
       "_translations": {
         "text": {}
@@ -90,6 +97,7 @@
     },
     {
       "id": "friends",
+      "name": "friends",
       "text": "Friends",
       "_translations": {
         "text": {}
@@ -102,6 +110,7 @@
     },
     {
       "id": "play",
+      "name": "play",
       "text": "Let's Play",
       "_translations": {
         "text": {}
@@ -114,6 +123,7 @@
     },
     {
       "id": "count",
+      "name": "count",
       "text": "Let's Count",
       "_translations": {
         "text": {}

diff --git a/app_data/sheets/data_list/books_all.json b/app_data/sheets/data_list/books_all.json
@@ -6275,7 +6275,7 @@
           "eng": "Shongololo has lost his shoes, and the other animals are NOT being very helpful. Will he ever find them?"
         },
         "licence": {
-          "eng": ". © Book Dash, 2016. Some rights reserved. Released under CC BY 4.0 license."
+          "eng": "© Book Dash, 2016. Some rights reserved. Released under CC BY 4.0 license."
         },
         "text_1": {
           "eng": "Where are all my shoes? I know I left them here!"
@@ -6352,7 +6352,7 @@
       },
       "title": "Shongololo's Shoes",
       "description": "Shongololo has lost his shoes, and the other animals are NOT being very helpful. Will he ever find them?",
-      "licence": ". © Book Dash, 2016. Some rights reserved. Released under CC BY 4.0 license.",
+      "licence": "© Book Dash, 2016. Some rights reserved. Released under CC BY 4.0 license.",
       "text_1": "Where are all my shoes? I know I left them here!",
       "guidance_1_a": "Use descriptive words and explanations to talk about the pictures. The long millipede has many tiny little feet. I think he is looking for his shoes. I see some yellow boots scattered across the floor. Do you think those are his shoes?",
       "text_2": "I haven’t seen your shoes. Go ask Snail!",

diff --git a/app_data/sheets/data_list/generated/books.json b/app_data/sheets/data_list/generated/books.json
@@ -4688,7 +4688,7 @@
           "eng": "Shongololo has lost his shoes, and the other animals are NOT being very helpful. Will he ever find them?"
         },
         "licence": {
-          "eng": ". © Book Dash, 2016. Some rights reserved. Released under CC BY 4.0 license."
+          "eng": "© Book Dash, 2016. Some rights reserved. Released under CC BY 4.0 license."
         },
         "text_1": {
           "eng": "Where are all my shoes? I know I left them here!"
@@ -4764,7 +4764,7 @@
         }
       },
       "description": "Shongololo has lost his shoes, and the other animals are NOT being very helpful. Will he ever find them?",
-      "licence": ". © Book Dash, 2016. Some rights reserved. Released under CC BY 4.0 license.",
+      "licence": "© Book Dash, 2016. Some rights reserved. Released under CC BY 4.0 license.",
       "text_1": "Where are all my shoes? I know I left them here!",
       "text_7": "Will I ever find my shoes?",
       "text_8": "Shoes, eh? You should ask the Monkeys.",

diff --git a/app_data/sheets/template/home_practice_card.json b/app_data/sheets/template/home_practice_card.json
@@ -330,7 +330,7 @@
                 "text_align": "center"
               },
               "style_list": [
-                "margin: -20px 0"
+                "margin: -5px 0"
               ],
               "_nested_name": "[email protected]_practice_type.dg_column.text",
               "_dynamicFields": {

diff --git a/app_data/sheets/template/lib_books.json b/app_data/sheets/template/lib_books.json
@@ -3,15 +3,6 @@
   "flow_name": "lib_books",
   "status": "released",
   "rows": [
-    {
-      "name": "join",
-      "value": "_",
-      "_translations": {
-        "value": {}
-      },
-      "type": "set_variable",
-      "_nested_name": "join"
-    },
     {
       "type": "title",
       "name": "title",
@@ -21,6 +12,7 @@
           "tz_sw": true
         }
       },
+      "condition": false,
       "_nested_name": "title"
     },
     {
@@ -87,8 +79,8 @@
     {
       "condition": false,
       "type": "set_variable",
-      "name": "set_variable_6",
-      "_nested_name": "set_variable_6"
+      "name": "set_variable_5",
+      "_nested_name": "set_variable_5"
     },
     {
       "type": "title",
@@ -144,7 +136,7 @@
       "type": "display_grid",
       "name": "grid_1",
       "parameter_list": {
-        "item_width": "160px",
+        "item_width": "100px",
         "item_border": "none",
         "grid_width": "100%",
         "grid_gap": "16px"
@@ -299,13 +291,14 @@
               }
             },
             {
+              "name": "has_selected_tag",
               "value": "@calc.(@local.book_tag_list.includes(@local.select_tag))",
               "_translations": {
                 "value": {}
               },
+              "condition": "!!(@local.select_tag)",
               "type": "set_variable",
-              "name": "set_variable_6",
-              "_nested_name": "grid_1.books.set_variable_6",
+              "_nested_name": "grid_1.books.has_selected_tag",
               "_dynamicFields": {
                 "value": [
                   {
@@ -320,13 +313,67 @@
                     "type": "local",
                     "fieldName": "select_tag"
                   }
+                ],
+                "condition": [
+                  {
+                    "fullExpression": "!!(@local.select_tag)",
+                    "matchedExpression": "@local.select_tag",
+                    "type": "local",
+                    "fieldName": "select_tag"
+                  }
                 ]
               },
               "_dynamicDependencies": {
                 "@local.book_tag_list.includes": [
                   "value"
                 ],
                 "@local.select_tag": [
+                  "value",
+                  "condition"
+                ]
+              }
+            },
+            {
+              "type": "text",
+              "name": "[email protected]",
+              "value": "has selected tag: @local.has_selected_tag",
+              "_translations": {
+                "value": {}
+              },
+              "condition": false,
+              "_nested_name": "[email protected]",
+              "_dynamicFields": {
+                "name": [
+                  {
+                    "fullExpression": "[email protected]",
+                    "matchedExpression": "@item.id",
+                    "type": "item",
+                    "fieldName": "id"
+                  }
+                ],
+                "value": [
+                  {
+                    "fullExpression": "has selected tag: @local.has_selected_tag",
+                    "matchedExpression": "@local.has_selected_tag",
+                    "type": "local",
+                    "fieldName": "has_selected_tag"
+                  }
+                ],
+                "_nested_name": [
+                  {
+                    "fullExpression": "[email protected]",
+                    "matchedExpression": "@item.id",
+                    "type": "item",
+                    "fieldName": "id"
+                  }
+                ]
+              },
+              "_dynamicDependencies": {
+                "@item.id": [
+                  "name",
+                  "_nested_name"
+                ],
+                "@local.has_selected_tag": [
                   "value"
                 ]
               }
@@ -335,6 +382,7 @@
               "type": "template",
               "name": "[email protected]",
               "value": "book_button",
+              "condition": false,
               "rows": [
                 {
                   "name": "book_id",