Index: Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/GrassCoverErosionInwardsCalculationEntity.cs =================================================================== diff -u -r95bbe12fc806f0d87b31ba178135094d3150ff8a -r3fbd801481124067e570c969810710b65cde6711 --- Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/GrassCoverErosionInwardsCalculationEntity.cs (.../GrassCoverErosionInwardsCalculationEntity.cs) (revision 95bbe12fc806f0d87b31ba178135094d3150ff8a) +++ Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/GrassCoverErosionInwardsCalculationEntity.cs (.../GrassCoverErosionInwardsCalculationEntity.cs) (revision 3fbd801481124067e570c969810710b65cde6711) @@ -39,7 +39,6 @@ public GrassCoverErosionInwardsCalculationEntity() { GrassCoverErosionInwardsOutputEntities = new HashSet(); - GrassCoverErosionInwardsSectionResultEntities = new HashSet(); } public long GrassCoverErosionInwardsCalculationEntityId { get; set; } @@ -62,15 +61,14 @@ public byte ShouldDikeHeightIllustrationPointsBeCalculated { get; set; } public byte ShouldOvertoppingRateIllustrationPointsBeCalculated { get; set; } public byte ShouldOvertoppingOutputIllustrationPointsBeCalculated { get; set; } + public byte RelevantForScenario { get; set; } + public double? ScenarioContribution { get; set; } public virtual CalculationGroupEntity CalculationGroupEntity { get; set; } public virtual DikeProfileEntity DikeProfileEntity { get; set; } public virtual HydraulicLocationEntity HydraulicLocationEntity { get; set; } [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverErosionInwardsOutputEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection GrassCoverErosionInwardsSectionResultEntities { get; set; } } } \ No newline at end of file Index: Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/GrassCoverErosionInwardsSectionResultEntity.cs =================================================================== diff -u -r95bbe12fc806f0d87b31ba178135094d3150ff8a -r3fbd801481124067e570c969810710b65cde6711 --- Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/GrassCoverErosionInwardsSectionResultEntity.cs (.../GrassCoverErosionInwardsSectionResultEntity.cs) (revision 95bbe12fc806f0d87b31ba178135094d3150ff8a) +++ Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/GrassCoverErosionInwardsSectionResultEntity.cs (.../GrassCoverErosionInwardsSectionResultEntity.cs) (revision 3fbd801481124067e570c969810710b65cde6711) @@ -34,7 +34,6 @@ { public long GrassCoverErosionInwardsSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } - public long? GrassCoverErosionInwardsCalculationEntityId { get; set; } public byte SimpleAssessmentResult { get; set; } public byte DetailedAssessmentResult { get; set; } public byte TailorMadeAssessmentResult { get; set; } @@ -43,6 +42,5 @@ public double? ManualAssemblyProbability { get; set; } public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } - public virtual GrassCoverErosionInwardsCalculationEntity GrassCoverErosionInwardsCalculationEntity { get; set; } } } \ No newline at end of file Index: Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/RiskeerEntities.Context.cs =================================================================== diff -u -r95bbe12fc806f0d87b31ba178135094d3150ff8a -r3fbd801481124067e570c969810710b65cde6711 --- Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/RiskeerEntities.Context.cs (.../RiskeerEntities.Context.cs) (revision 95bbe12fc806f0d87b31ba178135094d3150ff8a) +++ Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/RiskeerEntities.Context.cs (.../RiskeerEntities.Context.cs) (revision 3fbd801481124067e570c969810710b65cde6711) @@ -1,4 +1,4 @@ -// Copyright (C) Stichting Deltares 2019. All rights reserved. +// Copyright (C) Stichting Deltares 2019. All rights reserved. // // This file is part of Riskeer. // @@ -129,7 +129,7 @@ public virtual DbSet WaveImpactAsphaltCoverSectionResultEntities { get; set; } public virtual DbSet WaveImpactAsphaltCoverWaveConditionsCalculationEntities { get; set; } public virtual DbSet WaveImpactAsphaltCoverWaveConditionsOutputEntities { get; set; } - + /// /// This method is called in a 'code first' approach when the model for a derived has been initialized, /// but before the model has been locked down and used to initialize the . Index: Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/RiskeerEntities.Designer.cs =================================================================== diff -u -r95bbe12fc806f0d87b31ba178135094d3150ff8a -r3fbd801481124067e570c969810710b65cde6711 --- Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/RiskeerEntities.Designer.cs (.../RiskeerEntities.Designer.cs) (revision 95bbe12fc806f0d87b31ba178135094d3150ff8a) +++ Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/RiskeerEntities.Designer.cs (.../RiskeerEntities.Designer.cs) (revision 3fbd801481124067e570c969810710b65cde6711) @@ -1,4 +1,4 @@ -// T4 code generation is enabled for model 'D:\checkouts\Riskeer\Riskeer\Storage\src\Riskeer.Storage.Core\DbContext\RiskeerEntities.edmx'. +// T4 code generation is enabled for model 'D:\Development\Riskeer-tools\StorageEntityGenerator\StorageEntityGenerator\DbContext\RiskeerEntities.edmx'. // To enable legacy code generation, change the value of the 'Code Generation Strategy' designer // property to 'Legacy ObjectContext'. This property is available in the Properties Window when the model // is open in the designer. Index: Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/RiskeerEntities.edmx =================================================================== diff -u -r95bbe12fc806f0d87b31ba178135094d3150ff8a -r3fbd801481124067e570c969810710b65cde6711 --- Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/RiskeerEntities.edmx (.../RiskeerEntities.edmx) (revision 95bbe12fc806f0d87b31ba178135094d3150ff8a) +++ Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/RiskeerEntities.edmx (.../RiskeerEntities.edmx) (revision 3fbd801481124067e570c969810710b65cde6711) @@ -4,7 +4,7 @@ - + @@ -392,6 +392,8 @@ + + @@ -448,7 +450,6 @@ - @@ -2242,18 +2243,6 @@ - - - - - - - - - - - - @@ -3734,10 +3723,6 @@ - - - - @@ -4473,7 +4458,7 @@ - + @@ -4605,10 +4590,6 @@ - - - - @@ -5192,7 +5173,7 @@ - + @@ -5300,11 +5281,12 @@ + + - @@ -5370,15 +5352,13 @@ - - - + @@ -7384,7 +7364,7 @@ - + @@ -7780,18 +7760,6 @@ - - - - - - - - - - - - @@ -8738,6 +8706,8 @@ + + @@ -8823,7 +8793,6 @@ - Index: Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/RiskeerEntities.edmx.diagram =================================================================== diff -u -r95bbe12fc806f0d87b31ba178135094d3150ff8a -r3fbd801481124067e570c969810710b65cde6711 --- Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/RiskeerEntities.edmx.diagram (.../RiskeerEntities.edmx.diagram) (revision 95bbe12fc806f0d87b31ba178135094d3150ff8a) +++ Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/RiskeerEntities.edmx.diagram (.../RiskeerEntities.edmx.diagram) (revision 3fbd801481124067e570c969810710b65cde6711) @@ -52,100 +52,100 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -209,7 +209,7 @@ - + @@ -242,7 +242,6 @@ -