Merge pull request #104 from IDEMSInternational/content/1.1.8

content: 1.1.8

app_data/assets/contents.json

@@ -411,6 +411,10 @@
     "md5Checksum": "0a7233c6b3cd46ec4e708f81eacae687",
     "size_kb": 62.4
   },
+  "images/makerere_university_logo.png": {
+    "md5Checksum": "32ea097efc60d6f04ce980f599620183",
+    "size_kb": 14.9
+  },
   "images/managing_difficult_behaviour_1.jpg": {
     "md5Checksum": "6d3affcfcf75716fcbcd5bff474879d2",
     "size_kb": 58.7
@@ -579,17 +583,13 @@
     "md5Checksum": "615436c60988fbf23f09391280ae4822",
     "size_kb": 126.9
   },
-  "logos/CHDC_logo.png": {
-    "md5Checksum": "3009e1d46312fd6fbc9cf85cf6023447",
-    "size_kb": 120.3
-  },
   "logos/Evaluation_fund_logo.png": {
     "md5Checksum": "d28a83d81ed4d0de18f06e551c123703",
     "size_kb": 9.3
   },
   "logos/GPI_logo.png": {
-    "md5Checksum": "8ed510555679c5589c059a0e471308f7",
-    "size_kb": 20.5
+    "md5Checksum": "23adb97a7ef79d3f4ebbeeae648f5758",
+    "size_kb": 14.8
   },
   "logos/SVRI_logo.png": {
     "md5Checksum": "eb29aca1f1216f8ce692b01d31e163cc",
@@ -644,8 +644,8 @@
     "size_kb": 39.3
   },
   "logos/makerere_university_logo.png": {
-    "md5Checksum": "e9d7d863842ab6e6dcd5cd93b9f2a5a6",
-    "size_kb": 461.3
+    "md5Checksum": "5d25ba66c7e3ab9a18b6b7039307f15c",
+    "size_kb": 342.5
   },
   "logos/no_means_no.png": {
     "md5Checksum": "4dff17585cd1858cef680d05806dd588",
@@ -731,6 +731,14 @@
     "md5Checksum": "131145b165cd19613a9e277a514eec2f",
     "size_kb": 140.5
   },
