Skip to content

Hotfix/couting families approval tracker #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcusgraca merged 2 commits into from
Aug 18, 2025
Merged

Hotfix/couting families approval tracker #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d989c7e
Fixed BUG with Families in the approval tracker
marcusgraca Aug 7, 2025
87db0a3
Fixed the counting of families in Approval Tracker
marcusgraca Aug 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
120 changes: 118 additions & 2 deletions ...her.Report/definition/pages/03622d788c359b5e7432/visuals/d6084660d102c3617329/visual.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
},
"queryRef": "Role Approval.Entity Type",
"nativeQueryRef": "Entity Type",
"active": false
"active": true
},
{
"field": {
Expand Down Expand Up @@ -99,6 +99,23 @@
}
]
}
},
"sortDefinition": {
"sort": [
{
"field": {
"Column": {
"Expression": {
"SourceRef": {
"Entity": "Role Approval"
}
},
"Property": "Entity Name"
}
},
"direction": "Ascending"
}
]
}
},
"expansionStates": [
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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"
}
]
}
}
2 changes: 1 addition & 1 deletion ...her.Report/definition/pages/b86606d8cc618ca89105/visuals/db179545061c8d04967d/visual.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
[
{
"Literal": {
"Value": "'Family'"
"Value": "'Person'"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion CareTogether.Report/definition/pages/pages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
"ReportSectiondde1dd56e86a6be0bd57",
"e3e436ecd75be754ee24"
],
"activePageName": "d08ff20b71001be16c90"
"activePageName": "03622d788c359b5e7432"
}
17 changes: 16 additions & 1 deletion CareTogether.Report/definition/report.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,22 @@
}
},
"type": "Categorical",
"howCreated": "User"
"howCreated": "User",
"objects": {
"general": [
{
"properties": {
"isInvertedSelectionMode": {
"expr": {
"Literal": {
"Value": "true"
}
}
}
}
}
]
}
}
],
"filterSortOrder": "Custom"
Expand Down
44 changes: 22 additions & 22 deletions CareTogether.SemanticModel/definition/model.tmdl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'
Expand All @@ -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'
Expand Down
4 changes: 4 additions & 0 deletions CareTogether.SemanticModel/definition/relationships.tmdl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

4 changes: 2 additions & 2 deletions CareTogether.SemanticModel/definition/tables/Approval Status.tmdl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ table 'Approval Status'
in
#"Changed Type"

annotation PBI_ResultType = Table

annotation PBI_NavigationStepName = Navigation

annotation PBI_ResultType = Table

22 changes: 11 additions & 11 deletions CareTogether.SemanticModel/definition/tables/Arrangement Type.tmdl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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

Expand Down Expand Up @@ -62,7 +62,7 @@ table 'Arrangement Type'
ArrangementType
```

annotation PBI_ResultType = Table

annotation PBI_NavigationStepName = Navigation

annotation PBI_ResultType = Table

Loading
Loading