Skip to content

Commit

Permalink
Export scenario column (#181)
Browse files Browse the repository at this point in the history 
* Removing scenario column, where needed.

* Changes in the Test

* diff ;

* Removing the unused method.

* Taking care of the order of the columns

* Removing the display orders where the default ordering does the wanted.
  • Loading branch information
@tkukuljan
tkukuljan authored Jan 19, 2023
1 parent fc7ea03 commit 810d513
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 31 deletions.
4 changes: 2 additions & 2 deletions ifrs17-template/Export/MapTemplate.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
"\n .PortfolioConfiguration<InsurancePortfolio>()",
"\n .GroupofContractConfiguration<GroupOfReinsuranceContract>(typeof(ReinsurancePortfolio))",
"\n .GroupofContractConfiguration<GroupOfInsuranceContract>(typeof(InsurancePortfolio))",
"\n .MainTabConfigurationWoScenario(partition)",
"\n .MainTabConfiguration(partition)",
"\n .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
],
"metadata": {},
Expand Down Expand Up @@ -239,7 +239,7 @@
"\n .WithSource(Workspace)",
"\n .StateEnumConfiguration() ",
"\n .DataNodeStateConfiguration(dataNodeStates)",
"\n .MainTabConfigurationWoScenario(partition)",
"\n .MainTabConfiguration(partition)",
"\n .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
],
"metadata": {},
Expand Down
8 changes: 4 additions & 4 deletions ifrs17-template/Test/MapTemplateAndImportTest.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
"\n .PortfolioConfiguration<InsurancePortfolio>()",
"\n .GroupofContractConfiguration<GroupOfReinsuranceContract>(typeof(ReinsurancePortfolio))",
"\n .GroupofContractConfiguration<GroupOfInsuranceContract>(typeof(InsurancePortfolio))",
"\n .MainTabConfigurationWoScenario(partition)",
"\n .MainTabConfiguration(partition)",
"\n .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader);",
"\n",
"\nexportResult.ActivityLog.Status.Should().Be(ActivityLogStatus.Succeeded);"
Expand All @@ -183,7 +183,7 @@
"\n .PortfolioConfiguration<InsurancePortfolio>()",
"\n .GroupofContractConfiguration<GroupOfReinsuranceContract>(typeof(ReinsurancePortfolio))",
"\n .GroupofContractConfiguration<GroupOfInsuranceContract>(typeof(InsurancePortfolio))",
"\n .MainTabConfigurationWoScenario(partition)",
"\n .MainTabConfiguration(partition)",
"\n .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
],
"metadata": {},
Expand Down Expand Up @@ -264,7 +264,7 @@
"\n .WithSource(Workspace)",
"\n .StateEnumConfiguration() ",
"\n .DataNodeStateConfiguration(dataNodeStates)",
"\n .MainTabConfigurationWoScenario(partition)",
"\n .MainTabConfiguration(partition)",
"\n .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader);",
"\n",
"\nexportResult.ActivityLog.Status.Should().Be(ActivityLogStatus.Succeeded);"
Expand All @@ -280,7 +280,7 @@
"\n .WithSource(Workspace)",
"\n .StateEnumConfiguration() ",
"\n .DataNodeStateConfiguration(dataNodeStates)",
"\n .MainTabConfigurationWoScenario(partition)",
"\n .MainTabConfiguration(partition)",
"\n .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
],
"metadata": {},
Expand Down
16 changes: 4 additions & 12 deletions ifrs17/DataModel/DataStructure.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1151,7 +1151,6 @@
"\n public string Scenario { get; init; }",
"\n",
"\n [IdentityProperty]",
"\n [Display(Order = 37)]",
"\n public string Name { get; init; }",
"\n ",
"\n [Conversion(typeof(PrimitiveArrayConverter))]",
Expand Down Expand Up @@ -1232,6 +1231,7 @@
"\n [Required]",
"\n [Dimension(typeof(ReportingNode))]",
"\n [IdentityProperty]",
"\n [Display(Order = 10)]",
"\n public string ReportingNode { get; init; }",
"\n}"
],
Expand Down Expand Up @@ -1272,15 +1272,17 @@
"public record PartitionByReportingNodeAndPeriod : IfrsPartition {",
"\n [Dimension(typeof(int), nameof(Year))]",
"\n [IdentityProperty]",
"\n [Display(Order = 20)]",
"\n public int Year { get; init; }",
"\n",
"\n [Dimension(typeof(int), nameof(Month))]",
"\n [IdentityProperty]",
"\n [Display(Order = 30)]",
"\n public int Month { get; init; }",
"\n ",
"\n [Display(Order = 50)]",
"\n [Dimension(typeof(Scenario))]",
"\n [IdentityProperty]",
"\n [Display(Order = 40)]",
"\n public string Scenario { get; init; }",
"\n}"
],
Expand Down Expand Up @@ -1502,7 +1504,6 @@
"\n ",
"\n [Required]",
"\n [IdentityProperty]",
"\n [Display(Order = 10)]",
"\n [Dimension(typeof(GroupOfContract))]",
"\n public string DataNode { get; init; }",
"\n ",
Expand All @@ -1511,25 +1512,21 @@
"\n [NoArithmetics(ArithmeticOperation.Scale)]",
"\n [Dimension(typeof(int), nameof(Year))]",
"\n [Range(1900, 2100, ErrorMessage = \"Value for {0} must be between {1} and {2}.\")]",
"\n [Display(Order = 20)]",
"\n public int Year { get; init; }",
"\n ",
"\n [Required]",
"\n [IdentityProperty]",
"\n [NoArithmetics(ArithmeticOperation.Scale)]",
"\n [Dimension(typeof(int), nameof(Month))]",
"\n [Range(1, 12, ErrorMessage = \"Value for {0} must be between {1} and {2}.\")]",
"\n [Display(Order = 30)]",
"\n [DefaultValue(DefaultDataNodeActivationMonth)]",
"\n public int Month { get; init; } = DefaultDataNodeActivationMonth;",
"\n ",
"\n [Required]",
"\n [Display(Order = 40)]",
"\n [DefaultValue(State.Active)]",
"\n public State State { get; init; } = State.Active;",
"\n",
"\n [IdentityProperty]",
"\n [Display(Order = 50)]",
"\n [Dimension(typeof(Scenario))]",
"\n public string Scenario { get; init; }",
"\n}"
Expand Down Expand Up @@ -1568,26 +1565,22 @@
"\n [NoArithmetics(ArithmeticOperation.Scale)]",
"\n [Dimension(typeof(int), nameof(Year))]",
"\n [Range(1900, 2100, ErrorMessage = \"Value for {0} must be between {1} and {2}.\")]",
"\n [Display(Order = 20)]",
"\n public int Year { get; init; }",
"\n ",
"\n [Required]",
"\n [IdentityProperty]",
"\n [NoArithmetics(ArithmeticOperation.Scale)]",
"\n [Dimension(typeof(int), nameof(Month))]",
"\n [Range(1, 12, ErrorMessage = \"Value for {0} must be between {1} and {2}.\")]",
"\n [Display(Order = 30)]",
"\n [DefaultValue(DefaultDataNodeActivationMonth)]",
"\n public int Month { get; init; } = DefaultDataNodeActivationMonth;",
"\n ",
"\n [Required]",
"\n [IdentityProperty]",
"\n [Display(Order = 10)]",
"\n [Dimension(typeof(GroupOfContract))]",
"\n public string DataNode { get; init; }",
"\n",
"\n [IdentityProperty]",
"\n [Display(Order = 40)]",
"\n [Dimension(typeof(Scenario))]",
"\n public string Scenario { get; init; }",
"\n}"
Expand All @@ -1608,7 +1601,6 @@
"\npublic record InterDataNodeParameter : DataNodeParameter {",
"\n [Required]",
"\n [IdentityProperty]",
"\n [Display(Order = 10)]",
"\n [Dimension(typeof(GroupOfContract))]",
"\n public string LinkedDataNode { get; init; }",
"\n ",
Expand Down
16 changes: 3 additions & 13 deletions ifrs17/Export/ExportConfiguration.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,19 +62,6 @@
"execution_count": 0,
"outputs": []
},
{
"cell_type": "code",
"source": [
"public static IDocumentBuilder MainTabConfigurationWoScenario<T>(this IDocumentBuilder builder, T args) where T : IfrsPartition",
"\n => builder.WithTable<T>( config => config .AtBeginning() ",
"\n .WithName(Main) ",
"\n .WithSource(source => args.RepeatOnce().AsQueryable()) ",
"\n .WithColumn(x => x.Id, x => x.Delete()));"
],
"metadata": {},
"execution_count": 0,
"outputs": []
},
{
"cell_type": "code",
"source": [
Expand Down Expand Up @@ -197,6 +184,7 @@
"\n .WithColumn(x => x.Month, x => x.Delete())",
"\n .WithColumn(x => x.Year, x => x.Delete())",
"\n .WithColumn(x => x.Id, x => x.Delete())",
"\n .WithColumn(x => x.Scenario, x => x.Delete())",
"\n .WithColumn(x => x.State, y => y.WithDataValidation(z => z.WithReferenceTo<HelperState, string>(t => t.State)))",
"\n );"
],
Expand Down Expand Up @@ -250,6 +238,7 @@
"\n .WithColumn(x => x.Partition, x => x.Delete())",
"\n .WithColumn(x => x.Month, x => x.Delete())",
"\n .WithColumn(x => x.Id, x => x.Delete())",
"\n .WithColumn(x => x.Scenario, x => x.Delete())",
"\n .WithColumn(x => x.Year, x => x.Delete())",
"\n )",
"\n .WithTable<SingleDataNodeParameter>(config => config ",
Expand All @@ -261,6 +250,7 @@
"\n .WithColumn(x => x.Year, x => x.Delete())",
"\n .WithColumn(x => x.Year, x => x.Delete())",
"\n .WithColumn(x => x.Id, x => x.Delete())",
"\n .WithColumn(x => x.Scenario, x => x.Delete())",
"\n );"
],
"metadata": {},
Expand Down

0 comments on commit 810d513

Please sign in to comment.