Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql
===================================================================
diff -u -r1ddc72e4a81ee005dc74dff30431913c20a85c94 -r71aaa7a4e1ff2efe276a2e8195641566530d6ffe
--- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql (.../DatabaseStructure18.1.sql) (revision 1ddc72e4a81ee005dc74dff30431913c20a85c94)
+++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql (.../DatabaseStructure18.1.sql) (revision 71aaa7a4e1ff2efe276a2e8195641566530d6ffe)
@@ -1,6 +1,6 @@
/* ---------------------------------------------------- */
/* Generated by Enterprise Architect Version 12.0 */
-/* Created On : 04-Apr-2018 15:56:50 */
+/* Created On : 04-Apr-2018 16:29:39 */
/* DBMS : SQLite */
/* ---------------------------------------------------- */
@@ -801,8 +801,12 @@
'GrassCoverErosionInwardsSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismSectionEntityId' INTEGER NOT NULL,
'GrassCoverErosionInwardsCalculationEntityId' 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 = Applicable
+ '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_GrassCoverErosionInwardsSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade,
CONSTRAINT 'FK_GrassCoverErosionInwardsSectionResultEntity_GrassCoverErosionInwardsCalculationEntity' FOREIGN KEY ('GrassCoverErosionInwardsCalculationEntityId') REFERENCES 'GrassCoverErosionInwardsCalculationEntity' ('GrassCoverErosionInwardsCalculationEntityId') ON DELETE Set Null ON UPDATE Cascade
)
@@ -859,8 +863,12 @@
'ClosingStructuresSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismSectionEntityId' INTEGER NOT NULL,
'ClosingStructuresCalculationEntityId' 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_ClosingStructuresSectionResultEntity_ClosingStructuresCalculationEntity' FOREIGN KEY ('ClosingStructuresCalculationEntityId') REFERENCES 'ClosingStructuresCalculationEntity' ('ClosingStructuresCalculationEntityId') ON DELETE Set Null ON UPDATE Cascade,
CONSTRAINT 'FK_ClosingStructuresSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade
)
@@ -990,8 +998,12 @@
'StabilityPointStructuresSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismSectionEntityId' INTEGER NOT NULL,
'StabilityPointStructuresCalculationEntityId' 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 = Applicable
+ '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_StabilityPointStructuresSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade,
CONSTRAINT 'FK_StabilityPointStructuresSectionResultEntity_StabilityPointStructuresCalculationEntity' FOREIGN KEY ('StabilityPointStructuresCalculationEntityId') REFERENCES 'StabilityPointStructuresCalculationEntity' ('StabilityPointStructuresCalculationEntityId') ON DELETE Set Null ON UPDATE Cascade
)
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresSectionResultEntity.cs
===================================================================
diff -u -r3dbf451144dc23d8abe649913baee1a5e544c48c -r71aaa7a4e1ff2efe276a2e8195641566530d6ffe
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresSectionResultEntity.cs (.../ClosingStructuresSectionResultEntity.cs) (revision 3dbf451144dc23d8abe649913baee1a5e544c48c)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresSectionResultEntity.cs (.../ClosingStructuresSectionResultEntity.cs) (revision 71aaa7a4e1ff2efe276a2e8195641566530d6ffe)
@@ -35,8 +35,12 @@
public long ClosingStructuresSectionResultEntityId { get; set; }
public long FailureMechanismSectionEntityId { get; set; }
public long? ClosingStructuresCalculationEntityId { 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 ClosingStructuresCalculationEntity ClosingStructuresCalculationEntity { get; set; }
public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsSectionResultEntity.cs
===================================================================
diff -u -r3dbf451144dc23d8abe649913baee1a5e544c48c -r71aaa7a4e1ff2efe276a2e8195641566530d6ffe
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsSectionResultEntity.cs (.../GrassCoverErosionInwardsSectionResultEntity.cs) (revision 3dbf451144dc23d8abe649913baee1a5e544c48c)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsSectionResultEntity.cs (.../GrassCoverErosionInwardsSectionResultEntity.cs) (revision 71aaa7a4e1ff2efe276a2e8195641566530d6ffe)
@@ -35,8 +35,12 @@
public long GrassCoverErosionInwardsSectionResultEntityId { get; set; }
public long FailureMechanismSectionEntityId { get; set; }
public long? GrassCoverErosionInwardsCalculationEntityId { 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 GrassCoverErosionInwardsCalculationEntity GrassCoverErosionInwardsCalculationEntity { get; set; }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx
===================================================================
diff -u -rd3049beedd35b6b8842a8ed66cf3055f66eb78ba -r71aaa7a4e1ff2efe276a2e8195641566530d6ffe
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision d3049beedd35b6b8842a8ed66cf3055f66eb78ba)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 71aaa7a4e1ff2efe276a2e8195641566530d6ffe)
@@ -171,8 +171,12 @@
-
-
+
+
+
+
+
+
@@ -421,8 +425,12 @@
-
-
+
+
+
+
+
+
@@ -1233,8 +1241,12 @@
-
-
+
+
+
+
+
+
@@ -4622,7 +4634,7 @@
-
+
@@ -4857,8 +4869,12 @@
-
-
+
+
+
+
+
+
@@ -5163,8 +5179,12 @@
-
-
+
+
+
+
+
+
@@ -6027,8 +6047,12 @@
-
-
+
+
+
+
+
+
@@ -8169,8 +8193,12 @@
-
-
+
+
+
+
+
+
@@ -8404,8 +8432,12 @@
-
-
+
+
+
+
+
+
@@ -9211,8 +9243,12 @@
-
-
+
+
+
+
+
+
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram
===================================================================
diff -u -rd3049beedd35b6b8842a8ed66cf3055f66eb78ba -r71aaa7a4e1ff2efe276a2e8195641566530d6ffe
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision d3049beedd35b6b8842a8ed66cf3055f66eb78ba)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 71aaa7a4e1ff2efe276a2e8195641566530d6ffe)
@@ -52,94 +52,94 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresSectionResultEntity.cs
===================================================================
diff -u -r3dbf451144dc23d8abe649913baee1a5e544c48c -r71aaa7a4e1ff2efe276a2e8195641566530d6ffe
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresSectionResultEntity.cs (.../StabilityPointStructuresSectionResultEntity.cs) (revision 3dbf451144dc23d8abe649913baee1a5e544c48c)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresSectionResultEntity.cs (.../StabilityPointStructuresSectionResultEntity.cs) (revision 71aaa7a4e1ff2efe276a2e8195641566530d6ffe)
@@ -35,8 +35,12 @@
public long StabilityPointStructuresSectionResultEntityId { get; set; }
public long FailureMechanismSectionEntityId { get; set; }
public long? StabilityPointStructuresCalculationEntityId { 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 StabilityPointStructuresCalculationEntity StabilityPointStructuresCalculationEntity { get; set; }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Ringtoets.rtd
===================================================================
diff -u -r1ddc72e4a81ee005dc74dff30431913c20a85c94 -r71aaa7a4e1ff2efe276a2e8195641566530d6ffe
Binary files differ
Index: build/DatabaseStructure.sql
===================================================================
diff -u -r1ddc72e4a81ee005dc74dff30431913c20a85c94 -r71aaa7a4e1ff2efe276a2e8195641566530d6ffe
--- build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 1ddc72e4a81ee005dc74dff30431913c20a85c94)
+++ build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 71aaa7a4e1ff2efe276a2e8195641566530d6ffe)
@@ -1,6 +1,6 @@
/* ---------------------------------------------------- */
/* Generated by Enterprise Architect Version 12.0 */
-/* Created On : 04-Apr-2018 15:56:50 */
+/* Created On : 04-Apr-2018 16:29:39 */
/* DBMS : SQLite */
/* ---------------------------------------------------- */
@@ -801,8 +801,12 @@
'GrassCoverErosionInwardsSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismSectionEntityId' INTEGER NOT NULL,
'GrassCoverErosionInwardsCalculationEntityId' 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 = Applicable
+ '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_GrassCoverErosionInwardsSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade,
CONSTRAINT 'FK_GrassCoverErosionInwardsSectionResultEntity_GrassCoverErosionInwardsCalculationEntity' FOREIGN KEY ('GrassCoverErosionInwardsCalculationEntityId') REFERENCES 'GrassCoverErosionInwardsCalculationEntity' ('GrassCoverErosionInwardsCalculationEntityId') ON DELETE Set Null ON UPDATE Cascade
)
@@ -859,8 +863,12 @@
'ClosingStructuresSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismSectionEntityId' INTEGER NOT NULL,
'ClosingStructuresCalculationEntityId' 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_ClosingStructuresSectionResultEntity_ClosingStructuresCalculationEntity' FOREIGN KEY ('ClosingStructuresCalculationEntityId') REFERENCES 'ClosingStructuresCalculationEntity' ('ClosingStructuresCalculationEntityId') ON DELETE Set Null ON UPDATE Cascade,
CONSTRAINT 'FK_ClosingStructuresSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade
)
@@ -990,8 +998,12 @@
'StabilityPointStructuresSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismSectionEntityId' INTEGER NOT NULL,
'StabilityPointStructuresCalculationEntityId' 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 = Applicable
+ '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_StabilityPointStructuresSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade,
CONSTRAINT 'FK_StabilityPointStructuresSectionResultEntity_StabilityPointStructuresCalculationEntity' FOREIGN KEY ('StabilityPointStructuresCalculationEntityId') REFERENCES 'StabilityPointStructuresCalculationEntity' ('StabilityPointStructuresCalculationEntityId') ON DELETE Set Null ON UPDATE Cascade
)