Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ClosingStructures/ClosingStructuresFailureMechanismSectionResultCreateExtensions.cs =================================================================== diff -u -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6 -r3a7eb07c13a15f90342ac16fb4dc9f0df32a9c5a --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ClosingStructures/ClosingStructuresFailureMechanismSectionResultCreateExtensions.cs (.../ClosingStructuresFailureMechanismSectionResultCreateExtensions.cs) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ClosingStructures/ClosingStructuresFailureMechanismSectionResultCreateExtensions.cs (.../ClosingStructuresFailureMechanismSectionResultCreateExtensions.cs) (revision 3a7eb07c13a15f90342ac16fb4dc9f0df32a9c5a) @@ -47,7 +47,6 @@ var sectionResultEntity = new ClosingStructuresSectionResultEntity { LayerOne = Convert.ToByte(result.AssessmentLayerOne), - LayerTwoA = result.AssessmentLayerTwoA.ToNaNAsNull(), LayerThree = result.AssessmentLayerThree.Value.ToNaNAsNull() }; Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresSectionResultEntity.cs =================================================================== diff -u -radbfca968beb93b87561607f2b0fd9a23bdfc6bd -r3a7eb07c13a15f90342ac16fb4dc9f0df32a9c5a --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresSectionResultEntity.cs (.../ClosingStructuresSectionResultEntity.cs) (revision adbfca968beb93b87561607f2b0fd9a23bdfc6bd) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresSectionResultEntity.cs (.../ClosingStructuresSectionResultEntity.cs) (revision 3a7eb07c13a15f90342ac16fb4dc9f0df32a9c5a) @@ -39,7 +39,6 @@ public long FailureMechanismSectionEntityId { get; set; } public Nullable ClosingStructuresCalculationEntityId { get; set; } public byte LayerOne { get; set; } - public Nullable LayerTwoA { get; set; } public Nullable LayerThree { get; set; } public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql =================================================================== diff -u -rac5da35861aeeaaab57c029d1dc7f6ed47013d25 -r3a7eb07c13a15f90342ac16fb4dc9f0df32a9c5a --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision ac5da35861aeeaaab57c029d1dc7f6ed47013d25) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 3a7eb07c13a15f90342ac16fb4dc9f0df32a9c5a) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 25-okt-2016 11:47:35 */ +/* Created On : 25-Oct-2016 14:14:08 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -543,7 +543,6 @@ 'FailureMechanismSectionEntityId' INTEGER NOT NULL, 'ClosingStructuresCalculationEntityId' INTEGER, 'LayerOne' TINYINT (1) NOT NULL, -- true or false - 'LayerTwoA' REAL, 'LayerThree' REAL, CONSTRAINT 'FK_ClosingStructuresSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade ) Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs =================================================================== diff -u -rac5da35861aeeaaab57c029d1dc7f6ed47013d25 -r3a7eb07c13a15f90342ac16fb4dc9f0df32a9c5a --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision ac5da35861aeeaaab57c029d1dc7f6ed47013d25) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision 3a7eb07c13a15f90342ac16fb4dc9f0df32a9c5a) @@ -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:\Repos\Ringtoets\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 -rac5da35861aeeaaab57c029d1dc7f6ed47013d25 -r3a7eb07c13a15f90342ac16fb4dc9f0df32a9c5a --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision ac5da35861aeeaaab57c029d1dc7f6ed47013d25) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 3a7eb07c13a15f90342ac16fb4dc9f0df32a9c5a) @@ -4,7 +4,7 @@ - + @@ -94,7 +94,6 @@ - @@ -2302,7 +2301,6 @@ - @@ -3963,7 +3961,6 @@ - Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram =================================================================== diff -u -rac5da35861aeeaaab57c029d1dc7f6ed47013d25 -r3a7eb07c13a15f90342ac16fb4dc9f0df32a9c5a --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision ac5da35861aeeaaab57c029d1dc7f6ed47013d25) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 3a7eb07c13a15f90342ac16fb4dc9f0df32a9c5a) @@ -5,60 +5,60 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ClosingStructures/ClosingStructuresSectionResultEntityReadExtensionsTest.cs =================================================================== diff -u -rfe1332c1e9b14365a62f6ce03c9494393223179e -r3a7eb07c13a15f90342ac16fb4dc9f0df32a9c5a --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ClosingStructures/ClosingStructuresSectionResultEntityReadExtensionsTest.cs (.../ClosingStructuresSectionResultEntityReadExtensionsTest.cs) (revision fe1332c1e9b14365a62f6ce03c9494393223179e) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ClosingStructures/ClosingStructuresSectionResultEntityReadExtensionsTest.cs (.../ClosingStructuresSectionResultEntityReadExtensionsTest.cs) (revision 3a7eb07c13a15f90342ac16fb4dc9f0df32a9c5a) @@ -79,31 +79,6 @@ [Test] [TestCase(true)] [TestCase(false)] - public void Read_WithNullLayerTwoA_ReturnClosingStructuresSectionResultWithNullParameters(bool layerOne) - { - // Setup - var collector = new ReadConversionCollector(); - var failureMechanismSectionEntity = new FailureMechanismSectionEntity(); - collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection()); - var entity = new ClosingStructuresSectionResultEntity - { - LayerOne = Convert.ToByte(layerOne), - LayerTwoA = null, - LayerThree = new Random(21).NextDouble(), - FailureMechanismSectionEntity = failureMechanismSectionEntity - }; - var sectionResult = new ClosingStructuresFailureMechanismSectionResult(new TestFailureMechanismSection()); - - // Call - entity.Read(sectionResult); - - // Assert - Assert.IsNaN(sectionResult.AssessmentLayerTwoA); - } - - [Test] - [TestCase(true)] - [TestCase(false)] public void Read_WithNullLayerThree_ReturnClosingStructuresSectionResultWithNullParameters(bool layerOne) { // Setup @@ -113,7 +88,6 @@ var entity = new ClosingStructuresSectionResultEntity { LayerOne = Convert.ToByte(layerOne), - LayerTwoA = new Random(21).NextDouble(), LayerThree = null, FailureMechanismSectionEntity = failureMechanismSectionEntity };