diff --git a/CareTogether.Report/definition/pages/03622d788c359b5e7432/visuals/d6084660d102c3617329/visual.json b/CareTogether.Report/definition/pages/03622d788c359b5e7432/visuals/d6084660d102c3617329/visual.json index 6665e54..63e6c7b 100644 --- a/CareTogether.Report/definition/pages/03622d788c359b5e7432/visuals/d6084660d102c3617329/visual.json +++ b/CareTogether.Report/definition/pages/03622d788c359b5e7432/visuals/d6084660d102c3617329/visual.json @@ -62,7 +62,7 @@ }, "queryRef": "Role Approval.Entity Type", "nativeQueryRef": "Entity Type", - "active": false + "active": true }, { "field": { @@ -99,6 +99,23 @@ } ] } + }, + "sortDefinition": { + "sort": [ + { + "field": { + "Column": { + "Expression": { + "SourceRef": { + "Entity": "Role Approval" + } + }, + "Property": "Entity Name" + } + }, + "direction": "Ascending" + } + ] } }, "expansionStates": [ @@ -150,10 +167,35 @@ "Role Approval.Entity Name" ], "isCollapsed": true, + "identityKeys": [ + { + "Column": { + "Expression": { + "SourceRef": { + "Entity": "Role Approval" + } + }, + "Property": "Entity Name" + } + } + ], "isPinned": true } ], - "root": {} + "root": { + "children": [ + { + "identityValues": [ + { + "Literal": { + "Value": "'Host Family'" + } + } + ], + "isToggled": true + } + ] + } } ], "objects": { @@ -859,5 +901,79 @@ ] }, "drillFilterOtherVisuals": true + }, + "filterConfig": { + "filters": [ + { + "name": "d5cc457d931685967877", + "field": { + "Column": { + "Expression": { + "SourceRef": { + "Entity": "Approval Status" + } + }, + "Property": "Status" + } + }, + "type": "Categorical" + }, + { + "name": "40bdb127b593b16ae80e", + "field": { + "Column": { + "Expression": { + "SourceRef": { + "Entity": "Role Approval" + } + }, + "Property": "Role Name" + } + }, + "type": "Categorical" + }, + { + "name": "4bdc536ba026360c0856", + "field": { + "Column": { + "Expression": { + "SourceRef": { + "Entity": "Role Approval" + } + }, + "Property": "Entity Type" + } + }, + "type": "Categorical" + }, + { + "name": "98237feb5dc58c05ce4d", + "field": { + "Column": { + "Expression": { + "SourceRef": { + "Entity": "Role Approval" + } + }, + "Property": "Entity Name" + } + }, + "type": "Categorical" + }, + { + "name": "cff85d29358cd430061a", + "field": { + "Measure": { + "Expression": { + "SourceRef": { + "Entity": "Role Approval" + } + }, + "Property": "# Approval Tracker" + } + }, + "type": "Advanced" + } + ] } } \ No newline at end of file diff --git a/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/db179545061c8d04967d/visual.json b/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/db179545061c8d04967d/visual.json index dc65107..fef4e0c 100644 --- a/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/db179545061c8d04967d/visual.json +++ b/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/db179545061c8d04967d/visual.json @@ -108,7 +108,7 @@ [ { "Literal": { - "Value": "'Family'" + "Value": "'Person'" } } ] diff --git a/CareTogether.Report/definition/pages/pages.json b/CareTogether.Report/definition/pages/pages.json index 69d95c0..d43be7c 100644 --- a/CareTogether.Report/definition/pages/pages.json +++ b/CareTogether.Report/definition/pages/pages.json @@ -13,5 +13,5 @@ "ReportSectiondde1dd56e86a6be0bd57", "e3e436ecd75be754ee24" ], - "activePageName": "d08ff20b71001be16c90" + "activePageName": "03622d788c359b5e7432" } \ No newline at end of file diff --git a/CareTogether.Report/definition/report.json b/CareTogether.Report/definition/report.json index 1916cdb..6cfa064 100644 --- a/CareTogether.Report/definition/report.json +++ b/CareTogether.Report/definition/report.json @@ -81,7 +81,22 @@ } }, "type": "Categorical", - "howCreated": "User" + "howCreated": "User", + "objects": { + "general": [ + { + "properties": { + "isInvertedSelectionMode": { + "expr": { + "Literal": { + "Value": "true" + } + } + } + } + } + ] + } } ], "filterSortOrder": "Custom" diff --git a/CareTogether.SemanticModel/definition/model.tmdl b/CareTogether.SemanticModel/definition/model.tmdl index c2e0486..9357649 100644 --- a/CareTogether.SemanticModel/definition/model.tmdl +++ b/CareTogether.SemanticModel/definition/model.tmdl @@ -11,6 +11,11 @@ queryGroup 'Source Queries' annotation PBI_QueryGroupOrder = 0 +/// Row Level Security Tables +queryGroup RLS + + annotation PBI_QueryGroupOrder = 4 + queryGroup 'Model Queries' annotation PBI_QueryGroupOrder = 1 @@ -24,43 +29,39 @@ queryGroup 'Consolidated Entities' annotation PBI_QueryGroupOrder = 3 -/// Row Level Security Tables -queryGroup RLS - - annotation PBI_QueryGroupOrder = 4 - annotation PBI_QueryOrder = ["Community","Role","OData Live","Production","Referral","Arrangement","Arrangement Type","Child Location Record","Approval Status","Close Reason","Arrangement Phase","Childcare","Childcare Plan","Date","_Measures","Community Member Families","Community Role Assignments","Function Assignments","Entity","Role Approval","RLS Location User - Approvals","RLS Location User - Arrangements","RLS Location User - Referral","RLS Location User - Locations","RLS Location User - Community","Location","RLS Location User - Arrangement Type","RLS Location User - Role","RLS Location User - Entity"] annotation __PBI_TimeIntelligenceEnabled = 1 -annotation PBIDesktopVersion = 2.145.1262.0 (25.07)+10bdeda5ab0db954b2cf824e7a117ad7cee97f88 +annotation PBIDesktopVersion = 2.145.1602.0 (25.07)+10647c9fa319b5e39936cdb21328038c371d1fe4 annotation PBI_ProTooling = ["CalcGroup","DevMode","DaxQueryView_Desktop"] -annotation PBI_RemovedChildren = [{"remoteItemId":{"foreignKeyRelationship":{"fromTableLocalLineageTag":"46d5bd4a-a507-4eb7-941d-b7680ccdeaa3","fromColumnLocalLineageTag":"c2ba4d85-eb62-48a9-9d35-f7ec94997aef","toTableLocalLineageTag":"d767a338-d9a5-4e00-8b61-2f6469d3aa63","toColumnLocalLineageTag":"048d136e-c963-4efb-954c-117136ca81da"}},"objectType":"Relationship"}] - annotation __TEdtr = 1 -ref table DateTableTemplate_281570fe-3908-44fd-b0fc-579445d6c411 +annotation PBI_RemovedChildren = [{"remoteItemId":{"foreignKeyRelationship":{"fromTableLocalLineageTag":"46d5bd4a-a507-4eb7-941d-b7680ccdeaa3","fromColumnLocalLineageTag":"c2ba4d85-eb62-48a9-9d35-f7ec94997aef","toTableLocalLineageTag":"d767a338-d9a5-4e00-8b61-2f6469d3aa63","toColumnLocalLineageTag":"048d136e-c963-4efb-954c-117136ca81da"}},"objectType":"Relationship"}] + +ref table Date +ref table Location +ref table 'Function Assignments' +ref table 'Arrangement Type' +ref table Childcare +ref table 'Close Reason' +ref table 'Community Member Families' +ref table Community +ref table 'Community Role Assignments' +ref table 'Child Location Record' +ref table 'Childcare Plan' +ref table ChildLocationExpanded +ref table 'Approval Status' ref table Role +ref table DateTableTemplate_281570fe-3908-44fd-b0fc-579445d6c411 ref table Referral ref table Arrangement ref table LocalDateTable_badf15b7-4811-4e5f-aee5-299aaab58eca ref table LocalDateTable_d64749d8-d763-4d50-94b8-a3acfe90e321 ref table LocalDateTable_73d01070-72e6-4583-b4ff-d5fa05eb2eee -ref table 'Arrangement Type' -ref table 'Child Location Record' -ref table 'Approval Status' -ref table 'Close Reason' ref table 'Arrangement Phase' -ref table Childcare -ref table 'Childcare Plan' -ref table Date -ref table ChildLocationExpanded -ref table Community -ref table 'Community Member Families' -ref table 'Community Role Assignments' -ref table 'Function Assignments' ref table Entity ref table LocalDateTable_de2c3251-3f42-4917-b1a3-c8994b5b4a55 ref table 'Role Approval' @@ -76,7 +77,6 @@ ref table LocalDateTable_dff05e92-cf4f-4a2f-8fa1-12d5156f3746 ref table 'RLS Location User - Referral' ref table 'RLS Location User - Locations' ref table 'RLS Location User - Community' -ref table Location ref table 'RLS Location User - Arrangement Type' ref table 'RLS Location User - Role' ref table 'RLS Location User - Entity' diff --git a/CareTogether.SemanticModel/definition/relationships.tmdl b/CareTogether.SemanticModel/definition/relationships.tmdl index 0d28902..d2ded88 100644 --- a/CareTogether.SemanticModel/definition/relationships.tmdl +++ b/CareTogether.SemanticModel/definition/relationships.tmdl @@ -207,3 +207,7 @@ relationship 10870e51-e908-9513-3cd3-cfdb9fcb195b fromColumn: 'Role Approval'.'Role Name' toColumn: Role.'Role Name' +relationship 65e2d38c-306d-a183-5743-844f5f716512 + fromColumn: 'Role Approval'.LocationId + toColumn: Location.Id + diff --git a/CareTogether.SemanticModel/definition/tables/Approval Status.tmdl b/CareTogether.SemanticModel/definition/tables/Approval Status.tmdl index 9a32161..07c61b2 100644 --- a/CareTogether.SemanticModel/definition/tables/Approval Status.tmdl +++ b/CareTogether.SemanticModel/definition/tables/Approval Status.tmdl @@ -52,7 +52,7 @@ table 'Approval Status' in #"Changed Type" - annotation PBI_ResultType = Table - annotation PBI_NavigationStepName = Navigation + annotation PBI_ResultType = Table + diff --git a/CareTogether.SemanticModel/definition/tables/Arrangement Type.tmdl b/CareTogether.SemanticModel/definition/tables/Arrangement Type.tmdl index 2f5bedc..cf2da34 100644 --- a/CareTogether.SemanticModel/definition/tables/Arrangement Type.tmdl +++ b/CareTogether.SemanticModel/definition/tables/Arrangement Type.tmdl @@ -1,14 +1,11 @@ table 'Arrangement Type' lineageTag: c7cb613d-9d95-4212-99b0-afeb17ed7411 - column ChildInvolvement + column 'RLS Key' dataType: string - isHidden - lineageTag: 106f4bcb-6fa8-4ebc-a504-f2cad0bf9090 + lineageTag: d5779dd9-d981-42f6-a99f-94f9a0b4660d summarizeBy: none - sourceColumn: ChildInvolvement - - changedProperty = IsHidden + sourceColumn: RLS Key annotation SummarizationSetBy = Automatic @@ -20,11 +17,14 @@ table 'Arrangement Type' annotation SummarizationSetBy = Automatic - column 'RLS Key' + column ChildInvolvement dataType: string - lineageTag: d5779dd9-d981-42f6-a99f-94f9a0b4660d + isHidden + lineageTag: 106f4bcb-6fa8-4ebc-a504-f2cad0bf9090 summarizeBy: none - sourceColumn: RLS Key + sourceColumn: ChildInvolvement + + changedProperty = IsHidden annotation SummarizationSetBy = Automatic @@ -62,7 +62,7 @@ table 'Arrangement Type' ArrangementType ``` - annotation PBI_ResultType = Table - annotation PBI_NavigationStepName = Navigation + annotation PBI_ResultType = Table + diff --git a/CareTogether.SemanticModel/definition/tables/Child Location Record.tmdl b/CareTogether.SemanticModel/definition/tables/Child Location Record.tmdl index 27a3ca4..98165e2 100644 --- a/CareTogether.SemanticModel/definition/tables/Child Location Record.tmdl +++ b/CareTogether.SemanticModel/definition/tables/Child Location Record.tmdl @@ -188,51 +188,39 @@ table 'Child Location Record' formatString: 0 lineageTag: 2e84ddd1-74f4-473b-9b8d-b93b89c10625 - column ArrangementId - dataType: string - isHidden - displayFolder: _Columns - lineageTag: 35cd963b-9383-49a0-8f43-957369306c02 - summarizeBy: none - sourceColumn: ArrangementId - - changedProperty = IsHidden - - annotation SummarizationSetBy = Automatic - - column ChildPersonId + column 'RLS Key' dataType: string - isHidden - displayFolder: _Columns - lineageTag: 88b1135a-1cb9-4149-ae6c-ab177bf74225 + lineageTag: 82281731-b782-4fa0-bf7b-4389ce679571 summarizeBy: none - sourceColumn: ChildPersonId - - changedProperty = IsHidden + sourceColumn: RLS Key annotation SummarizationSetBy = Automatic - column FamilyId - dataType: string - isHidden - displayFolder: _Columns - lineageTag: b8f54091-35b4-4e2c-a854-de0b3e59a7cd + column Started + dataType: dateTime + formatString: General Date + lineageTag: 6bbd5812-018b-4fed-8cb0-b4029fe9195c summarizeBy: none - sourceColumn: FamilyId + sourceColumn: Started - changedProperty = IsHidden + variation Variation + isDefault + relationship: 18a4db2c-4e05-4ea5-8f43-5fb9d592bd70 + defaultHierarchy: LocalDateTable_9ca3cc68-8275-4543-b0b6-67540c77809a.'Date Hierarchy' annotation SummarizationSetBy = Automatic - column ChildcarePlan - dataType: string - isHidden - displayFolder: _Columns - lineageTag: 2bdb74fb-63d5-42fe-8be3-6347f3570834 + column Ended + dataType: dateTime + formatString: General Date + lineageTag: bb9fc08e-ab1b-4525-954d-52ce0e4aaf98 summarizeBy: none - sourceColumn: ChildcarePlan + sourceColumn: Ended - changedProperty = IsHidden + variation Variation + isDefault + relationship: 5219e77b-bbc9-450b-a090-ed7b1f9e6270 + defaultHierarchy: LocalDateTable_dff05e92-cf4f-4a2f-8fa1-12d5156f3746.'Date Hierarchy' annotation SummarizationSetBy = Automatic @@ -272,55 +260,67 @@ table 'Child Location Record' annotation SummarizationSetBy = Automatic - column OrganizationId + column ArrangementId dataType: string - lineageTag: 87f794c6-4604-4114-bf59-6ed71a889e40 + isHidden + displayFolder: _Columns + lineageTag: 35cd963b-9383-49a0-8f43-957369306c02 summarizeBy: none - sourceColumn: OrganizationId + sourceColumn: ArrangementId + + changedProperty = IsHidden annotation SummarizationSetBy = Automatic - column LocationId + column ChildPersonId dataType: string - lineageTag: faa6577f-a1d5-449b-810e-9a26b33f9a83 + isHidden + displayFolder: _Columns + lineageTag: 88b1135a-1cb9-4149-ae6c-ab177bf74225 summarizeBy: none - sourceColumn: LocationId + sourceColumn: ChildPersonId + + changedProperty = IsHidden annotation SummarizationSetBy = Automatic - column 'RLS Key' + column FamilyId dataType: string - lineageTag: 82281731-b782-4fa0-bf7b-4389ce679571 + isHidden + displayFolder: _Columns + lineageTag: b8f54091-35b4-4e2c-a854-de0b3e59a7cd summarizeBy: none - sourceColumn: RLS Key + sourceColumn: FamilyId + + changedProperty = IsHidden annotation SummarizationSetBy = Automatic - column Started - dataType: dateTime - formatString: General Date - lineageTag: 6bbd5812-018b-4fed-8cb0-b4029fe9195c + column ChildcarePlan + dataType: string + isHidden + displayFolder: _Columns + lineageTag: 2bdb74fb-63d5-42fe-8be3-6347f3570834 summarizeBy: none - sourceColumn: Started + sourceColumn: ChildcarePlan - variation Variation - isDefault - relationship: 18a4db2c-4e05-4ea5-8f43-5fb9d592bd70 - defaultHierarchy: LocalDateTable_9ca3cc68-8275-4543-b0b6-67540c77809a.'Date Hierarchy' + changedProperty = IsHidden annotation SummarizationSetBy = Automatic - column Ended - dataType: dateTime - formatString: General Date - lineageTag: bb9fc08e-ab1b-4525-954d-52ce0e4aaf98 + column OrganizationId + dataType: string + lineageTag: 87f794c6-4604-4114-bf59-6ed71a889e40 summarizeBy: none - sourceColumn: Ended + sourceColumn: OrganizationId - variation Variation - isDefault - relationship: 5219e77b-bbc9-450b-a090-ed7b1f9e6270 - defaultHierarchy: LocalDateTable_dff05e92-cf4f-4a2f-8fa1-12d5156f3746.'Date Hierarchy' + annotation SummarizationSetBy = Automatic + + column LocationId + dataType: string + lineageTag: faa6577f-a1d5-449b-810e-9a26b33f9a83 + summarizeBy: none + sourceColumn: LocationId annotation SummarizationSetBy = Automatic @@ -369,7 +369,7 @@ table 'Child Location Record' #"Removed Duplicates" ``` - annotation PBI_ResultType = Table - annotation PBI_NavigationStepName = Navigation + annotation PBI_ResultType = Table + diff --git a/CareTogether.SemanticModel/definition/tables/ChildLocationExpanded.tmdl b/CareTogether.SemanticModel/definition/tables/ChildLocationExpanded.tmdl index 0773798..3a58b53 100644 --- a/CareTogether.SemanticModel/definition/tables/ChildLocationExpanded.tmdl +++ b/CareTogether.SemanticModel/definition/tables/ChildLocationExpanded.tmdl @@ -1,12 +1,12 @@ table ChildLocationExpanded lineageTag: 1ad7d14d-cbb6-433b-85ee-5fc54cf0046c - column OvernightStay - formatString: """TRUE"";""TRUE"";""FALSE""" - lineageTag: 787eef0b-4782-465f-b3bc-d3e29ee8e5bb + column Date + formatString: General Date + lineageTag: 7a8d7e88-19f5-400f-b564-81ac64deded9 summarizeBy: none isNameInferred - sourceColumn: [OvernightStay] + sourceColumn: [Date] annotation SummarizationSetBy = Automatic @@ -19,20 +19,20 @@ table ChildLocationExpanded annotation SummarizationSetBy = Automatic - column Date - formatString: General Date - lineageTag: 7a8d7e88-19f5-400f-b564-81ac64deded9 + column ChildcarePlan + lineageTag: d2112788-be7f-48b7-b736-0594325c6e23 summarizeBy: none isNameInferred - sourceColumn: [Date] + sourceColumn: [ChildcarePlan] annotation SummarizationSetBy = Automatic - column ChildcarePlan - lineageTag: d2112788-be7f-48b7-b736-0594325c6e23 + column OvernightStay + formatString: """TRUE"";""TRUE"";""FALSE""" + lineageTag: 787eef0b-4782-465f-b3bc-d3e29ee8e5bb summarizeBy: none isNameInferred - sourceColumn: [ChildcarePlan] + sourceColumn: [OvernightStay] annotation SummarizationSetBy = Automatic diff --git a/CareTogether.SemanticModel/definition/tables/Childcare Plan.tmdl b/CareTogether.SemanticModel/definition/tables/Childcare Plan.tmdl index 7022b77..01f40e4 100644 --- a/CareTogether.SemanticModel/definition/tables/Childcare Plan.tmdl +++ b/CareTogether.SemanticModel/definition/tables/Childcare Plan.tmdl @@ -47,7 +47,7 @@ table 'Childcare Plan' in #"Changed Type" - annotation PBI_ResultType = Table - annotation PBI_NavigationStepName = Navigation + annotation PBI_ResultType = Table + diff --git a/CareTogether.SemanticModel/definition/tables/Childcare.tmdl b/CareTogether.SemanticModel/definition/tables/Childcare.tmdl index 84b2752..c41ba92 100644 --- a/CareTogether.SemanticModel/definition/tables/Childcare.tmdl +++ b/CareTogether.SemanticModel/definition/tables/Childcare.tmdl @@ -48,7 +48,7 @@ table Childcare in #"Renamed Columns" - annotation PBI_ResultType = Table - annotation PBI_NavigationStepName = Navigation + annotation PBI_ResultType = Table + diff --git a/CareTogether.SemanticModel/definition/tables/Close Reason.tmdl b/CareTogether.SemanticModel/definition/tables/Close Reason.tmdl index 46c90e0..0a8e1d0 100644 --- a/CareTogether.SemanticModel/definition/tables/Close Reason.tmdl +++ b/CareTogether.SemanticModel/definition/tables/Close Reason.tmdl @@ -49,7 +49,7 @@ table 'Close Reason' in #"Changed Type" - annotation PBI_ResultType = Table - annotation PBI_NavigationStepName = Navigation + annotation PBI_ResultType = Table + diff --git a/CareTogether.SemanticModel/definition/tables/Community Member Families.tmdl b/CareTogether.SemanticModel/definition/tables/Community Member Families.tmdl index 8d4e4e0..b07c1c3 100644 --- a/CareTogether.SemanticModel/definition/tables/Community Member Families.tmdl +++ b/CareTogether.SemanticModel/definition/tables/Community Member Families.tmdl @@ -1,6 +1,14 @@ table 'Community Member Families' lineageTag: 614cb360-e6aa-4352-801e-f51065f1076b + column 'RLS Key' + dataType: string + lineageTag: 42c7c364-dce2-4f41-9878-8aedcc685c27 + summarizeBy: none + sourceColumn: RLS Key + + annotation SummarizationSetBy = Automatic + column CommunityId dataType: string isHidden @@ -23,14 +31,6 @@ table 'Community Member Families' annotation SummarizationSetBy = Automatic - column 'RLS Key' - dataType: string - lineageTag: 42c7c364-dce2-4f41-9878-8aedcc685c27 - summarizeBy: none - sourceColumn: RLS Key - - annotation SummarizationSetBy = Automatic - partition 'Community Member Families' = m mode: import queryGroup: 'Model Queries' @@ -53,7 +53,7 @@ table 'Community Member Families' CommunityMemberFamilies ``` - annotation PBI_ResultType = Table - annotation PBI_NavigationStepName = Navigation + annotation PBI_ResultType = Table + diff --git a/CareTogether.SemanticModel/definition/tables/Community Role Assignments.tmdl b/CareTogether.SemanticModel/definition/tables/Community Role Assignments.tmdl index b2e9692..74b8b86 100644 --- a/CareTogether.SemanticModel/definition/tables/Community Role Assignments.tmdl +++ b/CareTogether.SemanticModel/definition/tables/Community Role Assignments.tmdl @@ -1,6 +1,22 @@ table 'Community Role Assignments' lineageTag: 5d48d610-1f9d-4a9e-bae4-ef9ac4fec4a1 + column 'RLS Key' + dataType: string + lineageTag: 7d7dc74e-96dc-4d55-b1f7-05c70051b20d + summarizeBy: none + sourceColumn: RLS Key + + annotation SummarizationSetBy = Automatic + + column Role + dataType: string + lineageTag: 06599e01-9ba0-42ec-b312-72f9bcf5e226 + summarizeBy: none + sourceColumn: Role + + annotation SummarizationSetBy = Automatic + column CommunityId dataType: string isHidden @@ -23,22 +39,6 @@ table 'Community Role Assignments' annotation SummarizationSetBy = Automatic - column Role - dataType: string - lineageTag: 06599e01-9ba0-42ec-b312-72f9bcf5e226 - summarizeBy: none - sourceColumn: Role - - annotation SummarizationSetBy = Automatic - - column 'RLS Key' - dataType: string - lineageTag: 7d7dc74e-96dc-4d55-b1f7-05c70051b20d - summarizeBy: none - sourceColumn: RLS Key - - annotation SummarizationSetBy = Automatic - partition 'Community Role Assignments' = m mode: import queryGroup: 'Model Queries' @@ -60,7 +60,7 @@ table 'Community Role Assignments' CommunityRoleAssignments ``` - annotation PBI_ResultType = Table - annotation PBI_NavigationStepName = Navigation + annotation PBI_ResultType = Table + diff --git a/CareTogether.SemanticModel/definition/tables/Community.tmdl b/CareTogether.SemanticModel/definition/tables/Community.tmdl index d4462ec..5bbbf2a 100644 --- a/CareTogether.SemanticModel/definition/tables/Community.tmdl +++ b/CareTogether.SemanticModel/definition/tables/Community.tmdl @@ -13,6 +13,22 @@ table Community RETURN IF(ISBLANK(FirstCommunity), "", FirstCommunity) lineageTag: b7d1d23d-01bf-4edc-ab56-d3625c342b19 + column 'RLS Key' + dataType: string + lineageTag: 6dcceb4c-652e-4283-b288-5caad649fe72 + summarizeBy: none + sourceColumn: RLS Key + + annotation SummarizationSetBy = Automatic + + column 'Community Name' + dataType: string + lineageTag: a71ae971-d636-466e-9ad0-1c78feb732f3 + summarizeBy: none + sourceColumn: Community Name + + annotation SummarizationSetBy = Automatic + column Id dataType: string isHidden @@ -32,22 +48,6 @@ table Community annotation SummarizationSetBy = Automatic - column 'Community Name' - dataType: string - lineageTag: a71ae971-d636-466e-9ad0-1c78feb732f3 - summarizeBy: none - sourceColumn: Community Name - - annotation SummarizationSetBy = Automatic - - column 'RLS Key' - dataType: string - lineageTag: 6dcceb4c-652e-4283-b288-5caad649fe72 - summarizeBy: none - sourceColumn: RLS Key - - annotation SummarizationSetBy = Automatic - partition Community = m mode: import queryGroup: 'Model Queries' @@ -73,7 +73,7 @@ table Community Community ``` - annotation PBI_ResultType = Table - annotation PBI_NavigationStepName = Navigation + annotation PBI_ResultType = Table + diff --git a/CareTogether.SemanticModel/definition/tables/Function Assignments.tmdl b/CareTogether.SemanticModel/definition/tables/Function Assignments.tmdl index b72b9e4..f520fed 100644 --- a/CareTogether.SemanticModel/definition/tables/Function Assignments.tmdl +++ b/CareTogether.SemanticModel/definition/tables/Function Assignments.tmdl @@ -1,11 +1,11 @@ table 'Function Assignments' lineageTag: 37dbfcb3-ae81-4dbe-b5b6-66fa9cff03bd - column ArrangementId + column 'RLS Key' dataType: string - lineageTag: 6e947cab-fb5f-4159-a6ed-a29555e29a34 + lineageTag: a62545b1-4137-41f8-9d68-0900e4d3a38f summarizeBy: none - sourceColumn: ArrangementId + sourceColumn: RLS Key annotation SummarizationSetBy = Automatic @@ -17,6 +17,14 @@ table 'Function Assignments' annotation SummarizationSetBy = Automatic + column ArrangementId + dataType: string + lineageTag: 6e947cab-fb5f-4159-a6ed-a29555e29a34 + summarizeBy: none + sourceColumn: ArrangementId + + annotation SummarizationSetBy = Automatic + column OrganizationId dataType: string lineageTag: 3bf90936-d651-468d-84df-2c4743f87024 @@ -33,14 +41,6 @@ table 'Function Assignments' annotation SummarizationSetBy = Automatic - column 'RLS Key' - dataType: string - lineageTag: a62545b1-4137-41f8-9d68-0900e4d3a38f - summarizeBy: none - sourceColumn: RLS Key - - annotation SummarizationSetBy = Automatic - column EntityId dataType: string lineageTag: 2d038b06-0aab-426f-a859-cc8c2f60c7ce diff --git a/CareTogether.SemanticModel/definition/tables/Location.tmdl b/CareTogether.SemanticModel/definition/tables/Location.tmdl index 3c88006..13e1a17 100644 --- a/CareTogether.SemanticModel/definition/tables/Location.tmdl +++ b/CareTogether.SemanticModel/definition/tables/Location.tmdl @@ -9,19 +9,19 @@ table Location annotation SummarizationSetBy = Automatic - column Id + column Location dataType: string - lineageTag: 21cf8ebc-50d3-4f02-9094-2fe85114b691 + lineageTag: 97b1dc7f-4d67-4527-bf14-7423eb64f770 summarizeBy: none - sourceColumn: Id + sourceColumn: Location annotation SummarizationSetBy = Automatic - column Location + column Id dataType: string - lineageTag: 97b1dc7f-4d67-4527-bf14-7423eb64f770 + lineageTag: 21cf8ebc-50d3-4f02-9094-2fe85114b691 summarizeBy: none - sourceColumn: Location + sourceColumn: Id annotation SummarizationSetBy = Automatic diff --git a/CareTogether.SemanticModel/definition/tables/Role.tmdl b/CareTogether.SemanticModel/definition/tables/Role.tmdl index c8bef56..a769d70 100644 --- a/CareTogether.SemanticModel/definition/tables/Role.tmdl +++ b/CareTogether.SemanticModel/definition/tables/Role.tmdl @@ -37,7 +37,7 @@ table Role Role ``` - annotation PBI_ResultType = Table - annotation PBI_NavigationStepName = Navigation + annotation PBI_ResultType = Table + diff --git a/CareTogether.SemanticModel/diagramLayout.json b/CareTogether.SemanticModel/diagramLayout.json index 6b13c4a..92ecf14 100644 --- a/CareTogether.SemanticModel/diagramLayout.json +++ b/CareTogether.SemanticModel/diagramLayout.json @@ -367,7 +367,7 @@ "ordinal": 1, "scrollPosition": { "x": 0, - "y": 647.08299907702633 + "y": 0 }, "nodes": [ {