Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql
===================================================================
diff -u -r3911270a85371be92632b1aafaf1f2b523a6b729 -rf2ab31166e5c693678b6743d1c321d7b35d8bb19
--- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql (.../DatabaseStructure18.1.sql) (revision 3911270a85371be92632b1aafaf1f2b523a6b729)
+++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql (.../DatabaseStructure18.1.sql) (revision f2ab31166e5c693678b6743d1c321d7b35d8bb19)
@@ -1,6 +1,6 @@
/* ---------------------------------------------------- */
/* Generated by Enterprise Architect Version 12.0 */
-/* Created On : 09-Apr-2018 13:37:29 */
+/* Created On : 09-May-2018 15:05:35 */
/* DBMS : SQLite */
/* ---------------------------------------------------- */
@@ -1130,6 +1130,7 @@
'UpperBoundaryWaterLevels' REAL,
'LowerBoundaryWaterLevels' REAL,
'StepSize' TINYINT (1) NOT NULL, -- Enum: 1 = 0.5, 2 = 1.0, 3 = 2.0
+ 'CategoryType' TINYINT (1) NOT NULL, -- Enum: 1 = FactorizedSignalingNorm, 2 = SignalingNorm, 3 = LowerLimitNorm, 4 = FactorizedLowerLimitNorm
CONSTRAINT 'FK_StabilityStoneCoverWaveConditionsCalculationEntity_CalculationGroupEntity' FOREIGN KEY ('CalculationGroupEntityId') REFERENCES 'CalculationGroupEntity' ('CalculationGroupEntityId') ON DELETE Cascade ON UPDATE Cascade,
CONSTRAINT 'FK_StabilityStoneCoverWaveConditionsCalculationEntity_ForeshoreProfileEntity' FOREIGN KEY ('ForeshoreProfileEntityId') REFERENCES 'ForeshoreProfileEntity' ('ForeshoreProfileEntityId') ON DELETE Set Null ON UPDATE Cascade,
CONSTRAINT 'FK_StabilityStoneCoverWaveConditionsCalculationEntity_HydraulicLocationEntity' FOREIGN KEY ('HydraulicLocationEntityId') REFERENCES 'HydraulicLocationEntity' ('HydraulicLocationEntityId') ON DELETE Set Null ON UPDATE Cascade
@@ -1175,6 +1176,7 @@
'UpperBoundaryWaterLevels' REAL,
'LowerBoundaryWaterLevels' REAL,
'StepSize' TINYINT (1) NOT NULL, -- Enum: 1 = 0.5, 2 = 1.0, 3 = 2.0
+ 'CategoryType' TINYINT (1) NOT NULL, -- Enum: 1 = FactorizedSignalingNorm, 2 = SignalingNorm, 3 = LowerLimitNorm, 4 = FactorizedLowerLimitNorm
CONSTRAINT 'FK_WaveImpactAsphaltCoverWaveConditionsCalculationEntity_CalculationGroupEntity' FOREIGN KEY ('CalculationGroupEntityId') REFERENCES 'CalculationGroupEntity' ('CalculationGroupEntityId') ON DELETE Cascade ON UPDATE Cascade,
CONSTRAINT 'FK_WaveImpactAsphaltCoverWaveConditionsCalculationEntity_ForeshoreProfileEntity' FOREIGN KEY ('ForeshoreProfileEntityId') REFERENCES 'ForeshoreProfileEntity' ('ForeshoreProfileEntityId') ON DELETE Set Null ON UPDATE Cascade,
CONSTRAINT 'FK_WaveImpactAsphaltCoverWaveConditionsCalculationEntity_HydraulicLocationEntity' FOREIGN KEY ('HydraulicLocationEntityId') REFERENCES 'HydraulicLocationEntity' ('HydraulicLocationEntityId') ON DELETE Set Null ON UPDATE Cascade
@@ -1219,6 +1221,7 @@
'UpperBoundaryWaterLevels' REAL,
'LowerBoundaryWaterLevels' REAL,
'StepSize' TINYINT (1) NOT NULL, -- Enum: 1 = 0.5, 2 = 1.0, 3 = 2.0
+ 'CategoryType' TINYINT (1) NOT NULL, -- Enum: 1 = MechanismSpecificFactorizedSignalingNorm, 2 = MechanismSpecificSignalingNorm, 3 = MechanismSpecificLowerLimitNorm, 4 = LowerLimitNorm, 5 = FactorizedLowerLimitNorm
CONSTRAINT 'FK_GrassCoverErosionOutwardsWaveConditionsCalculationEntity_CalculationGroupEntity' FOREIGN KEY ('CalculationGroupEntityId') REFERENCES 'CalculationGroupEntity' ('CalculationGroupEntityId') ON DELETE Cascade ON UPDATE Cascade,
CONSTRAINT 'FK_GrassCoverErosionOutwardsWaveConditionsCalculationEntity_ForeshoreProfileEntity' FOREIGN KEY ('ForeshoreProfileEntityId') REFERENCES 'ForeshoreProfileEntity' ('ForeshoreProfileEntityId') ON DELETE Set Null ON UPDATE Cascade,
CONSTRAINT 'FK_GrassCoverErosionOutwardsWaveConditionsCalculationEntity_HydraulicLocationEntity' FOREIGN KEY ('HydraulicLocationEntityId') REFERENCES 'HydraulicLocationEntity' ('HydraulicLocationEntityId') ON DELETE Set Null ON UPDATE Cascade
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsWaveConditionsCalculationEntity.cs
===================================================================
diff -u -rf2de3d7dc89f96fd652a166c5b75c41e22485f21 -rf2ab31166e5c693678b6743d1c321d7b35d8bb19
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsWaveConditionsCalculationEntity.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationEntity.cs) (revision f2de3d7dc89f96fd652a166c5b75c41e22485f21)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsWaveConditionsCalculationEntity.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationEntity.cs) (revision f2ab31166e5c693678b6743d1c321d7b35d8bb19)
@@ -58,6 +58,7 @@
public double? UpperBoundaryWaterLevels { get; set; }
public double? LowerBoundaryWaterLevels { get; set; }
public byte StepSize { get; set; }
+ public byte CategoryType { get; set; }
public virtual CalculationGroupEntity CalculationGroupEntity { get; set; }
public virtual ForeshoreProfileEntity ForeshoreProfileEntity { get; set; }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx
===================================================================
diff -u -r3911270a85371be92632b1aafaf1f2b523a6b729 -rf2ab31166e5c693678b6743d1c321d7b35d8bb19
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 3911270a85371be92632b1aafaf1f2b523a6b729)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision f2ab31166e5c693678b6743d1c321d7b35d8bb19)
@@ -490,6 +490,7 @@
+
@@ -1319,6 +1320,7 @@
+
@@ -1504,6 +1506,7 @@
+
@@ -5230,6 +5233,7 @@
+
@@ -6163,6 +6167,7 @@
+
@@ -6378,6 +6383,7 @@
+
@@ -8535,6 +8541,7 @@
+
@@ -9403,6 +9410,7 @@
+
@@ -9603,6 +9611,7 @@
+
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram
===================================================================
diff -u -r3911270a85371be92632b1aafaf1f2b523a6b729 -rf2ab31166e5c693678b6743d1c321d7b35d8bb19
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 3911270a85371be92632b1aafaf1f2b523a6b729)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision f2ab31166e5c693678b6743d1c321d7b35d8bb19)
@@ -52,98 +52,98 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityStoneCoverWaveConditionsCalculationEntity.cs
===================================================================
diff -u -r3dbf451144dc23d8abe649913baee1a5e544c48c -rf2ab31166e5c693678b6743d1c321d7b35d8bb19
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityStoneCoverWaveConditionsCalculationEntity.cs (.../StabilityStoneCoverWaveConditionsCalculationEntity.cs) (revision 3dbf451144dc23d8abe649913baee1a5e544c48c)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityStoneCoverWaveConditionsCalculationEntity.cs (.../StabilityStoneCoverWaveConditionsCalculationEntity.cs) (revision f2ab31166e5c693678b6743d1c321d7b35d8bb19)
@@ -58,6 +58,7 @@
public double? UpperBoundaryWaterLevels { get; set; }
public double? LowerBoundaryWaterLevels { get; set; }
public byte StepSize { get; set; }
+ public byte CategoryType { get; set; }
public virtual CalculationGroupEntity CalculationGroupEntity { get; set; }
public virtual ForeshoreProfileEntity ForeshoreProfileEntity { get; set; }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/WaveImpactAsphaltCoverWaveConditionsCalculationEntity.cs
===================================================================
diff -u -r3dbf451144dc23d8abe649913baee1a5e544c48c -rf2ab31166e5c693678b6743d1c321d7b35d8bb19
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/WaveImpactAsphaltCoverWaveConditionsCalculationEntity.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationEntity.cs) (revision 3dbf451144dc23d8abe649913baee1a5e544c48c)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/WaveImpactAsphaltCoverWaveConditionsCalculationEntity.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationEntity.cs) (revision f2ab31166e5c693678b6743d1c321d7b35d8bb19)
@@ -58,6 +58,7 @@
public double? UpperBoundaryWaterLevels { get; set; }
public double? LowerBoundaryWaterLevels { get; set; }
public byte StepSize { get; set; }
+ public byte CategoryType { get; set; }
public virtual CalculationGroupEntity CalculationGroupEntity { get; set; }
public virtual ForeshoreProfileEntity ForeshoreProfileEntity { get; set; }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Ringtoets.rtd
===================================================================
diff -u -r3911270a85371be92632b1aafaf1f2b523a6b729 -rf2ab31166e5c693678b6743d1c321d7b35d8bb19
Binary files differ
Index: build/DatabaseStructure.sql
===================================================================
diff -u -r3911270a85371be92632b1aafaf1f2b523a6b729 -rf2ab31166e5c693678b6743d1c321d7b35d8bb19
--- build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 3911270a85371be92632b1aafaf1f2b523a6b729)
+++ build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision f2ab31166e5c693678b6743d1c321d7b35d8bb19)
@@ -1,6 +1,6 @@
/* ---------------------------------------------------- */
/* Generated by Enterprise Architect Version 12.0 */
-/* Created On : 09-Apr-2018 13:37:29 */
+/* Created On : 09-May-2018 15:05:35 */
/* DBMS : SQLite */
/* ---------------------------------------------------- */
@@ -1130,6 +1130,7 @@
'UpperBoundaryWaterLevels' REAL,
'LowerBoundaryWaterLevels' REAL,
'StepSize' TINYINT (1) NOT NULL, -- Enum: 1 = 0.5, 2 = 1.0, 3 = 2.0
+ 'CategoryType' TINYINT (1) NOT NULL, -- Enum: 1 = FactorizedSignalingNorm, 2 = SignalingNorm, 3 = LowerLimitNorm, 4 = FactorizedLowerLimitNorm
CONSTRAINT 'FK_StabilityStoneCoverWaveConditionsCalculationEntity_CalculationGroupEntity' FOREIGN KEY ('CalculationGroupEntityId') REFERENCES 'CalculationGroupEntity' ('CalculationGroupEntityId') ON DELETE Cascade ON UPDATE Cascade,
CONSTRAINT 'FK_StabilityStoneCoverWaveConditionsCalculationEntity_ForeshoreProfileEntity' FOREIGN KEY ('ForeshoreProfileEntityId') REFERENCES 'ForeshoreProfileEntity' ('ForeshoreProfileEntityId') ON DELETE Set Null ON UPDATE Cascade,
CONSTRAINT 'FK_StabilityStoneCoverWaveConditionsCalculationEntity_HydraulicLocationEntity' FOREIGN KEY ('HydraulicLocationEntityId') REFERENCES 'HydraulicLocationEntity' ('HydraulicLocationEntityId') ON DELETE Set Null ON UPDATE Cascade
@@ -1175,6 +1176,7 @@
'UpperBoundaryWaterLevels' REAL,
'LowerBoundaryWaterLevels' REAL,
'StepSize' TINYINT (1) NOT NULL, -- Enum: 1 = 0.5, 2 = 1.0, 3 = 2.0
+ 'CategoryType' TINYINT (1) NOT NULL, -- Enum: 1 = FactorizedSignalingNorm, 2 = SignalingNorm, 3 = LowerLimitNorm, 4 = FactorizedLowerLimitNorm
CONSTRAINT 'FK_WaveImpactAsphaltCoverWaveConditionsCalculationEntity_CalculationGroupEntity' FOREIGN KEY ('CalculationGroupEntityId') REFERENCES 'CalculationGroupEntity' ('CalculationGroupEntityId') ON DELETE Cascade ON UPDATE Cascade,
CONSTRAINT 'FK_WaveImpactAsphaltCoverWaveConditionsCalculationEntity_ForeshoreProfileEntity' FOREIGN KEY ('ForeshoreProfileEntityId') REFERENCES 'ForeshoreProfileEntity' ('ForeshoreProfileEntityId') ON DELETE Set Null ON UPDATE Cascade,
CONSTRAINT 'FK_WaveImpactAsphaltCoverWaveConditionsCalculationEntity_HydraulicLocationEntity' FOREIGN KEY ('HydraulicLocationEntityId') REFERENCES 'HydraulicLocationEntity' ('HydraulicLocationEntityId') ON DELETE Set Null ON UPDATE Cascade
@@ -1219,6 +1221,7 @@
'UpperBoundaryWaterLevels' REAL,
'LowerBoundaryWaterLevels' REAL,
'StepSize' TINYINT (1) NOT NULL, -- Enum: 1 = 0.5, 2 = 1.0, 3 = 2.0
+ 'CategoryType' TINYINT (1) NOT NULL, -- Enum: 1 = MechanismSpecificFactorizedSignalingNorm, 2 = MechanismSpecificSignalingNorm, 3 = MechanismSpecificLowerLimitNorm, 4 = LowerLimitNorm, 5 = FactorizedLowerLimitNorm
CONSTRAINT 'FK_GrassCoverErosionOutwardsWaveConditionsCalculationEntity_CalculationGroupEntity' FOREIGN KEY ('CalculationGroupEntityId') REFERENCES 'CalculationGroupEntity' ('CalculationGroupEntityId') ON DELETE Cascade ON UPDATE Cascade,
CONSTRAINT 'FK_GrassCoverErosionOutwardsWaveConditionsCalculationEntity_ForeshoreProfileEntity' FOREIGN KEY ('ForeshoreProfileEntityId') REFERENCES 'ForeshoreProfileEntity' ('ForeshoreProfileEntityId') ON DELETE Set Null ON UPDATE Cascade,
CONSTRAINT 'FK_GrassCoverErosionOutwardsWaveConditionsCalculationEntity_HydraulicLocationEntity' FOREIGN KEY ('HydraulicLocationEntityId') REFERENCES 'HydraulicLocationEntity' ('HydraulicLocationEntityId') ON DELETE Set Null ON UPDATE Cascade