Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/Resources/DatabaseStructure17.1.sql =================================================================== diff -u -rd34720bc7fe019afec92b91f017b56618dafa95d -r873bd2b6b7b9d0737dde2ed16ff5d10a66795a2f --- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/Resources/DatabaseStructure17.1.sql (.../DatabaseStructure17.1.sql) (revision d34720bc7fe019afec92b91f017b56618dafa95d) +++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/Resources/DatabaseStructure17.1.sql (.../DatabaseStructure17.1.sql) (revision 873bd2b6b7b9d0737dde2ed16ff5d10a66795a2f) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 02-mrt-2017 10:24:51 */ +/* Created On : 07-mrt-2017 08:22:26 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -528,6 +528,7 @@ 'StochasticSoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'SoilProfileEntityId' INTEGER NOT NULL, 'StochasticSoilModelEntityId' INTEGER NOT NULL, + 'Type' TINYINT (1) NOT NULL, -- Enum: 1 = SoilProfile1D, 2 = SoilProfile2D 'Probability' REAL NOT NULL, 'Order' INT (4) NOT NULL, CONSTRAINT 'FK_StochasticSoilProfileEntity_SoilProfileEntity' FOREIGN KEY ('SoilProfileEntityId') REFERENCES 'SoilProfileEntity' ('SoilProfileEntityId') ON DELETE Cascade ON UPDATE Cascade, Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/Resources/Migration_5_17.1.sql =================================================================== diff -u -rd34720bc7fe019afec92b91f017b56618dafa95d -r873bd2b6b7b9d0737dde2ed16ff5d10a66795a2f --- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/Resources/Migration_5_17.1.sql (.../Migration_5_17.1.sql) (revision d34720bc7fe019afec92b91f017b56618dafa95d) +++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/Resources/Migration_5_17.1.sql (.../Migration_5_17.1.sql) (revision 873bd2b6b7b9d0737dde2ed16ff5d10a66795a2f) @@ -148,6 +148,7 @@ [StochasticSoilProfileEntityId], [SoilProfileEntityId], [StochasticSoilmodelEntityId], + 1, CASE WHEN [Probability] BETWEEN 0 AND 1 THEN [Probability] ELSE 0 Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx =================================================================== diff -u -rd34720bc7fe019afec92b91f017b56618dafa95d -r873bd2b6b7b9d0737dde2ed16ff5d10a66795a2f --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision d34720bc7fe019afec92b91f017b56618dafa95d) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 873bd2b6b7b9d0737dde2ed16ff5d10a66795a2f) @@ -4,7 +4,7 @@ - + @@ -943,6 +943,7 @@ + @@ -4089,6 +4090,7 @@ + @@ -6285,6 +6287,7 @@ + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram =================================================================== diff -u -rd34720bc7fe019afec92b91f017b56618dafa95d -r873bd2b6b7b9d0737dde2ed16ff5d10a66795a2f --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision d34720bc7fe019afec92b91f017b56618dafa95d) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 873bd2b6b7b9d0737dde2ed16ff5d10a66795a2f) @@ -6,72 +6,72 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - + + + + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StochasticSoilProfileEntity.cs =================================================================== diff -u -r5e44a4eb7c69ccaca763dce7cd7735e33a1f3c85 -r873bd2b6b7b9d0737dde2ed16ff5d10a66795a2f --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StochasticSoilProfileEntity.cs (.../StochasticSoilProfileEntity.cs) (revision 5e44a4eb7c69ccaca763dce7cd7735e33a1f3c85) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StochasticSoilProfileEntity.cs (.../StochasticSoilProfileEntity.cs) (revision 873bd2b6b7b9d0737dde2ed16ff5d10a66795a2f) @@ -44,6 +44,7 @@ public long StochasticSoilProfileEntityId { get; set; } public long SoilProfileEntityId { get; set; } public long StochasticSoilModelEntityId { get; set; } + public byte Type { get; set; } public double Probability { get; set; } public int Order { get; set; } Index: build/DatabaseStructure.sql =================================================================== diff -u -rd34720bc7fe019afec92b91f017b56618dafa95d -r873bd2b6b7b9d0737dde2ed16ff5d10a66795a2f --- build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision d34720bc7fe019afec92b91f017b56618dafa95d) +++ build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 873bd2b6b7b9d0737dde2ed16ff5d10a66795a2f) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 02-mrt-2017 10:24:51 */ +/* Created On : 07-mrt-2017 08:22:26 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -528,6 +528,7 @@ 'StochasticSoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'SoilProfileEntityId' INTEGER NOT NULL, 'StochasticSoilModelEntityId' INTEGER NOT NULL, + 'Type' TINYINT (1) NOT NULL, -- Enum: 1 = SoilProfile1D, 2 = SoilProfile2D 'Probability' REAL NOT NULL, 'Order' INT (4) NOT NULL, CONSTRAINT 'FK_StochasticSoilProfileEntity_SoilProfileEntity' FOREIGN KEY ('SoilProfileEntityId') REFERENCES 'SoilProfileEntity' ('SoilProfileEntityId') ON DELETE Cascade ON UPDATE Cascade, Index: design/DatabaseDesign.eap =================================================================== diff -u -rd34720bc7fe019afec92b91f017b56618dafa95d -r873bd2b6b7b9d0737dde2ed16ff5d10a66795a2f Binary files differ Index: design/OpslagMapping.xlsx =================================================================== diff -u -rd34720bc7fe019afec92b91f017b56618dafa95d -r873bd2b6b7b9d0737dde2ed16ff5d10a66795a2f Binary files differ