Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql
===================================================================
diff -u -r71aaa7a4e1ff2efe276a2e8195641566530d6ffe -r08cb71c4aed1c349c20bb4f7ab38fdbf92bf8998
--- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql (.../DatabaseStructure18.1.sql) (revision 71aaa7a4e1ff2efe276a2e8195641566530d6ffe)
+++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql (.../DatabaseStructure18.1.sql) (revision 08cb71c4aed1c349c20bb4f7ab38fdbf92bf8998)
@@ -1,6 +1,6 @@
/* ---------------------------------------------------- */
/* Generated by Enterprise Architect Version 12.0 */
-/* Created On : 04-Apr-2018 16:29:39 */
+/* Created On : 05-Apr-2018 16:03:04 */
/* DBMS : SQLite */
/* ---------------------------------------------------- */
@@ -790,8 +790,12 @@
(
'PipingSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismSectionEntityId' INTEGER NOT NULL,
- '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 = ProbablityNegligible, 3 = Probability, 4 = NotAssessed
+ 'TailorMadeAssessmentProbability' REAL,
+ 'UseManualAssemblyProbability' TINYINT (1) NOT NULL, -- true or false
+ 'ManualAssemblyProbability' REAL,
CONSTRAINT 'FK_PipingSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade
)
;
@@ -911,8 +915,12 @@
(
'MacroStabilityInwardsSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismSectionEntityId' INTEGER NOT NULL,
- '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_MacroStabilityInwardsSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade
)
;
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityInwardsSectionResultEntity.cs
===================================================================
diff -u -r3dbf451144dc23d8abe649913baee1a5e544c48c -r08cb71c4aed1c349c20bb4f7ab38fdbf92bf8998
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityInwardsSectionResultEntity.cs (.../MacroStabilityInwardsSectionResultEntity.cs) (revision 3dbf451144dc23d8abe649913baee1a5e544c48c)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityInwardsSectionResultEntity.cs (.../MacroStabilityInwardsSectionResultEntity.cs) (revision 08cb71c4aed1c349c20bb4f7ab38fdbf92bf8998)
@@ -34,8 +34,12 @@
{
public long MacroStabilityInwardsSectionResultEntityId { get; set; }
public long FailureMechanismSectionEntityId { 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; }
}
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingSectionResultEntity.cs
===================================================================
diff -u -r3dbf451144dc23d8abe649913baee1a5e544c48c -r08cb71c4aed1c349c20bb4f7ab38fdbf92bf8998
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingSectionResultEntity.cs (.../PipingSectionResultEntity.cs) (revision 3dbf451144dc23d8abe649913baee1a5e544c48c)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingSectionResultEntity.cs (.../PipingSectionResultEntity.cs) (revision 08cb71c4aed1c349c20bb4f7ab38fdbf92bf8998)
@@ -34,8 +34,12 @@
{
public long PipingSectionResultEntityId { get; set; }
public long FailureMechanismSectionEntityId { 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; }
}
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx
===================================================================
diff -u -r71aaa7a4e1ff2efe276a2e8195641566530d6ffe -r08cb71c4aed1c349c20bb4f7ab38fdbf92bf8998
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 71aaa7a4e1ff2efe276a2e8195641566530d6ffe)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 08cb71c4aed1c349c20bb4f7ab38fdbf92bf8998)
@@ -829,8 +829,12 @@
-
-
+
+
+
+
+
+
@@ -1024,8 +1028,12 @@
-
-
+
+
+
+
+
+
@@ -5626,8 +5634,12 @@
-
-
+
+
+
+
+
+
@@ -5818,8 +5830,12 @@
-
-
+
+
+
+
+
+
@@ -8845,8 +8861,12 @@
-
-
+
+
+
+
+
+
@@ -9025,8 +9045,12 @@
-
-
+
+
+
+
+
+
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram
===================================================================
diff -u -r71aaa7a4e1ff2efe276a2e8195641566530d6ffe -r08cb71c4aed1c349c20bb4f7ab38fdbf92bf8998
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 71aaa7a4e1ff2efe276a2e8195641566530d6ffe)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 08cb71c4aed1c349c20bb4f7ab38fdbf92bf8998)
@@ -52,94 +52,94 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Ringtoets.rtd
===================================================================
diff -u -r71aaa7a4e1ff2efe276a2e8195641566530d6ffe -r08cb71c4aed1c349c20bb4f7ab38fdbf92bf8998
Binary files differ
Index: build/DatabaseStructure.sql
===================================================================
diff -u -r71aaa7a4e1ff2efe276a2e8195641566530d6ffe -r08cb71c4aed1c349c20bb4f7ab38fdbf92bf8998
--- build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 71aaa7a4e1ff2efe276a2e8195641566530d6ffe)
+++ build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 08cb71c4aed1c349c20bb4f7ab38fdbf92bf8998)
@@ -1,6 +1,6 @@
/* ---------------------------------------------------- */
/* Generated by Enterprise Architect Version 12.0 */
-/* Created On : 04-Apr-2018 16:29:39 */
+/* Created On : 05-Apr-2018 16:03:04 */
/* DBMS : SQLite */
/* ---------------------------------------------------- */
@@ -790,8 +790,12 @@
(
'PipingSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismSectionEntityId' INTEGER NOT NULL,
- '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 = ProbablityNegligible, 3 = Probability, 4 = NotAssessed
+ 'TailorMadeAssessmentProbability' REAL,
+ 'UseManualAssemblyProbability' TINYINT (1) NOT NULL, -- true or false
+ 'ManualAssemblyProbability' REAL,
CONSTRAINT 'FK_PipingSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade
)
;
@@ -911,8 +915,12 @@
(
'MacroStabilityInwardsSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismSectionEntityId' INTEGER NOT NULL,
- '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_MacroStabilityInwardsSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade
)
;