+  "lottie/well_done.json": {
+    "md5Checksum": "5f0187a1d1961ec152bf19a1f7a59660",
+    "size_kb": 38.8
+  },
+  "lottie/well_done.txt": {
+    "md5Checksum": "7a10387b0df7a27efc81dbe6742fa34f",
+    "size_kb": 1.7
+  },
   "pdf/facilitator_manual/10_review_pfr_manual.pdf": {
     "md5Checksum": "dede387f6b7070109f5d472b00427be9",
     "size_kb": 1217.9

app_data/assets/lottie/well_done.txt

@@ -0,0 +1,12 @@
+Lottie Simple License (FL 9.13.21)
+Copyright © 2021 Design Barn Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of the public animation files available for download at the LottieFiles site (“Files”) to download, reproduce, modify, publish, distribute, publicly display, and publicly digitally perform such Files, including for commercial purposes, provided that any display, publication, performance, or distribution of Files must contain (and be subject to) the same terms and conditions of this license. Modifications to Files are deemed derivative works and must also be expressly distributed under the same terms and conditions of this license. You may not purport to impose any additional or different terms or conditions on, or apply any technical measures that restrict exercise of, the rights granted under this license. This license does not include the right to collect or compile Files from LottieFiles to replicate or develop a similar or competing service.
+
+
+
+Use of Files without attributing the creator(s) of the Files is permitted under this license, though attribution is strongly encouraged. If attributions are included, such attributions should be visible to the end user.
+
+
+
+FILES ARE PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL THE CREATOR(S) OF FILES OR DESIGN BARN, INC. BE LIABLE ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE, OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF SUCH FILES.

app_data/sheets/contents.json

@@ -1288,13 +1288,13 @@
       "flow_type": "template",
       "flow_subtype": "legal_terms",
       "flow_name": "app_menu_privacy_policy",
-      "_xlsxPath": "global/templates/legal_terms_pfr.xlsx"
+      "_xlsxPath": "global/templates/app_launch_templates.xlsx"
     },
     "app_menu_terms": {
       "flow_type": "template",
       "flow_subtype": "legal_terms",
       "flow_name": "app_menu_terms",
-      "_xlsxPath": "global/templates/legal_terms_pfr.xlsx"
+      "_xlsxPath": "global/templates/app_launch_templates.xlsx"
     },
     "library": {
       "flow_type": "template",

app_data/sheets/data_list/organisation.json

@@ -6,14 +6,13 @@
   "rows": [
     {
       "id": "organisation_1",
-      "name": "CHDC",
-      "image_asset": "logos/CHDC_logo.png",
+      "name": "Child Health and Development Centre (CDHC)",
       "group": "partners",
       "attached_single_doc": "https://docs.google.com/document/d/1PWD0URrev1bVlK8SnK3LeU_lvEXbao7Jm43hegGVMGk"
     },
     {
       "id": "organisation_2",
-      "name": "Oxford Uni",
+      "name": "University of Oxford",
       "image_asset": "logos/university_of_oxford.png",
       "group": "partners"
     },
@@ -25,7 +24,7 @@
     },
     {
       "id": "organisation_4",
-      "name": "Makerere Uni",
+      "name": "Makerere University",
       "image_asset": "logos/makerere_university_logo.png",
       "group": "partners"
     },

app_data/sheets/template/accept_terms.json

@@ -18,40 +18,22 @@
     {
       "type": "text",
       "name": "text_1",
-      "value": "By providing your consent below you acknowledge reading and accepting the @global.terms_and_conditions and @global.privacy_policy. The most important commitments are:\n1. This is, and will always be, a fully free app.\n2. Your data will never be sold. We are not for profit.\n3. By using the app you are helping to make the app better for you and others.\n4. Your anonymised data may be used for research purposes by our @global.parent_app team.",
+      "value": "By providing your consent below you acknowledge reading and accepting the Terms & Conditions and Privacy Policy. The most important commitments are:\n1. This is, and will always be, a fully free app.\n2. Your data will never be sold. We are not for profit.\n3. By using the app you are helping to make the app better for you and others.\n4. Your anonymised data may be used for research purposes by our @global.parent_app team.",
       "_translations": {
         "value": {}
       },
       "_nested_name": "text_1",
       "_dynamicFields": {
         "value": [
           {
-            "fullExpression": "By providing your consent below you acknowledge reading and accepting the @global.terms_and_conditions and @global.privacy_policy. The most important commitments are:\n1. This is, and will always be, a fully free app.\n2. Your data will never be sold. We are not for profit.\n3. By using the app you are helping to make the app better for you and others.\n4. Your anonymised data may be used for research purposes by our @global.parent_app team.",
-            "matchedExpression": "@global.terms_and_conditions",
-            "type": "global",
-            "fieldName": "terms_and_conditions"
-          },
-          {
-            "fullExpression": "By providing your consent below you acknowledge reading and accepting the @global.terms_and_conditions and @global.privacy_policy. The most important commitments are:\n1. This is, and will always be, a fully free app.\n2. Your data will never be sold. We are not for profit.\n3. By using the app you are helping to make the app better for you and others.\n4. Your anonymised data may be used for research purposes by our @global.parent_app team.",
-            "matchedExpression": "@global.privacy_policy",
-            "type": "global",
-            "fieldName": "privacy_policy"
-          },
-          {
-            "fullExpression": "By providing your consent below you acknowledge reading and accepting the @global.terms_and_conditions and @global.privacy_policy. The most important commitments are:\n1. This is, and will always be, a fully free app.\n2. Your data will never be sold. We are not for profit.\n3. By using the app you are helping to make the app better for you and others.\n4. Your anonymised data may be used for research purposes by our @global.parent_app team.",
+            "fullExpression": "By providing your consent below you acknowledge reading and accepting the Terms & Conditions and Privacy Policy. The most important commitments are:\n1. This is, and will always be, a fully free app.\n2. Your data will never be sold. We are not for profit.\n3. By using the app you are helping to make the app better for you and others.\n4. Your anonymised data may be used for research purposes by our @global.parent_app team.",
             "matchedExpression": "@global.parent_app",
             "type": "global",
             "fieldName": "parent_app"
           }
         ]
       },
       "_dynamicDependencies": {
-        "@global.terms_and_conditions": [
-          "value"
-        ],
-        "@global.privacy_policy": [
-          "value"
-        ],
         "@global.parent_app": [
           "value"
         ]
@@ -60,7 +42,7 @@
     {
       "type": "button",
       "name": "button_1",
-      "value": "@global.terms_and_conditions",
+      "value": "Terms & Conditions",
       "_translations": {
         "value": {}
       },
@@ -75,27 +57,12 @@
           "_cleaned": "click | pop_up: app_menu_terms"
         }
       ],
-      "_nested_name": "button_1",
-      "_dynamicFields": {
-        "value": [
-          {
-            "fullExpression": "@global.terms_and_conditions",
-            "matchedExpression": "@global.terms_and_conditions",
-            "type": "global",
-            "fieldName": "terms_and_conditions"
-          }
-        ]
-      },
-      "_dynamicDependencies": {
-        "@global.terms_and_conditions": [
-          "value"
-        ]
-      }
+      "_nested_name": "button_1"
     },
     {
       "type": "button",
       "name": "button_2",
-      "value": "@global.privacy_policy",
+      "value": "Privacy Policy",
       "_translations": {
         "value": {}
       },
@@ -110,22 +77,7 @@
           "_cleaned": "click | pop_up: app_menu_privacy_policy"
         }
       ],
