Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismSectionResultCreateExtensions.cs =================================================================== diff -u -r7ae9100ff4e61169edcefaeb01b72d492431742f -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismSectionResultCreateExtensions.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismSectionResultCreateExtensions.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultCreateExtensions.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -41,7 +41,7 @@ var sectionResultEntity = new WaveImpactAsphaltCoverSectionResultEntity { LayerOne = Convert.ToByte(result.AssessmentLayerOne), - LayerTwoA = result.AssessmentLayerTwoA.Value.ToNaNAsNull(), + LayerTwoA = Convert.ToByte(result.AssessmentLayerTwoA), LayerThree = result.AssessmentLayerThree.Value.ToNaNAsNull() }; Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/AssessmentSectionEntity.cs =================================================================== diff -u -r211bad78e373481dee065860d8eb842b9db653ab -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/AssessmentSectionEntity.cs (.../AssessmentSectionEntity.cs) (revision 211bad78e373481dee065860d8eb842b9db653ab) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/AssessmentSectionEntity.cs (.../AssessmentSectionEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -1,5 +1,4 @@ // Copyright (C) Stichting Deltares 2016. All rights reserved. -// Copyright (C) Stichting Deltares 2016. All rights reserved. // // This file is part of Ringtoets. // @@ -29,20 +28,20 @@ // //------------------------------------------------------------------------------ -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class AssessmentSectionEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public AssessmentSectionEntity() { FailureMechanismEntities = new HashSet(); HydraulicLocationEntities = new HashSet(); } - + public long AssessmentSectionEntityId { get; set; } public long ProjectEntityId { get; set; } public string Id { get; set; } @@ -54,13 +53,11 @@ public short Composition { get; set; } public string ReferenceLinePointXml { get; set; } public int Order { get; set; } - + public virtual ProjectEntity ProjectEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection FailureMechanismEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection HydraulicLocationEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/CalculationGroupEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/CalculationGroupEntity.cs (.../CalculationGroupEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/CalculationGroupEntity.cs (.../CalculationGroupEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,15 +28,14 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class CalculationGroupEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public CalculationGroupEntity() { CalculationGroupEntity1 = new HashSet(); @@ -50,42 +49,32 @@ StabilityStoneCoverWaveConditionsCalculationEntities = new HashSet(); WaveImpactAsphaltCoverWaveConditionsCalculationEntities = new HashSet(); } - + public long CalculationGroupEntityId { get; set; } public Nullable ParentCalculationGroupEntityId { get; set; } public string Name { get; set; } public int Order { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection CalculationGroupEntity1 { get; set; } - public virtual CalculationGroupEntity CalculationGroupEntity2 { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection ClosingStructuresCalculationEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection FailureMechanismEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverErosionInwardsCalculationEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverErosionOutwardsWaveConditionsCalculationEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection HeightStructuresCalculationEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection PipingCalculationEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StabilityPointStructuresCalculationEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StabilityStoneCoverWaveConditionsCalculationEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection WaveImpactAsphaltCoverWaveConditionsCalculationEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/CharacteristicPointEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/CharacteristicPointEntity.cs (.../CharacteristicPointEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/CharacteristicPointEntity.cs (.../CharacteristicPointEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,10 +28,11 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class CharacteristicPointEntity { public long CharacteristicPointEntityId { get; set; } @@ -40,7 +41,7 @@ public Nullable X { get; set; } public Nullable Y { get; set; } public Nullable Z { get; set; } - + public virtual SurfaceLineEntity SurfaceLineEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructureEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructureEntity.cs (.../ClosingStructureEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructureEntity.cs (.../ClosingStructureEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,20 +28,19 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class ClosingStructureEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public ClosingStructureEntity() { ClosingStructuresCalculationEntities = new HashSet(); } - + public long ClosingStructureEntityId { get; set; } public long FailureMechanismEntityId { get; set; } public int Order { get; set; } @@ -73,10 +72,9 @@ public int IdenticalApertures { get; set; } public Nullable FailureProbabilityReparation { get; set; } public byte InflowModelType { get; set; } - + public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection ClosingStructuresCalculationEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructureFailureMechanismMetaEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructureFailureMechanismMetaEntity.cs (.../ClosingStructureFailureMechanismMetaEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructureFailureMechanismMetaEntity.cs (.../ClosingStructureFailureMechanismMetaEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -30,12 +30,15 @@ namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class ClosingStructureFailureMechanismMetaEntity { public long ClosingStructureFailureMechanismMetaEntityId { get; set; } public long FailureMechanismEntityId { get; set; } public int N2A { get; set; } - + public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresCalculationEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresCalculationEntity.cs (.../ClosingStructuresCalculationEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresCalculationEntity.cs (.../ClosingStructuresCalculationEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,21 +28,20 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class ClosingStructuresCalculationEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public ClosingStructuresCalculationEntity() { ClosingStructuresOutputEntities = new HashSet(); ClosingStructuresSectionResultEntities = new HashSet(); } - + public long ClosingStructuresCalculationEntityId { get; set; } public long CalculationGroupEntityId { get; set; } public Nullable ForeshoreProfileEntityId { get; set; } @@ -51,7 +50,18 @@ public int Order { get; set; } public string Name { get; set; } public string Comments { get; set; } + public byte UseBreakWater { get; set; } + public short BreakWaterType { get; set; } + public Nullable BreakWaterHeight { get; set; } + public byte UseForeshore { get; set; } public Nullable Orientation { get; set; } + public Nullable StructureNormalOrientation { get; set; } + public Nullable StorageStructureAreaMean { get; set; } + public Nullable StorageStructureAreaCoefficientOfVariation { get; set; } + public Nullable AllowedLevelIncreaseStorageMean { get; set; } + public Nullable AllowedLevelIncreaseStorageStandardDeviation { get; set; } + public Nullable WidthFlowAperturesMean { get; set; } + public Nullable WidthFlowAperturesCoefficientOfVariation { get; set; } public Nullable LevelCrestStructureNotClosingMean { get; set; } public Nullable LevelCrestStructureNotClosingStandardDeviation { get; set; } public Nullable InsideWaterLevelMean { get; set; } @@ -60,43 +70,29 @@ public Nullable ThresholdHeightOpenWeirStandardDeviation { get; set; } public Nullable AreaFlowAperturesMean { get; set; } public Nullable AreaFlowAperturesStandardDeviation { get; set; } + public Nullable CriticalOvertoppingDischargeMean { get; set; } + public Nullable CriticalOvertoppingDischargeCoefficientOfVariation { get; set; } + public Nullable FlowWidthAtBottomProtectionMean { get; set; } + public Nullable FlowWidthAtBottomProtectionStandardDeviation { get; set; } public double ProbabilityOpenStructureBeforeFlooding { get; set; } public double FailureProbabilityOpenStructure { get; set; } public int IdenticalApertures { get; set; } public double FailureProbabilityReparation { get; set; } public byte InflowModelType { get; set; } + public double FailureProbabilityStructureWithErosion { get; set; } public Nullable DeviationWaveDirection { get; set; } public Nullable DrainCoefficientMean { get; set; } + public Nullable ModelFactorSuperCriticalFlowMean { get; set; } + public Nullable StormDurationMean { get; set; } public Nullable FactorStormDurationOpenStructure { get; set; } - + public virtual CalculationGroupEntity CalculationGroupEntity { get; set; } public virtual ClosingStructureEntity ClosingStructureEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection ClosingStructuresOutputEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection ClosingStructuresSectionResultEntities { get; set; } - - public byte UseBreakWater { get; set; } - public short BreakWaterType { get; set; } - public Nullable BreakWaterHeight { get; set; } - public byte UseForeshore { get; set; } - public Nullable StructureNormalOrientation { get; set; } - public Nullable StorageStructureAreaMean { get; set; } - public Nullable StorageStructureAreaCoefficientOfVariation { get; set; } - public Nullable AllowedLevelIncreaseStorageMean { get; set; } - public Nullable AllowedLevelIncreaseStorageStandardDeviation { get; set; } - public Nullable WidthFlowAperturesMean { get; set; } - public Nullable WidthFlowAperturesCoefficientOfVariation { get; set; } - public Nullable CriticalOvertoppingDischargeMean { get; set; } - public Nullable CriticalOvertoppingDischargeCoefficientOfVariation { get; set; } - public Nullable FlowWidthAtBottomProtectionMean { get; set; } - public Nullable FlowWidthAtBottomProtectionStandardDeviation { get; set; } - public double FailureProbabilityStructureWithErosion { get; set; } - public Nullable ModelFactorSuperCriticalFlowMean { get; set; } - public Nullable StormDurationMean { get; set; } public virtual HydraulicLocationEntity HydraulicLocationEntity { get; set; } public virtual ForeshoreProfileEntity ForeshoreProfileEntity { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection ClosingStructuresOutputEntities { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection ClosingStructuresSectionResultEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresOutputEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresOutputEntity.cs (.../ClosingStructuresOutputEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresOutputEntity.cs (.../ClosingStructuresOutputEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,20 +28,21 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class ClosingStructuresOutputEntity { public long ClosingStructuresOutputEntityId { get; set; } public long ClosingStructuresCalculationEntityId { get; set; } - - public virtual ClosingStructuresCalculationEntity ClosingStructuresCalculationEntity { get; set; } public Nullable RequiredProbability { get; set; } public Nullable RequiredReliability { get; set; } public Nullable Probability { get; set; } public Nullable Reliability { get; set; } public Nullable FactorOfSafety { get; set; } + + public virtual ClosingStructuresCalculationEntity ClosingStructuresCalculationEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresSectionResultEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresSectionResultEntity.cs (.../ClosingStructuresSectionResultEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresSectionResultEntity.cs (.../ClosingStructuresSectionResultEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,19 +28,20 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class ClosingStructuresSectionResultEntity { public long ClosingStructuresSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } public Nullable ClosingStructuresCalculationEntityId { get; set; } public byte LayerOne { get; set; } public Nullable LayerThree { get; set; } - + public virtual ClosingStructuresCalculationEntity ClosingStructuresCalculationEntity { get; set; } public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql =================================================================== diff -u -r211bad78e373481dee065860d8eb842b9db653ab -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 211bad78e373481dee065860d8eb842b9db653ab) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 01-Dec-2016 15:49:09 */ +/* Created On : 02-Dec-2016 14:27:45 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -703,7 +703,7 @@ 'WaveImpactAsphaltCoverSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'FailureMechanismSectionEntityId' INTEGER NOT NULL, 'LayerOne' TINYINT (1) NOT NULL, -- Enum: 1 = NotAssessed 2 = Sufficient 3 = NeedsDetailedAssessment - 'LayerTwoA' REAL, + 'LayerTwoA' TINYINT (1) NOT NULL, -- Enum: 1 = NotCalculated 2 = Failed 3 = Successful 'LayerThree' REAL, CONSTRAINT 'FK_WaveImpactAsphaltCoverSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade ) Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DikeProfileEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DikeProfileEntity.cs (.../DikeProfileEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DikeProfileEntity.cs (.../DikeProfileEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,20 +28,19 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class DikeProfileEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public DikeProfileEntity() { GrassCoverErosionInwardsCalculationEntities = new HashSet(); } - + public long DikeProfileEntityId { get; set; } public long FailureMechanismEntityId { get; set; } public string Name { get; set; } @@ -55,10 +54,9 @@ public Nullable Y { get; set; } public Nullable X0 { get; set; } public int Order { get; set; } - + public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverErosionInwardsCalculationEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DuneErosionSectionResultEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DuneErosionSectionResultEntity.cs (.../DuneErosionSectionResultEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DuneErosionSectionResultEntity.cs (.../DuneErosionSectionResultEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,18 +28,19 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class DuneErosionSectionResultEntity { public long DuneErosionSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } public byte LayerOne { get; set; } public byte LayerTwoA { get; set; } public Nullable LayerThree { get; set; } - + public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismEntity.cs =================================================================== diff -u -r8e310b99d8873ca1a46282c54302acb1d1678dab -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismEntity.cs (.../FailureMechanismEntity.cs) (revision 8e310b99d8873ca1a46282c54302acb1d1678dab) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismEntity.cs (.../FailureMechanismEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,15 +28,14 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class FailureMechanismEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public FailureMechanismEntity() { ClosingStructureEntities = new HashSet(); @@ -55,7 +54,7 @@ StochasticSoilModelEntities = new HashSet(); SurfaceLineEntities = new HashSet(); } - + public long FailureMechanismEntityId { get; set; } public long AssessmentSectionEntityId { get; set; } public Nullable CalculationGroupEntityId { get; set; } @@ -64,53 +63,38 @@ public string InputComments { get; set; } public string OutputComments { get; set; } public string NotRelevantComments { get; set; } - + public virtual AssessmentSectionEntity AssessmentSectionEntity { get; set; } public virtual CalculationGroupEntity CalculationGroupEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection ClosingStructureEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection ClosingStructureFailureMechanismMetaEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection DikeProfileEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection FailureMechanismSectionEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection ForeshoreProfileEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverErosionInwardsFailureMechanismMetaEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverErosionOutwardsFailureMechanismMetaEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverErosionOutwardsHydraulicLocationEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection HeightStructureEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection HeightStructuresFailureMechanismMetaEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection PipingFailureMechanismMetaEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StabilityPointStructureEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StabilityPointStructuresFailureMechanismMetaEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StochasticSoilModelEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection SurfaceLineEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismSectionEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismSectionEntity.cs (.../FailureMechanismSectionEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismSectionEntity.cs (.../FailureMechanismSectionEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,14 +28,14 @@ // //------------------------------------------------------------------------------ -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class FailureMechanismSectionEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public FailureMechanismSectionEntity() { ClosingStructuresSectionResultEntities = new HashSet(); @@ -57,66 +57,48 @@ WaterPressureAsphaltCoverSectionResultEntities = new HashSet(); WaveImpactAsphaltCoverSectionResultEntities = new HashSet(); } - + public long FailureMechanismSectionEntityId { get; set; } public long FailureMechanismEntityId { get; set; } public string Name { get; set; } public string FailureMechanismSectionPointXml { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection ClosingStructuresSectionResultEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection DuneErosionSectionResultEntities { get; set; } - public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverErosionInwardsSectionResultEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverErosionOutwardsSectionResultEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverSlipOffInwardsSectionResultEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverSlipOffOutwardsSectionResultEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection HeightStructuresSectionResultEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection MacrostabilityInwardsSectionResultEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection MacrostabilityOutwardsSectionResultEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection MicrostabilitySectionResultEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection PipingSectionResultEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection PipingStructureSectionResultEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StabilityPointStructuresSectionResultEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StabilityStoneCoverSectionResultEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StrengthStabilityLengthwiseConstructionSectionResultEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection TechnicalInnovationSectionResultEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection WaterPressureAsphaltCoverSectionResultEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection WaveImpactAsphaltCoverSectionResultEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ForeshoreProfileEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ForeshoreProfileEntity.cs (.../ForeshoreProfileEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ForeshoreProfileEntity.cs (.../ForeshoreProfileEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,15 +28,14 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class ForeshoreProfileEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public ForeshoreProfileEntity() { ClosingStructuresCalculationEntities = new HashSet(); @@ -46,7 +45,7 @@ StabilityStoneCoverWaveConditionsCalculationEntities = new HashSet(); WaveImpactAsphaltCoverWaveConditionsCalculationEntities = new HashSet(); } - + public long ForeshoreProfileEntityId { get; set; } public long FailureMechanismEntityId { get; set; } public string Name { get; set; } @@ -58,25 +57,19 @@ public Nullable Y { get; set; } public Nullable X0 { get; set; } public int Order { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection ClosingStructuresCalculationEntities { get; set; } - public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverErosionOutwardsWaveConditionsCalculationEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection HeightStructuresCalculationEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StabilityPointStructuresCalculationEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StabilityStoneCoverWaveConditionsCalculationEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection WaveImpactAsphaltCoverWaveConditionsCalculationEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsCalculationEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsCalculationEntity.cs (.../GrassCoverErosionInwardsCalculationEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsCalculationEntity.cs (.../GrassCoverErosionInwardsCalculationEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,21 +28,20 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class GrassCoverErosionInwardsCalculationEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public GrassCoverErosionInwardsCalculationEntity() { GrassCoverErosionInwardsOutputEntities = new HashSet(); GrassCoverErosionInwardsSectionResultEntities = new HashSet(); } - + public long GrassCoverErosionInwardsCalculationEntityId { get; set; } public long CalculationGroupEntityId { get; set; } public Nullable HydraulicLocationEntityId { get; set; } @@ -59,15 +58,13 @@ public short BreakWaterType { get; set; } public Nullable BreakWaterHeight { get; set; } public byte CalculateDikeHeight { 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")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverErosionInwardsOutputEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverErosionInwardsSectionResultEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsFailureMechanismMetaEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsFailureMechanismMetaEntity.cs (.../GrassCoverErosionInwardsFailureMechanismMetaEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsFailureMechanismMetaEntity.cs (.../GrassCoverErosionInwardsFailureMechanismMetaEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -30,12 +30,15 @@ namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class GrassCoverErosionInwardsFailureMechanismMetaEntity { public long GrassCoverErosionInwardsFailureMechanismMetaEntityId { get; set; } public long FailureMechanismEntityId { get; set; } public int N { get; set; } - + public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsOutputEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsOutputEntity.cs (.../GrassCoverErosionInwardsOutputEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsOutputEntity.cs (.../GrassCoverErosionInwardsOutputEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,10 +28,11 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class GrassCoverErosionInwardsOutputEntity { public long GrassCoverErosionInwardsOutputEntityId { get; set; } @@ -46,7 +47,7 @@ public Nullable Probability { get; set; } public Nullable Reliability { get; set; } public Nullable FactorOfSafety { get; set; } - + public virtual GrassCoverErosionInwardsCalculationEntity GrassCoverErosionInwardsCalculationEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsSectionResultEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsSectionResultEntity.cs (.../GrassCoverErosionInwardsSectionResultEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsSectionResultEntity.cs (.../GrassCoverErosionInwardsSectionResultEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,19 +28,20 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class GrassCoverErosionInwardsSectionResultEntity { public long GrassCoverErosionInwardsSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } public Nullable GrassCoverErosionInwardsCalculationEntityId { get; set; } public byte LayerOne { get; set; } public Nullable LayerThree { get; set; } - + public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } public virtual GrassCoverErosionInwardsCalculationEntity GrassCoverErosionInwardsCalculationEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsFailureMechanismMetaEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsFailureMechanismMetaEntity.cs (.../GrassCoverErosionOutwardsFailureMechanismMetaEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsFailureMechanismMetaEntity.cs (.../GrassCoverErosionOutwardsFailureMechanismMetaEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -30,12 +30,15 @@ namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class GrassCoverErosionOutwardsFailureMechanismMetaEntity { public long GrassCoverErosionOutwardsFailureMechanismMetaEntityId { get; set; } public long FailureMechanismEntityId { get; set; } public int N { get; set; } - + public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsHydraulicLocationEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsHydraulicLocationEntity.cs (.../GrassCoverErosionOutwardsHydraulicLocationEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsHydraulicLocationEntity.cs (.../GrassCoverErosionOutwardsHydraulicLocationEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,20 +28,19 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class GrassCoverErosionOutwardsHydraulicLocationEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public GrassCoverErosionOutwardsHydraulicLocationEntity() { GrassCoverErosionOutwardsWaveConditionsCalculationEntities = new HashSet(); } - + public long GrassCoverErosionOutwardsHydraulicLocationEntityId { get; set; } public long FailureMechanismEntityId { get; set; } public long LocationId { get; set; } @@ -53,10 +52,9 @@ public byte DesignWaterLevelCalculationConvergence { get; set; } public byte WaveHeightCalculationConvergence { get; set; } public int Order { get; set; } - + public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverErosionOutwardsWaveConditionsCalculationEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsSectionResultEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsSectionResultEntity.cs (.../GrassCoverErosionOutwardsSectionResultEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsSectionResultEntity.cs (.../GrassCoverErosionOutwardsSectionResultEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,18 +28,19 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class GrassCoverErosionOutwardsSectionResultEntity { public long GrassCoverErosionOutwardsSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } public byte LayerOne { get; set; } public byte LayerTwoA { get; set; } public Nullable LayerThree { get; set; } - + public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsWaveConditionsCalculationEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsWaveConditionsCalculationEntity.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsWaveConditionsCalculationEntity.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,20 +28,19 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class GrassCoverErosionOutwardsWaveConditionsCalculationEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public GrassCoverErosionOutwardsWaveConditionsCalculationEntity() { GrassCoverErosionOutwardsWaveConditionsOutputEntities = new HashSet(); } - + public long GrassCoverErosionOutwardsWaveConditionsCalculationEntityId { get; set; } public long CalculationGroupEntityId { get; set; } public Nullable ForeshoreProfileEntityId { get; set; } @@ -59,12 +58,11 @@ public Nullable UpperBoundaryWaterLevels { get; set; } public Nullable LowerBoundaryWaterLevels { get; set; } public byte StepSize { get; set; } - + public virtual CalculationGroupEntity CalculationGroupEntity { get; set; } public virtual ForeshoreProfileEntity ForeshoreProfileEntity { get; set; } public virtual GrassCoverErosionOutwardsHydraulicLocationEntity GrassCoverErosionOutwardsHydraulicLocationEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverErosionOutwardsWaveConditionsOutputEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsWaveConditionsOutputEntity.cs =================================================================== diff -u -r211bad78e373481dee065860d8eb842b9db653ab -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsWaveConditionsOutputEntity.cs (.../GrassCoverErosionOutwardsWaveConditionsOutputEntity.cs) (revision 211bad78e373481dee065860d8eb842b9db653ab) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsWaveConditionsOutputEntity.cs (.../GrassCoverErosionOutwardsWaveConditionsOutputEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,10 +28,11 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class GrassCoverErosionOutwardsWaveConditionsOutputEntity { public long GrassCoverErosionOutwardsWaveConditionsOutputEntityId { get; set; } @@ -47,7 +48,7 @@ public Nullable CalculatedProbability { get; set; } public Nullable CalculatedReliability { get; set; } public Nullable CalculationConvergence { get; set; } - + public virtual GrassCoverErosionOutwardsWaveConditionsCalculationEntity GrassCoverErosionOutwardsWaveConditionsCalculationEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverSlipOffInwardsSectionResultEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverSlipOffInwardsSectionResultEntity.cs (.../GrassCoverSlipOffInwardsSectionResultEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverSlipOffInwardsSectionResultEntity.cs (.../GrassCoverSlipOffInwardsSectionResultEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,18 +28,19 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class GrassCoverSlipOffInwardsSectionResultEntity { public long GrassCoverSlipOffInwardsSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } public byte LayerOne { get; set; } public byte LayerTwoA { get; set; } public Nullable LayerThree { get; set; } - + public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverSlipOffOutwardsSectionResultEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverSlipOffOutwardsSectionResultEntity.cs (.../GrassCoverSlipOffOutwardsSectionResultEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverSlipOffOutwardsSectionResultEntity.cs (.../GrassCoverSlipOffOutwardsSectionResultEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,18 +28,19 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class GrassCoverSlipOffOutwardsSectionResultEntity { public long GrassCoverSlipOffOutwardsSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } public byte LayerOne { get; set; } public byte LayerTwoA { get; set; } public Nullable LayerThree { get; set; } - + public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructureEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructureEntity.cs (.../HeightStructureEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructureEntity.cs (.../HeightStructureEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,20 +28,19 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class HeightStructureEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public HeightStructureEntity() { HeightStructuresCalculationEntities = new HashSet(); } - + public long HeightStructureEntityId { get; set; } public long FailureMechanismEntityId { get; set; } public int Order { get; set; } @@ -63,10 +62,9 @@ public Nullable StorageStructureAreaCoefficientOfVariation { get; set; } public Nullable AllowedLevelIncreaseStorageMean { get; set; } public Nullable AllowedLevelIncreaseStorageStandardDeviation { get; set; } - + public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection HeightStructuresCalculationEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresCalculationEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresCalculationEntity.cs (.../HeightStructuresCalculationEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresCalculationEntity.cs (.../HeightStructuresCalculationEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,21 +28,20 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class HeightStructuresCalculationEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public HeightStructuresCalculationEntity() { HeightStructuresOutputEntities = new HashSet(); HeightStructuresSectionResultEntities = new HashSet(); } - + public long HeightStructuresCalculationEntityId { get; set; } public long CalculationGroupEntityId { get; set; } public Nullable HydraulicLocationEntityId { get; set; } @@ -51,19 +50,6 @@ public int Order { get; set; } public string Name { get; set; } public string Comments { get; set; } - public Nullable LevelCrestStructureMean { get; set; } - public Nullable LevelCrestStructureStandardDeviation { get; set; } - public Nullable DeviationWaveDirection { get; set; } - - public virtual CalculationGroupEntity CalculationGroupEntity { get; set; } - public virtual HeightStructureEntity HeightStructureEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection HeightStructuresOutputEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection HeightStructuresSectionResultEntities { get; set; } - public Nullable ModelFactorSuperCriticalFlowMean { get; set; } public Nullable StructureNormalOrientation { get; set; } public Nullable AllowedLevelIncreaseStorageMean { get; set; } @@ -78,11 +64,21 @@ public Nullable WidthFlowAperturesMean { get; set; } public Nullable WidthFlowAperturesCoefficientOfVariation { get; set; } public Nullable StormDurationMean { get; set; } + public Nullable LevelCrestStructureMean { get; set; } + public Nullable LevelCrestStructureStandardDeviation { get; set; } + public Nullable DeviationWaveDirection { get; set; } public byte UseBreakWater { get; set; } public byte UseForeshore { get; set; } public short BreakWaterType { get; set; } public Nullable BreakWaterHeight { get; set; } + + public virtual CalculationGroupEntity CalculationGroupEntity { get; set; } public virtual ForeshoreProfileEntity ForeshoreProfileEntity { get; set; } + public virtual HeightStructureEntity HeightStructureEntity { get; set; } public virtual HydraulicLocationEntity HydraulicLocationEntity { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection HeightStructuresOutputEntities { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection HeightStructuresSectionResultEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresFailureMechanismMetaEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresFailureMechanismMetaEntity.cs (.../HeightStructuresFailureMechanismMetaEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresFailureMechanismMetaEntity.cs (.../HeightStructuresFailureMechanismMetaEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -30,12 +30,15 @@ namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class HeightStructuresFailureMechanismMetaEntity { public long HeightStructuresFailureMechanismMetaEntityId { get; set; } public long FailureMechanismEntityId { get; set; } public int N { get; set; } - + public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresOutputEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresOutputEntity.cs (.../HeightStructuresOutputEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresOutputEntity.cs (.../HeightStructuresOutputEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,20 +28,21 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class HeightStructuresOutputEntity { public long HeightStructuresOutputEntityId { get; set; } public long HeightStructuresCalculationEntityId { get; set; } - - public virtual HeightStructuresCalculationEntity HeightStructuresCalculationEntity { get; set; } public Nullable RequiredProbability { get; set; } public Nullable RequiredReliability { get; set; } public Nullable Probability { get; set; } public Nullable Reliability { get; set; } public Nullable FactorOfSafety { get; set; } + + public virtual HeightStructuresCalculationEntity HeightStructuresCalculationEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresSectionResultEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresSectionResultEntity.cs (.../HeightStructuresSectionResultEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresSectionResultEntity.cs (.../HeightStructuresSectionResultEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,19 +28,20 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class HeightStructuresSectionResultEntity { public long HeightStructuresSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } public Nullable HeightStructuresCalculationEntityId { get; set; } public byte LayerOne { get; set; } public Nullable LayerThree { get; set; } - + public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } public virtual HeightStructuresCalculationEntity HeightStructuresCalculationEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationEntity.cs (.../HydraulicLocationEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationEntity.cs (.../HydraulicLocationEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,15 +28,14 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class HydraulicLocationEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public HydraulicLocationEntity() { ClosingStructuresCalculationEntities = new HashSet(); @@ -47,7 +46,7 @@ StabilityStoneCoverWaveConditionsCalculationEntities = new HashSet(); WaveImpactAsphaltCoverWaveConditionsCalculationEntities = new HashSet(); } - + public long HydraulicLocationEntityId { get; set; } public long AssessmentSectionEntityId { get; set; } public long LocationId { get; set; } @@ -59,28 +58,21 @@ public int Order { get; set; } public byte DesignWaterLevelCalculationConvergence { get; set; } public byte WaveHeightCalculationConvergence { get; set; } - + public virtual AssessmentSectionEntity AssessmentSectionEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection ClosingStructuresCalculationEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverErosionInwardsCalculationEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection HeightStructuresCalculationEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection PipingCalculationEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StabilityPointStructuresCalculationEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StabilityStoneCoverWaveConditionsCalculationEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection WaveImpactAsphaltCoverWaveConditionsCalculationEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacrostabilityInwardsSectionResultEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacrostabilityInwardsSectionResultEntity.cs (.../MacrostabilityInwardsSectionResultEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacrostabilityInwardsSectionResultEntity.cs (.../MacrostabilityInwardsSectionResultEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,18 +28,19 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class MacrostabilityInwardsSectionResultEntity { public long MacrostabilityInwardsSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } public byte LayerOne { get; set; } public Nullable LayerTwoA { get; set; } public Nullable LayerThree { get; set; } - + public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacrostabilityOutwardsSectionResultEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacrostabilityOutwardsSectionResultEntity.cs (.../MacrostabilityOutwardsSectionResultEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacrostabilityOutwardsSectionResultEntity.cs (.../MacrostabilityOutwardsSectionResultEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,18 +28,19 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class MacrostabilityOutwardsSectionResultEntity { public long MacrostabilityOutwardsSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } public byte LayerOne { get; set; } public Nullable LayerTwoA { get; set; } public Nullable LayerThree { get; set; } - + public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MicrostabilitySectionResultEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MicrostabilitySectionResultEntity.cs (.../MicrostabilitySectionResultEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MicrostabilitySectionResultEntity.cs (.../MicrostabilitySectionResultEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,18 +28,19 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class MicrostabilitySectionResultEntity { public long MicrostabilitySectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } public byte LayerOne { get; set; } public byte LayerTwoA { get; set; } public Nullable LayerThree { get; set; } - + public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingCalculationEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingCalculationEntity.cs (.../PipingCalculationEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingCalculationEntity.cs (.../PipingCalculationEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,21 +28,20 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class PipingCalculationEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public PipingCalculationEntity() { PipingCalculationOutputEntities = new HashSet(); PipingSemiProbabilisticOutputEntities = new HashSet(); } - + public long PipingCalculationEntityId { get; set; } public long CalculationGroupEntityId { get; set; } public Nullable SurfaceLineEntityId { get; set; } @@ -59,16 +58,14 @@ public Nullable DampingFactorExitStandardDeviation { get; set; } public byte RelevantForScenario { get; set; } public Nullable ScenarioContribution { get; set; } - + public virtual CalculationGroupEntity CalculationGroupEntity { get; set; } public virtual HydraulicLocationEntity HydraulicLocationEntity { get; set; } public virtual SurfaceLineEntity SurfaceLineEntity { get; set; } public virtual StochasticSoilProfileEntity StochasticSoilProfileEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection PipingCalculationOutputEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection PipingSemiProbabilisticOutputEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingCalculationOutputEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingCalculationOutputEntity.cs (.../PipingCalculationOutputEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingCalculationOutputEntity.cs (.../PipingCalculationOutputEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,10 +28,11 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class PipingCalculationOutputEntity { public long PipingCalculationOutputEntityId { get; set; } @@ -43,7 +44,7 @@ public Nullable UpliftZValue { get; set; } public Nullable SellmeijerFactorOfSafety { get; set; } public Nullable SellmeijerZValue { get; set; } - + public virtual PipingCalculationEntity PipingCalculationEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingFailureMechanismMetaEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingFailureMechanismMetaEntity.cs (.../PipingFailureMechanismMetaEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingFailureMechanismMetaEntity.cs (.../PipingFailureMechanismMetaEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -30,12 +30,15 @@ namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class PipingFailureMechanismMetaEntity { public long PipingFailureMechanismMetaEntityId { get; set; } public long FailureMechanismEntityId { get; set; } public double A { get; set; } - + public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingSectionResultEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingSectionResultEntity.cs (.../PipingSectionResultEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingSectionResultEntity.cs (.../PipingSectionResultEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,17 +28,18 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class PipingSectionResultEntity { public long PipingSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } public byte LayerOne { get; set; } public Nullable LayerThree { get; set; } - + public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingSemiProbabilisticOutputEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingSemiProbabilisticOutputEntity.cs (.../PipingSemiProbabilisticOutputEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingSemiProbabilisticOutputEntity.cs (.../PipingSemiProbabilisticOutputEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,10 +28,11 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class PipingSemiProbabilisticOutputEntity { public long PipingSemiProbabilisticOutputEntityId { get; set; } @@ -51,7 +52,7 @@ public Nullable PipingProbability { get; set; } public Nullable PipingReliability { get; set; } public Nullable PipingFactorOfSafety { get; set; } - + public virtual PipingCalculationEntity PipingCalculationEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingStructureSectionResultEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingStructureSectionResultEntity.cs (.../PipingStructureSectionResultEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingStructureSectionResultEntity.cs (.../PipingStructureSectionResultEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,18 +28,19 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class PipingStructureSectionResultEntity { public long PipingStructureSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } public byte LayerOne { get; set; } public byte LayerTwoA { get; set; } public Nullable LayerThree { get; set; } - + public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ProjectEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ProjectEntity.cs (.../ProjectEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ProjectEntity.cs (.../ProjectEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,23 +28,23 @@ // //------------------------------------------------------------------------------ -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class ProjectEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public ProjectEntity() { AssessmentSectionEntities = new HashSet(); } - + public long ProjectEntityId { get; set; } public string Description { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection AssessmentSectionEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -95,7 +95,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: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs =================================================================== diff -u -r6d4085c478883a718c7967c3d773619074c726db -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision 6d4085c478883a718c7967c3d773619074c726db) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -1,25 +1,4 @@ -// Copyright (C) Stichting Deltares 2016. All rights reserved. -// -// This file is part of Ringtoets. -// -// Ringtoets is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -// -// All names, logos, and references to "Deltares" are registered trademarks of -// Stichting Deltares and remain full property of Stichting Deltares at all times. -// All rights reserved. - -// T4 code generation is enabled for model 'D:\Projects\WTI\trunk\Application\Ringtoets\src\Application.Ringtoets.Storage\DbContext\RingtoetsEntities.edmx'. +// T4 code generation is enabled for model 'D:\Repos\Ringtoets\Application\Ringtoets\src\Application.Ringtoets.Storage\DbContext\RingtoetsEntities.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: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx =================================================================== diff -u -r211bad78e373481dee065860d8eb842b9db653ab -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 211bad78e373481dee065860d8eb842b9db653ab) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -4,7 +4,7 @@ - + @@ -908,7 +908,7 @@ - + @@ -3802,7 +3802,7 @@ - + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram =================================================================== diff -u -r211bad78e373481dee065860d8eb842b9db653ab -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 211bad78e373481dee065860d8eb842b9db653ab) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -6,65 +6,65 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - + + + + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SoilLayerEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SoilLayerEntity.cs (.../SoilLayerEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SoilLayerEntity.cs (.../SoilLayerEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,10 +28,11 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class SoilLayerEntity { public long SoilLayerEntityId { get; set; } @@ -48,7 +49,7 @@ public Nullable PermeabilityMean { get; set; } public Nullable PermeabilityDeviation { get; set; } public int Order { get; set; } - + public virtual SoilProfileEntity SoilProfileEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SoilProfileEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SoilProfileEntity.cs (.../SoilProfileEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SoilProfileEntity.cs (.../SoilProfileEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,29 +28,27 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class SoilProfileEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public SoilProfileEntity() { SoilLayerEntities = new HashSet(); StochasticSoilProfileEntities = new HashSet(); } - + public long SoilProfileEntityId { get; set; } public Nullable Bottom { get; set; } public string Name { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection SoilLayerEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StochasticSoilProfileEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructureEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructureEntity.cs (.../StabilityPointStructureEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructureEntity.cs (.../StabilityPointStructureEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,20 +28,19 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class StabilityPointStructureEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public StabilityPointStructureEntity() { StabilityPointStructuresCalculationEntities = new HashSet(); } - + public long StabilityPointStructureEntityId { get; set; } public long FailureMechanismEntityId { get; set; } public int Order { get; set; } @@ -94,10 +93,9 @@ public Nullable AreaFlowAperturesMean { get; set; } public Nullable AreaFlowAperturesStandardDeviation { get; set; } public byte InflowModelType { get; set; } - + public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StabilityPointStructuresCalculationEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresCalculationEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresCalculationEntity.cs (.../StabilityPointStructuresCalculationEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresCalculationEntity.cs (.../StabilityPointStructuresCalculationEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,21 +28,20 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class StabilityPointStructuresCalculationEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public StabilityPointStructuresCalculationEntity() { StabilityPointStructuresOutputEntities = new HashSet(); StabilityPointStructuresSectionResultEntities = new HashSet(); } - + public long StabilityPointStructuresCalculationEntityId { get; set; } public long CalculationGroupEntityId { get; set; } public Nullable ForeshoreProfileEntityId { get; set; } @@ -51,10 +50,25 @@ public int Order { get; set; } public string Name { get; set; } public string Comments { get; set; } + public byte UseBreakWater { get; set; } + public short BreakWaterType { get; set; } + public Nullable BreakWaterHeight { get; set; } + public byte UseForeshore { get; set; } + public Nullable StructureNormalOrientation { get; set; } + public Nullable StorageStructureAreaMean { get; set; } + public Nullable StorageStructureAreaCoefficientOfVariation { get; set; } + public Nullable AllowedLevelIncreaseStorageMean { get; set; } + public Nullable AllowedLevelIncreaseStorageStandardDeviation { get; set; } + public Nullable WidthFlowAperturesMean { get; set; } + public Nullable WidthFlowAperturesCoefficientOfVariation { get; set; } public Nullable InsideWaterLevelMean { get; set; } public Nullable InsideWaterLevelStandardDeviation { get; set; } public Nullable ThresholdHeightOpenWeirMean { get; set; } public Nullable ThresholdHeightOpenWeirStandardDeviation { get; set; } + public Nullable CriticalOvertoppingDischargeMean { get; set; } + public Nullable CriticalOvertoppingDischargeCoefficientOfVariation { get; set; } + public Nullable FlowWidthAtBottomProtectionMean { get; set; } + public Nullable FlowWidthAtBottomProtectionStandardDeviation { get; set; } public Nullable ConstructiveStrengthLinearLoadModelMean { get; set; } public Nullable ConstructiveStrengthLinearLoadModelCoefficientOfVariation { get; set; } public Nullable ConstructiveStrengthQuadraticLoadModelMean { get; set; } @@ -87,37 +101,19 @@ public byte InflowModelType { get; set; } public byte LoadSchematizationType { get; set; } public Nullable VolumicWeightWater { get; set; } + public Nullable StormDurationMean { get; set; } + public Nullable ModelFactorSuperCriticalFlowMean { get; set; } public Nullable FactorStormDurationOpenStructure { get; set; } public Nullable DrainCoefficientMean { get; set; } - + public double FailureProbabilityStructureWithErosion { get; set; } + public virtual CalculationGroupEntity CalculationGroupEntity { get; set; } + public virtual ForeshoreProfileEntity ForeshoreProfileEntity { get; set; } + public virtual HydraulicLocationEntity HydraulicLocationEntity { get; set; } public virtual StabilityPointStructureEntity StabilityPointStructureEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StabilityPointStructuresOutputEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StabilityPointStructuresSectionResultEntities { get; set; } - - public byte UseBreakWater { get; set; } - public short BreakWaterType { get; set; } - public Nullable BreakWaterHeight { get; set; } - public byte UseForeshore { get; set; } - public Nullable StructureNormalOrientation { get; set; } - public Nullable StorageStructureAreaMean { get; set; } - public Nullable StorageStructureAreaCoefficientOfVariation { get; set; } - public Nullable AllowedLevelIncreaseStorageMean { get; set; } - public Nullable AllowedLevelIncreaseStorageStandardDeviation { get; set; } - public Nullable WidthFlowAperturesMean { get; set; } - public Nullable WidthFlowAperturesCoefficientOfVariation { get; set; } - public Nullable CriticalOvertoppingDischargeMean { get; set; } - public Nullable CriticalOvertoppingDischargeCoefficientOfVariation { get; set; } - public Nullable FlowWidthAtBottomProtectionMean { get; set; } - public Nullable FlowWidthAtBottomProtectionStandardDeviation { get; set; } - public Nullable StormDurationMean { get; set; } - public Nullable ModelFactorSuperCriticalFlowMean { get; set; } - public double FailureProbabilityStructureWithErosion { get; set; } - public virtual ForeshoreProfileEntity ForeshoreProfileEntity { get; set; } - public virtual HydraulicLocationEntity HydraulicLocationEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresFailureMechanismMetaEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresFailureMechanismMetaEntity.cs (.../StabilityPointStructuresFailureMechanismMetaEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresFailureMechanismMetaEntity.cs (.../StabilityPointStructuresFailureMechanismMetaEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -30,12 +30,15 @@ namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class StabilityPointStructuresFailureMechanismMetaEntity { public long StrengthStabilityPointConstructionFailureMechanismMetaEntityId { get; set; } public long FailureMechanismEntityId { get; set; } public int N { get; set; } - + public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresOutputEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresOutputEntity.cs (.../StabilityPointStructuresOutputEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresOutputEntity.cs (.../StabilityPointStructuresOutputEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,20 +28,21 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class StabilityPointStructuresOutputEntity { public long StabilityPointStructuresOutputEntity1 { get; set; } public long StabilityPointStructuresCalculationEntityId { get; set; } - - public virtual StabilityPointStructuresCalculationEntity StabilityPointStructuresCalculationEntity { get; set; } public Nullable RequiredProbability { get; set; } public Nullable RequiredReliability { get; set; } public Nullable Probability { get; set; } public Nullable Reliability { get; set; } public Nullable FactorOfSafety { get; set; } + + public virtual StabilityPointStructuresCalculationEntity StabilityPointStructuresCalculationEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresSectionResultEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresSectionResultEntity.cs (.../StabilityPointStructuresSectionResultEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresSectionResultEntity.cs (.../StabilityPointStructuresSectionResultEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,19 +28,20 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class StabilityPointStructuresSectionResultEntity { public long StabilityPointStructuresSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } public Nullable StabilityPointStructuresCalculationEntityId { get; set; } public byte LayerOne { get; set; } public Nullable LayerThree { get; set; } - + public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } public virtual StabilityPointStructuresCalculationEntity StabilityPointStructuresCalculationEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityStoneCoverSectionResultEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityStoneCoverSectionResultEntity.cs (.../StabilityStoneCoverSectionResultEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityStoneCoverSectionResultEntity.cs (.../StabilityStoneCoverSectionResultEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,18 +28,19 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class StabilityStoneCoverSectionResultEntity { public long StabilityStoneCoverSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } public byte LayerOne { get; set; } public byte LayerTwoA { get; set; } public Nullable LayerThree { get; set; } - + public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityStoneCoverWaveConditionsCalculationEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityStoneCoverWaveConditionsCalculationEntity.cs (.../StabilityStoneCoverWaveConditionsCalculationEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityStoneCoverWaveConditionsCalculationEntity.cs (.../StabilityStoneCoverWaveConditionsCalculationEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,20 +28,19 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class StabilityStoneCoverWaveConditionsCalculationEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public StabilityStoneCoverWaveConditionsCalculationEntity() { StabilityStoneCoverWaveConditionsOutputEntities = new HashSet(); } - + public long StabilityStoneCoverWaveConditionsCalculationEntityId { get; set; } public long CalculationGroupEntityId { get; set; } public Nullable ForeshoreProfileEntityId { get; set; } @@ -59,12 +58,11 @@ public Nullable UpperBoundaryWaterLevels { get; set; } public Nullable LowerBoundaryWaterLevels { get; set; } public byte StepSize { get; set; } - + public virtual CalculationGroupEntity CalculationGroupEntity { get; set; } public virtual ForeshoreProfileEntity ForeshoreProfileEntity { get; set; } public virtual HydraulicLocationEntity HydraulicLocationEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StabilityStoneCoverWaveConditionsOutputEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityStoneCoverWaveConditionsOutputEntity.cs =================================================================== diff -u -r211bad78e373481dee065860d8eb842b9db653ab -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityStoneCoverWaveConditionsOutputEntity.cs (.../StabilityStoneCoverWaveConditionsOutputEntity.cs) (revision 211bad78e373481dee065860d8eb842b9db653ab) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityStoneCoverWaveConditionsOutputEntity.cs (.../StabilityStoneCoverWaveConditionsOutputEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,10 +28,11 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class StabilityStoneCoverWaveConditionsOutputEntity { public long StabilityStoneCoverWaveConditionsOutputEntityId { get; set; } @@ -48,7 +49,7 @@ public Nullable CalculatedProbability { get; set; } public Nullable CalculatedReliability { get; set; } public Nullable CalculationConvergence { get; set; } - + public virtual StabilityStoneCoverWaveConditionsCalculationEntity StabilityStoneCoverWaveConditionsCalculationEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StochasticSoilModelEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StochasticSoilModelEntity.cs (.../StochasticSoilModelEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StochasticSoilModelEntity.cs (.../StochasticSoilModelEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,29 +28,28 @@ // //------------------------------------------------------------------------------ -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class StochasticSoilModelEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public StochasticSoilModelEntity() { StochasticSoilProfileEntities = new HashSet(); } - + public long StochasticSoilModelEntityId { get; set; } public long FailureMechanismEntityId { get; set; } public string Name { get; set; } public string SegmentName { get; set; } public string StochasticSoilModelSegmentPointXml { get; set; } public int Order { get; set; } - + public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StochasticSoilProfileEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StochasticSoilProfileEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StochasticSoilProfileEntity.cs (.../StochasticSoilProfileEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StochasticSoilProfileEntity.cs (.../StochasticSoilProfileEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,30 +28,28 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class StochasticSoilProfileEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public StochasticSoilProfileEntity() { PipingCalculationEntities = new HashSet(); } - + public long StochasticSoilProfileEntityId { get; set; } public long SoilProfileEntityId { get; set; } public long StochasticSoilModelEntityId { get; set; } public Nullable Probability { get; set; } public int Order { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection PipingCalculationEntities { get; set; } - public virtual SoilProfileEntity SoilProfileEntity { get; set; } public virtual StochasticSoilModelEntity StochasticSoilModelEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StrengthStabilityLengthwiseConstructionSectionResultEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StrengthStabilityLengthwiseConstructionSectionResultEntity.cs (.../StrengthStabilityLengthwiseConstructionSectionResultEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StrengthStabilityLengthwiseConstructionSectionResultEntity.cs (.../StrengthStabilityLengthwiseConstructionSectionResultEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,17 +28,18 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class StrengthStabilityLengthwiseConstructionSectionResultEntity { public long StrengthStabilityLengthwiseConstructionSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } public byte LayerOne { get; set; } public Nullable LayerThree { get; set; } - + public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SurfaceLineEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SurfaceLineEntity.cs (.../SurfaceLineEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SurfaceLineEntity.cs (.../SurfaceLineEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,35 +28,32 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class SurfaceLineEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public SurfaceLineEntity() { CharacteristicPointEntities = new HashSet(); PipingCalculationEntities = new HashSet(); } - + public long SurfaceLineEntityId { get; set; } public long FailureMechanismEntityId { get; set; } public string Name { get; set; } public Nullable ReferenceLineIntersectionX { get; set; } public Nullable ReferenceLineIntersectionY { get; set; } public string PointsXml { get; set; } public int Order { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection CharacteristicPointEntities { get; set; } - public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection PipingCalculationEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/TechnicalInnovationSectionResultEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/TechnicalInnovationSectionResultEntity.cs (.../TechnicalInnovationSectionResultEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/TechnicalInnovationSectionResultEntity.cs (.../TechnicalInnovationSectionResultEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,17 +28,18 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class TechnicalInnovationSectionResultEntity { public long TechnicalInnovationSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } public byte LayerOne { get; set; } public Nullable LayerThree { get; set; } - + public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/VersionEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/VersionEntity.cs (.../VersionEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/VersionEntity.cs (.../VersionEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,15 +28,16 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class VersionEntity { public long VersionId { get; set; } public long Version { get; set; } - public DateTime Timestamp { get; set; } + public System.DateTime Timestamp { get; set; } public byte[] FingerPrint { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/WaterPressureAsphaltCoverSectionResultEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/WaterPressureAsphaltCoverSectionResultEntity.cs (.../WaterPressureAsphaltCoverSectionResultEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/WaterPressureAsphaltCoverSectionResultEntity.cs (.../WaterPressureAsphaltCoverSectionResultEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,17 +28,18 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class WaterPressureAsphaltCoverSectionResultEntity { public long WaterPressureAsphaltCoverSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } public byte LayerOne { get; set; } public Nullable LayerThree { get; set; } - + public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/WaveImpactAsphaltCoverSectionResultEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/WaveImpactAsphaltCoverSectionResultEntity.cs (.../WaveImpactAsphaltCoverSectionResultEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/WaveImpactAsphaltCoverSectionResultEntity.cs (.../WaveImpactAsphaltCoverSectionResultEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,18 +28,19 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class WaveImpactAsphaltCoverSectionResultEntity { public long WaveImpactAsphaltCoverSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } public byte LayerOne { get; set; } - public Nullable LayerTwoA { get; set; } + public byte LayerTwoA { get; set; } public Nullable LayerThree { get; set; } - + public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/WaveImpactAsphaltCoverWaveConditionsCalculationEntity.cs =================================================================== diff -u -r2c4c587a6116234a66e22bdd2634ba815f7f09e4 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/WaveImpactAsphaltCoverWaveConditionsCalculationEntity.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationEntity.cs) (revision 2c4c587a6116234a66e22bdd2634ba815f7f09e4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/WaveImpactAsphaltCoverWaveConditionsCalculationEntity.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,20 +28,19 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class WaveImpactAsphaltCoverWaveConditionsCalculationEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public WaveImpactAsphaltCoverWaveConditionsCalculationEntity() { WaveImpactAsphaltCoverWaveConditionsOutputEntities = new HashSet(); } - + public long WaveImpactAsphaltCoverWaveConditionsCalculationEntityId { get; set; } public long CalculationGroupEntityId { get; set; } public Nullable ForeshoreProfileEntityId { get; set; } @@ -59,12 +58,11 @@ public Nullable UpperBoundaryWaterLevels { get; set; } public Nullable LowerBoundaryWaterLevels { get; set; } public byte StepSize { get; set; } - + public virtual CalculationGroupEntity CalculationGroupEntity { get; set; } public virtual ForeshoreProfileEntity ForeshoreProfileEntity { get; set; } public virtual HydraulicLocationEntity HydraulicLocationEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection WaveImpactAsphaltCoverWaveConditionsOutputEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/WaveImpactAsphaltCoverWaveConditionsOutputEntity.cs =================================================================== diff -u -r211bad78e373481dee065860d8eb842b9db653ab -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/WaveImpactAsphaltCoverWaveConditionsOutputEntity.cs (.../WaveImpactAsphaltCoverWaveConditionsOutputEntity.cs) (revision 211bad78e373481dee065860d8eb842b9db653ab) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/WaveImpactAsphaltCoverWaveConditionsOutputEntity.cs (.../WaveImpactAsphaltCoverWaveConditionsOutputEntity.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -28,10 +28,11 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class WaveImpactAsphaltCoverWaveConditionsOutputEntity { public long WaveImpactAsphaltCoverWaveConditionsOutputEntityId { get; set; } @@ -47,7 +48,7 @@ public Nullable CalculatedProbability { get; set; } public Nullable CalculatedReliability { get; set; } public Nullable CalculationConvergence { get; set; } - + public virtual WaveImpactAsphaltCoverWaveConditionsCalculationEntity WaveImpactAsphaltCoverWaveConditionsCalculationEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverSectionResultEntityReadExtensions.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverSectionResultEntityReadExtensions.cs (.../WaveImpactAsphaltCoverSectionResultEntityReadExtensions.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverSectionResultEntityReadExtensions.cs (.../WaveImpactAsphaltCoverSectionResultEntityReadExtensions.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -49,7 +49,7 @@ } sectionResult.AssessmentLayerOne = (AssessmentLayerOneState) entity.LayerOne; - sectionResult.AssessmentLayerTwoA = (RoundedDouble) entity.LayerTwoA.ToNullAsNaN(); + sectionResult.AssessmentLayerTwoA = (AssessmentLayerTwoAResult) entity.LayerTwoA; sectionResult.AssessmentLayerThree = (RoundedDouble) entity.LayerThree.ToNullAsNaN(); } } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs =================================================================== diff -u -rba3865a26a9d4893855dd528ea1ad804d1cdae61 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs) (revision ba3865a26a9d4893855dd528ea1ad804d1cdae61) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -36,15 +36,16 @@ public void Create_WithDifferentResults_ReturnsEntityWithExpectedResults( [Values(AssessmentLayerOneState.NotAssessed, AssessmentLayerOneState.NoVerdict, AssessmentLayerOneState.Sufficient)] AssessmentLayerOneState assessmentLayerOneResult, - [Values(0.2, 0.523)] double assessmentLayerTwoAResult, + [Values(AssessmentLayerTwoAResult.Failed, AssessmentLayerTwoAResult.NotCalculated, + AssessmentLayerTwoAResult.Successful)] AssessmentLayerTwoAResult assessmentLayerTwoAResult, [Values(3.2, 4.5)] double assessmentLayerThreeResult ) { // Setup var sectionResult = new WaveImpactAsphaltCoverFailureMechanismSectionResult(new TestFailureMechanismSection()) { AssessmentLayerOne = assessmentLayerOneResult, - AssessmentLayerTwoA = (RoundedDouble) assessmentLayerTwoAResult, + AssessmentLayerTwoA = assessmentLayerTwoAResult, AssessmentLayerThree = (RoundedDouble) assessmentLayerThreeResult }; @@ -53,27 +54,11 @@ // Assert Assert.AreEqual(Convert.ToByte(assessmentLayerOneResult), result.LayerOne); - Assert.AreEqual(assessmentLayerTwoAResult, result.LayerTwoA); + Assert.AreEqual(Convert.ToByte(assessmentLayerTwoAResult), result.LayerTwoA); Assert.AreEqual(assessmentLayerThreeResult, result.LayerThree); } [Test] - public void Create_WithNaNLevel2aResult_ReturnsEntityWithExpectedResults() - { - // Setup - var sectionResult = new WaveImpactAsphaltCoverFailureMechanismSectionResult(new TestFailureMechanismSection()) - { - AssessmentLayerTwoA = RoundedDouble.NaN - }; - - // Call - var result = sectionResult.Create(); - - // Assert - Assert.IsNull(result.LayerTwoA); - } - - [Test] public void Create_WithNaNLevel3Result_ReturnsEntityWithExpectedResults() { // Setup Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverSectionResultEntityReadExtensionsTest.cs =================================================================== diff -u -rba3865a26a9d4893855dd528ea1ad804d1cdae61 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverSectionResultEntityReadExtensionsTest.cs (.../WaveImpactAsphaltCoverSectionResultEntityReadExtensionsTest.cs) (revision ba3865a26a9d4893855dd528ea1ad804d1cdae61) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverSectionResultEntityReadExtensionsTest.cs (.../WaveImpactAsphaltCoverSectionResultEntityReadExtensionsTest.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -51,7 +51,8 @@ public void Read_ParameterValues_SectionResultWithParameterValues( [Values(AssessmentLayerOneState.NotAssessed, AssessmentLayerOneState.NoVerdict, AssessmentLayerOneState.Sufficient)] AssessmentLayerOneState layerOne, - [Values(0.1, 0.2, null)] double? layerTwoA, + [Values(AssessmentLayerTwoAResult.Failed, AssessmentLayerTwoAResult.NotCalculated, + AssessmentLayerTwoAResult.Successful)] AssessmentLayerTwoAResult layerTwoA, [Values(0.11, 0.22, null)] double? layerThree) { // Setup @@ -62,7 +63,7 @@ var entity = new WaveImpactAsphaltCoverSectionResultEntity { LayerThree = layerThree, - LayerTwoA = layerTwoA, + LayerTwoA = Convert.ToByte(layerTwoA), LayerOne = Convert.ToByte(layerOne), FailureMechanismSectionEntity = failureMechanismSectionEntity }; @@ -74,7 +75,7 @@ // Assert Assert.IsNotNull(sectionResult); Assert.AreEqual(layerOne, sectionResult.AssessmentLayerOne); - Assert.AreEqual(layerTwoA ?? double.NaN, sectionResult.AssessmentLayerTwoA, 1e-6); + Assert.AreEqual(layerTwoA, sectionResult.AssessmentLayerTwoA); Assert.AreEqual(layerThree ?? double.NaN, sectionResult.AssessmentLayerThree, 1e-6); } } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs =================================================================== diff -u -r714ecb29352663cc4b18f7d00d09ed73b863c53f -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 714ecb29352663cc4b18f7d00d09ed73b863c53f) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -1153,7 +1153,7 @@ foreach (var sectionResult in sectionResults) { sectionResult.AssessmentLayerOne = GetAssessmentLayerOneState(); - sectionResult.AssessmentLayerTwoA = (RoundedDouble) random.NextDouble(); + sectionResult.AssessmentLayerTwoA = GetAssessmentLayerTwoAResult(); sectionResult.AssessmentLayerThree = (RoundedDouble) random.NextDouble(); } } Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanismSectionResult.cs =================================================================== diff -u -r41a37c93cb0b3e36ff7023c9f42b4e6225598b55 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanismSectionResult.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResult.cs) (revision 41a37c93cb0b3e36ff7023c9f42b4e6225598b55) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanismSectionResult.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResult.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Core.Common.Base.Data; using Ringtoets.Common.Data.FailureMechanism; namespace Ringtoets.WaveImpactAsphaltCover.Data @@ -39,12 +38,13 @@ /// Thrown when is null. public WaveImpactAsphaltCoverFailureMechanismSectionResult(FailureMechanismSection section) : base(section) { - AssessmentLayerTwoA = RoundedDouble.NaN; + AssessmentLayerTwoA = AssessmentLayerTwoAResult.NotCalculated; } /// - /// Gets or sets the value of the detailed assessment of safety per failure mechanism section. + /// Gets or sets the value of the detailed assessment of safety per failure mechanism section, for which + /// the result is a value of . /// - public RoundedDouble AssessmentLayerTwoA { get; set; } + public AssessmentLayerTwoAResult AssessmentLayerTwoA { get; set; } } } \ No newline at end of file Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismResultView.cs =================================================================== diff -u -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismResultView.cs (.../WaveImpactAsphaltCoverFailureMechanismResultView.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismResultView.cs (.../WaveImpactAsphaltCoverFailureMechanismResultView.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -19,8 +19,12 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; +using System.Linq; using System.Windows.Forms; +using Core.Common.Utils; using Core.Common.Utils.Reflection; +using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Forms.Views; using Ringtoets.WaveImpactAsphaltCover.Data; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; @@ -56,9 +60,18 @@ { base.AddDataGridColumns(); - DataGridViewControl.AddTextBoxColumn( + EnumDisplayWrapper[] twoAResultDataSource = + Enum.GetValues(typeof(AssessmentLayerTwoAResult)) + .OfType() + .Select(el => new EnumDisplayWrapper(el)) + .ToArray(); + + DataGridViewControl.AddComboBoxColumn( TypeUtils.GetMemberName(sr => sr.AssessmentLayerTwoA), - RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a); + RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a, + twoAResultDataSource, + TypeUtils.GetMemberName>(edw => edw.Value), + TypeUtils.GetMemberName>(edw => edw.DisplayName)); DataGridViewControl.AddTextBoxColumn( TypeUtils.GetMemberName(sr => sr.AssessmentLayerThree), RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three); Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismSectionResultRow.cs =================================================================== diff -u -r673e35de0df920529e5dda63ea8b4dfb08ed65a8 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismSectionResultRow.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultRow.cs) (revision 673e35de0df920529e5dda63ea8b4dfb08ed65a8) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismSectionResultRow.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultRow.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -22,6 +22,7 @@ using System; using System.ComponentModel; using Core.Common.Base.Data; +using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Forms.TypeConverters; using Ringtoets.Common.Forms.Views; using Ringtoets.WaveImpactAsphaltCover.Data; @@ -44,8 +45,7 @@ /// /// Gets the assessment layer two a of the . /// - [TypeConverter(typeof(NoValueRoundedDoubleConverter))] - public RoundedDouble AssessmentLayerTwoA + public AssessmentLayerTwoAResult AssessmentLayerTwoA { get { Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismSectionResultTest.cs =================================================================== diff -u -r673e35de0df920529e5dda63ea8b4dfb08ed65a8 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismSectionResultTest.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultTest.cs) (revision 673e35de0df920529e5dda63ea8b4dfb08ed65a8) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismSectionResultTest.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultTest.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -43,7 +43,7 @@ // Assert Assert.IsInstanceOf(result); Assert.AreSame(section, result.Section); - Assert.IsNaN(result.AssessmentLayerTwoA); + Assert.AreEqual(AssessmentLayerTwoAResult.NotCalculated, result.AssessmentLayerTwoA); } } } \ No newline at end of file Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs =================================================================== diff -u -rba3865a26a9d4893855dd528ea1ad804d1cdae61 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs (.../WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs) (revision ba3865a26a9d4893855dd528ea1ad804d1cdae61) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs (.../WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -58,7 +58,7 @@ Assert.AreEqual(4, dataGridView.ColumnCount); Assert.IsInstanceOf(dataGridView.Columns[assessmentLayerOneIndex]); - Assert.IsInstanceOf(dataGridView.Columns[assessmentLayerTwoAIndex]); + Assert.IsInstanceOf(dataGridView.Columns[assessmentLayerTwoAIndex]); Assert.IsInstanceOf(dataGridView.Columns[assessmentLayerThreeIndex]); Assert.AreEqual("Toetslaag 1", dataGridView.Columns[assessmentLayerOneIndex].HeaderText); @@ -92,19 +92,19 @@ var result1 = new WaveImpactAsphaltCoverFailureMechanismSectionResult(section1) { AssessmentLayerOne = AssessmentLayerOneState.Sufficient, - AssessmentLayerTwoA = (RoundedDouble) random.NextDouble(), + AssessmentLayerTwoA = AssessmentLayerTwoAResult.Failed, AssessmentLayerThree = (RoundedDouble) random.NextDouble() }; var result2 = new WaveImpactAsphaltCoverFailureMechanismSectionResult(section2) { AssessmentLayerOne = AssessmentLayerOneState.NotAssessed, - AssessmentLayerTwoA = (RoundedDouble) random.NextDouble(), + AssessmentLayerTwoA = AssessmentLayerTwoAResult.Successful, AssessmentLayerThree = (RoundedDouble) random.NextDouble() }; var result3 = new WaveImpactAsphaltCoverFailureMechanismSectionResult(section3) { AssessmentLayerOne = AssessmentLayerOneState.NoVerdict, - AssessmentLayerTwoA = (RoundedDouble) random.NextDouble(), + AssessmentLayerTwoA = AssessmentLayerTwoAResult.Successful, AssessmentLayerThree = (RoundedDouble) random.NextDouble() }; @@ -132,7 +132,7 @@ Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); Assert.AreEqual(result1.AssessmentLayerOne, cells[assessmentLayerOneIndex].Value); - Assert.AreEqual(result1.AssessmentLayerTwoA.ToString(), cells[assessmentLayerTwoAIndex].FormattedValue); + Assert.AreEqual(result1.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); Assert.AreEqual(result1.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); @@ -142,7 +142,7 @@ Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 2", cells[nameColumnIndex].FormattedValue); Assert.AreEqual(result2.AssessmentLayerOne, cells[assessmentLayerOneIndex].Value); - Assert.AreEqual(result2.AssessmentLayerTwoA.ToString(), cells[assessmentLayerTwoAIndex].FormattedValue); + Assert.AreEqual(result2.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); Assert.AreEqual(result2.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); @@ -152,7 +152,7 @@ Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 3", cells[nameColumnIndex].FormattedValue); Assert.AreEqual(result3.AssessmentLayerOne, cells[assessmentLayerOneIndex].Value); - Assert.AreEqual(result3.AssessmentLayerTwoA.ToString(), cells[assessmentLayerTwoAIndex].FormattedValue); + Assert.AreEqual(result3.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); Assert.AreEqual(result3.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); @@ -176,7 +176,7 @@ var result = new WaveImpactAsphaltCoverFailureMechanismSectionResult(section) { AssessmentLayerOne = assessmentLayerOneState, - AssessmentLayerTwoA = (RoundedDouble) random.NextDouble(), + AssessmentLayerTwoA = AssessmentLayerTwoAResult.Failed, AssessmentLayerThree = (RoundedDouble) random.NextDouble() }; using (var form = new Form()) Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r673e35de0df920529e5dda63ea8b4dfb08ed65a8 -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismSectionResultRowTest.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultRowTest.cs) (revision 673e35de0df920529e5dda63ea8b4dfb08ed65a8) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismSectionResultRowTest.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultRowTest.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) @@ -19,14 +19,9 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; -using Core.Common.Base.Data; using Core.Common.Base.Geometry; -using Core.Common.Utils.Reflection; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; -using Ringtoets.Common.Data.TestUtil; -using Ringtoets.Common.Forms.TypeConverters; using Ringtoets.Common.Forms.Views; using Ringtoets.WaveImpactAsphaltCover.Data; using Ringtoets.WaveImpactAsphaltCover.Forms.Views; @@ -49,26 +44,23 @@ // Assert Assert.IsInstanceOf>(row); Assert.AreEqual(result.AssessmentLayerTwoA, row.AssessmentLayerTwoA); - Assert.IsTrue(TypeUtils.HasTypeConverter( - r => r.AssessmentLayerTwoA)); } [Test] public void AssessmentLayerTwoA_AlwaysOnChange_ResultPropertyChanged() { // Setup - var random = new Random(21); - var newValue = random.NextDouble(); + const AssessmentLayerTwoAResult newValue = AssessmentLayerTwoAResult.Successful; + FailureMechanismSection section = CreateSection(); var result = new WaveImpactAsphaltCoverFailureMechanismSectionResult(section); var row = new WaveImpactAsphaltCoverFailureMechanismSectionResultRow(result); // Call - row.AssessmentLayerTwoA = (RoundedDouble) newValue; + row.AssessmentLayerTwoA = newValue; // Assert - Assert.AreEqual(newValue, result.AssessmentLayerTwoA, row.AssessmentLayerTwoA.GetAccuracy()); + Assert.AreEqual(newValue, result.AssessmentLayerTwoA); } private static FailureMechanismSection CreateSection()