Skip to content

Commit

Permalink
Merge pull request #67 from IDEMSInternational/content/1.2.27
Browse files Browse the repository at this point in the history 
content: 1.2.27
  • Loading branch information
@esmeetewinkel
esmeetewinkel authored May 1, 2024
2 parents a1956c0 + 92774dc commit d37924f
Show file tree
Hide file tree
Showing 3 changed files with 179 additions and 25 deletions.
16 changes: 8 additions & 8 deletions app_data/sheets/data_list/generated/example_pipe_appended.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"sort_alpha": "bonus",
"completed": true,
"Text": "Hello id_1",
"Boolean": "FALSE"
"Boolean": false
},
{
"id": "id_2",
Expand All @@ -19,23 +19,23 @@
"sort_alpha": "basis",
"completed": false,
"Text": "Hello id_2",
"Boolean": "FALSE"
"Boolean": false
},
{
"id": "id_3",
"value": 3,
"sort_order": 6,
"sort_alpha": "topic",
"Text": "Hello id_3",
"Boolean": "FALSE"
"Boolean": false
},
{
"id": "id_4",
"value": 4,
"sort_order": 5,
"sort_alpha": "world",
"Text": "Hello id_4",
"Boolean": "FALSE"
"Boolean": false
},
{
"id": "id_5",
Expand All @@ -44,7 +44,7 @@
"sort_alpha": "event",
"completed": true,
"Text": "Hello id_5",
"Boolean": "FALSE"
"Boolean": false
},
{
"id": "id_6",
Expand All @@ -53,7 +53,7 @@
"sort_alpha": "photo",
"completed": true,
"Text": "Hello id_6",
"Boolean": "FALSE"
"Boolean": false
},
{
"id": "id_7",
Expand All @@ -62,7 +62,7 @@
"sort_alpha": "guest",
"completed": false,
"Text": "Hello id_7",
"Boolean": "FALSE"
"Boolean": false
},
{
"id": "id_8",
Expand All @@ -71,7 +71,7 @@
"sort_alpha": "skill",
"completed": false,
"Text": "Hello id_8",
"Boolean": "FALSE"
"Boolean": false
}
]
}
186 changes: 170 additions & 16 deletions app_data/sheets/template/debug/debug_data_items_nesting.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@
{
"type": "data_items",
"name": "data_items",
"value": "@data.comp_data_items_list",
"value": "example_pipe_appended",
"parameter_list": {
"limit": "2"
},
"rows": [
{
"type": "text",
Expand Down Expand Up @@ -174,22 +177,173 @@
}
}
],
"_nested_name": "data_items",
"_dynamicFields": {
"value": [
{
"fullExpression": "@data.comp_data_items_list",
"matchedExpression": "@data.comp_data_items_list",
"type": "data",
"fieldName": "comp_data_items_list"
}
]
"_nested_name": "data_items"
},
{
"type": "data_items",
"name": "data_items",
"value": "example_pipe_appended",
"parameter_list": {
"limit": "2"
},
"_dynamicDependencies": {
"@data.comp_data_items_list": [
"value"
]
}
"rows": [
{
"type": "text",
"name": "[email protected]",
"value": "Item ID: @item.id",
"_translations": {
"value": {}
},
"_nested_name": "[email protected]",
"_dynamicFields": {
"name": [
{
"fullExpression": "[email protected]",
"matchedExpression": "@item.id",
"type": "item",
"fieldName": "id"
}
],
"value": [
{
"fullExpression": "Item ID: @item.id",
"matchedExpression": "@item.id",
"type": "item",
"fieldName": "id"
}
],
"_nested_name": [
{
"fullExpression": "[email protected]",
"matchedExpression": "@item.id",
"type": "item",
"fieldName": "id"
}
]
},
"_dynamicDependencies": {
"@item.id": [
"name",
"value",
"_nested_name"
]
}
},
{
"type": "text",
"name": "[email protected]",
"value": "Item completed: @item.completed",
"_translations": {
"value": {}
},
"_nested_name": "[email protected]",
"_dynamicFields": {
"name": [
{
"fullExpression": "[email protected]",
"matchedExpression": "@item.id",
"type": "item",
"fieldName": "id"
}
],
"value": [
{
"fullExpression": "Item completed: @item.completed",
"matchedExpression": "@item.completed",
"type": "item",
"fieldName": "completed"
}
],
"_nested_name": [
{
"fullExpression": "[email protected]",
"matchedExpression": "@item.id",
"type": "item",
"fieldName": "id"
}
]
},
"_dynamicDependencies": {
"@item.id": [
"name",
"_nested_name"
],
"@item.completed": [
"value"
]
}
},
{
"type": "template",
"name": "example_emit",
"value": "example_emit",
"action_list": [
{
"trigger": "completed",
"action_id": "set_item",
"args": [],
"_raw": "completed | set_item | Boolean: true",
"_cleaned": "completed | set_item | Boolean: true",
"params": {
"Boolean": true
}
},
{
"trigger": "uncompleted",
"action_id": "set_item",
"args": [],
"_raw": "uncompleted | set_item | _index: @item._index - 1, Boolean: false",
"_cleaned": "uncompleted | set_item | _index: @item._index - 1, Boolean: false",
"params": {
"_index": "@item._index - 1",
"Boolean": false
}
}
],
"rows": [],
"_nested_name": "data_items.example_emit",
"_dynamicFields": {
"action_list": {
"1": {
"_raw": [
{
"fullExpression": "uncompleted | set_item | _index: @item._index - 1, Boolean: false",
"matchedExpression": "@item._index",
"type": "item",
"fieldName": "_index"
}
],
"_cleaned": [
{
"fullExpression": "uncompleted | set_item | _index: @item._index - 1, Boolean: false",
"matchedExpression": "@item._index",
"type": "item",
"fieldName": "_index"
}
],
"params": {
"_index": [
{
"fullExpression": "@item._index - 1",
"matchedExpression": "@item._index",
"type": "item",
"fieldName": "_index"
}
]
}
}
}
},
"_dynamicDependencies": {
"@item._index": [
"action_list.1._raw",
"action_list.1._cleaned",
"action_list.1.params._index"
]
}
}
],
"_nested_name": "data_items"
}
],
"_xlsxPath": "component_sheets/component_data_items.xlsx"
Expand Down
2 changes: 1 addition & 1 deletion config.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ config.web.favicon_asset = "images/icons/favicon.svg";

config.git = {
content_repo: "https://github.com/IDEMSInternational/app-debug-content.git",
content_tag_latest: "1.2.26",
content_tag_latest: "1.2.27",
};

config.app_config.ASSET_PACKS = {
Expand Down

0 comments on commit d37924f

Please sign in to comment.