From 77168b5b0853e3e1f685ff8c4fe3fbb495f83bf4 Mon Sep 17 00:00:00 2001 From: marcusgraca Date: Fri, 26 Sep 2025 09:17:55 +0100 Subject: [PATCH] Refreshd the Data Model to overwride the Semantic Model files and Added Card Labels in the Engagement Tab --- .../visuals/1fba175e004611a9b13a/visual.json | 122 +++++++++++++++++- .../visuals/22e924eae97330d6bc7f/visual.json | 122 +++++++++++++++++- .../visuals/5bbba6e903b286db133d/visual.json | 11 +- .../visuals/f0e43f9fd05668cac760/visual.json | 29 +++-- .../definition/tables/Engagement Group.tmdl | 8 +- .../definition/tables/Location Client.tmdl | 2 - 6 files changed, 267 insertions(+), 27 deletions(-) diff --git a/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/1fba175e004611a9b13a/visual.json b/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/1fba175e004611a9b13a/visual.json index 7287c3f..2b38565 100644 --- a/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/1fba175e004611a9b13a/visual.json +++ b/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/1fba175e004611a9b13a/visual.json @@ -1,5 +1,5 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.2.0/schema.json", "name": "1fba175e004611a9b13a", "position": { "x": 640, @@ -59,6 +59,20 @@ "queryRef": "Arrangement Type.Arrangement Type", "nativeQueryRef": "Arrangement Type" }, + { + "field": { + "Column": { + "Expression": { + "SourceRef": { + "Entity": "Family Function Assignments" + } + }, + "Property": "Function" + } + }, + "queryRef": "Family Function Assignments.Function", + "nativeQueryRef": "Function" + }, { "field": { "Column": { @@ -217,7 +231,7 @@ "value": { "expr": { "Literal": { - "Value": "218D" + "Value": "160.25256546577424D" } } } @@ -231,7 +245,7 @@ "value": { "expr": { "Literal": { - "Value": "223D" + "Value": "137.6407490250382D" } } } @@ -239,6 +253,20 @@ "selector": { "metadata": "Client Person.Full Name" } + }, + { + "properties": { + "value": { + "expr": { + "Literal": { + "Value": "137.15902421610863D" + } + } + } + }, + "selector": { + "metadata": "Arrangement Type.Arrangement Type" + } } ], "total": [ @@ -543,5 +571,93 @@ ] }, "drillFilterOtherVisuals": true + }, + "filterConfig": { + "filters": [ + { + "name": "b6f35da3a42c0510da9d", + "field": { + "Column": { + "Expression": { + "SourceRef": { + "Entity": "Client Family" + } + }, + "Property": "Family Name" + } + }, + "type": "Categorical" + }, + { + "name": "db56b0fdd0c05b601457", + "field": { + "Column": { + "Expression": { + "SourceRef": { + "Entity": "Client Person" + } + }, + "Property": "Full Name" + } + }, + "type": "Categorical" + }, + { + "name": "87dc981a3eb38358abe8", + "field": { + "Column": { + "Expression": { + "SourceRef": { + "Entity": "Arrangement Type" + } + }, + "Property": "Arrangement Type" + } + }, + "type": "Categorical" + }, + { + "name": "6dca523414d06c3e3b31", + "field": { + "Column": { + "Expression": { + "SourceRef": { + "Entity": "Arrangements" + } + }, + "Property": "Arrangement ID" + } + }, + "type": "Categorical" + }, + { + "name": "7a2b0385899e144b1cd2", + "field": { + "Measure": { + "Expression": { + "SourceRef": { + "Entity": "Family" + } + }, + "Property": "Family Engagement Level" + } + }, + "type": "Advanced" + }, + { + "name": "e0c490b62be000e5aa6e", + "field": { + "Column": { + "Expression": { + "SourceRef": { + "Entity": "Family Function Assignments" + } + }, + "Property": "Function" + } + }, + "type": "Categorical" + } + ] } } \ No newline at end of file diff --git a/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/22e924eae97330d6bc7f/visual.json b/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/22e924eae97330d6bc7f/visual.json index c9987ab..5ce70aa 100644 --- a/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/22e924eae97330d6bc7f/visual.json +++ b/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/22e924eae97330d6bc7f/visual.json @@ -1,5 +1,5 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.2.0/schema.json", "name": "22e924eae97330d6bc7f", "position": { "x": 640, @@ -59,6 +59,20 @@ "queryRef": "Arrangement Type.Arrangement Type", "nativeQueryRef": "Arrangement Type" }, + { + "field": { + "Column": { + "Expression": { + "SourceRef": { + "Entity": "Individual Function Assignments" + } + }, + "Property": "Function" + } + }, + "queryRef": "Individual Function Assignments.Function", + "nativeQueryRef": "Function" + }, { "field": { "Column": { @@ -203,7 +217,7 @@ "value": { "expr": { "Literal": { - "Value": "218D" + "Value": "163.93857192540565D" } } } @@ -217,7 +231,7 @@ "value": { "expr": { "Literal": { - "Value": "223D" + "Value": "138.79571306745538D" } } } @@ -239,6 +253,20 @@ "selector": { "metadata": "Person.Individual Engagement Level" } + }, + { + "properties": { + "value": { + "expr": { + "Literal": { + "Value": "131.70815899491618D" + } + } + } + }, + "selector": { + "metadata": "Arrangement Type.Arrangement Type" + } } ], "total": [ @@ -543,5 +571,93 @@ ] }, "drillFilterOtherVisuals": true + }, + "filterConfig": { + "filters": [ + { + "name": "f927ea238a9001343c52", + "field": { + "Column": { + "Expression": { + "SourceRef": { + "Entity": "Client Family" + } + }, + "Property": "Family Name" + } + }, + "type": "Categorical" + }, + { + "name": "60cfef39a60d1b657a81", + "field": { + "Column": { + "Expression": { + "SourceRef": { + "Entity": "Client Person" + } + }, + "Property": "Full Name" + } + }, + "type": "Categorical" + }, + { + "name": "535281ef0c7968d9418e", + "field": { + "Column": { + "Expression": { + "SourceRef": { + "Entity": "Arrangement Type" + } + }, + "Property": "Arrangement Type" + } + }, + "type": "Categorical" + }, + { + "name": "89d711be5c24a091c517", + "field": { + "Column": { + "Expression": { + "SourceRef": { + "Entity": "Arrangements" + } + }, + "Property": "Arrangement ID" + } + }, + "type": "Categorical" + }, + { + "name": "e1aa788280e73badd000", + "field": { + "Measure": { + "Expression": { + "SourceRef": { + "Entity": "Person" + } + }, + "Property": "Individual Engagement Level" + } + }, + "type": "Advanced" + }, + { + "name": "6a9115de1a8cdb06703e", + "field": { + "Column": { + "Expression": { + "SourceRef": { + "Entity": "Individual Function Assignments" + } + }, + "Property": "Function" + } + }, + "type": "Categorical" + } + ] } } \ No newline at end of file diff --git a/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/5bbba6e903b286db133d/visual.json b/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/5bbba6e903b286db133d/visual.json index ee4492c..1a66541 100644 --- a/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/5bbba6e903b286db133d/visual.json +++ b/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/5bbba6e903b286db133d/visual.json @@ -1,5 +1,5 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.2.0/schema.json", "name": "5bbba6e903b286db133d", "position": { "x": 10.443686006825939, @@ -151,13 +151,8 @@ }, "text": { "expr": { - "Measure": { - "Expression": { - "SourceRef": { - "Entity": "Engagement by Entity" - } - }, - "Property": "# Approved Entities (Dynamic Title)" + "Literal": { + "Value": "'# of Approved Entities'" } } }, diff --git a/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/f0e43f9fd05668cac760/visual.json b/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/f0e43f9fd05668cac760/visual.json index 0f2872c..131d6c6 100644 --- a/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/f0e43f9fd05668cac760/visual.json +++ b/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/f0e43f9fd05668cac760/visual.json @@ -1,5 +1,5 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.2.0/schema.json", "name": "f0e43f9fd05668cac760", "position": { "x": 10.443686006825939, @@ -150,13 +150,8 @@ }, "text": { "expr": { - "Measure": { - "Expression": { - "SourceRef": { - "Entity": "Engagement by Entity" - } - }, - "Property": "# Engaged Entities (Dynamic Title)" + "Literal": { + "Value": "'# of Engaged Entities'" } } }, @@ -186,5 +181,23 @@ ] }, "drillFilterOtherVisuals": true + }, + "filterConfig": { + "filters": [ + { + "name": "2041060429ab86a6a5a9", + "field": { + "Measure": { + "Expression": { + "SourceRef": { + "Entity": "Engagement Group" + } + }, + "Property": "# of Engaged Entities" + } + }, + "type": "Advanced" + } + ] } } \ No newline at end of file diff --git a/CareTogether.SemanticModel/definition/tables/Engagement Group.tmdl b/CareTogether.SemanticModel/definition/tables/Engagement Group.tmdl index 05536a7..c09cb2f 100644 --- a/CareTogether.SemanticModel/definition/tables/Engagement Group.tmdl +++ b/CareTogether.SemanticModel/definition/tables/Engagement Group.tmdl @@ -53,13 +53,15 @@ table 'Engagement Group' Option, "Family", CALCULATE( DISTINCTCOUNT('Family Role Approvals'[Entity UID]), - 'Approval Type'[Approval Type] = "Direct" + 'Approval Type'[Approval Type] = "Direct", + 'Approval Status'[Status] IN {"Approved", "Onboarded"} ), "Person", CALCULATE( DISTINCTCOUNT('Individual Role Approvals'[Entity UID]), - 'Approval Type'[Approval Type] = "Direct" - ) + 'Approval Type'[Approval Type] = "Direct", + 'Approval Status'[Status] IN {"Approved", "Onboarded"} ) + ) formatString: 0 lineageTag: 249e807f-8f3e-4681-ab99-8d5d0bc3aadf diff --git a/CareTogether.SemanticModel/definition/tables/Location Client.tmdl b/CareTogether.SemanticModel/definition/tables/Location Client.tmdl index 1bcc30e..2ddaa92 100644 --- a/CareTogether.SemanticModel/definition/tables/Location Client.tmdl +++ b/CareTogether.SemanticModel/definition/tables/Location Client.tmdl @@ -41,8 +41,6 @@ table 'Location Client' #"Renamed Columns" ``` - changedProperty = Name - annotation PBI_NavigationStepName = Navigation annotation PBI_ResultType = Table