Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
===================================================================
diff -u -r583a729a502f52ca415627efcb2287886e8efb1d -r3b154768800db81f1cf35b68248bcc53f417c90a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 583a729a502f52ca415627efcb2287886e8efb1d)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 3b154768800db81f1cf35b68248bcc53f417c90a)
@@ -136,6 +136,9 @@
RingtoetsEntities.tt
+
+ RingtoetsEntities.tt
+
RingtoetsEntities.tt
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/CalculationGroupEntity.cs
===================================================================
diff -u -r5cc8a49cc445a67f425ced8216c772b9170ea517 -r3b154768800db81f1cf35b68248bcc53f417c90a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/CalculationGroupEntity.cs (.../CalculationGroupEntity.cs) (revision 5cc8a49cc445a67f425ced8216c772b9170ea517)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/CalculationGroupEntity.cs (.../CalculationGroupEntity.cs) (revision 3b154768800db81f1cf35b68248bcc53f417c90a)
@@ -42,6 +42,7 @@
this.FailureMechanismEntities = new HashSet();
this.GrassCoverErosionInwardsCalculationEntities = new HashSet();
this.GrassCoverErosionOutwardsWaveConditionsCalculationEntities = new HashSet();
+ this.HeightStructuresCalculationEntities = new HashSet();
this.PipingCalculationEntities = new HashSet();
this.StabilityStoneCoverWaveConditionsCalculationEntities = new HashSet();
this.WaveImpactAsphaltCoverWaveConditionsCalculationEntities = new HashSet();
@@ -63,6 +64,8 @@
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
public virtual ICollection GrassCoverErosionOutwardsWaveConditionsCalculationEntities { get; set; }
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+ public virtual ICollection HeightStructuresCalculationEntities { 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 StabilityStoneCoverWaveConditionsCalculationEntities { get; set; }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql
===================================================================
diff -u -re570ba372fafe1802a4caae2ef9410b64457198b -r3b154768800db81f1cf35b68248bcc53f417c90a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision e570ba372fafe1802a4caae2ef9410b64457198b)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 3b154768800db81f1cf35b68248bcc53f417c90a)
@@ -1,6 +1,6 @@
/* ---------------------------------------------------- */
/* Generated by Enterprise Architect Version 12.0 */
-/* Created On : 21-okt-2016 14:43:18 */
+/* Created On : 25-Oct-2016 8:28:00 AM */
/* DBMS : SQLite */
/* ---------------------------------------------------- */
@@ -162,6 +162,9 @@
DROP TABLE IF EXISTS 'HeightStructureEntity'
;
+DROP TABLE IF EXISTS 'HeightStructuresCalculationEntity'
+;
+
/* Create Tables with Primary and Foreign Keys, Check and Unique Constraints */
CREATE TABLE 'VersionEntity'
@@ -875,6 +878,42 @@
)
;
+CREATE TABLE 'HeightStructuresCalculationEntity'
+(
+ 'HeightStructuresCalculationEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+ 'CalculationGroupEntityId' INTEGER NOT NULL,
+ 'HydraulicLocationEntityId' INTEGER,
+ 'HeightStructureEntityId' INTEGER,
+ 'ForeshoreProfileEntityId' INTEGER,
+ 'HydraulicBoundaryLocationEntityId' INTEGER,
+ 'Order' INT (4) NOT NULL,
+ 'Name' VARCHAR (260),
+ 'Comments' TEXT,
+ 'ModelFactorSuperCriticalFlowMean' REAL,
+ 'VariationCoefficientLogNormalDistributionMean' REAL,
+ 'StructureNormalOrientation' REAL,
+ 'AllowedLevelIncreaseStorageMean' REAL,
+ 'AllowedLevelIncreaseStorageStandardDeviation' REAL,
+ 'StorageStructureAreaMean' REAL,
+ 'StorageStructureAreaCoefficientOfVariation' REAL,
+ 'FlowWidthAtBottomProtectionMean' REAL,
+ 'FlowWidthAtBottomProtectionCoefficientOfVariation' REAL,
+ 'CriticalOvertoppingDischargeMean' REAL,
+ 'CriticalOvertoppingDischargeCoefficientOfVariation' REAL,
+ 'FailureProbabilityStructureWithErosion' REAL,
+ 'WidthFlowAperturesMean' REAL,
+ 'WidthFlowAperturesCoefficientOfVariation' REAL,
+ 'UseBreakWater' TINYINT (1) NOT NULL,
+ 'UseForeshore' TINYINT (1) NOT NULL,
+ 'BreakWaterType' SMALLINT NOT NULL, -- Enum: 1 = Wall 2 = Caisson 3 = Dam
+ 'BreakWaterHeight' REAL,
+ CONSTRAINT 'FK_HeightStructuresCalculationEntity_CalculationGroupEntity' FOREIGN KEY ('CalculationGroupEntityId') REFERENCES 'CalculationGroupEntity' ('CalculationGroupEntityId') ON DELETE No Action ON UPDATE No Action,
+ CONSTRAINT 'FK_HeightStructuresCalculationEntity_ForeshoreProfileEntity' FOREIGN KEY ('ForeshoreProfileEntityId') REFERENCES 'ForeshoreProfileEntity' ('ForeshoreProfileEntityId') ON DELETE Set Null ON UPDATE Set Null,
+ CONSTRAINT 'FK_HeightStructuresCalculationEntity_HeightStructureEntity' FOREIGN KEY ('HeightStructureEntityId') REFERENCES 'HeightStructureEntity' ('HeightStructureEntityId') ON DELETE No Action ON UPDATE No Action,
+ CONSTRAINT 'FK_HeightStructuresCalculationEntity_HydraulicLocationEntity' FOREIGN KEY ('HydraulicLocationEntityId') REFERENCES 'HydraulicLocationEntity' ('HydraulicLocationEntityId') ON DELETE No Action ON UPDATE No Action
+)
+;
+
/* Create Indexes and Triggers */
CREATE INDEX 'IXFK_PipingFailureMechanismMetaEntity_FailureMechanismEntity'
@@ -1124,3 +1163,19 @@
CREATE INDEX 'IXFK_HeightStructure_FailureMechanismEntity'
ON 'HeightStructureEntity' ('FailureMechanismEntityId' ASC)
;
+
+CREATE INDEX 'IXFK_HeightStructuresCalculationEntity_CalculationGroupEntity'
+ ON 'HeightStructuresCalculationEntity' ('CalculationGroupEntityId' ASC)
+;
+
+CREATE INDEX 'IXFK_HeightStructuresCalculationEntity_ForeshoreProfileEntity'
+ ON 'HeightStructuresCalculationEntity' ('ForeshoreProfileEntityId' ASC)
+;
+
+CREATE INDEX 'IXFK_HeightStructuresCalculationEntity_HeightStructureEntity'
+ ON 'HeightStructuresCalculationEntity' ('HeightStructureEntityId' ASC)
+;
+
+CREATE INDEX 'IXFK_HeightStructuresCalculationEntity_HydraulicLocationEntity'
+ ON 'HeightStructuresCalculationEntity' ('HydraulicLocationEntityId' ASC)
+;
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ForeshoreProfileEntity.cs
===================================================================
diff -u -r5cc8a49cc445a67f425ced8216c772b9170ea517 -r3b154768800db81f1cf35b68248bcc53f417c90a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ForeshoreProfileEntity.cs (.../ForeshoreProfileEntity.cs) (revision 5cc8a49cc445a67f425ced8216c772b9170ea517)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ForeshoreProfileEntity.cs (.../ForeshoreProfileEntity.cs) (revision 3b154768800db81f1cf35b68248bcc53f417c90a)
@@ -39,6 +39,7 @@
public ForeshoreProfileEntity()
{
this.GrassCoverErosionOutwardsWaveConditionsCalculationEntities = new HashSet();
+ this.HeightStructuresCalculationEntities = new HashSet();
this.StabilityStoneCoverWaveConditionsCalculationEntities = new HashSet();
this.WaveImpactAsphaltCoverWaveConditionsCalculationEntities = new HashSet();
}
@@ -59,6 +60,8 @@
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
public virtual ICollection GrassCoverErosionOutwardsWaveConditionsCalculationEntities { get; set; }
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+ public virtual ICollection HeightStructuresCalculationEntities { get; set; }
+ [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
public virtual ICollection StabilityStoneCoverWaveConditionsCalculationEntities { get; set; }
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
public virtual ICollection WaveImpactAsphaltCoverWaveConditionsCalculationEntities { get; set; }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructureEntity.cs
===================================================================
diff -u -r1ab694fe2d416435524ceca426d459caac4af304 -r3b154768800db81f1cf35b68248bcc53f417c90a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructureEntity.cs (.../HeightStructureEntity.cs) (revision 1ab694fe2d416435524ceca426d459caac4af304)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructureEntity.cs (.../HeightStructureEntity.cs) (revision 3b154768800db81f1cf35b68248bcc53f417c90a)
@@ -35,6 +35,12 @@
public partial class HeightStructureEntity
{
+ [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+ public HeightStructureEntity()
+ {
+ this.HeightStructuresCalculationEntities = new HashSet();
+ }
+
public long HeightStructureEntityId { get; set; }
public long FailureMechanismEntityId { get; set; }
public int Order { get; set; }
@@ -58,5 +64,7 @@
public Nullable AllowedLevelIncreaseStorageStandardDeviation { get; set; }
public virtual FailureMechanismEntity FailureMechanismEntity { get; set; }
+ [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+ public virtual ICollection HeightStructuresCalculationEntities { get; set; }
}
}
Fisheye: Tag 37652d7a208ab210033b48025d8d768d409086a8 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresCalculationEntity.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationEntity.cs
===================================================================
diff -u -r5cc8a49cc445a67f425ced8216c772b9170ea517 -r3b154768800db81f1cf35b68248bcc53f417c90a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationEntity.cs (.../HydraulicLocationEntity.cs) (revision 5cc8a49cc445a67f425ced8216c772b9170ea517)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationEntity.cs (.../HydraulicLocationEntity.cs) (revision 3b154768800db81f1cf35b68248bcc53f417c90a)
@@ -39,6 +39,7 @@
public HydraulicLocationEntity()
{
this.GrassCoverErosionInwardsCalculationEntities = new HashSet();
+ this.HeightStructuresCalculationEntities = new HashSet();
this.PipingCalculationEntities = new HashSet();
this.StabilityStoneCoverWaveConditionsCalculationEntities = new HashSet();
this.WaveImpactAsphaltCoverWaveConditionsCalculationEntities = new HashSet();
@@ -60,6 +61,8 @@
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
public virtual ICollection GrassCoverErosionInwardsCalculationEntities { get; set; }
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+ public virtual ICollection HeightStructuresCalculationEntities { 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 StabilityStoneCoverWaveConditionsCalculationEntities { get; set; }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs
===================================================================
diff -u -r1ab694fe2d416435524ceca426d459caac4af304 -r3b154768800db81f1cf35b68248bcc53f417c90a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision 1ab694fe2d416435524ceca426d459caac4af304)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision 3b154768800db81f1cf35b68248bcc53f417c90a)
@@ -74,6 +74,7 @@
public virtual DbSet GrassCoverSlipOffInwardsSectionResultEntities { get; set; }
public virtual DbSet GrassCoverSlipOffOutwardsSectionResultEntities { get; set; }
public virtual DbSet HeightStructureEntities { get; set; }
+ public virtual DbSet HeightStructuresCalculationEntities { get; set; }
public virtual DbSet HeightStructuresFailureMechanismMetaEntities { get; set; }
public virtual DbSet HeightStructuresSectionResultEntities { get; set; }
public virtual DbSet HydraulicLocationEntities { get; set; }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs
===================================================================
diff -u -radbfca968beb93b87561607f2b0fd9a23bdfc6bd -r3b154768800db81f1cf35b68248bcc53f417c90a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision adbfca968beb93b87561607f2b0fd9a23bdfc6bd)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision 3b154768800db81f1cf35b68248bcc53f417c90a)
@@ -1,4 +1,4 @@
-// T4 code generation is enabled for model 'D:\Clean_WTI2017\Application\Ringtoets\src\Application.Ringtoets.Storage\DbContext\RingtoetsEntities.edmx'.
+// T4 code generation is enabled for model 'D:\Projects\WTI\trunk\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 -re570ba372fafe1802a4caae2ef9410b64457198b -r3b154768800db81f1cf35b68248bcc53f417c90a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision e570ba372fafe1802a4caae2ef9410b64457198b)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 3b154768800db81f1cf35b68248bcc53f417c90a)
@@ -4,7 +4,7 @@
-
+
@@ -294,6 +294,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -985,6 +1017,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1428,6 +1508,7 @@
+
@@ -1570,6 +1651,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1738,6 +1835,7 @@
+
@@ -1796,6 +1894,10 @@
+
+
+
+
@@ -1944,6 +2046,10 @@
+
+
+
+
@@ -1972,6 +2078,14 @@
+
+
+
+
+
+
+
+
@@ -2054,6 +2168,7 @@
+
@@ -2192,6 +2307,7 @@
+
@@ -2385,7 +2501,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2422,6 +2575,7 @@
+
@@ -2875,6 +3029,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3319,6 +3485,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3403,6 +3581,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3864,6 +4066,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram
===================================================================
diff -u -re570ba372fafe1802a4caae2ef9410b64457198b -r3b154768800db81f1cf35b68248bcc53f417c90a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision e570ba372fafe1802a4caae2ef9410b64457198b)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 3b154768800db81f1cf35b68248bcc53f417c90a)
@@ -5,65 +5,67 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
@@ -101,13 +103,16 @@
+
+
+