Skip to content

Commit

Permalink
Merge pull request #111 from IDEMSInternational/content/1.2.55
Browse files Browse the repository at this point in the history
content: 1.2.55
  • Loading branch information
esmeetewinkel authored Nov 12, 2024
2 parents 0f55a7a + 95b6eea commit b024696
Show file tree
Hide file tree
Showing 27 changed files with 1,446 additions and 173 deletions.
40 changes: 38 additions & 2 deletions app_data/assets/contents.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,21 @@
"md5Checksum": "4cba6f3545595d585cf1c89394955c71",
"size_kb": 0.5
},
"images/Dalal.png": {
"md5Checksum": "63a9c8ac873873ba14ed9e985dc33bef",
"size_kb": 4.2
},
"images/Faisal.png": {
"md5Checksum": "f2753b6306c8d4045426ce2ee3457f5f",
"size_kb": 3.5
},
"images/Noura.png": {
"md5Checksum": "b3f286e41f079f7db3ca679ce6e83f60",
"size_kb": 4.2
},
"images/avatar_1.png": {
"md5Checksum": "c5c1acec2fc92d6a19b972563d860798",
"size_kb": 60.5
"md5Checksum": "d2d29806c1c430e574a50ddd19319f52",
"size_kb": 67.7
},
"images/example/110-536x354.jpg": {
"md5Checksum": "bf471a3ecb792c6b8bdc9d8c82aeebc1",
Expand Down Expand Up @@ -173,6 +185,14 @@
"md5Checksum": "3837dbad3c5c5b8158a5370064283c20",
"size_kb": 0.6
},
"images/icons/home.svg": {
"md5Checksum": "9c992c891ce900160c3738088c497f8b",
"size_kb": 0.4
},
"images/icons/home_active.svg": {
"md5Checksum": "8704993d38482b0eb3ab261e9f18f8cf",
"size_kb": 0.4
},
"images/icons/house_white.svg": {
"md5Checksum": "f65ea96d7ff53e9bed8613e7f2fe3302",
"size_kb": 0.6
Expand All @@ -185,6 +205,14 @@
"md5Checksum": "21c6e54960599fdda6e4d58c3337b541",
"size_kb": 1.7
},
"images/icons/local_library.svg": {
"md5Checksum": "47c32e1a451ce2e6d55661977724cb1d",
"size_kb": 1.6
},
"images/icons/local_library_active.svg": {
"md5Checksum": "32cacaa501602e12c42cbf6f9a908efd",
"size_kb": 1.6
},
"images/icons/question_mark.svg": {
"md5Checksum": "49e1d1e478068a24949d87d09c9ba07b",
"size_kb": 0.8
Expand All @@ -197,6 +225,14 @@
"md5Checksum": "bc87b2ae05c7c762ca7673657c0efb56",
"size_kb": 1.6
},
"images/icons/settings.svg": {
"md5Checksum": "e4c57dd6bcaab75533160616f4ca1d39",
"size_kb": 2.4
},
"images/icons/settings_active.svg": {
"md5Checksum": "bf8d2472083667e3d651224f283da233",
"size_kb": 2.4
},
"images/icons/star_blue.svg": {
"md5Checksum": "7567cb259945a7f431d1e4ff45b4f0e4",
"size_kb": 1.3
Expand Down
3 changes: 3 additions & 0 deletions app_data/assets/images/Dalal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app_data/assets/images/Faisal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app_data/assets/images/Noura.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions app_data/assets/images/avatar_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app_data/assets/images/icons/home.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app_data/assets/images/icons/home_active.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app_data/assets/images/icons/local_library.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app_data/assets/images/icons/local_library_active.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app_data/assets/images/icons/settings.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app_data/assets/images/icons/settings_active.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
36 changes: 23 additions & 13 deletions app_data/sheets/contents.json
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,11 @@
"flow_subtype": "example_sheet_defaults",
"_xlsxPath": "example_sheets/to_be_sorted/example_sheet_defaults.xlsx"
},
"feat_data_actions_list": {
"flow_type": "data_list",
"flow_name": "feat_data_actions_list",
"_xlsxPath": "feature_sheets/feature_data_actions.xlsx"
},
"feat_task_group_1_data": {
"flow_type": "data_list",
"flow_name": "feat_task_group_1_data",
Expand Down Expand Up @@ -2883,6 +2888,16 @@
"flow_subtype": "example_sheet_defaults",
"_xlsxPath": "example_sheets/to_be_sorted/example_sheet_defaults.xlsx"
},
"feat_data_actions": {
"flow_type": "template",
"flow_name": "feat_data_actions",
"_xlsxPath": "feature_sheets/feature_data_actions.xlsx"
},
"feat_data_actions_summary": {
"flow_type": "template",
"flow_name": "feat_data_actions_summary",
"_xlsxPath": "feature_sheets/feature_data_actions.xlsx"
},
"feat_footer": {
"flow_type": "template",
"flow_name": "feat_footer",
Expand Down Expand Up @@ -2956,19 +2971,6 @@
"flow_name": "feature_home",
"_xlsxPath": "feature_sheets/to_be_sorted/feature_template_components.xlsx"
},
"feature_landscape_mode_false": {
"flow_type": "template",
"flow_name": "feature_landscape_mode_false",
"_xlsxPath": "feature_sheets/feature_landscape_mode.xlsx"
},
"feature_landscape_mode_true": {
"flow_type": "template",
"flow_name": "feature_landscape_mode_true",
"parameter_list": {
"landscape": true
},
"_xlsxPath": "feature_sheets/feature_landscape_mode.xlsx"
},
"feature_lottie": {
"flow_type": "template",
"flow_name": "feature_lottie",
Expand Down Expand Up @@ -3083,6 +3085,14 @@
"flow_type": "template",
"flow_name": "nav_buttons",
"_xlsxPath": "navigation.xlsx"
},
"template_orientation_landscape": {
"flow_type": "template",
"flow_name": "template_orientation_landscape",
"parameter_list": {
"orientation": "landscape"
},
"_xlsxPath": "feature_sheets/feature_screen_orientation.xlsx"
}
},
"tour": {
Expand Down
26 changes: 26 additions & 0 deletions app_data/sheets/data_list/feat_data_actions_list.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"flow_type": "data_list",
"flow_name": "feat_data_actions_list",
"status": "released",
"rows": [
{
"id": "id_1",
"label": "Task 1",
"number": 1,
"completed": false
},
{
"id": "id_2",
"label": "Task 2",
"number": 2,
"completed": true
},
{
"id": "id_3",
"label": "Task 3",
"number": 3,
"completed": true
}
],
"_xlsxPath": "feature_sheets/feature_data_actions.xlsx"
}
20 changes: 20 additions & 0 deletions app_data/sheets/template/app_menu.json
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,26 @@
],
"_nested_name": "button_templates"
},
{
"type": "button",
"name": "button_dynamic_data",
"value": "Dynamic data",
"_translations": {
"value": {}
},
"action_list": [
{
"trigger": "click",
"action_id": "go_to",
"args": [
"/user"
],
"_raw": "click | go_to:/user",
"_cleaned": "click | go_to:/user"
}
],
"_nested_name": "button_dynamic_data"
},
{
"type": "button",
"name": "button_notifications",
Expand Down
65 changes: 49 additions & 16 deletions app_data/sheets/template/component_demo/comp_accordion.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,39 @@
],
"_nested_name": "accordion"
},
{
"type": "subtitle",
"name": "text_accordion",
"value": "Text Accordion",
"_translations": {
"value": {}
},
"_nested_name": "text_accordion"
},
{
"type": "accordion",
"name": "accordion_2",
"rows": [
{
"type": "accordion_section",
"name": "third_section",
"value": "Long section title for the third accordion component on this page",
"rows": [
{
"type": "text",
"name": "text_3",
"value": "It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout. The point of using Lorem Ipsum is that it has a more-or-less normal distribution of letters, as opposed to using 'Content here, content here', making it look like readable English.",
"_translations": {
"value": {}
},
"_nested_name": "accordion_2.third_section.text_3"
}
],
"_nested_name": "accordion_2.third_section"
}
],
"_nested_name": "accordion_2"
},
{
"type": "subtitle",
"name": "parameters",
Expand Down Expand Up @@ -93,7 +126,7 @@
"parameter_list": {
"width": "150px"
},
"_nested_name": "items_5[email protected].{@item.id}_name",
"_nested_name": "items_8[email protected].{@item.id}_name",
"_dynamicFields": {
"name": [
{
Expand All @@ -113,13 +146,13 @@
],
"_nested_name": [
{
"fullExpression": "items_5[email protected].{@item.id}_name",
"fullExpression": "items_8[email protected].{@item.id}_name",
"matchedExpression": "@item.id",
"type": "item",
"fieldName": "id"
},
{
"fullExpression": "items_5[email protected].{@item.id}_name",
"fullExpression": "items_8[email protected].{@item.id}_name",
"matchedExpression": "@item.id",
"type": "item",
"fieldName": "id"
Expand All @@ -146,7 +179,7 @@
"parameter_list": {
"width": "100px"
},
"_nested_name": "items_5[email protected].{@item.id}_input",
"_nested_name": "items_8[email protected].{@item.id}_input",
"_dynamicFields": {
"name": [
{
Expand Down Expand Up @@ -174,13 +207,13 @@
],
"_nested_name": [
{
"fullExpression": "items_5[email protected].{@item.id}_input",
"fullExpression": "items_8[email protected].{@item.id}_input",
"matchedExpression": "@item.id",
"type": "item",
"fieldName": "id"
},
{
"fullExpression": "items_5[email protected].{@item.id}_input",
"fullExpression": "items_8[email protected].{@item.id}_input",
"matchedExpression": "@item.id",
"type": "item",
"fieldName": "id"
Expand Down Expand Up @@ -214,7 +247,7 @@
"parameter_list": {
"width": "100px"
},
"_nested_name": "items_5[email protected].{@item.id}_input",
"_nested_name": "items_8[email protected].{@item.id}_input",
"_dynamicFields": {
"name": [
{
Expand Down Expand Up @@ -254,13 +287,13 @@
},
"_nested_name": [
{
"fullExpression": "items_5[email protected].{@item.id}_input",
"fullExpression": "items_8[email protected].{@item.id}_input",
"matchedExpression": "@item.id",
"type": "item",
"fieldName": "id"
},
{
"fullExpression": "items_5[email protected].{@item.id}_input",
"fullExpression": "items_8[email protected].{@item.id}_input",
"matchedExpression": "@item.id",
"type": "item",
"fieldName": "id"
Expand Down Expand Up @@ -290,7 +323,7 @@
"parameter_list": {
"flex": "1"
},
"_nested_name": "items_5[email protected].{@item.id}_description",
"_nested_name": "items_8[email protected].{@item.id}_description",
"_dynamicFields": {
"name": [
{
Expand All @@ -310,13 +343,13 @@
],
"_nested_name": [
{
"fullExpression": "items_5[email protected].{@item.id}_description",
"fullExpression": "items_8[email protected].{@item.id}_description",
"matchedExpression": "@item.id",
"type": "item",
"fieldName": "id"
},
{
"fullExpression": "items_5[email protected].{@item.id}_description",
"fullExpression": "items_8[email protected].{@item.id}_description",
"matchedExpression": "@item.id",
"type": "item",
"fieldName": "id"
Expand All @@ -335,7 +368,7 @@
}
}
],
"_nested_name": "items_5[email protected]",
"_nested_name": "items_8[email protected]",
"_dynamicFields": {
"name": [
{
Expand All @@ -347,7 +380,7 @@
],
"_nested_name": [
{
"fullExpression": "items_5[email protected]",
"fullExpression": "items_8[email protected]",
"matchedExpression": "@item.id",
"type": "item",
"fieldName": "id"
Expand All @@ -362,8 +395,8 @@
}
}
],
"name": "items_5",
"_nested_name": "items_5",
"name": "items_8",
"_nested_name": "items_8",
"_dynamicFields": {
"value": [
{
Expand Down
Loading

0 comments on commit b024696

Please sign in to comment.