Index: Application/Ringtoets/src/Application.Ringtoets.Migration/Resources/DatabaseStructure17.1.sql =================================================================== diff -u -r03a263822252a5020135a7de96ea8e50d5eb5cc6 -r946a4e9beadd7a27a313fba0c365be20646abdb7 --- Application/Ringtoets/src/Application.Ringtoets.Migration/Resources/DatabaseStructure17.1.sql (.../DatabaseStructure17.1.sql) (revision 03a263822252a5020135a7de96ea8e50d5eb5cc6) +++ Application/Ringtoets/src/Application.Ringtoets.Migration/Resources/DatabaseStructure17.1.sql (.../DatabaseStructure17.1.sql) (revision 946a4e9beadd7a27a313fba0c365be20646abdb7) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 31-Jan-2017 10:19:09 */ +/* Created On : 06-Feb-2017 08:19:11 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -362,6 +362,7 @@ 'A' REAL NOT NULL, 'WaterVolumetricWeight' REAL NOT NULL, 'StochasticSoilModelSourcePath' TEXT, + 'SurfaceLineSourcePath' TEXT, CONSTRAINT 'FK_PipingFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade ) ; Index: Application/Ringtoets/src/Application.Ringtoets.Migration/Resources/Migration_5_17.1.sql =================================================================== diff -u -r975f383dbfa3abd403974d4159ae0bc2b0a5dfcd -r946a4e9beadd7a27a313fba0c365be20646abdb7 --- Application/Ringtoets/src/Application.Ringtoets.Migration/Resources/Migration_5_17.1.sql (.../Migration_5_17.1.sql) (revision 975f383dbfa3abd403974d4159ae0bc2b0a5dfcd) +++ Application/Ringtoets/src/Application.Ringtoets.Migration/Resources/Migration_5_17.1.sql (.../Migration_5_17.1.sql) (revision 946a4e9beadd7a27a313fba0c365be20646abdb7) @@ -45,16 +45,19 @@ INSERT INTO MicrostabilitySectionResultEntity SELECT * FROM [SOURCEPROJECT].MicrostabilitySectionResultEntity; INSERT INTO PipingCalculationEntity SELECT * FROM [SOURCEPROJECT].PipingCalculationEntity; INSERT INTO PipingCalculationOutputEntity SELECT * FROM [SOURCEPROJECT].PipingCalculationOutputEntity; -INSERT INTO PipingFailureMechanismMetaEntity ( - [PipingFailureMechanismMetaEntityId], - [FailureMechanismEntityId], - [A], - [WaterVolumetricWeight], - [StochasticSoilModelSourcePath]) -SELECT [PipingFailureMechanismMetaEntityId], - [FailureMechanismEntityId], - [A], + INSERT INTO PipingFailureMechanismMetaEntity ( + [PipingFailureMechanismMetaEntityId], + [FailureMechanismEntityId], + [A], + [WaterVolumetricWeight], + [StochasticSoilModelSourcePath], + [SurfacelineSourcePath]) +SELECT + [PipingFailureMechanismMetaEntityId], + [FailureMechanismEntityId], + [A], [WaterVolumetricWeight], + "Onbekend", "Onbekend" FROM [SOURCEPROJECT].PipingFailureMechanismMetaEntity; INSERT INTO PipingSectionResultEntity SELECT * FROM [SOURCEPROJECT].PipingSectionResultEntity; INSERT INTO PipingSemiProbabilisticOutputEntity SELECT * FROM [SOURCEPROJECT].PipingSemiProbabilisticOutputEntity; Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingFailureMechanismCreateExtensions.cs =================================================================== diff -u -r539d342dcf52309b4cb05b7cf49ded99c122d44f -r946a4e9beadd7a27a313fba0c365be20646abdb7 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingFailureMechanismCreateExtensions.cs (.../PipingFailureMechanismCreateExtensions.cs) (revision 539d342dcf52309b4cb05b7cf49ded99c122d44f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingFailureMechanismCreateExtensions.cs (.../PipingFailureMechanismCreateExtensions.cs) (revision 946a4e9beadd7a27a313fba0c365be20646abdb7) @@ -71,7 +71,8 @@ { A = mechanism.PipingProbabilityAssessmentInput.A, WaterVolumetricWeight = mechanism.GeneralInput.WaterVolumetricWeight, - StochasticSoilModelSourcePath = mechanism.StochasticSoilModels.SourcePath + StochasticSoilModelSourcePath = mechanism.StochasticSoilModels.SourcePath, + SurfaceLineSourcePath = mechanism.SurfaceLines.SourcePath }; entity.PipingFailureMechanismMetaEntities.Add(metaEntity); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresCalculationEntity.cs =================================================================== diff -u -rec9f45c99b375218d00a89df1ac1e187ebf54070 -r946a4e9beadd7a27a313fba0c365be20646abdb7 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresCalculationEntity.cs (.../ClosingStructuresCalculationEntity.cs) (revision ec9f45c99b375218d00a89df1ac1e187ebf54070) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresCalculationEntity.cs (.../ClosingStructuresCalculationEntity.cs) (revision 946a4e9beadd7a27a313fba0c365be20646abdb7) @@ -51,7 +51,18 @@ public int Order { get; set; } public string Name { get; set; } public string Comments { get; set; } + public byte UseBreakWater { get; set; } + public byte 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 WidthFlowAperturesStandardDeviation { get; set; } public Nullable LevelCrestStructureNotClosingMean { get; set; } public Nullable LevelCrestStructureNotClosingStandardDeviation { get; set; } public Nullable InsideWaterLevelMean { get; set; } @@ -60,43 +71,31 @@ 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 ProbabilityOrFrequencyOpenStructureBeforeFlooding { 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; } + public virtual HydraulicLocationEntity HydraulicLocationEntity { get; set; } + public virtual ForeshoreProfileEntity ForeshoreProfileEntity { 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 byte 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 WidthFlowAperturesStandardDeviation { 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; } } } \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresOutputEntity.cs =================================================================== diff -u -rec9f45c99b375218d00a89df1ac1e187ebf54070 -r946a4e9beadd7a27a313fba0c365be20646abdb7 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresOutputEntity.cs (.../ClosingStructuresOutputEntity.cs) (revision ec9f45c99b375218d00a89df1ac1e187ebf54070) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresOutputEntity.cs (.../ClosingStructuresOutputEntity.cs) (revision 946a4e9beadd7a27a313fba0c365be20646abdb7) @@ -36,12 +36,12 @@ { 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/GrassCoverErosionOutwardsHydraulicLocationOutputEntity.cs =================================================================== diff -u -rec9f45c99b375218d00a89df1ac1e187ebf54070 -r946a4e9beadd7a27a313fba0c365be20646abdb7 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsHydraulicLocationOutputEntity.cs (.../GrassCoverErosionOutwardsHydraulicLocationOutputEntity.cs) (revision ec9f45c99b375218d00a89df1ac1e187ebf54070) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsHydraulicLocationOutputEntity.cs (.../GrassCoverErosionOutwardsHydraulicLocationOutputEntity.cs) (revision 946a4e9beadd7a27a313fba0c365be20646abdb7) @@ -36,14 +36,14 @@ { public long GrassCoverErosionOutwardsHydraulicLocationOutputEntityId { get; set; } public long GrassCoverErosionOutwardsHydraulicLocationEntityId { get; set; } - - public virtual GrassCoverErosionOutwardsHydraulicLocationEntity GrassCoverErosionOutwardsHydraulicLocationEntity { get; set; } public byte HydraulicLocationOutputType { get; set; } public Nullable Result { get; set; } public Nullable TargetProbability { get; set; } public Nullable TargetReliability { get; set; } public Nullable CalculatedProbability { get; set; } public Nullable CalculatedReliability { get; set; } public byte CalculationConvergence { get; set; } + + public virtual GrassCoverErosionOutwardsHydraulicLocationEntity GrassCoverErosionOutwardsHydraulicLocationEntity { get; set; } } } \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresCalculationEntity.cs =================================================================== diff -u -rec9f45c99b375218d00a89df1ac1e187ebf54070 -r946a4e9beadd7a27a313fba0c365be20646abdb7 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresCalculationEntity.cs (.../HeightStructuresCalculationEntity.cs) (revision ec9f45c99b375218d00a89df1ac1e187ebf54070) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresCalculationEntity.cs (.../HeightStructuresCalculationEntity.cs) (revision 946a4e9beadd7a27a313fba0c365be20646abdb7) @@ -51,19 +51,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 +65,23 @@ public Nullable WidthFlowAperturesMean { get; set; } public Nullable WidthFlowAperturesStandardDeviation { 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 byte 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; } + + [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection HeightStructuresOutputEntities { get; set; } + + [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/HeightStructuresOutputEntity.cs =================================================================== diff -u -rec9f45c99b375218d00a89df1ac1e187ebf54070 -r946a4e9beadd7a27a313fba0c365be20646abdb7 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresOutputEntity.cs (.../HeightStructuresOutputEntity.cs) (revision ec9f45c99b375218d00a89df1ac1e187ebf54070) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresOutputEntity.cs (.../HeightStructuresOutputEntity.cs) (revision 946a4e9beadd7a27a313fba0c365be20646abdb7) @@ -36,12 +36,12 @@ { 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/HydraulicLocationOutputEntity.cs =================================================================== diff -u -rec9f45c99b375218d00a89df1ac1e187ebf54070 -r946a4e9beadd7a27a313fba0c365be20646abdb7 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationOutputEntity.cs (.../HydraulicLocationOutputEntity.cs) (revision ec9f45c99b375218d00a89df1ac1e187ebf54070) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationOutputEntity.cs (.../HydraulicLocationOutputEntity.cs) (revision 946a4e9beadd7a27a313fba0c365be20646abdb7) @@ -36,14 +36,14 @@ { public long HydraulicLocationEntityOutputId { get; set; } public long HydraulicLocationEntityId { get; set; } - - public virtual HydraulicLocationEntity HydraulicLocationEntity { get; set; } public byte HydraulicLocationOutputType { get; set; } public Nullable Result { get; set; } public Nullable TargetProbability { get; set; } public Nullable TargetReliability { get; set; } public Nullable CalculatedProbability { get; set; } public Nullable CalculatedReliability { get; set; } public byte CalculationConvergence { get; set; } + + public virtual HydraulicLocationEntity HydraulicLocationEntity { get; set; } } } \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingFailureMechanismMetaEntity.cs =================================================================== diff -u -rec9f45c99b375218d00a89df1ac1e187ebf54070 -r946a4e9beadd7a27a313fba0c365be20646abdb7 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingFailureMechanismMetaEntity.cs (.../PipingFailureMechanismMetaEntity.cs) (revision ec9f45c99b375218d00a89df1ac1e187ebf54070) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingFailureMechanismMetaEntity.cs (.../PipingFailureMechanismMetaEntity.cs) (revision 946a4e9beadd7a27a313fba0c365be20646abdb7) @@ -37,6 +37,7 @@ public double A { get; set; } public double WaterVolumetricWeight { get; set; } public string StochasticSoilModelSourcePath { get; set; } + public string SurfaceLineSourcePath { get; set; } public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs =================================================================== diff -u -rbae43849319d185f843b75146d0087bf7996e880 -r946a4e9beadd7a27a313fba0c365be20646abdb7 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision bae43849319d185f843b75146d0087bf7996e880) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision 946a4e9beadd7a27a313fba0c365be20646abdb7) @@ -1,4 +1,25 @@ -// T4 code generation is enabled for model 'D:\Repos\Ringtoets\Application\Ringtoets\src\Application.Ringtoets.Storage\DbContext\RingtoetsEntities.edmx'. +// 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:\Checkout\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 -rec9f45c99b375218d00a89df1ac1e187ebf54070 -r946a4e9beadd7a27a313fba0c365be20646abdb7 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision ec9f45c99b375218d00a89df1ac1e187ebf54070) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 946a4e9beadd7a27a313fba0c365be20646abdb7) @@ -4,7 +4,7 @@ - + @@ -641,6 +641,7 @@ + @@ -3756,6 +3757,7 @@ + @@ -5957,6 +5959,7 @@ + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram =================================================================== diff -u -rec9f45c99b375218d00a89df1ac1e187ebf54070 -r946a4e9beadd7a27a313fba0c365be20646abdb7 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision ec9f45c99b375218d00a89df1ac1e187ebf54070) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 946a4e9beadd7a27a313fba0c365be20646abdb7) @@ -5,73 +5,73 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresCalculationEntity.cs =================================================================== diff -u -rec9f45c99b375218d00a89df1ac1e187ebf54070 -r946a4e9beadd7a27a313fba0c365be20646abdb7 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresCalculationEntity.cs (.../StabilityPointStructuresCalculationEntity.cs) (revision ec9f45c99b375218d00a89df1ac1e187ebf54070) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresCalculationEntity.cs (.../StabilityPointStructuresCalculationEntity.cs) (revision 946a4e9beadd7a27a313fba0c365be20646abdb7) @@ -51,10 +51,25 @@ public int Order { get; set; } public string Name { get; set; } public string Comments { get; set; } + public byte UseBreakWater { get; set; } + public byte 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 WidthFlowAperturesStandardDeviation { 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; } @@ -86,37 +101,21 @@ 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")] public virtual ICollection StabilityPointStructuresOutputEntities { get; set; } [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StabilityPointStructuresSectionResultEntities { get; set; } - - public byte UseBreakWater { get; set; } - public byte 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 WidthFlowAperturesStandardDeviation { 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/StabilityPointStructuresOutputEntity.cs =================================================================== diff -u -rec9f45c99b375218d00a89df1ac1e187ebf54070 -r946a4e9beadd7a27a313fba0c365be20646abdb7 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresOutputEntity.cs (.../StabilityPointStructuresOutputEntity.cs) (revision ec9f45c99b375218d00a89df1ac1e187ebf54070) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresOutputEntity.cs (.../StabilityPointStructuresOutputEntity.cs) (revision 946a4e9beadd7a27a313fba0c365be20646abdb7) @@ -36,12 +36,12 @@ { 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/Read/FailureMechanismEntityReadExtensions.cs =================================================================== diff -u -rd6d1b03ce8dc3c4e6bba565a85ea310f6196adea -r946a4e9beadd7a27a313fba0c365be20646abdb7 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision d6d1b03ce8dc3c4e6bba565a85ea310f6196adea) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision 946a4e9beadd7a27a313fba0c365be20646abdb7) @@ -130,7 +130,7 @@ failureMechanism.SurfaceLines.AddRange(entity.SurfaceLineEntities .OrderBy(sl => sl.Order) .Select(e => e.Read(collector)), - "Temp"); + metaEntity.SurfaceLineSourcePath); } entity.ReadPipingMechanismSectionResults(failureMechanism, collector); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingFailureMechanismCreateExtensionsTest.cs =================================================================== diff -u -rd6d1b03ce8dc3c4e6bba565a85ea310f6196adea -r946a4e9beadd7a27a313fba0c365be20646abdb7 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingFailureMechanismCreateExtensionsTest.cs (.../PipingFailureMechanismCreateExtensionsTest.cs) (revision d6d1b03ce8dc3c4e6bba565a85ea310f6196adea) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingFailureMechanismCreateExtensionsTest.cs (.../PipingFailureMechanismCreateExtensionsTest.cs) (revision 946a4e9beadd7a27a313fba0c365be20646abdb7) @@ -188,10 +188,11 @@ // Setup var random = new Random(); var failureMechanism = new PipingFailureMechanism(); + const string somePath = "path"; failureMechanism.SurfaceLines.AddRange(new[] { CreateSurfaceLine(random) - }, "path"); + }, somePath); var registry = new PersistenceRegistry(); @@ -201,6 +202,7 @@ // Assert Assert.IsNotNull(entity); Assert.AreEqual(failureMechanism.SurfaceLines.Count, entity.SurfaceLineEntities.Count); + Assert.AreEqual(somePath, entity.PipingFailureMechanismMetaEntities.First().SurfaceLineSourcePath); } [Test] Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs =================================================================== diff -u -r9046346e9f7d535ae1dc2c774e0eb27c2accf174 -r946a4e9beadd7a27a313fba0c365be20646abdb7 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 9046346e9f7d535ae1dc2c774e0eb27c2accf174) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 946a4e9beadd7a27a313fba0c365be20646abdb7) @@ -313,6 +313,7 @@ var entity = CreateAssessmentSectionEntity(); string emptyPointsXml = new Point3DXmlSerializer().ToXml(new Point3D[0]); + const string surfaceLineSourcePath = "some/path"; var failureMechanismEntity = new FailureMechanismEntity { FailureMechanismType = (int) FailureMechanismType.Piping, @@ -330,7 +331,10 @@ }, PipingFailureMechanismMetaEntities = { - new PipingFailureMechanismMetaEntity() + new PipingFailureMechanismMetaEntity + { + SurfaceLineSourcePath = surfaceLineSourcePath + } } }; entity.FailureMechanismEntities.Add(failureMechanismEntity); @@ -343,6 +347,7 @@ // Assert Assert.AreEqual(2, section.PipingFailureMechanism.SurfaceLines.Count); + Assert.AreEqual(surfaceLineSourcePath, section.PipingFailureMechanism.SurfaceLines.SourcePath); } [Test] Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs =================================================================== diff -u -rd99c3b3ea6676f572c9bc5fb2615cabeb589c0f4 -r946a4e9beadd7a27a313fba0c365be20646abdb7 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision d99c3b3ea6676f572c9bc5fb2615cabeb589c0f4) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision 946a4e9beadd7a27a313fba0c365be20646abdb7) @@ -291,6 +291,9 @@ var pipingFailureMechanismMetaEntity = pipingFailureMechanismMetaEntities[0]; Assert.AreEqual(pipingFailureMechanismMetaEntity.A, failureMechanism.PipingProbabilityAssessmentInput.A); Assert.AreEqual(pipingFailureMechanismMetaEntity.WaterVolumetricWeight, failureMechanism.GeneralInput.WaterVolumetricWeight.Value); + + Assert.IsNull(pipingFailureMechanismMetaEntity.StochasticSoilModelSourcePath); + Assert.IsNull(pipingFailureMechanismMetaEntity.SurfaceLineSourcePath); } [Test] @@ -346,6 +349,7 @@ { // Setup string emptyPointsXml = new Point3DXmlSerializer().ToXml(new Point3D[0]); + var sourcePath = "some/path"; var entity = new FailureMechanismEntity { CalculationGroupEntity = new CalculationGroupEntity(), @@ -366,7 +370,10 @@ }, PipingFailureMechanismMetaEntities = { - new PipingFailureMechanismMetaEntity() + new PipingFailureMechanismMetaEntity + { + SurfaceLineSourcePath = sourcePath + } } }; var collector = new ReadConversionCollector(); @@ -377,6 +384,7 @@ // Assert Assert.AreEqual(2, failureMechanism.SurfaceLines.Count); + Assert.AreEqual(sourcePath, failureMechanism.SurfaceLines.SourcePath); CollectionAssert.AreEqual(new[] { "2", Index: build/DatabaseStructure.sql =================================================================== diff -u -rec9f45c99b375218d00a89df1ac1e187ebf54070 -r946a4e9beadd7a27a313fba0c365be20646abdb7 --- build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision ec9f45c99b375218d00a89df1ac1e187ebf54070) +++ build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 946a4e9beadd7a27a313fba0c365be20646abdb7) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 31-Jan-2017 10:19:09 */ +/* Created On : 06-Feb-2017 08:19:11 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -362,6 +362,7 @@ 'A' REAL NOT NULL, 'WaterVolumetricWeight' REAL NOT NULL, 'StochasticSoilModelSourcePath' TEXT, + 'SurfaceLineSourcePath' TEXT, CONSTRAINT 'FK_PipingFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade ) ;