Skip to content

Commit

Permalink
Merge pull request #129 from IDEMSInternational/content/1.3.9
Browse files Browse the repository at this point in the history
content: 1.3.9
  • Loading branch information
esmeetewinkel authored Dec 16, 2024
2 parents af44fa4 + 0229adb commit 9c0b1d6
Show file tree
Hide file tree
Showing 13 changed files with 371 additions and 399 deletions.
31 changes: 30 additions & 1 deletion app_data/sheets/contents.json
Original file line number Diff line number Diff line change
Expand Up @@ -3404,13 +3404,27 @@
"flow_subtype": "example_sheet_defaults",
"_xlsxPath": "example_sheets/to_be_sorted/example_sheet_defaults.xlsx"
},
"feat_app_layout_custom_header": {
"flow_type": "template",
"flow_name": "feat_app_layout_custom_header",
"parameter_list": {
"app_config": {
"APP_HEADER_DEFAULTS": {
"template": "feat_custom_header",
"should_show_back_button": "() => false"
}
}
},
"_xlsxPath": "feature_sheets/feature_app_layout.xlsx"
},
"feat_app_layout_footer": {
"flow_type": "template",
"flow_name": "feat_app_layout_footer",
"parameter_list": {
"app_config": {
"APP_FOOTER_DEFAULTS": {
"templateName": "feat_custom_footer"
"templateName": "feat_custom_footer",
"background": "none"
}
}
},
Expand All @@ -3431,6 +3445,16 @@
},
"_xlsxPath": "feature_sheets/feature_app_layout.xlsx"
},
"feat_app_layout_no_header": {
"flow_type": "template",
"flow_name": "feat_app_layout_no_header",
"parameter_list": {
"app_config": {
"APP_HEADER_DEFAULTS": {}
}
},
"_xlsxPath": "feature_sheets/feature_app_layout.xlsx"
},
"feat_app_layout_padding": {
"flow_type": "template",
"flow_name": "feat_app_layout_padding",
Expand All @@ -3448,6 +3472,11 @@
"flow_name": "feat_custom_footer",
"_xlsxPath": "feature_sheets/feature_app_layout.xlsx"
},
"feat_custom_header": {
"flow_type": "template",
"flow_name": "feat_custom_header",
"_xlsxPath": "feature_sheets/feature_app_layout.xlsx"
},
"feat_data_actions": {
"flow_type": "template",
"flow_name": "feat_data_actions",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,21 @@
"name": "option_1",
"text": "All Activities",
"image": "images/icons/reader_blue.svg",
"image_checked": "images/icons/reader_blue.svg"
"image_checked": "images/icons/tick.svg"
},
{
"id": "option_2",
"name": "option_2",
"text": "Played",
"image": "images/icons/star_blue.svg"
"image": "images/icons/star_blue.svg",
"image_checked": "images/icons/tick.svg"
},
{
"id": "option_3",
"name": "option_3",
"text": "Not Played",
"image": "images/icons/school_blue.svg"
"image": "images/icons/school_blue.svg",
"image_checked": "images/icons/tick.svg"
}
],
"_xlsxPath": "component_sheets/component_radio_button_grid.xlsx"
Expand Down
35 changes: 17 additions & 18 deletions app_data/sheets/template/component_demo/comp_task_card.json
Original file line number Diff line number Diff line change
Expand Up @@ -1872,16 +1872,24 @@
"trigger": "click",
"action_id": "set_field",
"args": [
"@local.task_completed_field",
true
"@local.task_completed_field = true"
],
"_raw": "click | set_field: @local.task_completed_field: true",
"_cleaned": "click | set_field: @local.task_completed_field: true"
"_raw": "click | set_field: @local.task_completed_field = true",
"_cleaned": "click | set_field: @local.task_completed_field = true"
},
{
"trigger": "click",
"action_id": "emit",
"args": [
"force_reload"
],
"_raw": "click | emit: force_reload",
"_cleaned": "click | emit: force_reload"
}
],
"parameter_list": {
"task_id": "@local.task_id",
"completed_field": "@local.task_completed_field",
"completed_field": "FALSE",
"title": "Pellentesque quis lectus pharetra, dictum orci ut, aliquet elit",
"style": "button",
"variant": "block-button",
Expand All @@ -1894,7 +1902,7 @@
"args": {
"0": [
{
"fullExpression": "@local.task_completed_field",
"fullExpression": "@local.task_completed_field = true",
"matchedExpression": "@local.task_completed_field",
"type": "local",
"fieldName": "task_completed_field"
Expand All @@ -1903,15 +1911,15 @@
},
"_raw": [
{
"fullExpression": "click | set_field: @local.task_completed_field: true",
"fullExpression": "click | set_field: @local.task_completed_field = true",
"matchedExpression": "@local.task_completed_field",
"type": "local",
"fieldName": "task_completed_field"
}
],
"_cleaned": [
{
"fullExpression": "click | set_field: @local.task_completed_field: true",
"fullExpression": "click | set_field: @local.task_completed_field = true",
"matchedExpression": "@local.task_completed_field",
"type": "local",
"fieldName": "task_completed_field"
Expand All @@ -1928,14 +1936,6 @@
"fieldName": "task_id"
}
],
"completed_field": [
{
"fullExpression": "@local.task_completed_field",
"matchedExpression": "@local.task_completed_field",
"type": "local",
"fieldName": "task_completed_field"
}
],
"image": [
{
"fullExpression": "@local.card_image",
Expand All @@ -1950,8 +1950,7 @@
"@local.task_completed_field": [
"action_list.0.args.0",
"action_list.0._raw",
"action_list.0._cleaned",
"parameter_list.completed_field"
"action_list.0._cleaned"
],
"@local.task_id": [
"parameter_list.task_id"
Expand Down
34 changes: 34 additions & 0 deletions app_data/sheets/template/feat_app_layout_custom_header.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"flow_type": "template",
"flow_name": "feat_app_layout_custom_header",
"status": "released",
"parameter_list": {
"app_config": {
"APP_HEADER_DEFAULTS": {
"template": "feat_custom_header",
"should_show_back_button": "() => false"
}
}
},
"rows": [
{
"type": "title",
"value": "Template-level app config overrides",
"_translations": {
"value": {}
},
"name": "title_2",
"_nested_name": "title_2"
},
{
"type": "text",
"value": "header template: feat_custom_header",
"_translations": {
"value": {}
},
"name": "text_3",
"_nested_name": "text_3"
}
],
"_xlsxPath": "feature_sheets/feature_app_layout.xlsx"
}
3 changes: 2 additions & 1 deletion app_data/sheets/template/feat_app_layout_footer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"parameter_list": {
"app_config": {
"APP_FOOTER_DEFAULTS": {
"templateName": "feat_custom_footer"
"templateName": "feat_custom_footer",
"background": "none"
}
}
},
Expand Down
31 changes: 31 additions & 0 deletions app_data/sheets/template/feat_app_layout_no_header.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"flow_type": "template",
"flow_name": "feat_app_layout_no_header",
"status": "released",
"parameter_list": {
"app_config": {
"APP_HEADER_DEFAULTS": {}
}
},
"rows": [
{
"type": "title",
"value": "Template-level app config overrides",
"_translations": {
"value": {}
},
"name": "title_2",
"_nested_name": "title_2"
},
{
"type": "text",
"value": "Do not show header",
"_translations": {
"value": {}
},
"name": "text_3",
"_nested_name": "text_3"
}
],
"_xlsxPath": "feature_sheets/feature_app_layout.xlsx"
}
2 changes: 1 addition & 1 deletion app_data/sheets/template/feat_custom_footer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"value": {}
},
"parameter_list": {
"style": "alternative"
"text_align": "center"
},
"name": "text_2",
"_nested_name": "text_2"
Expand Down
50 changes: 50 additions & 0 deletions app_data/sheets/template/feat_custom_header.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{
"flow_type": "template",
"flow_name": "feat_custom_header",
"status": "released",
"rows": [
{
"type": "display_group",
"style_list": [
"justify-content: center"
],
"rows": [
{
"type": "text",
"value": "Custom Header",
"_translations": {
"value": {}
},
"parameter_list": {
"style": "alternative"
},
"name": "text_1",
"_nested_name": "display_group_2.text_1"
},
{
"type": "button",
"value": "Back",
"_translations": {
"value": {}
},
"action_list": [
{
"trigger": "click",
"action_id": "nav",
"args": [
"back"
],
"_raw": "click | nav: back",
"_cleaned": "click | nav: back"
}
],
"name": "button_2",
"_nested_name": "display_group_2.button_2"
}
],
"name": "display_group_2",
"_nested_name": "display_group_2"
}
],
"_xlsxPath": "feature_sheets/feature_app_layout.xlsx"
}
Loading

0 comments on commit 9c0b1d6

Please sign in to comment.