Skip to content

Commit

Permalink
Merge pull request #131 from IDEMSInternational/content/1.3.10
Browse files Browse the repository at this point in the history 
content: 1.3.10
  • Loading branch information
@esmeetewinkel
esmeetewinkel authored Dec 18, 2024
2 parents 9c0b1d6 + 183ead3 commit 0969ec3
Show file tree
Hide file tree
Showing 20 changed files with 1,076 additions and 700 deletions.
37 changes: 14 additions & 23 deletions app_data/sheets/contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,17 +312,6 @@
}
}
},
"comp_title_params": {
"flow_type": "data_list",
"flow_name": "comp_title_params",
"flow_subtype": "component_demo",
"_xlsxPath": "component_sheets/component_title_test.xlsx",
"_metadata": {
"required": {
"type": "boolean"
}
}
},
"debug_accordion_data": {
"flow_type": "data_list",
"flow_name": "debug_accordion_data",
Expand Down Expand Up @@ -1571,7 +1560,7 @@
"flow_type": "template",
"flow_name": "comp_title",
"flow_subtype": "component_demo",
"_xlsxPath": "component_sheets/component_title_test.xlsx"
"_xlsxPath": "component_sheets/component_title.xlsx"
},
"comp_toggle_bar": {
"flow_type": "template",
Expand Down Expand Up @@ -3404,27 +3393,27 @@
"flow_subtype": "example_sheet_defaults",
"_xlsxPath": "example_sheets/to_be_sorted/example_sheet_defaults.xlsx"
},
"feat_app_layout_custom_header": {
"feat_app_layout_custom_footer": {
"flow_type": "template",
"flow_name": "feat_app_layout_custom_header",
"flow_name": "feat_app_layout_custom_footer",
"parameter_list": {
"app_config": {
"APP_HEADER_DEFAULTS": {
"template": "feat_custom_header",
"should_show_back_button": "() => false"
"APP_FOOTER_DEFAULTS": {
"templateName": "feat_custom_footer",
"background": "none"
}
}
},
"_xlsxPath": "feature_sheets/feature_app_layout.xlsx"
},
"feat_app_layout_footer": {
"feat_app_layout_custom_header": {
"flow_type": "template",
"flow_name": "feat_app_layout_footer",
"flow_name": "feat_app_layout_custom_header",
"parameter_list": {
"app_config": {
"APP_FOOTER_DEFAULTS": {
"templateName": "feat_custom_footer",
"background": "none"
"APP_HEADER_DEFAULTS": {
"template": "feat_custom_header",
"should_show_back_button": false
}
}
},
Expand All @@ -3450,7 +3439,9 @@
"flow_name": "feat_app_layout_no_header",
"parameter_list": {
"app_config": {
"APP_HEADER_DEFAULTS": {}
"APP_HEADER_DEFAULTS": {
"show": false
}
}
},
"_xlsxPath": "feature_sheets/feature_app_layout.xlsx"
Expand Down
3 changes: 2 additions & 1 deletion app_data/sheets/data_list/component_demo/comp_data_items_list.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"id": "id_1",
"label": "Task 1",
"completed": false,
"type": "type_a"
"type": "type_a",
"_app_meta_field": "example metadata"
},
{
"id": "id_2",
Expand Down
34 changes: 0 additions & 34 deletions app_data/sheets/data_list/component_demo/comp_title_params.json
View file

This file was deleted.

2 changes: 1 addition & 1 deletion app_data/sheets/template/component_demo/comp_carousel.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1613,7 +1613,7 @@
},
{
"type": "title",
"value": "[Not Working] Example using data_items",
"value": "Example using data_items",
"_translations": {
"value": {}
},
Expand Down
192 changes: 192 additions & 0 deletions app_data/sheets/template/component_demo/comp_display_grid.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,198 @@
]
}
},
{
"type": "subtitle",
"name": "example_2",
"value": "Example 1b - Using data_items",
"_translations": {
"value": {}
},
"_nested_name": "example_2"
},
{
"type": "display_grid",
"name": "grid_2",
"parameter_list": {
"item_width": "@local.item_width_input",
"item_border": "@local.item_border_input",
"grid_width": "@local.grid_width_input",
"grid_gap": "@local.grid_gap_input"
},
"exclude_from_translation": true,
"rows": [
{
"type": "data_items",
"value": "@data.comp_display_grid_data",
"rows": [
{
"type": "display_group",
"parameter_list": {
"style": "column"
},
"rows": [
{
"type": "text",
"name": "{@item.id}_id",
"value": "@item.id",
"_translations": {
"value": {}
},
"_nested_name": "grid_2.data_items_1.display_group_1.{@item.id}_id",
"_dynamicFields": {
"name": [
{
"fullExpression": "{@item.id}_id",
"matchedExpression": "@item.id",
"type": "item",
"fieldName": "id"
}
],
"value": [
{
"fullExpression": "@item.id",
"matchedExpression": "@item.id",
"type": "item",
"fieldName": "id"
}
],
"_nested_name": [
{
"fullExpression": "grid_2.data_items_1.display_group_1.{@item.id}_id",
"matchedExpression": "@item.id",
"type": "item",
"fieldName": "id"
}
]
},
"_dynamicDependencies": {
"@item.id": [
"name",
"value",
"_nested_name"
]
}
},
{
"type": "text",
"name": "{@item.id}_text",
"value": "@item.text",
"_translations": {
"value": {}
},
"_nested_name": "grid_2.data_items_1.display_group_1.{@item.id}_text",
"_dynamicFields": {
"name": [
{
"fullExpression": "{@item.id}_text",
"matchedExpression": "@item.id",
"type": "item",
"fieldName": "id"
}
],
"value": [
{
"fullExpression": "@item.text",
"matchedExpression": "@item.text",
"type": "item",
"fieldName": "text"
}
],
"_nested_name": [
{
"fullExpression": "grid_2.data_items_1.display_group_1.{@item.id}_text",
"matchedExpression": "@item.id",
"type": "item",
"fieldName": "id"
}
]
},
"_dynamicDependencies": {
"@item.id": [
"name",
"_nested_name"
],
"@item.text": [
"value"
]
}
}
],
"name": "display_group_1",
"_nested_name": "grid_2.data_items_1.display_group_1"
}
],
"name": "data_items_1",
"_nested_name": "grid_2.data_items_1",
"_dynamicFields": {
"value": [
{
"fullExpression": "@data.comp_display_grid_data",
"matchedExpression": "@data.comp_display_grid_data",
"type": "data",
"fieldName": "comp_display_grid_data"
}
]
},
"_dynamicDependencies": {
"@data.comp_display_grid_data": [
"value"
]
}
}
],
"_nested_name": "grid_2",
"_dynamicFields": {
"parameter_list": {
"item_width": [
{
"fullExpression": "@local.item_width_input",
"matchedExpression": "@local.item_width_input",
"type": "local",
"fieldName": "item_width_input"
}
],
"item_border": [
{
"fullExpression": "@local.item_border_input",
"matchedExpression": "@local.item_border_input",
"type": "local",
"fieldName": "item_border_input"
}
],
"grid_width": [
{
"fullExpression": "@local.grid_width_input",
"matchedExpression": "@local.grid_width_input",
"type": "local",
"fieldName": "grid_width_input"
}
],
"grid_gap": [
{
"fullExpression": "@local.grid_gap_input",
"matchedExpression": "@local.grid_gap_input",
"type": "local",
"fieldName": "grid_gap_input"
}
]
}
},
"_dynamicDependencies": {
"@local.item_width_input": [
"parameter_list.item_width"
],
"@local.item_border_input": [
"parameter_list.item_border"
],
"@local.grid_width_input": [
"parameter_list.grid_width"
],
"@local.grid_gap_input": [
"parameter_list.grid_gap"
]
}
},
{
"type": "subtitle",
"name": "example_2",
Expand Down
40 changes: 17 additions & 23 deletions app_data/sheets/template/component_demo/comp_plh_module_details_header.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,17 @@
"flow_subtype": "component_demo",
"rows": [
{
"type": "display_group",
"rows": [
{
"type": "plh_module_details_header",
"value": "Module Title: Taking Care of Yourself",
"_translations": {
"value": {}
},
"parameter_list": {
"background_image_asset": "images/bg_illustration.png",
"module_image_asset": "images/module-1.png"
},
"name": "plh_module_details_header_1",
"_nested_name": "display_group_2.plh_module_details_header_1"
}
],
"name": "display_group_2",
"_nested_name": "display_group_2"
"type": "plh_module_details_header",
"value": "Module Title: Taking Care of Yourself",
"_translations": {
"value": {}
},
"parameter_list": {
"background_image_asset": "images/bg_illustration.png",
"module_image_asset": "images/module-1.png"
},
"name": "plh_module_details_header_2",
"_nested_name": "plh_module_details_header_2"
},
{
"type": "plh_module_details_header",
Expand All @@ -32,10 +25,11 @@
},
"parameter_list": {
"background_image_asset": "images/bg_illustration.png",
"module_image_asset": "images/module-1.png"
"module_image_asset": "images/module-1.png",
"hide_back_button": "true"
},
"name": "plh_module_details_header_4",
"_nested_name": "plh_module_details_header_4"
"name": "plh_module_details_header_3",
"_nested_name": "plh_module_details_header_3"
},
{
"type": "plh_module_details_header",
Expand All @@ -47,8 +41,8 @@
"background_image_asset": "images/bg_illustration.png",
"module_image_asset": "images/Noura.png"
},
"name": "plh_module_details_header_5",
"_nested_name": "plh_module_details_header_5"
"name": "plh_module_details_header_4",
"_nested_name": "plh_module_details_header_4"
}
],
"_xlsxPath": "component_sheets/component_plh_module_details_header.xlsx"
Expand Down
Loading

0 comments on commit 0969ec3

Please sign in to comment.