Skip to content

Commit

Permalink
Upgrade to TMDL & Info Matrix added
Browse files Browse the repository at this point in the history
  • Loading branch information
mthierba committed Nov 28, 2023
1 parent 6c27b42 commit c8b434f
Show file tree
Hide file tree
Showing 138 changed files with 1,143 additions and 1,436 deletions.
4 changes: 2 additions & 2 deletions .pbixproj.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@
}
},
"parameters": {
"[Version]": "1.0.0",
"[Version]": "1.1.0",
"WORKSPACE": "Calgary-Demo",
"[SQL Schema]": "PowerBI--{{ENVIRONMENT}}--Contoso@1.0.0",
"[SQL Schema]": "PowerBI--{{ENVIRONMENT}}--Contoso@1.1.0",
"SCHEMA_BASE_NAME": "PowerBI--{{ENVIRONMENT}}--Contoso",
"[SQL Server]": "pbitools-demo-01.database.windows.net",
"[SQL Database]": "Contoso",
Expand Down
4 changes: 2 additions & 2 deletions Contoso Dataset/.pbixproj.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": "0.12",
"version": "0.13",
"created": "2022-07-20T08:13:22.5835413+01:00",
"lastModified": "2022-07-20T08:22:37.0289475+01:00",
"lastModified": "2023-11-28T19:49:19.7082912+00:00",
"settings": {
"model": {
"serializationMode": "Default",
Expand Down
28 changes: 21 additions & 7 deletions Contoso Dataset/DiagramLayout.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{
"location": {
"x": 1370.2741170268844,
"y": 350.77677033913204
"y": 399.08747144614313
},
"nodeIndex": "Currency Exchange",
"size": {
Expand All @@ -23,7 +23,7 @@
{
"location": {
"x": 349.19876998769985,
"y": 96.621402214022169
"y": 144.93210332103325
},
"nodeIndex": "Customers",
"size": {
Expand All @@ -35,7 +35,7 @@
{
"location": {
"x": 1335.8858548585488,
"y": 677.74268142681433
"y": 726.05338253382547
},
"nodeIndex": "Date",
"size": {
Expand All @@ -47,7 +47,7 @@
{
"location": {
"x": 1022.2622386223862,
"y": 124.16051660516609
"y": 172.47121771217718
},
"nodeIndex": "Products",
"size": {
Expand All @@ -59,7 +59,7 @@
{
"location": {
"x": 404.89755754700406,
"y": 640.15238458542592
"y": 688.46308569243706
},
"nodeIndex": "Sales",
"size": {
Expand All @@ -71,21 +71,35 @@
{
"location": {
"x": 688.1938499384994,
"y": 98.327183271832723
"y": 146.63788437884381
},
"nodeIndex": "Stores",
"size": {
"height": 296,
"width": 234
},
"zIndex": 5
},
{
"location": {
"x": 1305.0753470391846,
"y": 377.076192292713
},
"nodeIndex": "Info",
"nodeLineageTag": "70da6bba-5162-4cb4-8a19-07dcea31c08b",
"size": {
"height": 296,
"width": 234
},
"zIndex": 0
}
],
"name": "All tables",
"zoomValue": 70,
"pinKeyFieldsToTop": true,
"showExtraHeaderInfo": true,
"hideKeyFieldsWhenCollapsed": false
"hideKeyFieldsWhenCollapsed": false,
"tablesLocked": false
}
],
"selectedDiagram": "All tables",
Expand Down
11 changes: 0 additions & 11 deletions Contoso Dataset/Model/cultures/en-US.json

This file was deleted.

10 changes: 10 additions & 0 deletions Contoso Dataset/Model/cultures/en-US.tmdl
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
culture en-US
linguisticMetadata:
content =
{
"Version": "1.0.0",
"Language": "en-US",
"DynamicImprovement": "HighConfidence"
}
contentType: Json

93 changes: 0 additions & 93 deletions Contoso Dataset/Model/database.json

This file was deleted.

38 changes: 38 additions & 0 deletions Contoso Dataset/Model/expressions.tmdl
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
expression '[SQL Server]' = "pbitools-demo-01.database.windows.net" meta [IsParameterQuery=true, Type="Text", IsParameterQueryRequired=true]
lineageTag: e6298aa0-8571-47f0-a389-a50c5b256cef
queryGroup: Parameters

annotation PBI_NavigationStepName = Navigation

annotation PBI_ResultType = Text

expression '[SQL Database]' = "Contoso" meta [IsParameterQuery=true, Type="Text", IsParameterQueryRequired=true]
lineageTag: 6cdf0b71-842d-4cf9-911b-0643277b45ec
queryGroup: Parameters

annotation PBI_ResultType = Text

expression '[SQL Schema]' = "dbo" meta [IsParameterQuery=true, Type="Text", IsParameterQueryRequired=true]
lineageTag: 34b73998-9e7d-4e45-a875-f7b03eb32a12
queryGroup: Parameters

annotation PBI_ResultType = Text

expression [Environment] = "ENVIRONMENT" meta [IsParameterQuery=true, Type="Text", IsParameterQueryRequired=true]
lineageTag: ddbdd34e-ea2d-4521-81a1-92d945b52582

expression [GH-Branch] = "GH-Branch" meta [IsParameterQuery=true, Type="Text", IsParameterQueryRequired=true]
lineageTag: c1f49751-4367-494f-ba3a-453d86491c05

expression [GH-RunId] = "GH-RunId" meta [IsParameterQuery=true, Type="Text", IsParameterQueryRequired=true]
lineageTag: c02c3091-0fb4-41cc-a04b-ead14a8bcbbe

expression [GH-SHA] = "GH-SHA" meta [IsParameterQuery=true, Type="Text", IsParameterQueryRequired=true]
lineageTag: 01f005eb-6bb7-49b7-8d02-bae1593a572d

expression [PBITOOLS_VERSION] = "PBITOOLS_VERSION" meta [IsParameterQuery=true, Type="Text", IsParameterQueryRequired=true]
lineageTag: 8d1e5ad7-44b0-4358-b714-74d1ca04d619

expression [Version] = "VERSION" meta [IsParameterQuery=true, Type="Text", IsParameterQueryRequired=true]
lineageTag: b2942f8e-2b73-460e-8ac1-b20e7e31c124

34 changes: 34 additions & 0 deletions Contoso Dataset/Model/model.tmdl
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
model Model
culture: en-US
defaultPowerBIDataSourceVersion: PowerBI_V3
sourceQueryCulture: en-GB
dataAccessOptions:
legacyRedirects
returnErrorValuesAsNull

queryGroup Parameters

annotation PBI_QueryGroupOrder = 0

annotation __PBI_TimeIntelligenceEnabled = 0

annotation PBIDesktopVersion = 2.123.742.0 (23.11)

annotation PBI_QueryOrder = ["[SQL Server]","[SQL Database]","Currency Exchange","Customers","Date","Products","Sales","Stores","[SQL Schema]","Info","[Environment]","[GH-Branch]","[GH-RunId]","[GH-SHA]","[PBITOOLS_VERSION]","[Version]"]

ref table 'Currency Exchange'

ref table Customers

ref table Date

ref table Info

ref table Products

ref table Sales

ref table Stores

ref culture en-US

5 changes: 0 additions & 5 deletions Contoso Dataset/Model/queries/Currency Exchange.m

This file was deleted.

5 changes: 0 additions & 5 deletions Contoso Dataset/Model/queries/Customers.m

This file was deleted.

5 changes: 0 additions & 5 deletions Contoso Dataset/Model/queries/Date.m

This file was deleted.

19 changes: 0 additions & 19 deletions Contoso Dataset/Model/queries/Info.m

This file was deleted.

5 changes: 0 additions & 5 deletions Contoso Dataset/Model/queries/Products.m

This file was deleted.

5 changes: 0 additions & 5 deletions Contoso Dataset/Model/queries/Sales.m

This file was deleted.

5 changes: 0 additions & 5 deletions Contoso Dataset/Model/queries/Stores.m

This file was deleted.

1 change: 0 additions & 1 deletion Contoso Dataset/Model/queries/[Environment].m

This file was deleted.

1 change: 0 additions & 1 deletion Contoso Dataset/Model/queries/[GH-Branch].m

This file was deleted.

1 change: 0 additions & 1 deletion Contoso Dataset/Model/queries/[GH-RunId].m

This file was deleted.

1 change: 0 additions & 1 deletion Contoso Dataset/Model/queries/[GH-SHA].m

This file was deleted.

1 change: 0 additions & 1 deletion Contoso Dataset/Model/queries/[PBITOOLS_VERSION].m

This file was deleted.

1 change: 0 additions & 1 deletion Contoso Dataset/Model/queries/[SQL Database].m

This file was deleted.

1 change: 0 additions & 1 deletion Contoso Dataset/Model/queries/[SQL Schema].m

This file was deleted.

1 change: 0 additions & 1 deletion Contoso Dataset/Model/queries/[SQL Server].m

This file was deleted.

1 change: 0 additions & 1 deletion Contoso Dataset/Model/queries/[Version].m

This file was deleted.

Loading

0 comments on commit c8b434f

Please sign in to comment.