From 43527d6c98111924fde6431e3dbf64ee9ab5f135 Mon Sep 17 00:00:00 2001 From: chenwu Date: Thu, 2 Apr 2026 15:02:33 +0800 Subject: [PATCH] 0402.0 --- .../visuals/2d12ecf88b5486506b67/visual.json | 2 +- .../visuals/bee83cc92d2c580c4e92/visual.json | 2 +- .../visuals/5cb4df78f5d530cf05f3/visual.json | 2 +- .../visuals/feb9f5082699c47020e7/visual.json | 2 +- .../visuals/c1deb1485428d9c18ec5/visual.json | 2 +- .../visuals/dc0d4b2f6bdd7343352a/visual.json | 2 +- .../visuals/06783054301c00db27eb/visual.json | 59 -- .../visuals/22687a566a79aa10c2d6/visual.json | 21 +- .../visuals/242e2687a7ecde65470a/visual.json | 5 +- .../visuals/2a8b2c548db03777053b/visual.json | 5 +- .../visuals/5bcb92300403b3088670/visual.json | 2 +- .../visuals/82fb1b832e8b58d00dee/visual.json | 21 +- .../visuals/ace762ee553dbc6b74ba/visual.json | 21 +- .../visuals/afafe14227095c6ce0bb/visual.json | 2 +- .../visuals/dd26f9798c6935278ce1/visual.json | 21 +- .../visuals/f4a797718c2a78d3dbc0/visual.json | 5 +- .../visuals/f4e6ab2be3009552d42d/visual.json | 21 +- .../visuals/770f413034713716524b/visual.json | 59 -- .../visuals/fd555d343b71f25376dd/visual.json | 2 +- .../visuals/638bc80ec2537d0b349b/visual.json | 59 -- .../visuals/1876ca94917b9c61550c/visual.json | 21 +- .../visuals/19e6d815c5020636dcc8/visual.json | 21 +- .../visuals/1f49a50ccb9b2c242678/visual.json | 59 -- .../visuals/444d34e12e03161414a5/visual.json | 2 +- .../visuals/67490824220c5d9d603c/visual.json | 21 +- .../visuals/b470285764c2abc4a273/visual.json | 21 +- .../visuals/c82cb626194167bed49e/visual.json | 21 +- .../visuals/d17841875ddc39abab37/visual.json | 5 +- .../visuals/a6e7a2b7056f5490fb28/visual.json | 2 +- .../visuals/4a2f472e93055801dbed/visual.json | 2 +- .../visuals/429213bbdee4bbee6a71/visual.json | 2 +- .../visuals/6e35df83a3041dd6713c/visual.json | 2 +- .../visuals/15e078bb43ab462ded44/visual.json | 2 +- .../visuals/23e50359e7ae900d1964/visual.json | 2 +- .../visuals/c634193f2a2970b632b1/visual.json | 10 +- .../visuals/c6970a7e6a05807080bc/visual.json | 59 -- .../definition/pages/pages.json | 2 +- .../definition/model.tmdl | 2 +- .../definition/relationships.tmdl | 12 + .../definition/tables/00_KPI.tmdl | 318 ++++++++-- .../definition/tables/Fact_Sales_NIAD.tmdl | 164 ++++- .../tables/Fields.FreeReportNIAD.tmdl | 10 +- .../definition/tables/Measure.tmdl | 297 --------- .../diagramLayout.json | 572 +++++------------- 44 files changed, 754 insertions(+), 1190 deletions(-) diff --git a/External All Channel.Report/definition/pages/05d495a4d45dc9188f5f/visuals/2d12ecf88b5486506b67/visual.json b/External All Channel.Report/definition/pages/05d495a4d45dc9188f5f/visuals/2d12ecf88b5486506b67/visual.json index 120a06a..2f48f71 100644 --- a/External All Channel.Report/definition/pages/05d495a4d45dc9188f5f/visuals/2d12ecf88b5486506b67/visual.json +++ b/External All Channel.Report/definition/pages/05d495a4d45dc9188f5f/visuals/2d12ecf88b5486506b67/visual.json @@ -280,7 +280,7 @@ "howCreated": "User" }, { - "name": "fc43b1037a9a5ee03de2", + "name": "c0622963edc1161ae0ae", "field": { "Column": { "Expression": { diff --git a/External All Channel.Report/definition/pages/0c6bf6c9118eec051860/visuals/bee83cc92d2c580c4e92/visual.json b/External All Channel.Report/definition/pages/0c6bf6c9118eec051860/visuals/bee83cc92d2c580c4e92/visual.json index 0e71e77..51cbe7f 100644 --- a/External All Channel.Report/definition/pages/0c6bf6c9118eec051860/visuals/bee83cc92d2c580c4e92/visual.json +++ b/External All Channel.Report/definition/pages/0c6bf6c9118eec051860/visuals/bee83cc92d2c580c4e92/visual.json @@ -280,7 +280,7 @@ "howCreated": "User" }, { - "name": "fc43b1037a9a5ee03de2", + "name": "c0622963edc1161ae0ae", "field": { "Column": { "Expression": { diff --git a/External All Channel.Report/definition/pages/1adfe56cfdfc93fcf3b0/visuals/5cb4df78f5d530cf05f3/visual.json b/External All Channel.Report/definition/pages/1adfe56cfdfc93fcf3b0/visuals/5cb4df78f5d530cf05f3/visual.json index 5a02160..8f858bb 100644 --- a/External All Channel.Report/definition/pages/1adfe56cfdfc93fcf3b0/visuals/5cb4df78f5d530cf05f3/visual.json +++ b/External All Channel.Report/definition/pages/1adfe56cfdfc93fcf3b0/visuals/5cb4df78f5d530cf05f3/visual.json @@ -280,7 +280,7 @@ "howCreated": "User" }, { - "name": "fc43b1037a9a5ee03de2", + "name": "c0622963edc1161ae0ae", "field": { "Column": { "Expression": { diff --git a/External All Channel.Report/definition/pages/533895fc7e570101ad8f/visuals/feb9f5082699c47020e7/visual.json b/External All Channel.Report/definition/pages/533895fc7e570101ad8f/visuals/feb9f5082699c47020e7/visual.json index e4270b3..0924deb 100644 --- a/External All Channel.Report/definition/pages/533895fc7e570101ad8f/visuals/feb9f5082699c47020e7/visual.json +++ b/External All Channel.Report/definition/pages/533895fc7e570101ad8f/visuals/feb9f5082699c47020e7/visual.json @@ -332,7 +332,7 @@ "howCreated": "User" }, { - "name": "fc43b1037a9a5ee03de2", + "name": "c0622963edc1161ae0ae", "field": { "Column": { "Expression": { diff --git a/External All Channel.Report/definition/pages/57cfd40c66e1339a587b/visuals/c1deb1485428d9c18ec5/visual.json b/External All Channel.Report/definition/pages/57cfd40c66e1339a587b/visuals/c1deb1485428d9c18ec5/visual.json index 4e4510d..f2fbbd7 100644 --- a/External All Channel.Report/definition/pages/57cfd40c66e1339a587b/visuals/c1deb1485428d9c18ec5/visual.json +++ b/External All Channel.Report/definition/pages/57cfd40c66e1339a587b/visuals/c1deb1485428d9c18ec5/visual.json @@ -280,7 +280,7 @@ "howCreated": "User" }, { - "name": "fc43b1037a9a5ee03de2", + "name": "c0622963edc1161ae0ae", "field": { "Column": { "Expression": { diff --git a/External All Channel.Report/definition/pages/72d86b23a3c9e4d9b1c6/visuals/dc0d4b2f6bdd7343352a/visual.json b/External All Channel.Report/definition/pages/72d86b23a3c9e4d9b1c6/visuals/dc0d4b2f6bdd7343352a/visual.json index b4d4667..50e2b86 100644 --- a/External All Channel.Report/definition/pages/72d86b23a3c9e4d9b1c6/visuals/dc0d4b2f6bdd7343352a/visual.json +++ b/External All Channel.Report/definition/pages/72d86b23a3c9e4d9b1c6/visuals/dc0d4b2f6bdd7343352a/visual.json @@ -332,7 +332,7 @@ "howCreated": "User" }, { - "name": "fc43b1037a9a5ee03de2", + "name": "c0622963edc1161ae0ae", "field": { "Column": { "Expression": { diff --git a/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/06783054301c00db27eb/visual.json b/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/06783054301c00db27eb/visual.json index 38c9a3f..fee3657 100644 --- a/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/06783054301c00db27eb/visual.json +++ b/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/06783054301c00db27eb/visual.json @@ -352,65 +352,6 @@ } }, "type": "Categorical" - }, - { - "name": "Filter84d74040256b5cbd09f5", - "ordinal": 2, - "field": { - "Measure": { - "Expression": { - "SourceRef": { - "Entity": "00_KPI" - } - }, - "Property": "External.Value.MTH" - } - }, - "type": "Advanced", - "filter": { - "Version": 2, - "From": [ - { - "Name": "0", - "Entity": "00_KPI", - "Type": 0 - }, - { - "Name": "m", - "Entity": "Measure", - "Type": 0 - } - ], - "Where": [ - { - "Condition": { - "Not": { - "Expression": { - "Comparison": { - "ComparisonKind": 0, - "Left": { - "Measure": { - "Expression": { - "SourceRef": { - "Source": "0" - } - }, - "Property": "External.Value.MTH" - } - }, - "Right": { - "Literal": { - "Value": "null" - } - } - } - } - } - } - } - ] - }, - "howCreated": "User" } ] } diff --git a/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/22687a566a79aa10c2d6/visual.json b/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/22687a566a79aa10c2d6/visual.json index 0d295f2..2370f25 100644 --- a/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/22687a566a79aa10c2d6/visual.json +++ b/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/22687a566a79aa10c2d6/visual.json @@ -1,5 +1,5 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.6.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.7.0/schema.json", "name": "22687a566a79aa10c2d6", "position": { "x": 87.028483822188946, @@ -44,8 +44,13 @@ "properties": { "text": { "expr": { - "Literal": { - "Value": "'City'" + "Measure": { + "Expression": { + "SourceRef": { + "Entity": "Measure" + } + }, + "Property": "CITY_Name" } } }, @@ -198,9 +203,13 @@ "solid": { "color": { "expr": { - "ThemeDataColor": { - "ColorId": 0, - "Percent": -0.1 + "Measure": { + "Expression": { + "SourceRef": { + "Entity": "Measure" + } + }, + "Property": "Geo.3.2.City.BackColor" } } } diff --git a/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/242e2687a7ecde65470a/visual.json b/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/242e2687a7ecde65470a/visual.json index 6b0fdba..faf52e4 100644 --- a/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/242e2687a7ecde65470a/visual.json +++ b/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/242e2687a7ecde65470a/visual.json @@ -1,5 +1,5 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.6.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.7.0/schema.json", "name": "242e2687a7ecde65470a", "position": { "x": 355.16187272396951, @@ -13,6 +13,5 @@ "displayName": "Molecule", "groupMode": "ScaleMode" }, - "parentGroupName": "b606c5b00e520b50b8b7", - "isHidden": true + "parentGroupName": "b606c5b00e520b50b8b7" } \ No newline at end of file diff --git a/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/2a8b2c548db03777053b/visual.json b/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/2a8b2c548db03777053b/visual.json index a4bb1bc..cd4e1ef 100644 --- a/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/2a8b2c548db03777053b/visual.json +++ b/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/2a8b2c548db03777053b/visual.json @@ -1,5 +1,5 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.6.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.7.0/schema.json", "name": "2a8b2c548db03777053b", "position": { "x": 355.16187272396951, @@ -13,6 +13,5 @@ "displayName": "Class", "groupMode": "ScaleMode" }, - "parentGroupName": "b606c5b00e520b50b8b7", - "isHidden": true + "parentGroupName": "b606c5b00e520b50b8b7" } \ No newline at end of file diff --git a/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/5bcb92300403b3088670/visual.json b/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/5bcb92300403b3088670/visual.json index 5bd922e..5efbeaa 100644 --- a/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/5bcb92300403b3088670/visual.json +++ b/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/5bcb92300403b3088670/visual.json @@ -1,5 +1,5 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.7.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.6.0/schema.json", "name": "5bcb92300403b3088670", "position": { "x": 0.87143460607468626, diff --git a/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/82fb1b832e8b58d00dee/visual.json b/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/82fb1b832e8b58d00dee/visual.json index 6f6b0e5..71430af 100644 --- a/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/82fb1b832e8b58d00dee/visual.json +++ b/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/82fb1b832e8b58d00dee/visual.json @@ -1,5 +1,5 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.6.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.7.0/schema.json", "name": "82fb1b832e8b58d00dee", "position": { "x": 87.028483822188946, @@ -44,8 +44,13 @@ "properties": { "text": { "expr": { - "Literal": { - "Value": "'City'" + "Measure": { + "Expression": { + "SourceRef": { + "Entity": "Measure" + } + }, + "Property": "CITY_Name" } } }, @@ -184,9 +189,13 @@ "solid": { "color": { "expr": { - "ThemeDataColor": { - "ColorId": 0, - "Percent": -0.1 + "Measure": { + "Expression": { + "SourceRef": { + "Entity": "Measure" + } + }, + "Property": "Geo.3.2.City.BackColor" } } } diff --git a/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/ace762ee553dbc6b74ba/visual.json b/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/ace762ee553dbc6b74ba/visual.json index 253fab8..0278409 100644 --- a/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/ace762ee553dbc6b74ba/visual.json +++ b/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/ace762ee553dbc6b74ba/visual.json @@ -1,5 +1,5 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.6.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.7.0/schema.json", "name": "ace762ee553dbc6b74ba", "position": { "x": 87.028483822188946, @@ -44,8 +44,13 @@ "properties": { "text": { "expr": { - "Literal": { - "Value": "'City'" + "Measure": { + "Expression": { + "SourceRef": { + "Entity": "Measure" + } + }, + "Property": "CITY_Name" } } }, @@ -184,9 +189,13 @@ "solid": { "color": { "expr": { - "ThemeDataColor": { - "ColorId": 0, - "Percent": -0.1 + "Measure": { + "Expression": { + "SourceRef": { + "Entity": "Measure" + } + }, + "Property": "Geo.3.2.City.BackColor" } } } diff --git a/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/afafe14227095c6ce0bb/visual.json b/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/afafe14227095c6ce0bb/visual.json index d8e7ff5..9f06bdd 100644 --- a/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/afafe14227095c6ce0bb/visual.json +++ b/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/afafe14227095c6ce0bb/visual.json @@ -280,7 +280,7 @@ "howCreated": "User" }, { - "name": "fc43b1037a9a5ee03de2", + "name": "c0622963edc1161ae0ae", "field": { "Column": { "Expression": { diff --git a/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/dd26f9798c6935278ce1/visual.json b/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/dd26f9798c6935278ce1/visual.json index 304408f..f12d25f 100644 --- a/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/dd26f9798c6935278ce1/visual.json +++ b/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/dd26f9798c6935278ce1/visual.json @@ -1,5 +1,5 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.6.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.7.0/schema.json", "name": "dd26f9798c6935278ce1", "position": { "x": 87.028483822188946, @@ -44,8 +44,13 @@ "properties": { "text": { "expr": { - "Literal": { - "Value": "'City'" + "Measure": { + "Expression": { + "SourceRef": { + "Entity": "Measure" + } + }, + "Property": "CITY_Name" } } }, @@ -184,9 +189,13 @@ "solid": { "color": { "expr": { - "ThemeDataColor": { - "ColorId": 0, - "Percent": -0.1 + "Measure": { + "Expression": { + "SourceRef": { + "Entity": "Measure" + } + }, + "Property": "Geo.3.2.City.BackColor" } } } diff --git a/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/f4a797718c2a78d3dbc0/visual.json b/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/f4a797718c2a78d3dbc0/visual.json index 0aefd19..7afdddf 100644 --- a/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/f4a797718c2a78d3dbc0/visual.json +++ b/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/f4a797718c2a78d3dbc0/visual.json @@ -1,5 +1,5 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.6.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.7.0/schema.json", "name": "f4a797718c2a78d3dbc0", "position": { "x": 355.34577153013743, @@ -13,6 +13,5 @@ "displayName": "Package", "groupMode": "ScaleMode" }, - "parentGroupName": "b606c5b00e520b50b8b7", - "isHidden": true + "parentGroupName": "b606c5b00e520b50b8b7" } \ No newline at end of file diff --git a/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/f4e6ab2be3009552d42d/visual.json b/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/f4e6ab2be3009552d42d/visual.json index 641a953..7a322e3 100644 --- a/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/f4e6ab2be3009552d42d/visual.json +++ b/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/f4e6ab2be3009552d42d/visual.json @@ -1,5 +1,5 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.6.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.7.0/schema.json", "name": "f4e6ab2be3009552d42d", "position": { "x": 87.028483822188946, @@ -44,8 +44,13 @@ "properties": { "text": { "expr": { - "Literal": { - "Value": "'City'" + "Measure": { + "Expression": { + "SourceRef": { + "Entity": "Measure" + } + }, + "Property": "CITY_Name" } } }, @@ -184,9 +189,13 @@ "solid": { "color": { "expr": { - "ThemeDataColor": { - "ColorId": 0, - "Percent": -0.1 + "Measure": { + "Expression": { + "SourceRef": { + "Entity": "Measure" + } + }, + "Property": "Geo.3.2.City.BackColor" } } } diff --git a/External All Channel.Report/definition/pages/ReportSection3e9b78a99de7939003a0/visuals/770f413034713716524b/visual.json b/External All Channel.Report/definition/pages/ReportSection3e9b78a99de7939003a0/visuals/770f413034713716524b/visual.json index 92c9778..2647384 100644 --- a/External All Channel.Report/definition/pages/ReportSection3e9b78a99de7939003a0/visuals/770f413034713716524b/visual.json +++ b/External All Channel.Report/definition/pages/ReportSection3e9b78a99de7939003a0/visuals/770f413034713716524b/visual.json @@ -359,65 +359,6 @@ } }, "type": "Categorical" - }, - { - "name": "Filter84d74040256b5cbd09f5", - "ordinal": 2, - "field": { - "Measure": { - "Expression": { - "SourceRef": { - "Entity": "00_KPI" - } - }, - "Property": "External.Value.MTH" - } - }, - "type": "Advanced", - "filter": { - "Version": 2, - "From": [ - { - "Name": "0", - "Entity": "00_KPI", - "Type": 0 - }, - { - "Name": "m", - "Entity": "Measure", - "Type": 0 - } - ], - "Where": [ - { - "Condition": { - "Not": { - "Expression": { - "Comparison": { - "ComparisonKind": 0, - "Left": { - "Measure": { - "Expression": { - "SourceRef": { - "Source": "0" - } - }, - "Property": "External.Value.MTH" - } - }, - "Right": { - "Literal": { - "Value": "null" - } - } - } - } - } - } - } - ] - }, - "howCreated": "User" } ], "filterSortOrder": "Custom" diff --git a/External All Channel.Report/definition/pages/ReportSection3e9b78a99de7939003a0/visuals/fd555d343b71f25376dd/visual.json b/External All Channel.Report/definition/pages/ReportSection3e9b78a99de7939003a0/visuals/fd555d343b71f25376dd/visual.json index 94dbd31..7205a08 100644 --- a/External All Channel.Report/definition/pages/ReportSection3e9b78a99de7939003a0/visuals/fd555d343b71f25376dd/visual.json +++ b/External All Channel.Report/definition/pages/ReportSection3e9b78a99de7939003a0/visuals/fd555d343b71f25376dd/visual.json @@ -280,7 +280,7 @@ "howCreated": "User" }, { - "name": "fc43b1037a9a5ee03de2", + "name": "c0622963edc1161ae0ae", "field": { "Column": { "Expression": { diff --git a/External All Channel.Report/definition/pages/ReportSection7c203e32de7071898401/visuals/638bc80ec2537d0b349b/visual.json b/External All Channel.Report/definition/pages/ReportSection7c203e32de7071898401/visuals/638bc80ec2537d0b349b/visual.json index 1822c41..c90b20d 100644 --- a/External All Channel.Report/definition/pages/ReportSection7c203e32de7071898401/visuals/638bc80ec2537d0b349b/visual.json +++ b/External All Channel.Report/definition/pages/ReportSection7c203e32de7071898401/visuals/638bc80ec2537d0b349b/visual.json @@ -359,65 +359,6 @@ } }, "type": "Categorical" - }, - { - "name": "Filter84d74040256b5cbd09f5", - "ordinal": 2, - "field": { - "Measure": { - "Expression": { - "SourceRef": { - "Entity": "00_KPI" - } - }, - "Property": "External.Value.MTH" - } - }, - "type": "Advanced", - "filter": { - "Version": 2, - "From": [ - { - "Name": "0", - "Entity": "00_KPI", - "Type": 0 - }, - { - "Name": "m", - "Entity": "Measure", - "Type": 0 - } - ], - "Where": [ - { - "Condition": { - "Not": { - "Expression": { - "Comparison": { - "ComparisonKind": 0, - "Left": { - "Measure": { - "Expression": { - "SourceRef": { - "Source": "0" - } - }, - "Property": "External.Value.MTH" - } - }, - "Right": { - "Literal": { - "Value": "null" - } - } - } - } - } - } - } - ] - }, - "howCreated": "User" } ] } diff --git a/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/1876ca94917b9c61550c/visual.json b/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/1876ca94917b9c61550c/visual.json index 0400043..3c7f7b6 100644 --- a/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/1876ca94917b9c61550c/visual.json +++ b/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/1876ca94917b9c61550c/visual.json @@ -1,5 +1,5 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.6.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.7.0/schema.json", "name": "1876ca94917b9c61550c", "position": { "x": 87.028483822188946, @@ -44,8 +44,13 @@ "properties": { "text": { "expr": { - "Literal": { - "Value": "'City'" + "Measure": { + "Expression": { + "SourceRef": { + "Entity": "Measure" + } + }, + "Property": "CITY_Name" } } }, @@ -184,9 +189,13 @@ "solid": { "color": { "expr": { - "ThemeDataColor": { - "ColorId": 0, - "Percent": -0.1 + "Measure": { + "Expression": { + "SourceRef": { + "Entity": "Measure" + } + }, + "Property": "Geo.3.2.City.BackColor" } } } diff --git a/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/19e6d815c5020636dcc8/visual.json b/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/19e6d815c5020636dcc8/visual.json index e6a9ea5..b0c882a 100644 --- a/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/19e6d815c5020636dcc8/visual.json +++ b/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/19e6d815c5020636dcc8/visual.json @@ -1,5 +1,5 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.6.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.7.0/schema.json", "name": "19e6d815c5020636dcc8", "position": { "x": 87.028483822188946, @@ -44,8 +44,13 @@ "properties": { "text": { "expr": { - "Literal": { - "Value": "'City'" + "Measure": { + "Expression": { + "SourceRef": { + "Entity": "Measure" + } + }, + "Property": "CITY_Name" } } }, @@ -184,9 +189,13 @@ "solid": { "color": { "expr": { - "ThemeDataColor": { - "ColorId": 0, - "Percent": -0.1 + "Measure": { + "Expression": { + "SourceRef": { + "Entity": "Measure" + } + }, + "Property": "Geo.3.2.City.BackColor" } } } diff --git a/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/1f49a50ccb9b2c242678/visual.json b/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/1f49a50ccb9b2c242678/visual.json index 5c4505c..2870806 100644 --- a/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/1f49a50ccb9b2c242678/visual.json +++ b/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/1f49a50ccb9b2c242678/visual.json @@ -352,65 +352,6 @@ } }, "type": "Categorical" - }, - { - "name": "Filter84d74040256b5cbd09f5", - "ordinal": 2, - "field": { - "Measure": { - "Expression": { - "SourceRef": { - "Entity": "00_KPI" - } - }, - "Property": "External.Value.MTH" - } - }, - "type": "Advanced", - "filter": { - "Version": 2, - "From": [ - { - "Name": "0", - "Entity": "00_KPI", - "Type": 0 - }, - { - "Name": "m", - "Entity": "Measure", - "Type": 0 - } - ], - "Where": [ - { - "Condition": { - "Not": { - "Expression": { - "Comparison": { - "ComparisonKind": 0, - "Left": { - "Measure": { - "Expression": { - "SourceRef": { - "Source": "0" - } - }, - "Property": "External.Value.MTH" - } - }, - "Right": { - "Literal": { - "Value": "null" - } - } - } - } - } - } - } - ] - }, - "howCreated": "User" } ] } diff --git a/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/444d34e12e03161414a5/visual.json b/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/444d34e12e03161414a5/visual.json index d5bdde4..89c34c0 100644 --- a/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/444d34e12e03161414a5/visual.json +++ b/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/444d34e12e03161414a5/visual.json @@ -280,7 +280,7 @@ "howCreated": "User" }, { - "name": "fc43b1037a9a5ee03de2", + "name": "c0622963edc1161ae0ae", "field": { "Column": { "Expression": { diff --git a/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/67490824220c5d9d603c/visual.json b/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/67490824220c5d9d603c/visual.json index 8ce9a3a..d44a9a6 100644 --- a/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/67490824220c5d9d603c/visual.json +++ b/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/67490824220c5d9d603c/visual.json @@ -1,5 +1,5 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.6.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.7.0/schema.json", "name": "67490824220c5d9d603c", "position": { "x": 87.028483822188946, @@ -44,8 +44,13 @@ "properties": { "text": { "expr": { - "Literal": { - "Value": "'City'" + "Measure": { + "Expression": { + "SourceRef": { + "Entity": "Measure" + } + }, + "Property": "CITY_Name" } } }, @@ -184,9 +189,13 @@ "solid": { "color": { "expr": { - "ThemeDataColor": { - "ColorId": 0, - "Percent": -0.1 + "Measure": { + "Expression": { + "SourceRef": { + "Entity": "Measure" + } + }, + "Property": "Geo.3.2.City.BackColor" } } } diff --git a/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/b470285764c2abc4a273/visual.json b/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/b470285764c2abc4a273/visual.json index bc87585..94143fd 100644 --- a/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/b470285764c2abc4a273/visual.json +++ b/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/b470285764c2abc4a273/visual.json @@ -1,5 +1,5 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.6.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.7.0/schema.json", "name": "b470285764c2abc4a273", "position": { "x": 87.028483822188946, @@ -44,8 +44,13 @@ "properties": { "text": { "expr": { - "Literal": { - "Value": "'City'" + "Measure": { + "Expression": { + "SourceRef": { + "Entity": "Measure" + } + }, + "Property": "CITY_Name" } } }, @@ -184,9 +189,13 @@ "solid": { "color": { "expr": { - "ThemeDataColor": { - "ColorId": 0, - "Percent": -0.1 + "Measure": { + "Expression": { + "SourceRef": { + "Entity": "Measure" + } + }, + "Property": "Geo.3.2.City.BackColor" } } } diff --git a/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/c82cb626194167bed49e/visual.json b/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/c82cb626194167bed49e/visual.json index 8201705..89e7220 100644 --- a/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/c82cb626194167bed49e/visual.json +++ b/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/c82cb626194167bed49e/visual.json @@ -1,5 +1,5 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.6.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.7.0/schema.json", "name": "c82cb626194167bed49e", "position": { "x": 87.028483822188946, @@ -44,8 +44,13 @@ "properties": { "text": { "expr": { - "Literal": { - "Value": "'City'" + "Measure": { + "Expression": { + "SourceRef": { + "Entity": "Measure" + } + }, + "Property": "CITY_Name" } } }, @@ -198,9 +203,13 @@ "solid": { "color": { "expr": { - "ThemeDataColor": { - "ColorId": 0, - "Percent": -0.1 + "Measure": { + "Expression": { + "SourceRef": { + "Entity": "Measure" + } + }, + "Property": "Geo.3.2.City.BackColor" } } } diff --git a/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/d17841875ddc39abab37/visual.json b/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/d17841875ddc39abab37/visual.json index 3d02254..d3431d7 100644 --- a/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/d17841875ddc39abab37/visual.json +++ b/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/d17841875ddc39abab37/visual.json @@ -1,5 +1,5 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.6.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.7.0/schema.json", "name": "d17841875ddc39abab37", "position": { "x": 0.42170370423519349, @@ -92,7 +92,8 @@ } }, "queryRef": "Measure.External.Gr%.KPI", - "nativeQueryRef": "External.Gr%.KPI" + "nativeQueryRef": "GR%", + "displayName": "GR%" }, { "field": { diff --git a/External All Channel.Report/definition/pages/ReportSectioned71c491b41e12906de3/visuals/a6e7a2b7056f5490fb28/visual.json b/External All Channel.Report/definition/pages/ReportSectioned71c491b41e12906de3/visuals/a6e7a2b7056f5490fb28/visual.json index 6da1997..043be7c 100644 --- a/External All Channel.Report/definition/pages/ReportSectioned71c491b41e12906de3/visuals/a6e7a2b7056f5490fb28/visual.json +++ b/External All Channel.Report/definition/pages/ReportSectioned71c491b41e12906de3/visuals/a6e7a2b7056f5490fb28/visual.json @@ -280,7 +280,7 @@ "howCreated": "User" }, { - "name": "fc43b1037a9a5ee03de2", + "name": "c0622963edc1161ae0ae", "field": { "Column": { "Expression": { diff --git a/External All Channel.Report/definition/pages/b44a3196b500090487a3/visuals/4a2f472e93055801dbed/visual.json b/External All Channel.Report/definition/pages/b44a3196b500090487a3/visuals/4a2f472e93055801dbed/visual.json index c5005d8..55842c2 100644 --- a/External All Channel.Report/definition/pages/b44a3196b500090487a3/visuals/4a2f472e93055801dbed/visual.json +++ b/External All Channel.Report/definition/pages/b44a3196b500090487a3/visuals/4a2f472e93055801dbed/visual.json @@ -280,7 +280,7 @@ "howCreated": "User" }, { - "name": "fc43b1037a9a5ee03de2", + "name": "c0622963edc1161ae0ae", "field": { "Column": { "Expression": { diff --git a/External All Channel.Report/definition/pages/b76a2e405a526ad30c18/visuals/429213bbdee4bbee6a71/visual.json b/External All Channel.Report/definition/pages/b76a2e405a526ad30c18/visuals/429213bbdee4bbee6a71/visual.json index 8802733..468f176 100644 --- a/External All Channel.Report/definition/pages/b76a2e405a526ad30c18/visuals/429213bbdee4bbee6a71/visual.json +++ b/External All Channel.Report/definition/pages/b76a2e405a526ad30c18/visuals/429213bbdee4bbee6a71/visual.json @@ -280,7 +280,7 @@ "howCreated": "User" }, { - "name": "fc43b1037a9a5ee03de2", + "name": "c0622963edc1161ae0ae", "field": { "Column": { "Expression": { diff --git a/External All Channel.Report/definition/pages/db03a629b7e27dacc7b6/visuals/6e35df83a3041dd6713c/visual.json b/External All Channel.Report/definition/pages/db03a629b7e27dacc7b6/visuals/6e35df83a3041dd6713c/visual.json index e1350d7..3a5a337 100644 --- a/External All Channel.Report/definition/pages/db03a629b7e27dacc7b6/visuals/6e35df83a3041dd6713c/visual.json +++ b/External All Channel.Report/definition/pages/db03a629b7e27dacc7b6/visuals/6e35df83a3041dd6713c/visual.json @@ -332,7 +332,7 @@ "howCreated": "User" }, { - "name": "fc43b1037a9a5ee03de2", + "name": "c0622963edc1161ae0ae", "field": { "Column": { "Expression": { diff --git a/External All Channel.Report/definition/pages/ecb4c3d9dd5480470c2b/visuals/15e078bb43ab462ded44/visual.json b/External All Channel.Report/definition/pages/ecb4c3d9dd5480470c2b/visuals/15e078bb43ab462ded44/visual.json index 163195d..26696ba 100644 --- a/External All Channel.Report/definition/pages/ecb4c3d9dd5480470c2b/visuals/15e078bb43ab462ded44/visual.json +++ b/External All Channel.Report/definition/pages/ecb4c3d9dd5480470c2b/visuals/15e078bb43ab462ded44/visual.json @@ -280,7 +280,7 @@ "howCreated": "User" }, { - "name": "fc43b1037a9a5ee03de2", + "name": "c0622963edc1161ae0ae", "field": { "Column": { "Expression": { diff --git a/External All Channel.Report/definition/pages/ecb4c3d9dd5480470c2b/visuals/23e50359e7ae900d1964/visual.json b/External All Channel.Report/definition/pages/ecb4c3d9dd5480470c2b/visuals/23e50359e7ae900d1964/visual.json index bb2b59e..18ddf4d 100644 --- a/External All Channel.Report/definition/pages/ecb4c3d9dd5480470c2b/visuals/23e50359e7ae900d1964/visual.json +++ b/External All Channel.Report/definition/pages/ecb4c3d9dd5480470c2b/visuals/23e50359e7ae900d1964/visual.json @@ -1,5 +1,5 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.7.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.6.0/schema.json", "name": "23e50359e7ae900d1964", "position": { "x": 0.35674880296443234, diff --git a/External All Channel.Report/definition/pages/ecb4c3d9dd5480470c2b/visuals/c634193f2a2970b632b1/visual.json b/External All Channel.Report/definition/pages/ecb4c3d9dd5480470c2b/visuals/c634193f2a2970b632b1/visual.json index 566cb4f..26fa0d6 100644 --- a/External All Channel.Report/definition/pages/ecb4c3d9dd5480470c2b/visuals/c634193f2a2970b632b1/visual.json +++ b/External All Channel.Report/definition/pages/ecb4c3d9dd5480470c2b/visuals/c634193f2a2970b632b1/visual.json @@ -1,12 +1,12 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.6.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.7.0/schema.json", "name": "c634193f2a2970b632b1", "position": { - "x": 654.2767351658598, - "y": 152.67442079930029, + "x": 810.09215037141757, + "y": 149.21579415755374, "z": 5000, - "height": 27.777777777777779, - "width": 324.44444444444446, + "height": 28.837209302325583, + "width": 319.06976744186051, "tabOrder": 0 }, "visual": { diff --git a/External All Channel.Report/definition/pages/ecb4c3d9dd5480470c2b/visuals/c6970a7e6a05807080bc/visual.json b/External All Channel.Report/definition/pages/ecb4c3d9dd5480470c2b/visuals/c6970a7e6a05807080bc/visual.json index 0852097..73438c8 100644 --- a/External All Channel.Report/definition/pages/ecb4c3d9dd5480470c2b/visuals/c6970a7e6a05807080bc/visual.json +++ b/External All Channel.Report/definition/pages/ecb4c3d9dd5480470c2b/visuals/c6970a7e6a05807080bc/visual.json @@ -359,65 +359,6 @@ } }, "type": "Categorical" - }, - { - "name": "Filter84d74040256b5cbd09f5", - "ordinal": 2, - "field": { - "Measure": { - "Expression": { - "SourceRef": { - "Entity": "00_KPI" - } - }, - "Property": "External.Value.MTH" - } - }, - "type": "Advanced", - "filter": { - "Version": 2, - "From": [ - { - "Name": "0", - "Entity": "00_KPI", - "Type": 0 - }, - { - "Name": "m", - "Entity": "Measure", - "Type": 0 - } - ], - "Where": [ - { - "Condition": { - "Not": { - "Expression": { - "Comparison": { - "ComparisonKind": 0, - "Left": { - "Measure": { - "Expression": { - "SourceRef": { - "Source": "0" - } - }, - "Property": "External.Value.MTH" - } - }, - "Right": { - "Literal": { - "Value": "null" - } - } - } - } - } - } - } - ] - }, - "howCreated": "User" } ], "filterSortOrder": "Custom" diff --git a/External All Channel.Report/definition/pages/pages.json b/External All Channel.Report/definition/pages/pages.json index f759b8a..add54d8 100644 --- a/External All Channel.Report/definition/pages/pages.json +++ b/External All Channel.Report/definition/pages/pages.json @@ -35,5 +35,5 @@ "57cfd40c66e1339a587b", "9269d52ebd3a7f68b724" ], - "activePageName": "57cfd40c66e1339a587b" + "activePageName": "ReportSectioned71c491b41e12906de3" } \ No newline at end of file diff --git a/External All Channel.SemanticModel/definition/model.tmdl b/External All Channel.SemanticModel/definition/model.tmdl index 1078cfe..e72b73e 100644 --- a/External All Channel.SemanticModel/definition/model.tmdl +++ b/External All Channel.SemanticModel/definition/model.tmdl @@ -66,7 +66,7 @@ queryGroup Dim annotation __PBI_TimeIntelligenceEnabled = 0 -annotation PBI_QueryOrder = ["Measure THC","Dim_PackInfo_Retail","Dim_MergeDataSource","Fact_Retail_Brand","Fact_Retail_RawData","Fact_EC_Total","Fact_Retail","Config_ReportURL","refresh_time","Dim_BrandMKT","Dim_Market_Total","Dim_MarketTA_Total","Dim_BrandDefaultMKT","Dim_Calendar","Dim_Corp","Dim_DataSource","Dim_Geo","Dim_PlatformMID","Dim_StoreTypeMID","Dim_GeoGroup","Dim_Market","Dim_MarketTA","Dim_Org","Dim_PackInfo","Dim_Platform","Dim_StoreType","Dim_ExchangRate","DM_AUTH_ORG","DM_AUTH_PRD","DM_AUTH_SALES_GEO","DM_AUTH_SALES_MKT","DM_AUTH_SALES_PACK","DM_AUTH_SALES_ORG","DM_AUTH_GEO","HttpPath","CatalogName","ServerAddress","limit_validity","UsingLimit","limit","TOP","Dim_MKTPackMapping_Total","Dim_PackInfo_Total","Dim_RegionType","Fact_Sales_Total","Dim_Unit","dm_td_chpa_market_definition","Fact_Retail_Total","Fact_Sales_Total_AIA","Fact_EC","Dim_Class","Dim_HPFlag","Dim_HPFlag_AIASpecial","Dim_InsSalesType","Dim_InsSalesType_AIASpecial","Dim_IsTarget_AIASpecial","Dim_CoreDept","Dim_Dept","Dim_PrescriptionSource","Dim_Reimburse","Dim_ReimburseType","dm_auth_aia_sales_pack","dm_auth_aia_sales_geo","dm_auth_aia_sales_org","dm_auth_aia_sales_mkt","DM_AIA_TD_HOSPITAL_NOT_PROVIDED","Dim_Original_Col_AIA","Dim_HP_Potential_AIA","AIA.Measures","DM_AUTH_PRD_PACK","Fact_Retail_Special","Fact_Sales_NIAD","AIA_AdvanceAnalysis_Brand","AIA_AdvanceAnalysis_Class","AIA_AdvanceAnalysis_Key_Competitor","AIA_AdvanceAnalysis_Mole","AIA_AdvanceAnalysis_Subchannel","AIA_AdvanceAnalysis_DRAGON","AIA_AdvanceAnalysis_Decile","AIA_AdvanceAnalysis_Decile_Group","Dim_IsEagle_AIASpecial","Dim_IsEagle_Bridge_AIASpecial","Dim_RC","Dim_Institution","DM_AUTH_SALES_TA","DM_AUTH_NONSALES_TA","DM_AUTH_MERGED_DATA","DM_AUTH_NONSALES_ORG","dm_td_user_permission_detail","Config_MarketRatio","Config_MergeData","Dim_RC_Merged_Data","Fact_Sales_SQL","Fact_Sales_SQL_limit","Fact_Sales","Fact_AIA_DataQuality","DM_AUTH_EMAIL_NOTIFICATION","Config_EmailWarning","Dim_Remove_inst","Config_PageFlag_FreeReportNIAD","Config_VisualFlag","Fact_Sales_THC","00_KPI","Dim_KeyCompetitor","Dim_Store","Dim_HP_Level"] +annotation PBI_QueryOrder = ["Measure THC","Dim_PackInfo_Retail","Dim_MergeDataSource","Fact_Retail_Brand","Fact_Retail_RawData","Fact_EC_Total","Fact_Retail","Config_ReportURL","refresh_time","Dim_BrandMKT","Dim_Market_Total","Dim_MarketTA_Total","Dim_BrandDefaultMKT","Dim_Calendar","Dim_Corp","Dim_DataSource","Dim_Geo","Dim_PlatformMID","Dim_StoreTypeMID","Dim_GeoGroup","Dim_Market","Dim_MarketTA","Dim_Org","Dim_PackInfo","Dim_Platform","Dim_StoreType","Dim_ExchangRate","DM_AUTH_ORG","DM_AUTH_PRD","DM_AUTH_SALES_GEO","DM_AUTH_SALES_MKT","DM_AUTH_SALES_PACK","DM_AUTH_SALES_ORG","DM_AUTH_GEO","HttpPath","CatalogName","ServerAddress","limit_validity","UsingLimit","limit","TOP","Dim_MKTPackMapping_Total","Dim_PackInfo_Total","Dim_RegionType","Fact_Sales_Total","Dim_Unit","dm_td_chpa_market_definition","Fact_Retail_Total","Fact_Sales_Total_AIA","Fact_EC","Dim_Class","Dim_HPFlag","Dim_HPFlag_AIASpecial","Dim_InsSalesType","Dim_InsSalesType_AIASpecial","Dim_IsTarget_AIASpecial","Dim_CoreDept","Dim_Dept","Dim_PrescriptionSource","Dim_Reimburse","Dim_ReimburseType","dm_auth_aia_sales_pack","dm_auth_aia_sales_geo","dm_auth_aia_sales_org","dm_auth_aia_sales_mkt","DM_AIA_TD_HOSPITAL_NOT_PROVIDED","Dim_Original_Col_AIA","Dim_HP_Potential_AIA","AIA.Measures","DM_AUTH_PRD_PACK","Fact_Retail_Special","AIA_AdvanceAnalysis_Brand","AIA_AdvanceAnalysis_Class","AIA_AdvanceAnalysis_Key_Competitor","AIA_AdvanceAnalysis_Mole","AIA_AdvanceAnalysis_Subchannel","AIA_AdvanceAnalysis_DRAGON","AIA_AdvanceAnalysis_Decile","AIA_AdvanceAnalysis_Decile_Group","Dim_IsEagle_AIASpecial","Dim_IsEagle_Bridge_AIASpecial","Dim_RC","Dim_Institution","DM_AUTH_SALES_TA","DM_AUTH_NONSALES_TA","DM_AUTH_MERGED_DATA","DM_AUTH_NONSALES_ORG","dm_td_user_permission_detail","Config_MarketRatio","Config_MergeData","Dim_RC_Merged_Data","Fact_Sales_SQL","Fact_Sales_SQL_limit","Fact_Sales","Fact_AIA_DataQuality","DM_AUTH_EMAIL_NOTIFICATION","Config_EmailWarning","Dim_Remove_inst","Config_PageFlag_FreeReportNIAD","Config_VisualFlag","Fact_Sales_THC","Fact_Sales_NIAD","00_KPI","Dim_KeyCompetitor","Dim_Store","Dim_HP_Level"] annotation __TEdtr = 1 diff --git a/External All Channel.SemanticModel/definition/relationships.tmdl b/External All Channel.SemanticModel/definition/relationships.tmdl index bfc53bf..4691e23 100644 --- a/External All Channel.SemanticModel/definition/relationships.tmdl +++ b/External All Channel.SemanticModel/definition/relationships.tmdl @@ -473,3 +473,15 @@ relationship acf87217-1a59-35dc-7e91-7ca108b0012b fromColumn: Fact_Sales.AUDIT_KEY toColumn: Dim_Geo.AUDIT_KEY +relationship 13500939-ea52-94b6-bb38-8a472b8d0e93 + fromColumn: Fact_Sales_NIAD.MARKET_SOURCE + toColumn: Dim_Market.MKT_SOURCE + +relationship 958fccd3-ede3-b6b7-9c49-ef532d97cf60 + fromColumn: Fact_Sales_NIAD.KEY_COMPETITOR + toColumn: Dim_KeyCompetitor.KEY_COMPETITOR + +relationship 54297790-f790-f0fc-7c36-c13537c5bd44 + fromColumn: Fact_Sales_NIAD.CLASS_SOURCE + toColumn: Dim_Class.CLASS_SOURCE + diff --git a/External All Channel.SemanticModel/definition/tables/00_KPI.tmdl b/External All Channel.SemanticModel/definition/tables/00_KPI.tmdl index 9b03bd3..88ac23b 100644 --- a/External All Channel.SemanticModel/definition/tables/00_KPI.tmdl +++ b/External All Channel.SemanticModel/definition/tables/00_KPI.tmdl @@ -5,6 +5,7 @@ table 00_KPI SUM ( Fact_Sales[SALES_VALUE_CAL] ) ``` + displayFolder: Normal lineageTag: 327243a7-d1c4-4efa-bec8-96f85ad40cec measure '00.base.cu' = @@ -17,7 +18,7 @@ table 00_KPI //+ SUM ( Fact_Sales_Main_Retail[CONUTING_UNIT] ) //+ SUM ( Fact_Sales_Main_EC[CONUTING_UNIT] ) //+ SUM ( Fact_Sales_Main_XH[CONUTING_UNIT] ) - displayFolder: 00base + displayFolder: Normal\00base lineageTag: 9620a79e-793e-465e-b981-40e0e904caa6 measure '00.base.cu.ly' = @@ -30,7 +31,7 @@ table 00_KPI //+ SUM ( Fact_Sales_Main_Retail[CONUTING_UNIT_LY] ) //+ SUM ( Fact_Sales_Main_EC[CONUTING_UNIT_LY] ) //+ SUM ( Fact_Sales_Main_XH[CONUTING_UNIT_LY] ) - displayFolder: 00base + displayFolder: Normal\00base lineageTag: ab799134-acf6-437b-b345-110c5cbab80b measure '00.base.pdot' = @@ -43,7 +44,7 @@ table 00_KPI //+ SUM ( Fact_Sales_Main_Retail[PDOT] ) //+ SUM ( Fact_Sales_Main_EC[PDOT] ) //+ SUM ( Fact_Sales_Main_XH[PDOT] ) - displayFolder: 00base + displayFolder: Normal\00base lineageTag: 3b437121-0751-4cfd-b746-f2a329a9d31a measure '00.base.pdot.ly' = @@ -56,7 +57,7 @@ table 00_KPI //+ SUM ( Fact_Sales_Main_Retail[PDOT_LY] ) //+ SUM ( Fact_Sales_Main_EC[PDOT_LY] ) //+ SUM ( Fact_Sales_Main_XH[PDOT_LY] ) - displayFolder: 00base + displayFolder: Normal\00base lineageTag: 33e343f4-c03c-4991-ae88-7fb34d7f0539 measure '00.base.unit' = @@ -69,7 +70,7 @@ table 00_KPI //+ SUM ( Fact_Sales_Main_Retail[SALES_UNIT_CAL] ) //+ SUM ( Fact_Sales_Main_EC[SALES_UNIT_CAL] ) //+ SUM ( Fact_Sales_Main_XH[SALES_UNIT_CAL] ) - displayFolder: 00base + displayFolder: Normal\00base lineageTag: a27f1e7f-c609-4434-8367-8d50a03f3731 measure '00.base.unit.ly' = @@ -82,7 +83,7 @@ table 00_KPI //+ SUM ( Fact_Sales_Main_Retail[SALES_UNIT_CAL_LY] ) //+ SUM ( Fact_Sales_Main_EC[SALES_UNIT_CAL_LY] ) //+ SUM ( Fact_Sales_Main_XH[SALES_UNIT_CAL_LY] ) - displayFolder: 00base + displayFolder: Normal\00base lineageTag: 7d18c9f1-6bd5-483d-b99d-b0439a1d80f6 measure '00.base.value' = @@ -95,7 +96,7 @@ table 00_KPI //+ SUM ( Fact_Sales_Main_Retail[SALES_VALUE_CAL] ) //+ SUM ( Fact_Sales_Main_EC[SALES_VALUE_CAL] ) //+ SUM ( Fact_Sales_Main_XH[SALES_VALUE_CAL] ) - displayFolder: 00base + displayFolder: Normal\00base lineageTag: 7ef37e6e-471d-4535-a462-47c7396708b5 measure '00.base.value.ly' = @@ -108,7 +109,7 @@ table 00_KPI //+ SUM ( Fact_Sales_Main_Retail[SALES_VALUE_CAL_LY] ) //+ SUM ( Fact_Sales_Main_EC[SALES_VALUE_CAL_LY] ) //+ SUM ( Fact_Sales_Main_XH[SALES_VALUE_CAL_LY] ) - displayFolder: 00base + displayFolder: Normal\00base lineageTag: d6584773-a573-4e2c-87a1-96c8e5cd774a measure '00.base.prescription.ly' = @@ -121,7 +122,7 @@ table 00_KPI //+ SUM ( Fact_Sales_Main_Retail[PRESCRIPTION_LY] ) //+ SUM ( Fact_Sales_Main_EC[PRESCRIPTION_LY] ) //+ SUM ( Fact_Sales_Main_XH[PRESCRIPTION_LY] ) - displayFolder: 00base + displayFolder: Normal\00base lineageTag: fbe0a78c-b51b-412b-a005-545af4e3a5b5 measure '00.base.prescription' = @@ -134,17 +135,17 @@ table 00_KPI //+ SUM ( Fact_Sales_Main_Retail[PRESCRIPTION] ) //+ SUM ( Fact_Sales_Main_EC[PRESCRIPTION] ) //+ SUM ( Fact_Sales_Main_XH[PRESCRIPTION] ) - displayFolder: 00base + displayFolder: Normal\00base lineageTag: 593c4a0e-9a8f-452a-8838-9cb3267497c1 measure '00.base.if.countTA' = //COUNTROWS ( ALL ( Dim_MarketTA ) )<>MAX (Config_TA_Countrows[@countrows]) FALSE () - displayFolder: 00base + displayFolder: Normal\00base lineageTag: a07a34b4-9afd-4471-bd7e-3650c34cbdf9 measure '00.base.if.countMarket' = COUNTROWS ( VALUES ( Dim_Market[MARKET] ) ) = 1 - displayFolder: 00base + displayFolder: Normal\00base lineageTag: ef825562-6c3a-40f5-bf07-ae628455c45b measure '01.CountingUnit' = @@ -175,7 +176,7 @@ table 00_KPI '0_Measure_CalGroup'[for_measure] = "_allmkt" ) ) - displayFolder: 01 + displayFolder: Normal\01 lineageTag: 2ada3919-acdf-4f6a-b991-7501cbd8a4e7 annotation PBI_FormatHint = {"isGeneralNumber":true} @@ -208,7 +209,7 @@ table 00_KPI '0_Measure_CalGroup'[for_measure] = "_allmkt" ) ) - displayFolder: 01 + displayFolder: Normal\01 lineageTag: 486b7a47-c7c1-4dc6-875d-1468a6c1417f annotation PBI_FormatHint = {"isGeneralNumber":true} @@ -241,7 +242,7 @@ table 00_KPI '0_Measure_CalGroup'[for_measure] = "_allmkt" ) ) - displayFolder: 01 + displayFolder: Normal\01 lineageTag: ba02edda-df39-47d9-8fe2-3cdb7cb86b16 annotation PBI_FormatHint = {"isGeneralNumber":true} @@ -275,7 +276,7 @@ table 00_KPI ) ) formatString: 0 - displayFolder: 01 + displayFolder: Normal\01 lineageTag: 02a43eda-2716-495c-b32a-045175a75c88 measure '01.Unit' = @@ -306,7 +307,7 @@ table 00_KPI '0_Measure_CalGroup'[for_measure] = "_allmkt" ) ) - displayFolder: 01 + displayFolder: Normal\01 lineageTag: 537b917b-4c00-41d7-a02f-1d61497bea1e annotation PBI_FormatHint = {"isGeneralNumber":true} @@ -339,7 +340,7 @@ table 00_KPI '0_Measure_CalGroup'[for_measure] = "_allmkt" ) ) - displayFolder: 01 + displayFolder: Normal\01 lineageTag: 9df28f96-4fea-45ca-9182-688f772bf2d8 annotation PBI_FormatHint = {"isGeneralNumber":true} @@ -372,7 +373,7 @@ table 00_KPI '0_Measure_CalGroup'[for_measure] = "_allmkt" ) ) - displayFolder: 01 + displayFolder: Normal\01 lineageTag: 3feb36e0-2c49-4481-8616-206b97fb8134 annotation PBI_FormatHint = {"isGeneralNumber":true} @@ -405,7 +406,7 @@ table 00_KPI '0_Measure_CalGroup'[for_measure] = "_allmkt" ) ) - displayFolder: 01 + displayFolder: Normal\01 lineageTag: e1294fda-25c0-44bd-9572-588e238352ca annotation PBI_FormatHint = {"isGeneralNumber":true} @@ -438,7 +439,7 @@ table 00_KPI '0_Measure_CalGroup'[for_measure] = "_allmkt" ) ) - displayFolder: 01 + displayFolder: Normal\01 lineageTag: 3470ce23-6b31-410b-8ac6-50e3aad999b3 annotation PBI_FormatHint = {"isGeneralNumber":true} @@ -471,7 +472,7 @@ table 00_KPI '0_Measure_CalGroup'[for_measure] = "_allmkt" ) ) - displayFolder: 01 + displayFolder: Normal\01 lineageTag: 9d0e9cf5-2a02-4012-a729-abaa4b4a5a2b annotation PBI_FormatHint = {"isGeneralNumber":true} @@ -496,7 +497,7 @@ table 00_KPI ------修改时间：2024.11.20 ------修改内容：除AIA外，其他数据源筛选架构但不选市场时显示为空 ---------------------------------------------------------------------------- - displayFolder: 02 + displayFolder: Normal\02 lineageTag: 21857317-ae56-454f-8e08-3a4c1874ff35 annotation PBI_FormatHint = {"isGeneralNumber":true} @@ -521,7 +522,7 @@ table 00_KPI ------修改时间：2024.11.20 ------修改内容：除AIA外，其他数据源筛选架构但不选市场时显示为空 ---------------------------------------------------------------------------- - displayFolder: 02 + displayFolder: Normal\02 lineageTag: 972ecad8-dc31-4e4f-a429-acc4c1b93fa9 annotation PBI_FormatHint = {"isGeneralNumber":true} @@ -546,7 +547,7 @@ table 00_KPI ------修改时间：2024.11.20 ------修改内容：除AIA外，其他数据源筛选架构但不选市场时显示为空 ---------------------------------------------------------------------------- - displayFolder: 02 + displayFolder: Normal\02 lineageTag: 5dc131a2-b621-44d8-a32d-94424bdfc245 annotation PBI_FormatHint = {"isGeneralNumber":true} @@ -571,7 +572,7 @@ table 00_KPI ------修改时间：2024.11.20 ------修改内容：除AIA外，其他数据源筛选架构但不选市场时显示为空 ---------------------------------------------------------------------------- - displayFolder: 02 + displayFolder: Normal\02 lineageTag: ae714255-0361-4924-bf9d-eaad87e5b2f0 annotation PBI_FormatHint = {"isGeneralNumber":true} @@ -596,7 +597,7 @@ table 00_KPI ------修改时间：2024.11.20 ------修改内容：除AIA外，其他数据源筛选架构但不选市场时显示为空 ---------------------------------------------------------------------------- - displayFolder: 02 + displayFolder: Normal\02 lineageTag: 6b37f467-e265-4931-8372-66116c9ad2bb annotation PBI_FormatHint = {"isGeneralNumber":true} @@ -621,7 +622,7 @@ table 00_KPI ------修改时间：2024.11.20 ------修改内容：除AIA外，其他数据源筛选架构但不选市场时显示为空 ---------------------------------------------------------------------------- - displayFolder: 02 + displayFolder: Normal\02 lineageTag: 2bd1913b-3039-4677-be2e-34859683e057 annotation PBI_FormatHint = {"isGeneralNumber":true} @@ -645,7 +646,7 @@ table 00_KPI ------修改时间：2024.11.20 ------修改内容：除AIA外，其他数据源筛选架构但不选市场时显示为空 ---------------------------------------------------------------------------- - displayFolder: 02 + displayFolder: Normal\02 lineageTag: fbbf5050-d892-4736-b4e4-087c34307a89 annotation PBI_FormatHint = {"isGeneralNumber":true} @@ -670,7 +671,7 @@ table 00_KPI ------修改时间：2024.11.20 ------修改内容：除AIA外，其他数据源筛选架构但不选市场时显示为空 ---------------------------------------------------------------------------- - displayFolder: 02 + displayFolder: Normal\02 lineageTag: 1359f4b3-be05-4c7d-bfc3-0eed768cd253 annotation PBI_FormatHint = {"isGeneralNumber":true} @@ -686,7 +687,7 @@ table 00_KPI ) ``` - displayFolder: 02 + displayFolder: Normal\02 lineageTag: 9bd0a77d-aac8-4148-9c85-df90c5c95d2e annotation PBI_FormatHint = {"isGeneralNumber":true} @@ -702,7 +703,7 @@ table 00_KPI ) ``` - displayFolder: 02 + displayFolder: Normal\02 lineageTag: 34938121-a3e9-4d5c-8180-bb0434ddc32e annotation PBI_FormatHint = {"isGeneralNumber":true} @@ -725,7 +726,7 @@ table 00_KPI ------修改时间：2024.6.10 ------修改内容：添加Retail的特殊逻辑处理 ----------------------------------------------------------------------------*/ - displayFolder: 03 + displayFolder: Normal\03 lineageTag: adf4c876-0c86-4a7b-b505-a198d6a7753f annotation PBI_FormatHint = {"isGeneralNumber":true} @@ -749,7 +750,7 @@ table 00_KPI ------修改内容：添加Retail的特殊逻辑处理 ----------------------------------------------------------------------------*/ formatString: #,0 - displayFolder: 03 + displayFolder: Normal\03 lineageTag: 26fe4b18-1ea2-411e-94c7-3e36e73eb325 measure 'External.Unit.MTH' = @@ -771,7 +772,7 @@ table 00_KPI ------修改内容：添加Retail的特殊逻辑处理 ----------------------------------------------------------------------------*/ formatString: #,0 - displayFolder: 03 + displayFolder: Normal\03 lineageTag: 68d74ae6-59c8-4170-bc6c-1d7adc2d211e measure 'External.Unit.LY.MTH' = @@ -792,7 +793,7 @@ table 00_KPI ------修改时间：2024.6.10 ------修改内容：添加Retail的特殊逻辑处理 ----------------------------------------------------------------------------*/ - displayFolder: 03 + displayFolder: Normal\03 lineageTag: aed844cb-df09-4124-b0dd-1043b18c9db3 annotation PBI_FormatHint = {"isGeneralNumber":true} @@ -816,7 +817,7 @@ table 00_KPI ------修改内容：添加Retail的特殊逻辑处理 ----------------------------------------------------------------------------*/ formatString: #,0 - displayFolder: 03 + displayFolder: Normal\03 lineageTag: 0ba0c91e-fec7-4b0a-a004-444837015f8e measure 'External.PDOT.LY.MTH' = @@ -838,7 +839,7 @@ table 00_KPI ------修改内容：添加Retail的特殊逻辑处理 ----------------------------------------------------------------------------*/ formatString: #,0 - displayFolder: 03 + displayFolder: Normal\03 lineageTag: 838247e1-7565-4c27-8f32-7a7be9d201fa measure 'External.CountingUnit.MTH' = @@ -860,7 +861,7 @@ table 00_KPI ------修改内容：添加Retail的特殊逻辑处理 ----------------------------------------------------------------------------*/ formatString: #,0 - displayFolder: 03 + displayFolder: Normal\03 lineageTag: f11b700c-1265-4f48-903c-a396c3484e8a measure 'External.CountingUnit.LY.MTH' = @@ -881,7 +882,7 @@ table 00_KPI ------修改时间：2024.6.10 ------修改内容：添加Retail的特殊逻辑处理 ----------------------------------------------------------------------------*/ - displayFolder: 03 + displayFolder: Normal\03 lineageTag: ea93613f-c719-47d7-b271-d1e21302fd4e annotation PBI_FormatHint = {"isGeneralNumber":true} @@ -917,7 +918,7 @@ table 00_KPI ), SUMX ( Fact_Sales, [PRESCRIPTION_LY] ) ) - displayFolder: 03 + displayFolder: Normal\03 lineageTag: f1da4fdc-9ec6-4e0a-9a03-bf6d6eb2b142 annotation PBI_FormatHint = {"isGeneralNumber":true} @@ -953,7 +954,7 @@ table 00_KPI ), SUMX ( Fact_Sales, [PRESCRIPTION] ) ) - displayFolder: 03 + displayFolder: Normal\03 lineageTag: 6c84cacc-65aa-4cbe-8a58-72427085c72b annotation PBI_FormatHint = {"isGeneralNumber":true} @@ -1028,7 +1029,7 @@ table 00_KPI ------修改时间： ------修改内容： ---------------------------------------------------------------------------- - displayFolder: 04 + displayFolder: Normal\04 lineageTag: b6f8ae54-bc7d-4349-887a-2b779d426b32 annotation PBI_FormatHint = {"isGeneralNumber":true} @@ -1296,7 +1297,7 @@ table 00_KPI ------修改时间：2024.6.10 ------修改内容：添加Retail的特殊逻辑处理 ----------------------------------------------------------------------------*/ - displayFolder: 05 + displayFolder: Normal\05 lineageTag: 0726ecc2-0bf6-43de-a635-c0089856d494 annotation PBI_FormatHint = {"isGeneralNumber":true} @@ -1371,7 +1372,7 @@ table 00_KPI ------修改时间： ------修改内容： ---------------------------------------------------------------------------- - displayFolder: 04 + displayFolder: Normal\04 lineageTag: 0ae3be0e-d367-4516-8679-d18f56f42ccd annotation PBI_FormatHint = {"isGeneralNumber":true} @@ -1624,7 +1625,7 @@ table 00_KPI ------修改时间：2024.6.10 ------修改内容：添加Retail的特殊逻辑处理 ----------------------------------------------------------------------------*/ - displayFolder: 05 + displayFolder: Normal\05 lineageTag: 3d5b4e15-ba20-4231-93ac-581e6e436e0f annotation PBI_FormatHint = {"isGeneralNumber":true} @@ -2091,6 +2092,231 @@ table 00_KPI annotation PBI_FormatHint = {"isGeneralNumber":true} + measure '00.Retail.NIAD.CU' = SUM ( Fact_Sales_NIAD[CONUTING_UNIT] ) + displayFolder: FreeReport_NIAD\00 + lineageTag: e7134c78-d8eb-4b51-a621-a71934194739 + + annotation PBI_FormatHint = {"isGeneralNumber":true} + + measure '00.Retail.NIAD.CU.LY' = SUM ( Fact_Sales_NIAD[CONUTING_UNIT_LY] ) + displayFolder: FreeReport_NIAD\00 + lineageTag: 6dc0eda0-6f38-4ed7-af8b-2922241500d5 + + annotation PBI_FormatHint = {"isGeneralNumber":true} + + measure '00.Retail.NIAD.PDOT' = SUM ( Fact_Sales_NIAD[CONUTING_UNIT] ) + displayFolder: FreeReport_NIAD\00 + lineageTag: 04b73112-a012-4bab-b05e-774810797bec + + annotation PBI_FormatHint = {"isGeneralNumber":true} + + measure '00.Retail.NIAD.PDOT.LY' = SUM ( Fact_Sales_NIAD[CONUTING_UNIT_LY] ) + displayFolder: FreeReport_NIAD\00 + lineageTag: 8b95b9d7-235a-4d7e-b6ea-94e79fcce762 + + annotation PBI_FormatHint = {"isGeneralNumber":true} + + measure '00.Retail.NIAD.Unit' = SUM ( Fact_Sales_NIAD[SALES_UNIT_CAL] ) + displayFolder: FreeReport_NIAD\00 + lineageTag: 24edaf71-7530-4c6d-929e-4d971a4a0e8b + + annotation PBI_FormatHint = {"isGeneralNumber":true} + + measure '00.Retail.NIAD.Unit.LY' = SUM ( Fact_Sales_NIAD[SALES_UNIT_CAL_LY] ) + displayFolder: FreeReport_NIAD\00 + lineageTag: a4017c61-122d-4af7-8eac-8a5410e92475 + + annotation PBI_FormatHint = {"isGeneralNumber":true} + + measure '00.Retail.NIAD.Value' = SUM ( Fact_Sales_NIAD[SALES_VALUE_CAL] ) + displayFolder: FreeReport_NIAD\00 + lineageTag: 5c3ce518-dae6-4095-b5f1-f3c216cadef0 + + annotation PBI_FormatHint = {"isGeneralNumber":true} + + measure '00.Retail.NIAD.Value.LY' = SUM ( Fact_Sales_NIAD[SALES_VALUE_CAL_LY] ) + displayFolder: FreeReport_NIAD\00 + lineageTag: 9593012e-070a-44a2-a950-93c5ac014837 + + annotation PBI_FormatHint = {"isGeneralNumber":true} + + measure '01.Retail.NIAD.CU' = + SWITCH ( + TRUE ( ), + ISFILTERED ( Dim_RC ) || ISFILTERED ( Dim_Org ), + CALCULATE ( + [00.Retail.NIAD.CU], + TREATAS ( + VALUES ( Dim_Market[MKT_SOURCE] ), + Dim_RC[MKT_SOURCE] + ) + ), + [00.Retail.NIAD.CU] + ) + displayFolder: FreeReport_NIAD\01 + lineageTag: f2fbd703-32b4-45c5-8f2f-37b9c6e68908 + + measure '01.Retail.NIAD.CU.LY' = + SWITCH ( + TRUE ( ), + ISFILTERED ( Dim_RC ) || ISFILTERED ( Dim_Org ), + CALCULATE ( + [00.Retail.NIAD.CU.LY], + TREATAS ( + VALUES ( Dim_Market[MKT_SOURCE] ), + Dim_RC[MKT_SOURCE] + ) + ), + [00.Retail.NIAD.CU.LY] + ) + displayFolder: FreeReport_NIAD\01 + lineageTag: cd23c4ea-e5b0-4ce3-864f-c45178a9af82 + + measure '01.Retail.NIAD.PDOT' = + SWITCH ( + TRUE ( ), + ISFILTERED ( Dim_RC ) || ISFILTERED ( Dim_Org ), + CALCULATE ( + [00.Retail.NIAD.PDOT], + TREATAS ( + VALUES ( Dim_Market[MKT_SOURCE] ), + Dim_RC[MKT_SOURCE] + ) + ), + [00.Retail.NIAD.PDOT] + ) + displayFolder: FreeReport_NIAD\01 + lineageTag: 4c7f667e-7d0a-4fcf-82d2-19fabf18e790 + + measure '01.Retail.NIAD.PDOT.LY' = + SWITCH ( + TRUE ( ), + ISFILTERED ( Dim_RC ) || ISFILTERED ( Dim_Org ), + CALCULATE ( + [00.Retail.NIAD.PDOT.LY], + TREATAS ( + VALUES ( Dim_Market[MKT_SOURCE] ), + Dim_RC[MKT_SOURCE] + ) + ), + [00.Retail.NIAD.PDOT.LY] + ) + displayFolder: FreeReport_NIAD\01 + lineageTag: 1dcc6d0b-3a67-45da-b593-c09d2a2f9802 + + measure '01.Retail.NIAD.Unit' = + SWITCH ( + TRUE ( ), + ISFILTERED ( Dim_RC ) || ISFILTERED ( Dim_Org ), + CALCULATE ( + [00.Retail.NIAD.Unit], + TREATAS ( + VALUES ( Dim_Market[MKT_SOURCE] ), + Dim_RC[MKT_SOURCE] + ) + ), + [00.Retail.NIAD.Unit] + ) + displayFolder: FreeReport_NIAD\01 + lineageTag: 99b4674a-cd6d-4621-897d-c3e8831c5210 + + measure '01.Retail.NIAD.Unit.LY' = + SWITCH ( + TRUE ( ), + ISFILTERED ( Dim_RC ) || ISFILTERED ( Dim_Org ), + CALCULATE ( + [00.Retail.NIAD.Unit.LY], + TREATAS ( + VALUES ( Dim_Market[MKT_SOURCE] ), + Dim_RC[MKT_SOURCE] + ) + ), + [00.Retail.NIAD.Unit.LY] + ) + displayFolder: FreeReport_NIAD\01 + lineageTag: 0a81f7dc-01d9-4446-b7fa-1cb30dd57d44 + + measure '01.Retail.NIAD.Value' = + SWITCH ( + TRUE ( ), + ISFILTERED ( Dim_RC ) || ISFILTERED ( Dim_Org ), + CALCULATE ( + [00.Retail.NIAD.Value], + TREATAS ( + VALUES ( Dim_Market[MKT_SOURCE] ), + Dim_RC[MKT_SOURCE] + ) + ), + [00.Retail.NIAD.Value] + ) + displayFolder: FreeReport_NIAD\01 + lineageTag: 792eaa55-a51f-4d28-8aef-f62b69a676e4 + + measure '01.Retail.NIAD.Value.LY' = + SWITCH ( + TRUE ( ), + ISFILTERED ( Dim_RC ) || ISFILTERED ( Dim_Org ), + CALCULATE ( + [00.Retail.NIAD.Value.LY], + TREATAS ( + VALUES ( Dim_Market[MKT_SOURCE] ), + Dim_RC[MKT_SOURCE] + ) + ), + [00.Retail.NIAD.Value.LY] + ) + displayFolder: FreeReport_NIAD\01 + lineageTag: 00a3ee30-b5b7-4253-9db4-f0aa80e5b409 + + measure 'Retail.NIAD.Sales.LY' = + SWITCH ( + [External.SelectUnit], + "RMB", [01.Retail.NIAD.Value.LY], + "K RMB", [01.Retail.NIAD.Value.LY] / 1000, + "M RMB", [01.Retail.NIAD.Value.LY] / 1000000, + "USD", DIVIDE ( [01.Retail.NIAD.Value.LY], [ExchangeRate] ), + "K USD", + DIVIDE ( [01.Retail.NIAD.Value.LY], [ExchangeRate] ) / 1000, + "M USD", + DIVIDE ( [01.Retail.NIAD.Value.LY], [ExchangeRate] ) + / 1000000, + "Unit", [01.Retail.NIAD.Unit.LY], + "K Unit", [01.Retail.NIAD.Unit.LY] / 1000, + "M Unit", [01.Retail.NIAD.Unit.LY] / 1000000, + "CU", [01.Retail.NIAD.CU.LY], + "K CU", [01.Retail.NIAD.CU.LY] / 1000, + "M CU", [01.Retail.NIAD.CU.LY] / 1000000, + "PDOT", [01.Retail.NIAD.PDOT.LY], + "K PDOT", [01.Retail.NIAD.PDOT.LY] / 1000, + "M PDOT", [01.Retail.NIAD.PDOT.LY] / 1000000 + ) + displayFolder: FreeReport_NIAD + lineageTag: 782b8f68-5311-4d58-b8c3-77d0615c723c + + measure 'Retail.NIAD.Sales' = + SWITCH ( + [External.SelectUnit], + "RMB", [01.Retail.NIAD.Value], + "K RMB", [01.Retail.NIAD.Value] / 1000, + "M RMB", [01.Retail.NIAD.Value] / 1000000, + "USD", DIVIDE ( [01.Retail.NIAD.Value], [ExchangeRate] ), + "K USD", + DIVIDE ( [01.Retail.NIAD.Value], [ExchangeRate] ) / 1000, + "M USD", + DIVIDE ( [01.Retail.NIAD.Value], [ExchangeRate] ) / 1000000, + "Unit", [01.Retail.NIAD.Unit], + "K Unit", [01.Retail.NIAD.Unit] / 1000, + "M Unit", [01.Retail.NIAD.Unit] / 1000000, + "CU", [01.Retail.NIAD.CU], + "K CU", [01.Retail.NIAD.CU] / 1000, + "M CU", [01.Retail.NIAD.CU] / 1000000, + "PDOT", [01.Retail.NIAD.PDOT], + "K PDOT", [01.Retail.NIAD.PDOT] / 1000, + "M PDOT", [01.Retail.NIAD.PDOT] / 1000000 + ) + displayFolder: FreeReport_NIAD + lineageTag: c23f7423-669e-4d88-aad1-98352853d75f + column KPI dataType: string isHidden diff --git a/External All Channel.SemanticModel/definition/tables/Fact_Sales_NIAD.tmdl b/External All Channel.SemanticModel/definition/tables/Fact_Sales_NIAD.tmdl index 5e6ebbc..a16acdb 100644 --- a/External All Channel.SemanticModel/definition/tables/Fact_Sales_NIAD.tmdl +++ b/External All Channel.SemanticModel/definition/tables/Fact_Sales_NIAD.tmdl @@ -116,15 +116,131 @@ table Fact_Sales_NIAD summarizeBy: none sourceColumn: DATE_KEY - changedProperty = DataType - annotation SummarizationSetBy = Automatic annotation UnderlyingDateTimeDataType = Date + column MARKET + dataType: string + lineageTag: f71a04d6-91b4-4354-85a7-c38fa2888245 + summarizeBy: none + sourceColumn: MARKET + + annotation SummarizationSetBy = Automatic + + column KEY_COMPETITOR + dataType: string + lineageTag: bd3ef19e-8e3c-4d56-98b4-c88e885ec7db + summarizeBy: none + sourceColumn: KEY_COMPETITOR + + annotation SummarizationSetBy = Automatic + + column CLASS + dataType: string + lineageTag: 1d13435a-a859-4ac1-8957-b99ddab9c41b + summarizeBy: none + sourceColumn: CLASS + + annotation SummarizationSetBy = Automatic + + column VA + dataType: double + lineageTag: 605d43d2-2d3f-4bb6-a68a-cdbf8530f78c + summarizeBy: sum + sourceColumn: VA + + annotation SummarizationSetBy = Automatic + + annotation PBI_FormatHint = {"isGeneralNumber":true} + + column UT + dataType: double + lineageTag: 4357b9e7-3fb2-44b7-b89d-52c949a01594 + summarizeBy: sum + sourceColumn: UT + + annotation SummarizationSetBy = Automatic + + annotation PBI_FormatHint = {"isGeneralNumber":true} + + column CU + dataType: double + lineageTag: ec859260-bbb1-4942-a308-ddeed28ce609 + summarizeBy: sum + sourceColumn: CU + + annotation SummarizationSetBy = Automatic + + annotation PBI_FormatHint = {"isGeneralNumber":true} + + column PT + dataType: double + lineageTag: b014fc48-26ce-4291-bbac-49efb08ec3f7 + summarizeBy: sum + sourceColumn: PT + + annotation SummarizationSetBy = Automatic + + annotation PBI_FormatHint = {"isGeneralNumber":true} + + column PDOT + dataType: double + lineageTag: 3e1f7977-926d-4364-8e66-7b21252142ad + summarizeBy: sum + sourceColumn: PDOT + + annotation SummarizationSetBy = Automatic + + annotation PBI_FormatHint = {"isGeneralNumber":true} + + column PDOT_LY + dataType: double + lineageTag: c15944f8-f929-4fec-9e12-aa6de850ffd9 + summarizeBy: sum + sourceColumn: PDOT_LY + + annotation SummarizationSetBy = Automatic + + annotation PBI_FormatHint = {"isGeneralNumber":true} + + column PRESCRIPTION + dataType: int64 + formatString: 0 + lineageTag: 606836a9-f115-4ba4-8f5a-baa7a143be16 + summarizeBy: sum + sourceColumn: PRESCRIPTION + + annotation SummarizationSetBy = Automatic + + column PRESCRIPTION_LY + dataType: int64 + formatString: 0 + lineageTag: bd792513-4f77-47df-861d-5273987fb633 + summarizeBy: sum + sourceColumn: PRESCRIPTION_LY + + annotation SummarizationSetBy = Automatic + + column MARKET_SOURCE + dataType: string + lineageTag: db499061-38c8-450c-a58f-b246b8a04d98 + summarizeBy: none + sourceColumn: MARKET_SOURCE + + annotation SummarizationSetBy = Automatic + + column CLASS_SOURCE + dataType: string + lineageTag: 41d82946-9635-4083-8ca0-2c5e3972cde5 + summarizeBy: none + sourceColumn: CLASS_SOURCE + + annotation SummarizationSetBy = Automatic + partition Fact_Sales_NIAD = m mode: import - queryGroup: OLD\FreeReport独有表 + queryGroup: Fact_Sales source = ``` let Source = @@ -140,28 +256,34 @@ table Fact_Sales_NIAD }[Data], " SELECT - DATA_SOURCE, + MARKET, + KEY_COMPETITOR, + CLASS, YYYYMM, PACK_COD, AUDIT_COD, - nullif(SUM(SALES_UNIT_CAL), 0) AS SALES_UNIT_CAL, - nullif(SUM(SALES_UNIT_CAL_LY), 0) AS SALES_UNIT_CAL_LY, - nullif(SUM(SALES_VALUE_CAL), 0) AS SALES_VALUE_CAL, - nullif(SUM(SALES_VALUE_CAL_LY), 0) AS SALES_VALUE_CAL_LY, - nullif(SUM(CONUTING_UNIT), 0) AS CONUTING_UNIT, - nullif(SUM(CONUTING_UNIT_LY), 0) AS CONUTING_UNIT_LY, - concat( PACK_COD,DATA_SOURCE) AS PACK_SOURCE, - concat( AUDIT_COD,DATA_SOURCE) AS AUDIT_SOURCE, - concat( LEFT(YYYYMM,4),'-',RIGHT(YYYYMM,2),'-','01') AS DATE_KEY - FROM - dm.dm_tf_external_sales_niad - WHERE - DATA_SOURCE in ( 'Retail(Quarterly)','EC(Monthly)' ) - GROUP BY DATA_SOURCE, - YYYYMM, - PACK_COD, - AUDIT_COD + VA, + UT, + CU, + PT, + SALES_UNIT_CAL, + SALES_UNIT_CAL_LY, + SALES_VALUE_CAL, + SALES_VALUE_CAL_LY, + CONUTING_UNIT, + CONUTING_UNIT_LY, + PDOT, + PDOT_LY, + PRESCRIPTION, + PRESCRIPTION_LY, + PACK_SOURCE, + AUDIT_SOURCE, + MARKET_SOURCE, + CLASS_SOURCE, + DATE_KEY + FROM + DM.DM_TF_EXT_UNIONALL_SALES_MAPPING_NIAD " & UsingLimit, null, diff --git a/External All Channel.SemanticModel/definition/tables/Fields.FreeReportNIAD.tmdl b/External All Channel.SemanticModel/definition/tables/Fields.FreeReportNIAD.tmdl index 04d6781..ba38e3e 100644 --- a/External All Channel.SemanticModel/definition/tables/Fields.FreeReportNIAD.tmdl +++ b/External All Channel.SemanticModel/definition/tables/Fields.FreeReportNIAD.tmdl @@ -38,14 +38,22 @@ table 'Fields.FreeReportNIAD' column Value4 lineageTag: 42721fe7-8334-4bf6-b1b7-552c1b31016b + summarizeBy: none isNameInferred sourceColumn: [Value4] + annotation SummarizationSetBy = Automatic + column Value5 lineageTag: df945e1e-7d43-4366-aa6d-9455af2aff07 + summarizeBy: sum isNameInferred sourceColumn: [Value5] + annotation SummarizationSetBy = Automatic + + annotation PBI_FormatHint = {"isGeneralNumber":true} + partition 'Fields.FreeReportNIAD' = calculated mode: import source = ``` @@ -72,7 +80,7 @@ table 'Fields.FreeReportNIAD' ( "Pack_LCH", NAMEOF ( Dim_PackInfo[PACK_LCH] ), 224, "Market & Product",2 ), ( "VBP", NAMEOF ( Dim_PackInfo[VBP_DESC] ), 225, "Market & Product",2 ), ( "VBP(Brand)", NAMEOF ( Dim_PackInfo[VBP_BRAND] ), 226, "Market & Product",2 ), - ( "Key Brand", NAMEOF ( Dim_MKTPackMapping[KEY_COMPETITOR] ), 227, "Market & Product",2 ), + ( "Key Brand", NAMEOF ( Dim_KeyCompetitor[KEY_COMPETITOR] ), 227, "Market & Product",2 ), ( "Originator/Generics", NAMEOF ( Dim_PackInfo[GENE_ORIG_DESC] ), 228, "Market & Product",2 ), ( "ATC1", NAMEOF ( Dim_PackInfo[ATC1_CODE_DESC] ), 230, "Market & Product",2 ), diff --git a/External All Channel.SemanticModel/definition/tables/Measure.tmdl b/External All Channel.SemanticModel/definition/tables/Measure.tmdl index 2f91e61..4cfa85e 100644 --- a/External All Channel.SemanticModel/definition/tables/Measure.tmdl +++ b/External All Channel.SemanticModel/definition/tables/Measure.tmdl @@ -20428,303 +20428,6 @@ table Measure displayFolder: OLD\ForAI lineageTag: ef44ef79-7921-416c-8ec0-a2d4ac11bf37 - measure '00.Retail.NIAD.Value' = - IF ( - ISCROSSFILTERED ( Dim_Market ), - SUMX ( - Fact_Sales_NIAD, - Fact_Sales_NIAD[SALES_VALUE_CAL] - * [External.SelectValueMKTRatio] - ), - SUM ( Fact_Sales_NIAD[SALES_VALUE_CAL] ) - ) - displayFolder: OLD\FreeReport_NIAD\00 - lineageTag: 5c3ce518-dae6-4095-b5f1-f3c216cadef0 - - annotation PBI_FormatHint = {"isGeneralNumber":true} - - measure '00.Retail.NIAD.Unit.LY' = - IF ( - ISCROSSFILTERED ( Dim_Market ), - SUMX ( - Fact_Sales_NIAD, - Fact_Sales_NIAD[SALES_UNIT_CAL_LY] - * [External.SelectUnitMKTRatio] - ), - SUM ( Fact_Sales_NIAD[SALES_UNIT_CAL_LY] ) - ) - displayFolder: OLD\FreeReport_NIAD\00 - lineageTag: a4017c61-122d-4af7-8eac-8a5410e92475 - - annotation PBI_FormatHint = {"isGeneralNumber":true} - - measure '00.Retail.NIAD.Unit' = - IF ( - ISCROSSFILTERED ( Dim_Market ), - SUMX ( - Fact_Sales_NIAD, - Fact_Sales_NIAD[SALES_UNIT_CAL] - * [External.SelectUnitMKTRatio] - ), - SUM ( Fact_Sales_NIAD[SALES_UNIT_CAL] ) - ) - displayFolder: OLD\FreeReport_NIAD\00 - lineageTag: 24edaf71-7530-4c6d-929e-4d971a4a0e8b - - annotation PBI_FormatHint = {"isGeneralNumber":true} - - measure '00.Retail.NIAD.PDOT.LY' = - IF ( - ISCROSSFILTERED ( Dim_Market ), - SUMX ( - Fact_Sales_NIAD, - Fact_Sales_NIAD[CONUTING_UNIT_LY] - * [External.SelectPDOTMKTRatio] - ), - SUM ( Fact_Sales_NIAD[CONUTING_UNIT_LY] ) - ) - displayFolder: OLD\FreeReport_NIAD\00 - lineageTag: 8b95b9d7-235a-4d7e-b6ea-94e79fcce762 - - annotation PBI_FormatHint = {"isGeneralNumber":true} - - measure '00.Retail.NIAD.PDOT' = - IF ( - ISCROSSFILTERED ( Dim_Market ), - SUMX ( - Fact_Sales_NIAD, - Fact_Sales_NIAD[CONUTING_UNIT] - * [External.SelectPDOTMKTRatio] - ), - SUM ( Fact_Sales_NIAD[CONUTING_UNIT] ) - ) - displayFolder: OLD\FreeReport_NIAD\00 - lineageTag: 04b73112-a012-4bab-b05e-774810797bec - - annotation PBI_FormatHint = {"isGeneralNumber":true} - - measure '00.Retail.NIAD.Value.LY' = - IF ( - ISCROSSFILTERED ( Dim_Market ), - SUMX ( - Fact_Sales_NIAD, - Fact_Sales_NIAD[SALES_VALUE_CAL_LY] - * [External.SelectValueMKTRatio] - ), - SUM ( Fact_Sales_NIAD[SALES_VALUE_CAL_LY] ) - ) - displayFolder: OLD\FreeReport_NIAD\00 - lineageTag: 9593012e-070a-44a2-a950-93c5ac014837 - - annotation PBI_FormatHint = {"isGeneralNumber":true} - - measure '00.Retail.NIAD.CU.LY' = - IF ( - ISCROSSFILTERED ( Dim_Market ), - SUMX ( - Fact_Sales_NIAD, - Fact_Sales_NIAD[CONUTING_UNIT_LY] - * [External.SelectCountingUnitMKTRatio] - ), - SUM ( Fact_Sales_NIAD[CONUTING_UNIT_LY] ) - ) - displayFolder: OLD\FreeReport_NIAD\00 - lineageTag: 6dc0eda0-6f38-4ed7-af8b-2922241500d5 - - annotation PBI_FormatHint = {"isGeneralNumber":true} - - measure '00.Retail.NIAD.CU' = - IF ( - ISCROSSFILTERED ( Dim_Market ), - SUMX ( - Fact_Sales_NIAD, - Fact_Sales_NIAD[CONUTING_UNIT] - * [External.SelectCountingUnitMKTRatio] - ), - SUM ( Fact_Sales_NIAD[CONUTING_UNIT] ) - ) - displayFolder: OLD\FreeReport_NIAD\00 - lineageTag: e7134c78-d8eb-4b51-a621-a71934194739 - - annotation PBI_FormatHint = {"isGeneralNumber":true} - - measure '01.Retail.NIAD.CU' = - SWITCH ( - TRUE ( ), - ISFILTERED ( Dim_RC ) || ISFILTERED ( Dim_Org ), - CALCULATE ( - [00.Retail.NIAD.CU], - TREATAS ( - VALUES ( Dim_Market[MKT_SOURCE] ), - Dim_RC[MKT_SOURCE] - ) - ), - [00.Retail.NIAD.CU] - ) - displayFolder: OLD\FreeReport_NIAD\01 - lineageTag: f2fbd703-32b4-45c5-8f2f-37b9c6e68908 - - measure '01.Retail.NIAD.CU.LY' = - SWITCH ( - TRUE ( ), - ISFILTERED ( Dim_RC ) || ISFILTERED ( Dim_Org ), - CALCULATE ( - [00.Retail.NIAD.CU.LY], - TREATAS ( - VALUES ( Dim_Market[MKT_SOURCE] ), - Dim_RC[MKT_SOURCE] - ) - ), - [00.Retail.NIAD.CU.LY] - ) - displayFolder: OLD\FreeReport_NIAD\01 - lineageTag: cd23c4ea-e5b0-4ce3-864f-c45178a9af82 - - measure '01.Retail.NIAD.PDOT' = - SWITCH ( - TRUE ( ), - ISFILTERED ( Dim_RC ) || ISFILTERED ( Dim_Org ), - CALCULATE ( - [00.Retail.NIAD.PDOT], - TREATAS ( - VALUES ( Dim_Market[MKT_SOURCE] ), - Dim_RC[MKT_SOURCE] - ) - ), - [00.Retail.NIAD.PDOT] - ) - displayFolder: OLD\FreeReport_NIAD\01 - lineageTag: 4c7f667e-7d0a-4fcf-82d2-19fabf18e790 - - measure '01.Retail.NIAD.PDOT.LY' = - SWITCH ( - TRUE ( ), - ISFILTERED ( Dim_RC ) || ISFILTERED ( Dim_Org ), - CALCULATE ( - [00.Retail.NIAD.PDOT.LY], - TREATAS ( - VALUES ( Dim_Market[MKT_SOURCE] ), - Dim_RC[MKT_SOURCE] - ) - ), - [00.Retail.NIAD.PDOT.LY] - ) - displayFolder: OLD\FreeReport_NIAD\01 - lineageTag: 1dcc6d0b-3a67-45da-b593-c09d2a2f9802 - - measure '01.Retail.NIAD.Unit' = - SWITCH ( - TRUE ( ), - ISFILTERED ( Dim_RC ) || ISFILTERED ( Dim_Org ), - CALCULATE ( - [00.Retail.NIAD.Unit], - TREATAS ( - VALUES ( Dim_Market[MKT_SOURCE] ), - Dim_RC[MKT_SOURCE] - ) - ), - [00.Retail.NIAD.Unit] - ) - displayFolder: OLD\FreeReport_NIAD\01 - lineageTag: 99b4674a-cd6d-4621-897d-c3e8831c5210 - - measure '01.Retail.NIAD.Unit.LY' = - SWITCH ( - TRUE ( ), - ISFILTERED ( Dim_RC ) || ISFILTERED ( Dim_Org ), - CALCULATE ( - [00.Retail.NIAD.Unit.LY], - TREATAS ( - VALUES ( Dim_Market[MKT_SOURCE] ), - Dim_RC[MKT_SOURCE] - ) - ), - [00.Retail.NIAD.Unit.LY] - ) - displayFolder: OLD\FreeReport_NIAD\01 - lineageTag: 0a81f7dc-01d9-4446-b7fa-1cb30dd57d44 - - measure '01.Retail.NIAD.Value' = - SWITCH ( - TRUE ( ), - ISFILTERED ( Dim_RC ) || ISFILTERED ( Dim_Org ), - CALCULATE ( - [00.Retail.NIAD.Value], - TREATAS ( - VALUES ( Dim_Market[MKT_SOURCE] ), - Dim_RC[MKT_SOURCE] - ) - ), - [00.Retail.NIAD.Value] - ) - displayFolder: OLD\FreeReport_NIAD\01 - lineageTag: 792eaa55-a51f-4d28-8aef-f62b69a676e4 - - measure '01.Retail.NIAD.Value.LY' = - SWITCH ( - TRUE ( ), - ISFILTERED ( Dim_RC ) || ISFILTERED ( Dim_Org ), - CALCULATE ( - [00.Retail.NIAD.Value.LY], - TREATAS ( - VALUES ( Dim_Market[MKT_SOURCE] ), - Dim_RC[MKT_SOURCE] - ) - ), - [00.Retail.NIAD.Value.LY] - ) - displayFolder: OLD\FreeReport_NIAD\01 - lineageTag: 00a3ee30-b5b7-4253-9db4-f0aa80e5b409 - - measure 'Retail.NIAD.Sales' = - SWITCH ( - [External.SelectUnit], - "RMB", [01.Retail.NIAD.Value], - "K RMB", [01.Retail.NIAD.Value] / 1000, - "M RMB", [01.Retail.NIAD.Value] / 1000000, - "USD", DIVIDE ( [01.Retail.NIAD.Value], [ExchangeRate] ), - "K USD", - DIVIDE ( [01.Retail.NIAD.Value], [ExchangeRate] ) / 1000, - "M USD", - DIVIDE ( [01.Retail.NIAD.Value], [ExchangeRate] ) / 1000000, - "Unit", [01.Retail.NIAD.Unit], - "K Unit", [01.Retail.NIAD.Unit] / 1000, - "M Unit", [01.Retail.NIAD.Unit] / 1000000, - "CU", [01.Retail.NIAD.CU], - "K CU", [01.Retail.NIAD.CU] / 1000, - "M CU", [01.Retail.NIAD.CU] / 1000000, - "PDOT", [01.Retail.NIAD.PDOT], - "K PDOT", [01.Retail.NIAD.PDOT] / 1000, - "M PDOT", [01.Retail.NIAD.PDOT] / 1000000 - ) - displayFolder: OLD\FreeReport_NIAD - lineageTag: c23f7423-669e-4d88-aad1-98352853d75f - - measure 'Retail.NIAD.Sales.LY' = - SWITCH ( - [External.SelectUnit], - "RMB", [01.Retail.NIAD.Value.LY], - "K RMB", [01.Retail.NIAD.Value.LY] / 1000, - "M RMB", [01.Retail.NIAD.Value.LY] / 1000000, - "USD", DIVIDE ( [01.Retail.NIAD.Value.LY], [ExchangeRate] ), - "K USD", - DIVIDE ( [01.Retail.NIAD.Value.LY], [ExchangeRate] ) / 1000, - "M USD", - DIVIDE ( [01.Retail.NIAD.Value.LY], [ExchangeRate] ) - / 1000000, - "Unit", [01.Retail.NIAD.Unit.LY], - "K Unit", [01.Retail.NIAD.Unit.LY] / 1000, - "M Unit", [01.Retail.NIAD.Unit.LY] / 1000000, - "CU", [01.Retail.NIAD.CU.LY], - "K CU", [01.Retail.NIAD.CU.LY] / 1000, - "M CU", [01.Retail.NIAD.CU.LY] / 1000000, - "PDOT", [01.Retail.NIAD.PDOT.LY], - "K PDOT", [01.Retail.NIAD.PDOT.LY] / 1000, - "M PDOT", [01.Retail.NIAD.PDOT.LY] / 1000000 - ) - displayFolder: OLD\FreeReport_NIAD - lineageTag: 782b8f68-5311-4d58-b8c3-77d0615c723c - measure 'External.4.1.Text.Retail.NIAD.Text' = VAR R = "NIAD市场月度明细（仅Retail/EC）" VAR EC = "NIAD市场月度明细（仅Retail/EC）" diff --git a/External All Channel.SemanticModel/diagramLayout.json b/External All Channel.SemanticModel/diagramLayout.json index 07342d2..f6c532a 100644 --- a/External All Channel.SemanticModel/diagramLayout.json +++ b/External All Channel.SemanticModel/diagramLayout.json @@ -917,243 +917,7 @@ { "ordinal": 1, "scrollPosition": { - "x": 0, - "y": 0 - }, - "nodes": [ - { - "location": { - "x": 1193.6470799771166, - "y": 612.00909991030812 - }, - "nodeIndex": "Dim_DataSource", - "nodeLineageTag": "8a47e04a-d7ca-4a96-bf05-10c9cff59288", - "size": { - "height": 176, - "width": 234 - }, - "zIndex": 10 - }, - { - "location": { - "x": 749.23438869196207, - "y": -50 - }, - "nodeIndex": "Dim_PackInfo", - "nodeLineageTag": "f420be02-8dc1-467f-8e0e-a8231e8b72e6", - "size": { - "height": 300, - "width": 234 - }, - "zIndex": 17 - }, - { - "location": { - "x": 622.80488712282977, - "y": 529.837077125478 - }, - "nodeIndex": "Fact_Sales", - "nodeLineageTag": "c6bdcb23-6f0c-4bd2-98b6-b3fd012d5ba6", - "size": { - "height": 300, - "width": 234 - }, - "zIndex": 18 - }, - { - "location": { - "x": 1273.5318996557298, - "y": 259.3339814607607 - }, - "nodeIndex": "Dim_Geo", - "nodeLineageTag": "aeec8d5d-c86c-4957-8592-3a153f08c3a8", - "size": { - "height": 300, - "width": 234 - }, - "zIndex": 13 - }, - { - "location": { - "x": 50, - "y": 816.007468034567 - }, - "nodeIndex": "Dim_Calendar", - "nodeLineageTag": "b54e7974-59f5-4b19-b987-f439b32f640d", - "size": { - "height": 300, - "width": 234 - }, - "zIndex": 15 - }, - { - "location": { - "x": 919.4086061629705, - "y": 1277.7320027702353 - }, - "nodeIndex": "Dim_HPFlag", - "nodeLineageTag": "e281e266-d03f-45f7-9f2f-9ff74984c501", - "size": { - "height": 152, - "width": 234 - }, - "zIndex": 1 - }, - { - "location": { - "x": 1630.3080435161082, - "y": 338.0240705621186 - }, - "nodeIndex": "Dim_InsSalesType", - "nodeLineageTag": "a283b30f-6bf9-4841-8c06-8b4b27572f51", - "size": { - "height": 200, - "width": 234 - }, - "zIndex": 2 - }, - { - "location": { - "x": 919.40258989628694, - "y": 1073.77427739801 - }, - "nodeIndex": "Dim_PlatformMID", - "nodeLineageTag": "1cd2fd49-62d1-49ca-ac98-218be929baae", - "size": { - "height": 152, - "width": 234 - }, - "zIndex": 3 - }, - { - "location": { - "x": 336.97245492727438, - "y": 702.77552127739159 - }, - "nodeIndex": "Dim_StoreTypeMID", - "nodeLineageTag": "d6ca2686-554d-4d78-a475-7787f1325ec0", - "size": { - "height": 152, - "width": 234 - }, - "zIndex": 4 - }, - { - "location": { - "x": 50.697016225196421, - "y": 534.24456287105033 - }, - "nodeIndex": "Dim_Dept", - "nodeLineageTag": "d4fade06-0fa3-4c36-ac23-2abf52ad9f5e", - "size": { - "height": 200, - "width": 234 - }, - "zIndex": 5 - }, - { - "location": { - "x": 1206.4659127349657, - "y": 1141.4258732573708 - }, - "nodeIndex": "Dim_PrescriptionSource", - "nodeLineageTag": "953c3d2a-0eeb-4153-8348-907f82bf6413", - "size": { - "height": 152, - "width": 234 - }, - "zIndex": 12 - }, - { - "location": { - "x": 247.78764562480046, - "y": 1168.971301646538 - }, - "nodeIndex": "Dim_Reimburse", - "nodeLineageTag": "12b7ce8a-0cd1-49b2-8dc4-bdc0b7ff9a7d", - "size": { - "height": 152, - "width": 234 - }, - "zIndex": 6 - }, - { - "location": { - "x": 462.21440909434796, - "y": 131.13832893982135 - }, - "nodeIndex": "Dim_ReimburseType", - "nodeLineageTag": "d90fa524-ebdf-41f4-a2c3-b79657f2e782", - "size": { - "height": 152, - "width": 234 - }, - "zIndex": 7 - }, - { - "location": { - "x": 1455.7008253958209, - "y": 840.76540031593527 - }, - "nodeIndex": "Dim_Institution", - "nodeLineageTag": "c0020314-ede0-4bf5-af71-1f63368ac6aa", - "size": { - "height": 248, - "width": 234 - }, - "zIndex": 8 - }, - { - "location": { - "x": 1557.8246228832991, - "y": 588.10442727846089 - }, - "nodeIndex": "Dim_GeoKey", - "nodeLineageTag": "88fbe5ba-558f-4580-8d08-19e6a3e5be6a", - "size": { - "height": 200, - "width": 234 - }, - "zIndex": 14 - }, - { - "location": { - "x": 749.23275432433547, - "y": 302.15186530339724 - }, - "nodeIndex": "Dim_DataSource_ForRLS", - "nodeLineageTag": "8a0dec48-e4ca-410e-bfb9-022ad263205c", - "size": { - "height": 176, - "width": 234 - }, - "zIndex": 9 - }, - { - "location": { - "x": 908.398488250178, - "y": 613.14005982127651 - }, - "nodeIndex": "Dim_MergeDataSource", - "nodeLineageTag": "b9ec943e-c3e6-4334-a98c-527f4e55ccd6", - "size": { - "height": 104, - "width": 234 - }, - "zIndex": 11 - } - ], - "name": "Fact_Sales_NIAD", - "zoomValue": 74.126497275900064, - "pinKeyFieldsToTop": false, - "showExtraHeaderInfo": false, - "hideKeyFieldsWhenCollapsed": false, - "tablesLocked": false - }, - { - "ordinal": 2, - "scrollPosition": { - "x": 779.8396758264231, + "x": 317.51723258276991, "y": 0 }, "nodes": [ @@ -1168,7 +932,7 @@ "height": 300, "width": 234 }, - "zIndex": 20 + "zIndex": 21 }, { "location": { @@ -1428,7 +1192,7 @@ "height": 224, "width": 234 }, - "zIndex": 21 + "zIndex": 20 } ], "name": "Main_CHPA", @@ -1439,203 +1203,7 @@ "tablesLocked": false }, { - "ordinal": 3, - "scrollPosition": { - "x": 0, - "y": 0 - }, - "nodes": [ - { - "location": { - "x": 0, - "y": 0 - }, - "nodeIndex": "Dim_Calendar", - "nodeLineageTag": "b54e7974-59f5-4b19-b987-f439b32f640d", - "size": { - "height": 128, - "width": 234 - }, - "zIndex": 9, - "expandedHeight": 281 - }, - { - "location": { - "x": 788, - "y": 0 - }, - "nodeIndex": "Dim_PackInfo", - "nodeLineageTag": "f420be02-8dc1-467f-8e0e-a8231e8b72e6", - "size": { - "height": 176, - "width": 234 - }, - "zIndex": 8, - "expandedHeight": 300 - }, - { - "location": { - "x": 256, - "y": 0 - }, - "nodeIndex": "Dim_GeoKey", - "nodeLineageTag": "88fbe5ba-558f-4580-8d08-19e6a3e5be6a", - "size": { - "height": 104, - "width": 234 - }, - "zIndex": 6, - "expandedHeight": 200 - }, - { - "location": { - "x": 533, - "y": 0 - }, - "nodeIndex": "Dim_Geo", - "nodeLineageTag": "aeec8d5d-c86c-4957-8592-3a153f08c3a8", - "size": { - "height": 104, - "width": 234 - }, - "zIndex": 7, - "expandedHeight": 300 - }, - { - "location": { - "x": 982, - "y": 851 - }, - "nodeIndex": "Dim_KeyCompetitor", - "nodeLineageTag": "a6eb142e-da93-4631-939c-d1305beec9f0", - "size": { - "height": 104, - "width": 234 - }, - "zIndex": 5, - "expandedHeight": 128 - }, - { - "location": { - "x": 1069, - "y": 0 - }, - "nodeIndex": "Dim_Class", - "nodeLineageTag": "5c9e5bd8-bf81-4518-85df-5ca516d61579", - "size": { - "height": 128, - "width": 234 - }, - "zIndex": 10, - "expandedHeight": 200 - }, - { - "location": { - "x": 52, - "y": 851 - }, - "nodeIndex": "Dim_PlatformMID", - "nodeLineageTag": "1cd2fd49-62d1-49ca-ac98-218be929baae", - "size": { - "height": 104, - "width": 234 - }, - "zIndex": 3, - "expandedHeight": 152 - }, - { - "location": { - "x": 628, - "y": 873 - }, - "nodeIndex": "Dim_DataSource", - "nodeLineageTag": "8a47e04a-d7ca-4a96-bf05-10c9cff59288", - "size": { - "height": 104, - "width": 234 - }, - "zIndex": 4, - "expandedHeight": 176 - }, - { - "location": { - "x": 631, - "y": 648 - }, - "nodeIndex": "Dim_DataSource_ForRLS", - "nodeLineageTag": "8a0dec48-e4ca-410e-bfb9-022ad263205c", - "size": { - "height": 104, - "width": 234 - }, - "zIndex": 11, - "expandedHeight": 176 - }, - { - "location": { - "x": 326, - "y": 862 - }, - "nodeIndex": "Dim_Dept", - "nodeLineageTag": "d4fade06-0fa3-4c36-ac23-2abf52ad9f5e", - "size": { - "height": 104, - "width": 234 - }, - "zIndex": 12, - "expandedHeight": 200 - }, - { - "location": { - "x": 971, - "y": 659 - }, - "nodeIndex": "Dim_Institution", - "nodeLineageTag": "c0020314-ede0-4bf5-af71-1f63368ac6aa", - "size": { - "height": 104, - "width": 234 - }, - "zIndex": 2, - "expandedHeight": 248 - }, - { - "location": { - "x": 1304, - "y": 608 - }, - "nodeIndex": "Dim_InsSalesType", - "nodeLineageTag": "a283b30f-6bf9-4841-8c06-8b4b27572f51", - "size": { - "height": 128, - "width": 234 - }, - "zIndex": 1, - "expandedHeight": 200 - }, - { - "location": { - "x": 1423, - "y": 374 - }, - "nodeIndex": "Dim_PrescriptionSource", - "nodeLineageTag": "953c3d2a-0eeb-4153-8348-907f82bf6413", - "size": { - "height": 152, - "width": 297 - }, - "zIndex": 14 - } - ], - "name": "Main_AIA", - "zoomValue": 100, - "pinKeyFieldsToTop": true, - "showExtraHeaderInfo": false, - "hideKeyFieldsWhenCollapsed": false, - "tablesLocked": false - }, - { - "ordinal": 4, + "ordinal": 2, "scrollPosition": { "x": 0, "y": 200 @@ -1791,6 +1359,138 @@ "showExtraHeaderInfo": false, "hideKeyFieldsWhenCollapsed": false, "tablesLocked": false + }, + { + "ordinal": 3, + "scrollPosition": { + "x": 0, + "y": 0 + }, + "nodes": [ + { + "location": { + "x": 335.88107188346197, + "y": 303.712776751037 + }, + "nodeIndex": "Fact_Sales_NIAD", + "nodeLineageTag": "5ce66265-a4ef-457b-9400-e0d76042498d", + "size": { + "height": 300, + "width": 234 + }, + "zIndex": 8 + }, + { + "location": { + "x": 446.51664729382634, + "y": 656.237407053744 + }, + "nodeIndex": "Dim_DataSource", + "nodeLineageTag": "8a47e04a-d7ca-4a96-bf05-10c9cff59288", + "size": { + "height": 176, + "width": 234 + }, + "zIndex": 3 + }, + { + "location": { + "x": 885.57121825961235, + "y": 586.28325464539716 + }, + "nodeIndex": "Dim_PackInfo", + "nodeLineageTag": "f420be02-8dc1-467f-8e0e-a8231e8b72e6", + "size": { + "height": 300, + "width": 234 + }, + "zIndex": 4 + }, + { + "location": { + "x": 50, + "y": 473.18935785794 + }, + "nodeIndex": "Dim_Geo", + "nodeLineageTag": "aeec8d5d-c86c-4957-8592-3a153f08c3a8", + "size": { + "height": 300, + "width": 234 + }, + "zIndex": 6 + }, + { + "location": { + "x": 64.819173935169488, + "y": 50.522183019311342 + }, + "nodeIndex": "Dim_GeoKey", + "nodeLineageTag": "88fbe5ba-558f-4580-8d08-19e6a3e5be6a", + "size": { + "height": 200, + "width": 234 + }, + "zIndex": 7 + }, + { + "location": { + "x": 545.51771421489957, + "y": -50 + }, + "nodeIndex": "Dim_Calendar", + "nodeLineageTag": "b54e7974-59f5-4b19-b987-f439b32f640d", + "size": { + "height": 300, + "width": 234 + }, + "zIndex": 5 + }, + { + "location": { + "x": 885.20000076293945, + "y": 197.20000076293945 + }, + "nodeIndex": "Dim_Market", + "nodeLineageTag": "e93174e2-bfca-4d29-bee7-23d72512e194", + "size": { + "height": 296, + "width": 234 + }, + "zIndex": 1 + }, + { + "location": { + "x": 1155.2000007629395, + "y": 501 + }, + "nodeIndex": "Dim_Class", + "nodeLineageTag": "5c9e5bd8-bf81-4518-85df-5ca516d61579", + "size": { + "height": 200, + "width": 234 + }, + "zIndex": 9 + }, + { + "location": { + "x": 1140.2000007629395, + "y": 244 + }, + "nodeIndex": "Dim_KeyCompetitor", + "nodeLineageTag": "a6eb142e-da93-4631-939c-d1305beec9f0", + "size": { + "height": 128, + "width": 234 + }, + "zIndex": 2 + } + ], + "name": "Fact_Sales_NIAD", + "zoomValue": 100, + "pinKeyFieldsToTop": false, + "showExtraHeaderInfo": false, + "hideKeyFieldsWhenCollapsed": false, + "tablesLocked": false } ], "selectedDiagram": "Fact_Sales_NIAD",