Merge pull request #46 from IDEMSInternational/content/1.2.3

content: 1.2.3
IDEMSInternational · Jan 16, 2024 · 153678d · 153678d
2 parents db19267 + fa15af7
commit 153678d
Show file tree

Hide file tree

Showing 12 changed files with 554 additions and 1,611 deletions.
diff --git a/app_data/sheets/contents.json b/app_data/sheets/contents.json
@@ -286,6 +286,30 @@
       "flow_subtype": "example_sheet_defaults",
       "_xlsxPath": "example_sheets/to_be_sorted/example_sheet_defaults.xlsx"
     },
+    "feat_task_group_1_data": {
+      "flow_type": "data_list",
+      "flow_name": "feat_task_group_1_data",
+      "data_list_name": "feat_task_group_1",
+      "_xlsxPath": "feature_sheets/to_be_sorted/feature_task_group.xlsx"
+    },
+    "feat_task_group_2_data": {
+      "flow_type": "data_list",
+      "flow_name": "feat_task_group_2_data",
+      "data_list_name": "feat_task_group_2",
+      "_xlsxPath": "feature_sheets/to_be_sorted/feature_task_group.xlsx"
+    },
+    "feat_task_group_3_data": {
+      "flow_type": "data_list",
+      "flow_name": "feat_task_group_3_data",
+      "data_list_name": "feat_task_group_3",
+      "_xlsxPath": "feature_sheets/to_be_sorted/feature_task_group.xlsx"
+    },
+    "feat_task_groups_data": {
+      "flow_type": "data_list",
+      "flow_name": "feat_task_groups_data",
+      "data_list_name": "feat_task_groups",
+      "_xlsxPath": "feature_sheets/to_be_sorted/feature_task_group.xlsx"
+    },
     "debug_filtered": {
       "flow_name": "debug_filtered",
       "flow_subtype": "generated",
@@ -1538,18 +1562,6 @@
       "flow_subtype": "debug",
       "_xlsxPath": "debug_sheets/to_be_sorted/debug_stepper.xlsx"
     },
-    "debug_task_card": {
-      "flow_type": "template",
-      "flow_name": "debug_task_card",
-      "flow_subtype": "debug",
-      "_xlsxPath": "debug_sheets/to_be_sorted/debug_task_card.xlsx"
-    },
-    "debug_task_card_set_progress": {
-      "flow_type": "template",
-      "flow_name": "debug_task_card_set_progress",
-      "flow_subtype": "debug",
-      "_xlsxPath": "debug_sheets/to_be_sorted/debug_task_card.xlsx"
-    },
     "debug_teen_ages": {
       "flow_type": "template",
       "flow_name": "debug_teen_ages",
@@ -2608,6 +2620,11 @@
       "flow_subtype": "example_sheet_defaults",
       "_xlsxPath": "example_sheets/to_be_sorted/example_sheet_defaults.xlsx"
     },
+    "feat_task_group_subtask_toggle": {
+      "flow_type": "template",
+      "flow_name": "feat_task_group_subtask_toggle",
+      "_xlsxPath": "feature_sheets/to_be_sorted/feature_task_group.xlsx"
+    },
     "feature_feedback_debug": {
       "flow_type": "template",
       "flow_name": "feature_feedback_debug",
@@ -2646,6 +2663,11 @@
       "flow_name": "feature_share_file",
       "_xlsxPath": "feature_sheets/to_be_sorted/feature_share.xlsx"
     },
