Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql
===================================================================
diff -u -r9e87591d99c3f1a53f2c93e4dbba8c8ebae492a3 -rd3049beedd35b6b8842a8ed66cf3055f66eb78ba
--- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql (.../DatabaseStructure18.1.sql) (revision 9e87591d99c3f1a53f2c93e4dbba8c8ebae492a3)
+++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql (.../DatabaseStructure18.1.sql) (revision d3049beedd35b6b8842a8ed66cf3055f66eb78ba)
@@ -1,6 +1,6 @@
/* ---------------------------------------------------- */
/* Generated by Enterprise Architect Version 12.0 */
-/* Created On : 30-Mar-2018 08:11:27 */
+/* Created On : 04-Apr-2018 08:52:27 */
/* DBMS : SQLite */
/* ---------------------------------------------------- */
@@ -813,8 +813,12 @@
'HeightStructuresSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismSectionEntityId' INTEGER NOT NULL,
'HeightStructuresCalculationEntityId' INTEGER,
- 'LayerOne' TINYINT (1) NOT NULL, -- Enum: 1 = NotAssessed, 2 = Sufficient, 3 = NoVerdict
- 'LayerThree' REAL,
+ 'SimpleAssessmentResult' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = NotApplicable, 3 = ProbabilityNegligible 4 = AssessFurther
+ 'DetailedAssessmentResult' TINYINT (1) NOT NULL, -- Enum: 1 = Probability 2 = NotAssessed
+ 'TailorMadeAssessmentResult' TINYINT (1) NOT NULL, -- Enum: 1 = None 2 = ProbabilityNegligible 3 = Probability 4 = NotAssessed
+ 'TailorMadeAssessmentProbability' REAL,
+ 'UseManualAssemblyProbability' TINYINT (1) NOT NULL, -- true or false
+ 'ManualAssemblyProbability' REAL,
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
)
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresSectionResultEntity.cs
===================================================================
diff -u -r3dbf451144dc23d8abe649913baee1a5e544c48c -rd3049beedd35b6b8842a8ed66cf3055f66eb78ba
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresSectionResultEntity.cs (.../HeightStructuresSectionResultEntity.cs) (revision 3dbf451144dc23d8abe649913baee1a5e544c48c)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresSectionResultEntity.cs (.../HeightStructuresSectionResultEntity.cs) (revision d3049beedd35b6b8842a8ed66cf3055f66eb78ba)
@@ -35,8 +35,12 @@
public long HeightStructuresSectionResultEntityId { get; set; }
public long FailureMechanismSectionEntityId { get; set; }
public long? HeightStructuresCalculationEntityId { get; set; }
- public byte LayerOne { get; set; }
- public double? LayerThree { get; set; }
+ public byte SimpleAssessmentResult { get; set; }
+ public byte DetailedAssessmentResult { get; set; }
+ public byte TailorMadeAssessmentResult { get; set; }
+ public double? TailorMadeAssessmentProbability { get; set; }
+ public byte UseManualAssemblyProbability { get; set; }
+ public double? ManualAssemblyProbability { 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 -rf2de3d7dc89f96fd652a166c5b75c41e22485f21 -rd3049beedd35b6b8842a8ed66cf3055f66eb78ba
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision f2de3d7dc89f96fd652a166c5b75c41e22485f21)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision d3049beedd35b6b8842a8ed66cf3055f66eb78ba)
@@ -596,8 +596,12 @@
-
-
+
+
+
+
+
+
@@ -5362,8 +5366,12 @@
-
-
+
+
+
+
+
+
@@ -8582,8 +8590,12 @@
-
-
+
+
+
+
+
+
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram
===================================================================
diff -u -rf2de3d7dc89f96fd652a166c5b75c41e22485f21 -rd3049beedd35b6b8842a8ed66cf3055f66eb78ba
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision f2de3d7dc89f96fd652a166c5b75c41e22485f21)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision d3049beedd35b6b8842a8ed66cf3055f66eb78ba)
@@ -52,94 +52,94 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Ringtoets.rtd
===================================================================
diff -u -rf2de3d7dc89f96fd652a166c5b75c41e22485f21 -rd3049beedd35b6b8842a8ed66cf3055f66eb78ba
Binary files differ
Index: build/DatabaseStructure.sql
===================================================================
diff -u -rf2de3d7dc89f96fd652a166c5b75c41e22485f21 -rd3049beedd35b6b8842a8ed66cf3055f66eb78ba
--- build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision f2de3d7dc89f96fd652a166c5b75c41e22485f21)
+++ build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision d3049beedd35b6b8842a8ed66cf3055f66eb78ba)
@@ -1,6 +1,6 @@
/* ---------------------------------------------------- */
/* Generated by Enterprise Architect Version 12.0 */
-/* Created On : 30-Mar-2018 08:11:27 */
+/* Created On : 04-Apr-2018 08:52:27 */
/* DBMS : SQLite */
/* ---------------------------------------------------- */
@@ -813,8 +813,12 @@
'HeightStructuresSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismSectionEntityId' INTEGER NOT NULL,
'HeightStructuresCalculationEntityId' INTEGER,
- 'LayerOne' TINYINT (1) NOT NULL, -- Enum: 1 = NotAssessed, 2 = Sufficient, 3 = NoVerdict
- 'LayerThree' REAL,
+ 'SimpleAssessmentResult' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = NotApplicable, 3 = ProbabilityNegligible 4 = AssessFurther
+ 'DetailedAssessmentResult' TINYINT (1) NOT NULL, -- Enum: 1 = Probability 2 = NotAssessed
+ 'TailorMadeAssessmentResult' TINYINT (1) NOT NULL, -- Enum: 1 = None 2 = ProbabilityNegligible 3 = Probability 4 = NotAssessed
+ 'TailorMadeAssessmentProbability' REAL,
+ 'UseManualAssemblyProbability' TINYINT (1) NOT NULL, -- true or false
+ 'ManualAssemblyProbability' REAL,
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
)