-      "_nested_name": "button_2",
-      "_dynamicFields": {
-        "value": [
-          {
-            "fullExpression": "@global.privacy_policy",
-            "matchedExpression": "@global.privacy_policy",
-            "type": "global",
-            "fieldName": "privacy_policy"
-          }
-        ]
-      },
-      "_dynamicDependencies": {
-        "@global.privacy_policy": [
-          "value"
-        ]
-      }
+      "_nested_name": "button_2"
     },
     {
       "type": "text",

app_data/sheets/template/legal_terms/app_menu_privacy_policy.json

@@ -163,5 +163,5 @@
       }
     }
   ],
-  "_xlsxPath": "global/templates/legal_terms_pfr.xlsx"
+  "_xlsxPath": "global/templates/app_launch_templates.xlsx"
 }

app_data/sheets/template/legal_terms/app_menu_terms.json

@@ -163,5 +163,5 @@
       }
     }
   ],
-  "_xlsxPath": "global/templates/legal_terms_pfr.xlsx"
+  "_xlsxPath": "global/templates/app_launch_templates.xlsx"
 }

app_data/sheets/template/praise.json

@@ -113,38 +113,14 @@
       }
     },
     {
-      "type": "image",
-      "name": "icon_asset",
-      "value": "@local.row_data.icon_asset",
+      "type": "lottie_animation",
+      "name": "lottie_welldone",
+      "value": "lottie/well_done.json",
       "_translations": {
         "value": {}
       },
-      "condition": "!!(@local.row_data.icon_asset)",
-      "_nested_name": "icon_asset",
-      "_dynamicFields": {
-        "value": [
-          {
-            "fullExpression": "@local.row_data.icon_asset",
-            "matchedExpression": "@local.row_data.icon_asset",
-            "type": "local",
-            "fieldName": "row_data"
-          }
-        ],
-        "condition": [
-          {
-            "fullExpression": "!!(@local.row_data.icon_asset)",
-            "matchedExpression": "@local.row_data.icon_asset",
-            "type": "local",
-            "fieldName": "row_data"
-          }
-        ]
-      },
-      "_dynamicDependencies": {
-        "@local.row_data.icon_asset": [
-          "value",
-          "condition"
-        ]
-      }
+      "condition": "!!(lottie/well_done.json)",
+      "_nested_name": "lottie_welldone"
     },
     {
       "type": "text",