Index: Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/GeneralResultSubMechanismIllustrationPointEntity.cs =================================================================== diff -u -r95bbe12fc806f0d87b31ba178135094d3150ff8a -rd3e9c5d835e2c37246d07c061a1e8a539fece3b7 --- Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/GeneralResultSubMechanismIllustrationPointEntity.cs (.../GeneralResultSubMechanismIllustrationPointEntity.cs) (revision 95bbe12fc806f0d87b31ba178135094d3150ff8a) +++ Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/GeneralResultSubMechanismIllustrationPointEntity.cs (.../GeneralResultSubMechanismIllustrationPointEntity.cs) (revision d3e9c5d835e2c37246d07c061a1e8a539fece3b7) @@ -39,6 +39,8 @@ public GeneralResultSubMechanismIllustrationPointEntity() { HydraulicLocationOutputEntities = new HashSet(); + ProbabilisticPipingCalculationOutputEntities = new HashSet(); + ProbabilisticPipingCalculationOutputEntities1 = new HashSet(); TopLevelSubMechanismIllustrationPointEntities = new HashSet(); StochastEntities = new HashSet(); } @@ -49,6 +51,12 @@ public virtual ICollection HydraulicLocationOutputEntities { get; set; } [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection ProbabilisticPipingCalculationOutputEntities { get; set; } + + [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection ProbabilisticPipingCalculationOutputEntities1 { get; set; } + + [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection TopLevelSubMechanismIllustrationPointEntities { get; set; } public string GoverningWindDirectionName { get; set; } Index: Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/ProbabilisticPipingCalculationOutputEntity.cs =================================================================== diff -u -r845fc40ad6c8b8f4b26a5fb325a628d27ac80b18 -rd3e9c5d835e2c37246d07c061a1e8a539fece3b7 --- Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/ProbabilisticPipingCalculationOutputEntity.cs (.../ProbabilisticPipingCalculationOutputEntity.cs) (revision 845fc40ad6c8b8f4b26a5fb325a628d27ac80b18) +++ Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/ProbabilisticPipingCalculationOutputEntity.cs (.../ProbabilisticPipingCalculationOutputEntity.cs) (revision d3e9c5d835e2c37246d07c061a1e8a539fece3b7) @@ -36,12 +36,16 @@ public long ProbabilisticPipingCalculationEntityId { get; set; } public long? ProfileSpecificGeneralResultFaultTreeIllustrationPointEntityId { get; set; } public long? SectionSpecificGeneralResultFaultTreeIllustrationPointEntityId { get; set; } + public long? ProfileSpecificGeneralResultSubMechanismIllustrationPointEntityId { get; set; } + public long? SectionSpecificGeneralResultSubMechanismIllustrationPointEntityId { get; set; } public int Order { get; set; } public double? ProfileSpecificReliability { get; set; } public double? SectionSpecificReliability { get; set; } public virtual GeneralResultFaultTreeIllustrationPointEntity GeneralResultFaultTreeIllustrationPointEntity { get; set; } public virtual GeneralResultFaultTreeIllustrationPointEntity GeneralResultFaultTreeIllustrationPointEntity1 { get; set; } + public virtual GeneralResultSubMechanismIllustrationPointEntity GeneralResultSubMechanismIllustrationPointEntity { get; set; } + public virtual GeneralResultSubMechanismIllustrationPointEntity GeneralResultSubMechanismIllustrationPointEntity1 { get; set; } public virtual ProbabilisticPipingCalculationEntity ProbabilisticPipingCalculationEntity { get; set; } } } \ No newline at end of file Index: Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/RiskeerEntities.Context.tt =================================================================== diff -u -r913494da9b1086ed9f0f8f36545f87a44652a302 -rd3e9c5d835e2c37246d07c061a1e8a539fece3b7 --- Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/RiskeerEntities.Context.tt (.../RiskeerEntities.Context.tt) (revision 913494da9b1086ed9f0f8f36545f87a44652a302) +++ Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/RiskeerEntities.Context.tt (.../RiskeerEntities.Context.tt) (revision d3e9c5d835e2c37246d07c061a1e8a539fece3b7) @@ -1,7 +1,6 @@ <#@ template language="C#" debug="false" hostspecific="true"#> <#@ include file="EF6.Utility.CS.ttinclude"#><#@ output extension=".cs"#><#@ import namespace="System.Collections" #><# - const string inputFile = @"RiskeerEntities.edmx"; var textTransform = DynamicTextTransformation.Create(this); var code = new CodeGenerationTools(this); @@ -41,10 +40,10 @@ //------------------------------------------------------------------------------ // -// <#=CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine1") #> +// <#= CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine1") #> // -// <#=CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine2") #> -// <#=CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine3") #> +// <#= CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine2") #> +// <#= CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine3") #> // //------------------------------------------------------------------------------ @@ -65,19 +64,19 @@ if (!String.IsNullOrEmpty(codeNamespace)) { #> -namespace <#=code.EscapeNamespace(codeNamespace) #> +namespace <#= code.EscapeNamespace(codeNamespace) #> { <# - PushIndent(" "); + PushIndent(" "); } #> -<#=Accessibility.ForType(container) #> partial class <#=code.Escape(container) #> : System.Data.Entity.DbContext +<#= Accessibility.ForType(container) #> partial class <#= code.Escape(container) #> : System.Data.Entity.DbContext { <# foreach (var entitySet in container.BaseEntitySets.OfType()) { #> - <#=codeStringGenerator.DbSet(entitySet) #> + <#= codeStringGenerator.DbSet(entitySet) #> <# } @@ -99,7 +98,6 @@ } } <# - if (!String.IsNullOrEmpty(codeNamespace)) { PopIndent(); @@ -114,26 +112,26 @@ { #> - [DbFunction("<#=edmFunction.NamespaceName #>", "<#=edmFunction.Name #>")] - <#=codeStringGenerator.ComposableFunctionMethod(edmFunction, modelNamespace) #> + [DbFunction("<#= edmFunction.NamespaceName #>", "<#= edmFunction.Name #>")] + <#= codeStringGenerator.ComposableFunctionMethod(edmFunction, modelNamespace) #> { <#+ codeStringGenerator.WriteFunctionParameters(edmFunction, WriteFunctionParameter); #> - <#=codeStringGenerator.ComposableCreateQuery(edmFunction, modelNamespace) #> + <#= codeStringGenerator.ComposableCreateQuery(edmFunction, modelNamespace) #> } <#+ } else { #> - <#=codeStringGenerator.FunctionMethod(edmFunction, modelNamespace, includeMergeOption) #> + <#= codeStringGenerator.FunctionMethod(edmFunction, modelNamespace, includeMergeOption) #> { <#+ codeStringGenerator.WriteFunctionParameters(edmFunction, WriteFunctionParameter); #> - <#=codeStringGenerator.ExecuteFunction(edmFunction, modelNamespace, includeMergeOption) #> + <#= codeStringGenerator.ExecuteFunction(edmFunction, modelNamespace, includeMergeOption) #> } <#+ if (typeMapper.GenerateMergeOptionFunction(edmFunction, includeMergeOption)) @@ -146,9 +144,9 @@ public void WriteFunctionParameter(string name, string isNotNull, string notNullInit, string nullInit) { #> - var <#=name #> = <#=isNotNull #> ? - <#=notNullInit #> : - <#=nullInit #>; + var <#= name #> = <#= isNotNull #> ? + <#= notNullInit #> : + <#= nullInit #>; <#+ } Index: Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/RiskeerEntities.edmx =================================================================== diff -u -r845fc40ad6c8b8f4b26a5fb325a628d27ac80b18 -rd3e9c5d835e2c37246d07c061a1e8a539fece3b7 --- Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/RiskeerEntities.edmx (.../RiskeerEntities.edmx) (revision 845fc40ad6c8b8f4b26a5fb325a628d27ac80b18) +++ Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/RiskeerEntities.edmx (.../RiskeerEntities.edmx) (revision d3e9c5d835e2c37246d07c061a1e8a539fece3b7) @@ -1131,6 +1131,8 @@ + + @@ -3009,6 +3011,18 @@ + + + + + + + + + + + + @@ -3020,7 +3034,19 @@ - + + + + + + + + + + + + + @@ -3032,7 +3058,7 @@ - + @@ -4051,14 +4077,22 @@ - + + + + + + + + + @@ -4668,11 +4702,11 @@ - + - + @@ -4688,6 +4722,14 @@ + + + + + + + + @@ -4860,7 +4902,7 @@ - + @@ -5360,8 +5402,8 @@ - - + + @@ -5374,6 +5416,8 @@ + + @@ -6238,7 +6282,7 @@ - + @@ -6248,12 +6292,16 @@ + + - - - + + + + + @@ -7848,7 +7896,7 @@ - + @@ -7860,7 +7908,7 @@ - + @@ -7908,6 +7956,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -8424,7 +8496,7 @@ - + @@ -9710,6 +9782,8 @@ + + Index: Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/RiskeerEntities.edmx.diagram =================================================================== diff -u -r93b3a652857fc9de1a19cb4f01d3926ac3b790b9 -rd3e9c5d835e2c37246d07c061a1e8a539fece3b7 --- Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/RiskeerEntities.edmx.diagram (.../RiskeerEntities.edmx.diagram) (revision 93b3a652857fc9de1a19cb4f01d3926ac3b790b9) +++ Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/RiskeerEntities.edmx.diagram (.../RiskeerEntities.edmx.diagram) (revision d3e9c5d835e2c37246d07c061a1e8a539fece3b7) @@ -53,101 +53,101 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + @@ -238,11 +238,13 @@ - + + + @@ -286,7 +288,7 @@ - + Index: Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/RiskeerEntities.tt =================================================================== diff -u -r913494da9b1086ed9f0f8f36545f87a44652a302 -rd3e9c5d835e2c37246d07c061a1e8a539fece3b7 --- Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/RiskeerEntities.tt (.../RiskeerEntities.tt) (revision 913494da9b1086ed9f0f8f36545f87a44652a302) +++ Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/RiskeerEntities.tt (.../RiskeerEntities.tt) (revision d3e9c5d835e2c37246d07c061a1e8a539fece3b7) @@ -1,7 +1,6 @@ <#@ template language="C#" debug="false" hostspecific="true"#> <#@ include file="EF6.Utility.CS.ttinclude"#><#@ output extension=".cs"#><#@ import namespace="System.Collections" #><# - const string inputFile = @"RiskeerEntities.edmx"; var textTransform = DynamicTextTransformation.Create(this); var code = new CodeGenerationTools(this); @@ -23,8 +22,8 @@ fileManager.StartNewFile(entity.Name + ".cs"); BeginNamespace(code); #> -<#=codeStringGenerator.UsingDirectives(inHeader: false) #> -<#=codeStringGenerator.EntityClassOpening(entity) #> +<#= codeStringGenerator.UsingDirectives(inHeader: false) #> +<#= codeStringGenerator.EntityClassOpening(entity) #> { <# var propertiesWithDefaultValues = typeMapper.GetPropertiesWithDefaultValues(entity); @@ -35,29 +34,29 @@ { #> [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] - public <#=code.Escape(entity) #>() + public <#= code.Escape(entity) #>() { <# - foreach (var edmProperty in propertiesWithDefaultValues) - { + foreach (var edmProperty in propertiesWithDefaultValues) + { #> - <#=code.Escape(edmProperty) #> = <#=typeMapper.CreateLiteral(edmProperty.DefaultValue) #>; + <#= code.Escape(edmProperty) #> = <#= typeMapper.CreateLiteral(edmProperty.DefaultValue) #>; <# - } + } - foreach (var navigationProperty in collectionNavigationProperties) - { + foreach (var navigationProperty in collectionNavigationProperties) + { #> - <#=code.Escape(navigationProperty) #> = new HashSet<<#=typeMapper.GetTypeName(navigationProperty.ToEndMember.GetEntityType()) #>>(); + <#= code.Escape(navigationProperty) #> = new HashSet<<#= typeMapper.GetTypeName(navigationProperty.ToEndMember.GetEntityType()) #>>(); <# - } + } - foreach (var complexProperty in complexProperties) - { + foreach (var complexProperty in complexProperties) + { #> - <#=code.Escape(complexProperty) #> = new <#=typeMapper.GetTypeName(complexProperty.TypeUsage) #>(); + <#= code.Escape(complexProperty) #> = new <#= typeMapper.GetTypeName(complexProperty.TypeUsage) #>(); <# - } + } #> } @@ -70,7 +69,7 @@ foreach (var edmProperty in simpleProperties) { #> - <#=codeStringGenerator.Property(edmProperty) #> + <#= codeStringGenerator.Property(edmProperty) #> <# } } @@ -80,12 +79,12 @@ #> <# - foreach (var complexProperty in complexProperties) - { + foreach (var complexProperty in complexProperties) + { #> - <#=codeStringGenerator.Property(complexProperty) #> + <#= codeStringGenerator.Property(complexProperty) #> <# - } + } } var navigationProperties = typeMapper.GetNavigationProperties(entity); @@ -94,18 +93,18 @@ #> <# - foreach (var navigationProperty in navigationProperties) - { - if (navigationProperty.ToEndMember.RelationshipMultiplicity == RelationshipMultiplicity.Many) - { + foreach (var navigationProperty in navigationProperties) + { + if (navigationProperty.ToEndMember.RelationshipMultiplicity == RelationshipMultiplicity.Many) + { #> [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] <# - } + } #> - <#=codeStringGenerator.NavigationProperty(navigationProperty) #> + <#= codeStringGenerator.NavigationProperty(navigationProperty) #> <# - } + } } #> } @@ -118,8 +117,8 @@ fileManager.StartNewFile(complex.Name + ".cs"); BeginNamespace(code); #> -<#=codeStringGenerator.UsingDirectives(inHeader: false, includeCollections: false) #> -<#=Accessibility.ForType(complex) #> partial class <#=code.Escape(complex) #> +<#= codeStringGenerator.UsingDirectives(inHeader: false, includeCollections: false) #> +<#= Accessibility.ForType(complex) #> partial class <#= code.Escape(complex) #> { <# var complexProperties = typeMapper.GetComplexProperties(complex); @@ -128,22 +127,22 @@ if (propertiesWithDefaultValues.Any() || complexProperties.Any()) { #> - public <#=code.Escape(complex) #>() + public <#= code.Escape(complex) #>() { <# - foreach (var edmProperty in propertiesWithDefaultValues) - { + foreach (var edmProperty in propertiesWithDefaultValues) + { #> - this.<#=code.Escape(edmProperty) #> = <#=typeMapper.CreateLiteral(edmProperty.DefaultValue) #>; + this.<#= code.Escape(edmProperty) #> = <#= typeMapper.CreateLiteral(edmProperty.DefaultValue) #>; <# - } + } - foreach (var complexProperty in complexProperties) - { + foreach (var complexProperty in complexProperties) + { #> - this.<#=code.Escape(complexProperty) #> = new <#=typeMapper.GetTypeName(complexProperty.TypeUsage) #>(); + this.<#= code.Escape(complexProperty) #> = new <#= typeMapper.GetTypeName(complexProperty.TypeUsage) #>(); <# - } + } #> } @@ -156,7 +155,7 @@ foreach (var edmProperty in simpleProperties) { #> - <#=codeStringGenerator.Property(edmProperty) #> + <#= codeStringGenerator.Property(edmProperty) #> <# } } @@ -166,12 +165,12 @@ #> <# - foreach (var edmProperty in complexProperties) - { + foreach (var edmProperty in complexProperties) + { #> - <#=codeStringGenerator.Property(edmProperty) #> + <#= codeStringGenerator.Property(edmProperty) #> <# - } + } } #> } @@ -184,7 +183,7 @@ fileManager.StartNewFile(enumType.Name + ".cs"); BeginNamespace(code); #> -<#=codeStringGenerator.UsingDirectives(inHeader: false, includeCollections: false) #> +<#= codeStringGenerator.UsingDirectives(inHeader: false, includeCollections: false) #> <# if (typeMapper.EnumIsFlags(enumType)) { @@ -193,7 +192,7 @@ <# } #> -<#=codeStringGenerator.EnumOpening(enumType) #> +<#= codeStringGenerator.EnumOpening(enumType) #> { <# var foundOne = false; @@ -202,7 +201,7 @@ { foundOne = true; #> - <#=code.Escape(typeMapper.GetEnumMemberName(member)) #> = <#=typeMapper.GetEnumMemberValue(member) #>, + <#= code.Escape(typeMapper.GetEnumMemberName(member)) #> = <#= typeMapper.GetEnumMemberValue(member) #>, <# } @@ -217,7 +216,6 @@ } fileManager.Process(); - #> <#+ public void WriteHeader(CodeStringGenerator codeStringGenerator, EntityFrameworkTemplateFileManager fileManager) @@ -247,13 +245,13 @@ //------------------------------------------------------------------------------ // -// <#=CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine1") #> +// <#= CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine1") #> // -// <#=CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine2") #> -// <#=CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine3") #> +// <#= CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine2") #> +// <#= CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine3") #> // //------------------------------------------------------------------------------ -<#=codeStringGenerator.UsingDirectives(inHeader: true) #> +<#= codeStringGenerator.UsingDirectives(inHeader: true) #> <#+ fileManager.EndBlock(); } @@ -264,7 +262,7 @@ if (!String.IsNullOrEmpty(codeNamespace)) { #> -namespace <#=code.EscapeNamespace(codeNamespace) #> +namespace <#= code.EscapeNamespace(codeNamespace) #> { <#+ PushIndent(" ");