+    "feature_task_group": {
+      "flow_type": "template",
+      "flow_name": "feature_task_group",
+      "_xlsxPath": "feature_sheets/to_be_sorted/feature_task_group.xlsx"
+    },
     "home_screen": {
       "flow_type": "template",
       "flow_name": "home_screen",

diff --git a/app_data/sheets/data_list/feat_task_group_1_data.json b/app_data/sheets/data_list/feat_task_group_1_data.json
@@ -0,0 +1,17 @@
+{
+  "flow_type": "data_list",
+  "flow_name": "feat_task_group_1_data",
+  "status": "released",
+  "data_list_name": "feat_task_group_1",
+  "rows": [
+    {
+      "id": "subtask_1",
+      "completed_field": "task_group_1_subtask_1_completed"
+    },
+    {
+      "id": "subtask_2",
+      "completed_field": "task_group_1_subtask_2_completed"
+    }
+  ],
+  "_xlsxPath": "feature_sheets/to_be_sorted/feature_task_group.xlsx"
+}
diff --git a/app_data/sheets/data_list/feat_task_group_2_data.json b/app_data/sheets/data_list/feat_task_group_2_data.json
@@ -0,0 +1,17 @@
+{
+  "flow_type": "data_list",
+  "flow_name": "feat_task_group_2_data",
+  "status": "released",
+  "data_list_name": "feat_task_group_2",
+  "rows": [
+    {
+      "id": "subtask_1",
+      "completed_field": "task_group_2_subtask_1_completed"
+    },
+    {
+      "id": "subtask_2",
+      "completed_field": "task_group_2_subtask_2_completed"
+    }
+  ],
+  "_xlsxPath": "feature_sheets/to_be_sorted/feature_task_group.xlsx"
+}
diff --git a/app_data/sheets/data_list/feat_task_group_3_data.json b/app_data/sheets/data_list/feat_task_group_3_data.json
@@ -0,0 +1,17 @@
+{
+  "flow_type": "data_list",
+  "flow_name": "feat_task_group_3_data",
+  "status": "released",
+  "data_list_name": "feat_task_group_3",
+  "rows": [
+    {
+      "id": "subtask_1",
+      "completed_field": "task_group_3_subtask_1_completed"
+    },
+    {
+      "id": "subtask_2",
+      "completed_field": "task_group_3_subtask_2_completed"
+    }
+  ],
+  "_xlsxPath": "feature_sheets/to_be_sorted/feature_task_group.xlsx"
+}
diff --git a/app_data/sheets/data_list/feat_task_groups_data.json b/app_data/sheets/data_list/feat_task_groups_data.json
@@ -0,0 +1,33 @@
+{
+  "flow_type": "data_list",
+  "flow_name": "feat_task_groups_data",
+  "status": "released",
+  "data_list_name": "feat_task_groups",
+  "rows": [
+    {
+      "id": "task_group_1",
+      "number": 1,
+      "title": "Task Group 1",
+      "description": "The first task group",
+      "image_asset": "images/example/jasper_1.jpg",
+      "completed_field": "task_group_1_completed"
+    },
+    {
+      "id": "task_group_2",
+      "number": 2,
+      "title": "Task Group 2",
+      "description": "The second task group",
+      "image_asset": "images/example/jasper_1.jpg",
+      "completed_field": "task_group_2_completed"
+    },
+    {
+      "id": "task_group_3",
+      "number": 3,
+      "title": "Task Group 3",
+      "description": "The third task group",
+      "image_asset": "images/example/jasper_1.jpg",
+      "completed_field": "task_group_3_completed"
+    }
+  ],
+  "_xlsxPath": "feature_sheets/to_be_sorted/feature_task_group.xlsx"
+}
diff --git a/app_data/sheets/template/component_demo/comp_task_prog_bar_dynamic.json b/app_data/sheets/template/component_demo/comp_task_prog_bar_dynamic.json
@@ -27,7 +27,6 @@
       "parameter_list": {
         "task_group_data": "@local.task_group",
         "completed_field": "comp_task_progress_bar_completed",
-        "variant": "green",
         "dynamic": "true"
       },
       "name": "task_progress_bar",

diff --git a/app_data/sheets/template/component_demo/comp_task_progress_bar.json b/app_data/sheets/template/component_demo/comp_task_progress_bar.json
@@ -26,8 +26,7 @@
       "type": "task_progress_bar",
       "parameter_list": {
         "task_group_data": "@local.task_group",
-        "completed_field": "comp_task_progress_bar_completed",
-        "variant": "green"
+        "completed_field": "comp_task_progress_bar_completed"
       },
       "name": "task_progress_bar",
       "_nested_name": "task_progress_bar",

diff --git a/app_data/sheets/template/debug/debug_task_card.json b/app_data/sheets/template/debug/debug_task_card.json