Interactive reports

full-ifrs17-template/Files/DimensionsAndPartitions.csv

@@ -228,9 +228,6 @@ CH,00000000-0000-0000-0000-000000000001,,,,,,,,,,
 ReportingNode,Year,Month,Id,,,,,,,,
 CH,2020,12,10000000-0000-0000-0000-000000000000,,,,,,,,
 CH,2021,3,20000000-0000-0000-0000-000000000000,,,,,,,,
-CH,2021,9,30000000-0000-0000-0000-000000000000,,,,,,,,
-CH,2021,12,35000000-0000-0000-0000-000000000000,,,,,,,,
-CH,2022,3,40000000-0000-0000-0000-000000000000,,,,,,,,
 ,,,,,,,,,,,
 @@ProjectionConfiguration,,,,,,,,,,,
 SystemName,DisplayName,Shift,TimeStep,,,,,,,,

full-ifrs17-template/Test/SpecificationsSetup.ipynb

@@ -90,7 +90,7 @@
                 "\n                         Value = scope.Value,",
                 "\n                         Partition = scope.GetStorage().TargetPartition };",
                 "\n",
-                "\npublic static IfrsVariable FromCsmToIfrsVariable(this ContractualServiceMaring scope)",
+                "\npublic static IfrsVariable FromCsmToIfrsVariable(this ContractualServiceMargin scope)",
                 "\n    => new IfrsVariable{ EstimateType = scope.EstimateType, ",
                 "\n                         DataNode = scope.Identity.DataNode, ",
                 "\n                         AocType = scope.Identity.AocType, ",

full-ifrs17-template/Test/SpecificationsTechnicalMargin.ipynb

@@ -1121,7 +1121,7 @@
         {
             "cell_type": "code",
             "source": [
-                "var computedCSM_BoP_I = Test.GetScope<ContractualServiceMaring>(id_BoP_I).Value;",
+                "var computedCSM_BoP_I = Test.GetScope<ContractualServiceMargin>(id_BoP_I).Value;",
                 "\nvar computedLC_BoP_I = Test.GetScope<LossComponent>(id_BoP_I).Value;"
             ]
         },
@@ -1196,7 +1196,7 @@
         {
             "cell_type": "code",
             "source": [
-                "var computedCSM_MC_I = Test.GetScope<ContractualServiceMaring>(id_MC_I).Value;",
+                "var computedCSM_MC_I = Test.GetScope<ContractualServiceMargin>(id_MC_I).Value;",
                 "\nvar computedLC_MC_I = Test.GetScope<LossComponent>(id_MC_I).Value;"
             ]
         },
@@ -1447,7 +1447,7 @@
         {
             "cell_type": "code",
             "source": [
-                "var computedCSM_CL_C = Test.GetScope<ContractualServiceMaring>(id_CL_C).Value;",
+                "var computedCSM_CL_C = Test.GetScope<ContractualServiceMargin>(id_CL_C).Value;",
                 "\nvar computedLC_CL_C = Test.GetScope<LossComponent>(id_CL_C).Value;"
             ]
         },
@@ -1644,7 +1644,7 @@
         {
             "cell_type": "code",
             "source": [
-                "var computedCSM_EoP_C = Test.GetScope<ContractualServiceMaring>(id_EoP_C).Value;",
+                "var computedCSM_EoP_C = Test.GetScope<ContractualServiceMargin>(id_EoP_C).Value;",
                 "\nvar computedLC_EoP_C = Test.GetScope<LossComponent>(id_EoP_C).Value;"
             ]
         },
@@ -1694,7 +1694,7 @@
         {
             "cell_type": "code",
             "source": [
-                "var csm = allIdentitiesWoLic.SelectMany(id => Test.GetScope<ContractualServiceMaring>(id).RepeatOnce()",
+                "var csm = allIdentitiesWoLic.SelectMany(id => Test.GetScope<ContractualServiceMargin>(id).RepeatOnce()",
                 "\n                                                  .Where(x => Math.Abs(x.Value) >= Precision)",
                 "\n                                                  .Select(x => x.FromCsmToIfrsVariable())).ToArray();"
             ]

ifrs17/CalculationEngine.ipynb

@@ -19,12 +19,18 @@
             "cell_type": "code",
             "source": [
                 "#!import \"DataModel/DataStructure\"",
-                "\n#!import \"Report/ReportScopes\"",
+                "\n#!import \"Report/ReportMutableScopes\"",
                 "\n#!import \"Import/Importers\"",
                 "\n#!import \"Export/ExportConfiguration\"",
                 "\n#!import \"Utils/TestHelper\"",
                 "\n#!import \"Utils/ImportCalculationMethods\""
             ]
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var ifrs17Report = new Ifrs17Reports(Workspace, Scopes, Report);"
+            ]
         }
     ]
 }

ifrs17/DataModel/DataStructure.ipynb

@@ -1056,15 +1056,6 @@
                 "\n- OCI Type"
             ]
         },
-        {
-            "cell_type": "markdown",
-            "source": [
-                "<b>TODOs:</b>",
-                "\n<ul>",
-                "\n<li> Remove Scenario from Partition and include it as simple property (see Year, Month). Introduce concept of Priority in LoadCurrentAndPreviousParameterAsync query (see ParameterResultsEntityQueryExtensions in IfrsGeneric).</li>",
-                "\n</ul>"
-            ]
-        },
         {
             "cell_type": "code",
             "source": [

ifrs17/Import/ImportScopeCalculation.ipynb

@@ -1784,7 +1784,7 @@
         {
             "cell_type": "code",
             "source": [
-                "public interface ContractualServiceMaring : IScope<ImportIdentity, ImportStorage>",
+                "public interface ContractualServiceMargin : IScope<ImportIdentity, ImportStorage>",
                 "\n{",
                 "\n    [NotVisible]string EstimateType => EstimateTypes.C;",
                 "\n    ",
@@ -1951,7 +1951,7 @@
                 "\n                            ",
                 "\n    IEnumerable<IfrsVariable> Csms => GetStorage().DataNodeDataBySystemName[Identity.DataNode].LiabilityType == LiabilityTypes.LIC",
                 "\n                            ? Enumerable.Empty<IfrsVariable>()",
-                "\n                            : GetScope<ContractualServiceMaring>(Identity).RepeatOnce()",
+                "\n                            : GetScope<ContractualServiceMargin>(Identity).RepeatOnce()",
                 "\n                              .Where(x => Math.Abs(x.Value) >= Precision)",
                 "\n                              .Select(x => new IfrsVariable{ EstimateType = x.EstimateType,",
                 "\n                                   DataNode = x.Identity.DataNode,",

ifrs17/Report/ReportConfigurationAndUtils.ipynb

@@ -102,7 +102,6 @@
             "source": [
                 "public static async Task<ICollection<ReportVariable>> QueryReportVariablesAsync(this IWorkspace workspace, (int Year, int Month, string ReportingNode, string Scenario) args ) {",
                 "\n    ",
-                "\n    await workspace.Partition.SetAsync<PartitionByReportingNode>(new { ReportingNode = args.ReportingNode, Scenario = args.Scenario });",
                 "\n    await workspace.Partition.SetAsync<PartitionByReportingNodeAndPeriod>(new { ReportingNode = args.ReportingNode, Scenario = args.Scenario, Year = args.Year, Month = args.Month });",
                 "\n    ",
                 "\n    return await workspace.Query<GroupOfContract>()",
@@ -146,6 +145,12 @@
                 "\n        .ToArrayAsync();",
                 "\n}"
             ]
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                ""
+            ]
         }
     ]
 }