Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresCalculationEntity.cs =================================================================== diff -u -r0a571f01845e933a1c290776f90b23df394debd6 -rac7fcdda3d4fc6f28d2d466055769ff03f7580fd --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresCalculationEntity.cs (.../ClosingStructuresCalculationEntity.cs) (revision 0a571f01845e933a1c290776f90b23df394debd6) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresCalculationEntity.cs (.../ClosingStructuresCalculationEntity.cs) (revision ac7fcdda3d4fc6f28d2d466055769ff03f7580fd) @@ -67,7 +67,7 @@ public Nullable CriticalOvertoppingDischargeCoefficientOfVariation { get; set; } public Nullable FlowWidthAtBottomProtectionMean { get; set; } public Nullable FlowWidthAtBottomProtectionStandardDeviation { get; set; } - public Nullable ProbabilityOpenStructureBeforeFlooding { get; set; } + public double ProbabilityOpenStructureBeforeFlooding { get; set; } public double FailureProbabilityOpenStructure { get; set; } public int IdenticalApertures { get; set; } public double FailureProbablityReparation { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql =================================================================== diff -u -r0a571f01845e933a1c290776f90b23df394debd6 -rac7fcdda3d4fc6f28d2d466055769ff03f7580fd --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 0a571f01845e933a1c290776f90b23df394debd6) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision ac7fcdda3d4fc6f28d2d466055769ff03f7580fd) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 27-okt-2016 15:12:09 */ +/* Created On : 27-Oct-2016 3:40:01 PM */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -509,9 +509,11 @@ ( 'HeightStructuresSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'FailureMechanismSectionEntityId' INTEGER NOT NULL, + 'HeightStructuresCalculationEntityId' INTEGER, 'LayerOne' TINYINT (1) NOT NULL, -- true or false 'LayerThree' REAL, - CONSTRAINT 'FK_HeightStructuresSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade + CONSTRAINT 'FK_HeightStructuresSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade, + CONSTRAINT 'FK_HeightStructuresSectionResultEntity_HeightStructuresCalculationEntity' FOREIGN KEY ('HeightStructuresCalculationEntityId') REFERENCES 'HeightStructuresCalculationEntity' ('HeightStructuresCalculationEntityId') ON DELETE Set Null ON UPDATE Cascade ) ; @@ -1014,7 +1016,7 @@ 'CriticalOvertoppingDischargeCoefficientOfVariation' REAL, 'FlowWidthAtBottomProtectionMean' REAL, 'FlowWidthAtBottomProtectionStandardDeviation' REAL, - 'ProbabilityOpenStructureBeforeFlooding' REAL, + 'ProbabilityOpenStructureBeforeFlooding' REAL NOT NULL, 'FailureProbabilityOpenStructure' REAL NOT NULL, 'IdenticalApertures' INT (4) NOT NULL, 'FailureProbablityReparation' REAL NOT NULL, @@ -1212,6 +1214,10 @@ ON 'HeightStructuresSectionResultEntity' ('FailureMechanismSectionEntityId' ASC) ; +CREATE INDEX 'IXFK_HeightStructuresSectionResultEntity_HeightStructuresCalculationEntity' + ON 'HeightStructuresSectionResultEntity' ('HeightStructuresCalculationEntityId' ASC) +; + CREATE INDEX 'IXFK_StrengthStabilityLengthwiseConstructionSectionResultEntity_FailureMechanismSectionEntity' ON 'StrengthStabilityLengthwiseConstructionSectionResultEntity' ('FailureMechanismSectionEntityId' ASC) ; Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresCalculationEntity.cs =================================================================== diff -u -rab4d75b5749af0a12698661f818e922e59125f7a -rac7fcdda3d4fc6f28d2d466055769ff03f7580fd --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresCalculationEntity.cs (.../HeightStructuresCalculationEntity.cs) (revision ab4d75b5749af0a12698661f818e922e59125f7a) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresCalculationEntity.cs (.../HeightStructuresCalculationEntity.cs) (revision ac7fcdda3d4fc6f28d2d466055769ff03f7580fd) @@ -39,6 +39,7 @@ public HeightStructuresCalculationEntity() { this.HeightStructuresOutputEntities = new HashSet(); + this.HeightStructuresSectionResultEntities = new HashSet(); } public long HeightStructuresCalculationEntityId { get; set; } @@ -77,5 +78,7 @@ 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; } } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresSectionResultEntity.cs =================================================================== diff -u -r741fcc00e47a7ff8fa01bbf15edbaedf8dec2e57 -rac7fcdda3d4fc6f28d2d466055769ff03f7580fd --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresSectionResultEntity.cs (.../HeightStructuresSectionResultEntity.cs) (revision 741fcc00e47a7ff8fa01bbf15edbaedf8dec2e57) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresSectionResultEntity.cs (.../HeightStructuresSectionResultEntity.cs) (revision ac7fcdda3d4fc6f28d2d466055769ff03f7580fd) @@ -37,9 +37,11 @@ { 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; } } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx =================================================================== diff -u -r0a571f01845e933a1c290776f90b23df394debd6 -rac7fcdda3d4fc6f28d2d466055769ff03f7580fd --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 0a571f01845e933a1c290776f90b23df394debd6) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision ac7fcdda3d4fc6f28d2d466055769ff03f7580fd) @@ -4,7 +4,7 @@ - + @@ -121,7 +121,7 @@ - + @@ -437,6 +437,7 @@ + @@ -1306,6 +1307,18 @@ + + + + + + + + + + + + @@ -1940,6 +1953,10 @@ + + + + @@ -2294,7 +2311,7 @@ - + @@ -2390,6 +2407,10 @@ + + + + @@ -2572,7 +2593,7 @@ - + @@ -2673,7 +2694,7 @@ - + @@ -2938,6 +2959,7 @@ + @@ -2967,9 +2989,11 @@ + - + + @@ -3875,7 +3899,7 @@ - + @@ -4163,6 +4187,18 @@ + + + + + + + + + + + + @@ -4771,6 +4807,7 @@ + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram =================================================================== diff -u -r0a571f01845e933a1c290776f90b23df394debd6 -rac7fcdda3d4fc6f28d2d466055769ff03f7580fd --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 0a571f01845e933a1c290776f90b23df394debd6) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision ac7fcdda3d4fc6f28d2d466055769ff03f7580fd) @@ -4,64 +4,175 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +<<<<<<< .mine + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> .r6236 + +<<<<<<< .mine + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -100,7 +211,7 @@ - + @@ -124,6 +235,7 @@ + @@ -136,6 +248,221 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +======= + + + + +>>>>>>> .r6236 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +