Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql =================================================================== diff -u -r89217cd12161055618bade4d54f34334c2714528 -r182ee751da4cc43bd5d44e816199ded9787f619e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 89217cd12161055618bade4d54f34334c2714528) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 182ee751da4cc43bd5d44e816199ded9787f619e) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 21-jul-2016 9:53:39 */ +/* Created On : 21-jul-2016 11:30:42 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -288,19 +288,22 @@ 'GrassCoverErosionInwardsCalculationEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'CalculationGroupEntityId' INTEGER NOT NULL, 'HydraulicLocationEntityId' INTEGER, + 'DikeProfileEntityId' INTEGER, 'GrassCoverErosionInwardsOutputEntityId' INTEGER, 'Order' INT (4) NOT NULL, 'Name' VARCHAR (260), 'Comments' TEXT, - 'Orientation' NUMERIC NOT NULL, - 'CriticalFlowRateMean' NUMERIC NOT NULL, - 'CriticalFlowRateStandardDeviation' NUMERIC NOT NULL, + 'Orientation' REAL, + 'CriticalFlowRateMean' REAL, + 'CriticalFlowRateStandardDeviation' REAL, 'UseForeshore' TINYINT (1) NOT NULL, - 'DikeHeight' NUMERIC NOT NULL, + 'DikeHeight' REAL, 'UseBreakWater' TINYINT (1) NOT NULL, 'BreakWaterType' SMALLINT NOT NULL, - 'BreakWaterHeight' NUMERIC NOT NULL, + 'BreakWaterHeight' REAL, + 'CalculateDikeHeight' TINYINT (1) NOT NULL, CONSTRAINT 'FK_GrassCoverErosionInwardsCalculationEntity_CalculationGroupEntity' FOREIGN KEY ('CalculationGroupEntityId') REFERENCES 'CalculationGroupEntity' ('CalculationGroupEntityId') ON DELETE Cascade ON UPDATE Cascade, + CONSTRAINT 'FK_GrassCoverErosionInwardsCalculationEntity_DikeProfileEntity' FOREIGN KEY ('DikeProfileEntityId') REFERENCES 'DikeProfileEntity' ('DikeProfileEntityId') ON DELETE Set Null ON UPDATE Cascade, CONSTRAINT 'FK_GrassCoverErosionInwardsCalculationEntity_GrassCoverErosionInwardsOutputEntity' FOREIGN KEY ('GrassCoverErosionInwardsOutputEntityId') REFERENCES 'GrassCoverErosionInwardsOutputEntity' ('GrassCoverErosionInwardsOutputId') ON DELETE Set Null ON UPDATE Cascade, CONSTRAINT 'FK_GrassCoverErosionInwardsCalculationEntity_HydraulicLocationEntity' FOREIGN KEY ('HydraulicLocationEntityId') REFERENCES 'HydraulicLocationEntity' ('HydraulicLocationEntityId') ON DELETE Set Null ON UPDATE Cascade ) @@ -736,6 +739,10 @@ ON 'GrassCoverErosionInwardsCalculationEntity' ('CalculationGroupEntityId' ASC) ; +CREATE INDEX 'IXFK_GrassCoverErosionInwardsCalculationEntity_DikeProfileEntity' + ON 'GrassCoverErosionInwardsCalculationEntity' ('DikeProfileEntityId' ASC) +; + CREATE INDEX 'IXFK_GrassCoverErosionInwardsCalculationEntity_GrassCoverErosionInwardsOutputEntity' ON 'GrassCoverErosionInwardsCalculationEntity' ('GrassCoverErosionInwardsOutputEntityId' ASC) ; Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DikeProfileEntity.cs =================================================================== diff -u -rc8c1b80956a5fc60e75510d9dc7a840062230b3b -r182ee751da4cc43bd5d44e816199ded9787f619e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DikeProfileEntity.cs (.../DikeProfileEntity.cs) (revision c8c1b80956a5fc60e75510d9dc7a840062230b3b) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DikeProfileEntity.cs (.../DikeProfileEntity.cs) (revision 182ee751da4cc43bd5d44e816199ded9787f619e) @@ -35,6 +35,12 @@ public partial class DikeProfileEntity { + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + public DikeProfileEntity() + { + this.GrassCoverErosionInwardsCalculationEntities = new HashSet(); + } + public long DikeProfileEntityId { get; set; } public long FailureMechanismEntityId { get; set; } public string Name { get; set; } @@ -49,5 +55,7 @@ public double X0 { get; set; } public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection GrassCoverErosionInwardsCalculationEntities { get; set; } } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsCalculationEntity.cs =================================================================== diff -u -r641deb71d80f4842345b3fce83304a00495010ed -r182ee751da4cc43bd5d44e816199ded9787f619e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsCalculationEntity.cs (.../GrassCoverErosionInwardsCalculationEntity.cs) (revision 641deb71d80f4842345b3fce83304a00495010ed) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsCalculationEntity.cs (.../GrassCoverErosionInwardsCalculationEntity.cs) (revision 182ee751da4cc43bd5d44e816199ded9787f619e) @@ -38,20 +38,23 @@ public long GrassCoverErosionInwardsCalculationEntityId { get; set; } public long CalculationGroupEntityId { get; set; } public Nullable HydraulicLocationEntityId { get; set; } + public Nullable DikeProfileEntityId { get; set; } public Nullable GrassCoverErosionInwardsOutputEntityId { get; set; } public int Order { get; set; } public string Name { get; set; } public string Comments { get; set; } - public decimal Orientation { get; set; } - public decimal CriticalFlowRateMean { get; set; } - public decimal CriticalFlowRateStandardDeviation { get; set; } + public Nullable Orientation { get; set; } + public Nullable CriticalFlowRateMean { get; set; } + public Nullable CriticalFlowRateStandardDeviation { get; set; } public byte UseForeshore { get; set; } - public decimal DikeHeight { get; set; } + public Nullable DikeHeight { get; set; } public byte UseBreakWater { get; set; } public short BreakWaterType { get; set; } - public decimal BreakWaterHeight { 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; } public virtual GrassCoverErosionInwardsOutputEntity GrassCoverErosionInwardsOutputEntity { get; set; } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs =================================================================== diff -u -ra0f8fe21c8dc4613598bdc294604c4b2bb2fd71f -r182ee751da4cc43bd5d44e816199ded9787f619e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision a0f8fe21c8dc4613598bdc294604c4b2bb2fd71f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision 182ee751da4cc43bd5d44e816199ded9787f619e) @@ -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 -r89217cd12161055618bade4d54f34334c2714528 -r182ee751da4cc43bd5d44e816199ded9787f619e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 89217cd12161055618bade4d54f34334c2714528) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 182ee751da4cc43bd5d44e816199ded9787f619e) @@ -4,7 +4,7 @@ - + @@ -109,18 +109,20 @@ + - - - + + + - + - + + @@ -632,6 +634,18 @@ + + + + + + + + + + + + @@ -1145,6 +1159,10 @@ + + + + @@ -1358,7 +1376,7 @@ - + @@ -1378,6 +1396,10 @@ + + + + @@ -1553,7 +1575,7 @@ - + @@ -1593,6 +1615,7 @@ + @@ -1669,19 +1692,22 @@ + - - - + + + - + - - + + + + @@ -2171,7 +2197,7 @@ - + @@ -2231,6 +2257,18 @@ + + + + + + + + + + + + @@ -2778,6 +2816,7 @@ + @@ -2790,6 +2829,7 @@ + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram =================================================================== diff -u -r89217cd12161055618bade4d54f34334c2714528 -r182ee751da4cc43bd5d44e816199ded9787f619e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 89217cd12161055618bade4d54f34334c2714528) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 182ee751da4cc43bd5d44e816199ded9787f619e) @@ -6,60 +6,61 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - + + - + +