Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
===================================================================
diff -u -r13e40c4b5b76b2a155c4490fdeb7b9644fde18f3 -r6059a4af5c28390c79efa4e808e28cc93eeddac1
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 13e40c4b5b76b2a155c4490fdeb7b9644fde18f3)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 6059a4af5c28390c79efa4e808e28cc93eeddac1)
@@ -90,6 +90,9 @@
RingtoetsEntities.tt
+
+ RingtoetsEntities.tt
+
RingtoetsEntities.tt
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/AssessmentSectionEntity.cs
===================================================================
diff -u -r4e65fa5d8abdf1c0a9238492cdbcd7d2b3fa2d0f -r6059a4af5c28390c79efa4e808e28cc93eeddac1
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/AssessmentSectionEntity.cs (.../AssessmentSectionEntity.cs) (revision 4e65fa5d8abdf1c0a9238492cdbcd7d2b3fa2d0f)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/AssessmentSectionEntity.cs (.../AssessmentSectionEntity.cs) (revision 6059a4af5c28390c79efa4e808e28cc93eeddac1)
@@ -46,6 +46,7 @@
public long AssessmentSectionEntityId { get; set; }
public long ProjectEntityId { get; set; }
public string Name { get; set; }
+ public string Comments { get; set; }
public int Norm { get; set; }
public int Order { get; set; }
public string HydraulicDatabaseVersion { get; set; }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/CalculationGroupEntity.cs
===================================================================
diff -u -r6e9bf03d69ca0ec95a023b658b55a4bbc0b8ad5f -r6059a4af5c28390c79efa4e808e28cc93eeddac1
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/CalculationGroupEntity.cs (.../CalculationGroupEntity.cs) (revision 6e9bf03d69ca0ec95a023b658b55a4bbc0b8ad5f)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/CalculationGroupEntity.cs (.../CalculationGroupEntity.cs) (revision 6059a4af5c28390c79efa4e808e28cc93eeddac1)
@@ -40,6 +40,7 @@
{
this.CalculationGroupEntity1 = new HashSet();
this.FailureMechanismEntities = new HashSet();
+ this.PipingCalculationEntities = new HashSet();
}
public long CalculationGroupEntityId { get; set; }
@@ -53,5 +54,7 @@
public virtual CalculationGroupEntity CalculationGroupEntity2 { get; set; }
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
public virtual ICollection FailureMechanismEntities { get; set; }
+ [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+ public virtual ICollection PipingCalculationEntities { get; set; }
}
}
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql
===================================================================
diff -u -r6e9bf03d69ca0ec95a023b658b55a4bbc0b8ad5f -r6059a4af5c28390c79efa4e808e28cc93eeddac1
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 6e9bf03d69ca0ec95a023b658b55a4bbc0b8ad5f)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 6059a4af5c28390c79efa4e808e28cc93eeddac1)
@@ -1,6 +1,6 @@
/* ---------------------------------------------------- */
/* Generated by Enterprise Architect Version 12.0 */
-/* Created On : 31-mei-2016 11:18:28 */
+/* Created On : 31-mei-2016 14:13:08 */
/* DBMS : SQLite */
/* ---------------------------------------------------- */
@@ -33,6 +33,9 @@
DROP TABLE IF EXISTS 'HydraulicLocationEntity'
;
+DROP TABLE IF EXISTS 'PipingCalculationEntity'
+;
+
DROP TABLE IF EXISTS 'ReferenceLinePointEntity'
;
@@ -79,7 +82,8 @@
(
'AssessmentSectionEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'ProjectEntityId' INTEGER NOT NULL,
- 'Name' VARCHAR (260) NOT NULL,
+ 'Name' VARCHAR (260),
+ 'Comments' TEXT,
'Norm' INT (4) NOT NULL,
'Order' INT (4) NOT NULL,
'HydraulicDatabaseVersion' TEXT,
@@ -106,7 +110,7 @@
(
'FailureMechanismSectionEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismEntityId' INTEGER NOT NULL,
- 'Name' VARCHAR (255) NOT NULL,
+ 'Name' VARCHAR (260) NOT NULL,
CONSTRAINT 'FK_FailureMechanismSectionEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
)
;
@@ -137,7 +141,7 @@
(
'CalculationGroupEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'ParentCalculationGroupEntityId' INTEGER,
- 'Name' VARCHAR (255) NOT NULL,
+ 'Name' VARCHAR (260),
'IsEditable' TINYINT (1) NOT NULL, -- true or false
'Order' INT (4) NOT NULL,
CONSTRAINT 'FK_CalculationGroupEntity_CalculationGroupEntity' FOREIGN KEY ('ParentCalculationGroupEntityId') REFERENCES 'CalculationGroupEntity' ('CalculationGroupEntityId') ON DELETE Cascade ON UPDATE Cascade
@@ -157,6 +161,38 @@
)
;
+CREATE TABLE 'PipingCalculationEntity'
+(
+ 'PipingCalculationEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+ 'CalculationGroupEntityId' INTEGER NOT NULL,
+ 'SurfaceLineEntityId' INTEGER,
+ 'StochasticSoilProfileEntityId' INTEGER,
+ 'HydraulicLocationEntityId' INTEGER,
+ 'Order' INT (4) NOT NULL,
+ 'Name' VARCHAR (260),
+ 'Comments' TEXT,
+ 'EntryPointL' NUMERIC,
+ 'ExitPointL' NUMERIC,
+ 'PhreaticLevelExitMean' NUMERIC NOT NULL,
+ 'PhreaticLevelExitStandardDeviation' NUMERIC NOT NULL,
+ 'Diameter70Mean' NUMERIC NOT NULL,
+ 'Diameter70StandardDeviation' NUMERIC NOT NULL,
+ 'DarcyPermeabilityMean' NUMERIC NOT NULL,
+ 'DarcyPermeabilityStandardDeviation' NUMERIC NOT NULL,
+ 'DampingFactorExitMean' NUMERIC NOT NULL,
+ 'DampingFactorExitStandardDeviation' NUMERIC NOT NULL,
+ 'SaturatedVolumicWeightOfCoverageLayerMean' NUMERIC NOT NULL,
+ 'SaturatedVolumicWeightOfCoverageLayerStandardDeviation' NUMERIC NOT NULL,
+ 'SaturatedVolumicWeightOfCoverageLayerShift' NUMERIC NOT NULL,
+ 'RelevantForScenario' TINYINT (1) NOT NULL,
+ 'ScenarioContribution' NUMERIC NOT NULL,
+ CONSTRAINT 'FK_PipingCalculationEntity_CalculationGroupEntity' FOREIGN KEY ('CalculationGroupEntityId') REFERENCES 'CalculationGroupEntity' ('CalculationGroupEntityId') ON DELETE No Action ON UPDATE No Action,
+ CONSTRAINT 'FK_PipingCalculationEntity_HydraulicLocationEntity' FOREIGN KEY ('HydraulicLocationEntityId') REFERENCES 'HydraulicLocationEntity' ('HydraulicLocationEntityId') ON DELETE No Action ON UPDATE No Action,
+ CONSTRAINT 'FK_PipingCalculationEntity_StochasticSoilProfileEntity' FOREIGN KEY ('StochasticSoilProfileEntityId') REFERENCES 'StochasticSoilProfileEntity' ('StochasticSoilProfileEntityId') ON DELETE No Action ON UPDATE No Action,
+ CONSTRAINT 'FK_PipingCalculationEntity_SurfaceLineEntity' FOREIGN KEY ('SurfaceLineEntityId') REFERENCES 'SurfaceLineEntity' ('SurfaceLineEntityId') ON DELETE No Action ON UPDATE No Action
+)
+;
+
CREATE TABLE 'ReferenceLinePointEntity'
(
'ReferenceLinePointEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -182,7 +218,7 @@
(
'SoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'Bottom' NUMERIC NOT NULL,
- 'Name' TEXT NOT NULL
+ 'Name' TEXT
)
;
@@ -201,8 +237,8 @@
(
'StochasticSoilModelEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismEntityId' INTEGER NOT NULL,
- 'Name' TEXT NOT NULL,
- 'SegmentName' TEXT NOT NULL,
+ 'Name' TEXT,
+ 'SegmentName' TEXT,
CONSTRAINT 'FK_StochasticSoilModelEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
)
;
@@ -211,7 +247,7 @@
(
'SurfaceLineEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismEntityId' INTEGER NOT NULL,
- 'Name' VARCHAR (255) NOT NULL,
+ 'Name' VARCHAR (260),
'ReferenceLineIntersectionX' NUMERIC NOT NULL,
'ReferenceLineIntersectionY' NUMERIC NOT NULL,
CONSTRAINT 'FK_SurfaceLineEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE No Action ON UPDATE No Action
@@ -269,6 +305,22 @@
ON 'HydraulicLocationEntity' ('AssessmentSectionEntityId' ASC)
;
+CREATE INDEX 'IXFK_PipingCalculationEntity_StochasticSoilProfileEntity'
+ ON 'PipingCalculationEntity' ('StochasticSoilProfileEntityId' ASC)
+;
+
+CREATE INDEX 'IXFK_PipingCalculationEntity_SurfaceLineEntity'
+ ON 'PipingCalculationEntity' ('SurfaceLineEntityId' ASC)
+;
+
+CREATE INDEX 'IXFK_PipingCalculationEntity_HydraulicLocationEntity'
+ ON 'PipingCalculationEntity' ('HydraulicLocationEntityId' ASC)
+;
+
+CREATE INDEX 'IXFK_PipingCalculationEntity_CalculationGroupEntity'
+ ON 'PipingCalculationEntity' ('CalculationGroupEntityId' ASC)
+;
+
CREATE INDEX 'IXFK_ReferenceLinePointEntity_AssessmentSectionEntity'
ON 'ReferenceLinePointEntity' ('AssessmentSectionEntityId' ASC)
;
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationEntity.cs
===================================================================
diff -u -r8b5a6f938fe2b04cd78623649df37580e145055f -r6059a4af5c28390c79efa4e808e28cc93eeddac1
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationEntity.cs (.../HydraulicLocationEntity.cs) (revision 8b5a6f938fe2b04cd78623649df37580e145055f)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationEntity.cs (.../HydraulicLocationEntity.cs) (revision 6059a4af5c28390c79efa4e808e28cc93eeddac1)
@@ -35,6 +35,12 @@
public partial class HydraulicLocationEntity
{
+ [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+ public HydraulicLocationEntity()
+ {
+ this.PipingCalculationEntities = new HashSet();
+ }
+
public long HydraulicLocationEntityId { get; set; }
public long AssessmentSectionEntityId { get; set; }
public long LocationId { get; set; }
@@ -44,5 +50,7 @@
public Nullable DesignWaterLevel { get; set; }
public virtual AssessmentSectionEntity AssessmentSectionEntity { get; set; }
+ [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+ public virtual ICollection PipingCalculationEntities { get; set; }
}
}
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IRingtoetsEntities.cs
===================================================================
diff -u -r1b46ad78fa9971fa15b74ca1e7904acf3483f24a -r6059a4af5c28390c79efa4e808e28cc93eeddac1
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IRingtoetsEntities.cs (.../IRingtoetsEntities.cs) (revision 1b46ad78fa9971fa15b74ca1e7904acf3483f24a)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IRingtoetsEntities.cs (.../IRingtoetsEntities.cs) (revision 6059a4af5c28390c79efa4e808e28cc93eeddac1)
@@ -79,6 +79,12 @@
DbSet CalculationGroupEntities { get; }
///
+ /// Gets a of containing
+ /// every calculation group found in the database.
+ ///
+ DbSet PipingCalculationEntities { get; }
+
+ ///
/// Gets a of containing
/// every entity found in the database.
///
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingCalculationEntity.cs
===================================================================
diff -u
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingCalculationEntity.cs (revision 0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingCalculationEntity.cs (revision 6059a4af5c28390c79efa4e808e28cc93eeddac1)
@@ -0,0 +1,67 @@
+// 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.
+
+//------------------------------------------------------------------------------
+//
+// This code was generated from a template.
+//
+// Manual changes to this file may cause unexpected behavior in your application.
+// Manual changes to this file will be overwritten if the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace Application.Ringtoets.Storage.DbContext
+{
+ using System;
+ using System.Collections.Generic;
+
+ public partial class PipingCalculationEntity
+ {
+ public long PipingCalculationEntityId { get; set; }
+ public long CalculationGroupEntityId { get; set; }
+ public Nullable SurfaceLineEntityId { get; set; }
+ public Nullable StochasticSoilProfileEntityId { get; set; }
+ public Nullable HydraulicLocationEntityId { get; set; }
+ public int Order { get; set; }
+ public string Name { get; set; }
+ public string Comments { get; set; }
+ public Nullable EntryPointL { get; set; }
+ public Nullable ExitPointL { get; set; }
+ public decimal PhreaticLevelExitMean { get; set; }
+ public decimal PhreaticLevelExitStandardDeviation { get; set; }
+ public decimal Diameter70Mean { get; set; }
+ public decimal Diameter70StandardDeviation { get; set; }
+ public decimal DarcyPermeabilityMean { get; set; }
+ public decimal DarcyPermeabilityStandardDeviation { get; set; }
+ public decimal DampingFactorExitMean { get; set; }
+ public decimal DampingFactorExitStandardDeviation { get; set; }
+ public decimal SaturatedVolumicWeightOfCoverageLayerMean { get; set; }
+ public decimal SaturatedVolumicWeightOfCoverageLayerStandardDeviation { get; set; }
+ public decimal SaturatedVolumicWeightOfCoverageLayerShift { get; set; }
+ public byte RelevantForScenario { get; set; }
+ public decimal 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; }
+ }
+}
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs
===================================================================
diff -u -r1b46ad78fa9971fa15b74ca1e7904acf3483f24a -r6059a4af5c28390c79efa4e808e28cc93eeddac1
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision 1b46ad78fa9971fa15b74ca1e7904acf3483f24a)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision 6059a4af5c28390c79efa4e808e28cc93eeddac1)
@@ -59,6 +59,7 @@
public virtual DbSet FailureMechanismSectionEntities { get; set; }
public virtual DbSet FailureMechanismSectionPointEntities { get; set; }
public virtual DbSet HydraulicLocationEntities { get; set; }
+ public virtual DbSet PipingCalculationEntities { get; set; }
public virtual DbSet ProjectEntities { get; set; }
public virtual DbSet ReferenceLinePointEntities { get; set; }
public virtual DbSet SoilLayerEntities { get; set; }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs
===================================================================
diff -u -r6e9bf03d69ca0ec95a023b658b55a4bbc0b8ad5f -r6059a4af5c28390c79efa4e808e28cc93eeddac1
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision 6e9bf03d69ca0ec95a023b658b55a4bbc0b8ad5f)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision 6059a4af5c28390c79efa4e808e28cc93eeddac1)
@@ -1,4 +1,4 @@
-// T4 code generation is enabled for model 'D:\Branch_WTI2017\Application\Ringtoets\src\Application.Ringtoets.Storage\DbContext\RingtoetsEntities.edmx'.
+// T4 code generation is enabled for model 'D:\Clean_WTI2017\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 -r6e9bf03d69ca0ec95a023b658b55a4bbc0b8ad5f -r6059a4af5c28390c79efa4e808e28cc93eeddac1
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 6e9bf03d69ca0ec95a023b658b55a4bbc0b8ad5f)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 6059a4af5c28390c79efa4e808e28cc93eeddac1)
@@ -4,14 +4,15 @@
-
+
-
+
+
@@ -24,7 +25,7 @@
-
+
@@ -52,7 +53,7 @@
-
+
@@ -76,6 +77,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -108,16 +137,16 @@
-
+
-
-
+
+
@@ -144,7 +173,7 @@
-
+
@@ -264,6 +293,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -368,6 +445,7 @@
+
@@ -410,6 +488,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -455,6 +549,7 @@
+
@@ -489,6 +584,10 @@
+
+
+
+
@@ -509,6 +608,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -536,7 +647,8 @@
-
+
+
@@ -553,12 +665,13 @@
-
+
+
@@ -590,7 +703,7 @@
-
+
@@ -617,7 +730,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -653,7 +799,7 @@
-
+
@@ -663,8 +809,8 @@
-
-
+
+
@@ -688,6 +834,7 @@
+
@@ -697,10 +844,11 @@
-
+
+
@@ -797,6 +945,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -857,6 +1017,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -931,6 +1127,7 @@
+
@@ -1001,6 +1198,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram
===================================================================
diff -u -r6e9bf03d69ca0ec95a023b658b55a4bbc0b8ad5f -r6059a4af5c28390c79efa4e808e28cc93eeddac1
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 6e9bf03d69ca0ec95a023b658b55a4bbc0b8ad5f)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 6059a4af5c28390c79efa4e808e28cc93eeddac1)
@@ -5,34 +5,39 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StochasticSoilProfileEntity.cs
===================================================================
diff -u -r6d514ec60f68620d78015ac58ba6a966ef6b14e3 -r6059a4af5c28390c79efa4e808e28cc93eeddac1
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StochasticSoilProfileEntity.cs (.../StochasticSoilProfileEntity.cs) (revision 6d514ec60f68620d78015ac58ba6a966ef6b14e3)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StochasticSoilProfileEntity.cs (.../StochasticSoilProfileEntity.cs) (revision 6059a4af5c28390c79efa4e808e28cc93eeddac1)
@@ -35,11 +35,19 @@
public partial class StochasticSoilProfileEntity
{
+ [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+ public StochasticSoilProfileEntity()
+ {
+ this.PipingCalculationEntities = new HashSet();
+ }
+
public long StochasticSoilProfileEntityId { get; set; }
public long SoilProfileEntityId { get; set; }
public long StochasticSoilModelEntityId { get; set; }
public decimal Probability { get; set; }
+ [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; }
}
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SurfaceLineEntity.cs
===================================================================
diff -u -r9e1b97e9540df6cbd635120135c83de0260aa6d1 -r6059a4af5c28390c79efa4e808e28cc93eeddac1
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SurfaceLineEntity.cs (.../SurfaceLineEntity.cs) (revision 9e1b97e9540df6cbd635120135c83de0260aa6d1)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SurfaceLineEntity.cs (.../SurfaceLineEntity.cs) (revision 6059a4af5c28390c79efa4e808e28cc93eeddac1)
@@ -38,6 +38,7 @@
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
public SurfaceLineEntity()
{
+ this.PipingCalculationEntities = new HashSet();
this.SurfaceLinePointEntities = new HashSet();
}
@@ -49,6 +50,8 @@
public virtual FailureMechanismEntity FailureMechanismEntity { get; set; }
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+ public virtual ICollection PipingCalculationEntities { get; set; }
+ [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
public virtual ICollection SurfaceLinePointEntities { get; set; }
}
}
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsEntitiesHelper.cs
===================================================================
diff -u -r1b46ad78fa9971fa15b74ca1e7904acf3483f24a -r6059a4af5c28390c79efa4e808e28cc93eeddac1
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsEntitiesHelper.cs (.../RingtoetsEntitiesHelper.cs) (revision 1b46ad78fa9971fa15b74ca1e7904acf3483f24a)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsEntitiesHelper.cs (.../RingtoetsEntitiesHelper.cs) (revision 6059a4af5c28390c79efa4e808e28cc93eeddac1)
@@ -44,6 +44,7 @@
DbSet assessmentSectionsSet = CreateEmptyTestDbSet();
DbSet referenceLinesSet = CreateEmptyTestDbSet();
DbSet calculationGroupsSet = CreateEmptyTestDbSet();
+ DbSet pipingCalculationsSet = CreateEmptyTestDbSet();
DbSet stochasticSoilModelsSet = CreateEmptyTestDbSet();
DbSet soilModelSegmentPointsSet = CreateEmptyTestDbSet();
DbSet stochasticSoilProfilesSet = CreateEmptyTestDbSet();
@@ -62,6 +63,7 @@
ringtoetsEntities.Stub(r => r.AssessmentSectionEntities).Return(assessmentSectionsSet);
ringtoetsEntities.Stub(r => r.ReferenceLinePointEntities).Return(referenceLinesSet);
ringtoetsEntities.Stub(r => r.CalculationGroupEntities).Return(calculationGroupsSet);
+ ringtoetsEntities.Stub(r => r.PipingCalculationEntities).Return(pipingCalculationsSet);
ringtoetsEntities.Stub(r => r.StochasticSoilModelEntities).Return(stochasticSoilModelsSet);
ringtoetsEntities.Stub(r => r.StochasticSoilModelSegmentPointEntities).Return(soilModelSegmentPointsSet);
ringtoetsEntities.Stub(r => r.StochasticSoilProfileEntities).Return(stochasticSoilProfilesSet);