Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultTotalView.cs =================================================================== diff -u -r933d13f37606dd02f49148d8f1c4bb556b1dfbdf -r044ec12bd4756e37ad6ffa368f183af6d9d0fa9a --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultTotalView.cs (.../AssemblyResultTotalView.cs) (revision 933d13f37606dd02f49148d8f1c4bb556b1dfbdf) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultTotalView.cs (.../AssemblyResultTotalView.cs) (revision 044ec12bd4756e37ad6ffa368f183af6d9d0fa9a) @@ -148,7 +148,7 @@ RingtoetsCommonFormsResources.AssemblyCategory_Group_DisplayName, true); - dataGridViewControl.AddTextBoxColumn(nameof(FailureMechanismAssemblyResultRowBase.Probablity), + dataGridViewControl.AddTextBoxColumn(nameof(FailureMechanismAssemblyResultRowBase.Probability), Resources.AssemblyResultTotalView_Probability_DisplayName, true); Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismAssemblyCategoryGroupResultRow.cs =================================================================== diff -u -r3356463e60f4ae18255055ae3aa6e5d3b5cbbe01 -r044ec12bd4756e37ad6ffa368f183af6d9d0fa9a --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismAssemblyCategoryGroupResultRow.cs (.../FailureMechanismAssemblyCategoryGroupResultRow.cs) (revision 3356463e60f4ae18255055ae3aa6e5d3b5cbbe01) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismAssemblyCategoryGroupResultRow.cs (.../FailureMechanismAssemblyCategoryGroupResultRow.cs) (revision 044ec12bd4756e37ad6ffa368f183af6d9d0fa9a) @@ -51,7 +51,7 @@ } this.getFailureMechanismAssemblyCategoryGroup = getFailureMechanismAssemblyCategoryGroup; - Probablity = double.NaN; + Probability = double.NaN; Update(); } Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismAssemblyResultRow.cs =================================================================== diff -u -r3356463e60f4ae18255055ae3aa6e5d3b5cbbe01 -r044ec12bd4756e37ad6ffa368f183af6d9d0fa9a --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismAssemblyResultRow.cs (.../FailureMechanismAssemblyResultRow.cs) (revision 3356463e60f4ae18255055ae3aa6e5d3b5cbbe01) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismAssemblyResultRow.cs (.../FailureMechanismAssemblyResultRow.cs) (revision 044ec12bd4756e37ad6ffa368f183af6d9d0fa9a) @@ -61,12 +61,12 @@ { FailureMechanismAssembly failureMechanismAssembly = getFailureMechanismAssembly(); CategoryGroup = failureMechanismAssembly.Group; - Probablity = failureMechanismAssembly.Probability; + Probability = failureMechanismAssembly.Probability; } catch (AssemblyException e) { CategoryGroup = FailureMechanismAssemblyCategoryGroup.None; - Probablity = double.NaN; + Probability = double.NaN; GetCategoryGroupColumnStateDefinition().ErrorText = e.Message; } } Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismAssemblyResultRowBase.cs =================================================================== diff -u -r4613f112c78c8a1ea1c69d07a0e08e5a69b3689e -r044ec12bd4756e37ad6ffa368f183af6d9d0fa9a --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismAssemblyResultRowBase.cs (.../FailureMechanismAssemblyResultRowBase.cs) (revision 4613f112c78c8a1ea1c69d07a0e08e5a69b3689e) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismAssemblyResultRowBase.cs (.../FailureMechanismAssemblyResultRowBase.cs) (revision 044ec12bd4756e37ad6ffa368f183af6d9d0fa9a) @@ -102,7 +102,7 @@ /// Gets the probability of the failure mechanism assembly. /// [TypeConverter(typeof(NoProbabilityValueDoubleConverter))] - public double Probablity { get; protected set; } + public double Probability { get; protected set; } public IDictionary ColumnStateDefinitions { get; } Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssemblyResultTotalViewTest.cs =================================================================== diff -u -r4ab9368523437c447c06c565d18f987a0457e72b -r044ec12bd4756e37ad6ffa368f183af6d9d0fa9a --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssemblyResultTotalViewTest.cs (.../AssemblyResultTotalViewTest.cs) (revision 4ab9368523437c447c06c565d18f987a0457e72b) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssemblyResultTotalViewTest.cs (.../AssemblyResultTotalViewTest.cs) (revision 044ec12bd4756e37ad6ffa368f183af6d9d0fa9a) @@ -140,8 +140,8 @@ Assert.AreEqual("Totaal", totalResultLabel.Text); var failureMechanismsWithProbabilityLabel = (Label) tableLayoutPanel.GetControlFromPosition(0, 1); Assert.AreEqual("Groepen 1 en 2", failureMechanismsWithProbabilityLabel.Text); - var failureMechanismsWithoutProbablityLabel = (Label) tableLayoutPanel.GetControlFromPosition(0, 2); - Assert.AreEqual("Groepen 3 en 4", failureMechanismsWithoutProbablityLabel.Text); + var failureMechanismsWithoutProbabilityLabel = (Label) tableLayoutPanel.GetControlFromPosition(0, 2); + Assert.AreEqual("Groepen 3 en 4", failureMechanismsWithoutProbabilityLabel.Text); Assert.IsInstanceOf(tableLayoutPanel.GetControlFromPosition(1, 0)); Assert.IsInstanceOf(tableLayoutPanel.GetControlFromPosition(1, 1)); Assert.IsInstanceOf(tableLayoutPanel.GetControlFromPosition(1, 2)); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismAssemblyCategoryGroupResultRowTest.cs =================================================================== diff -u -r3356463e60f4ae18255055ae3aa6e5d3b5cbbe01 -r044ec12bd4756e37ad6ffa368f183af6d9d0fa9a --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismAssemblyCategoryGroupResultRowTest.cs (.../FailureMechanismAssemblyCategoryGroupResultRowTest.cs) (revision 3356463e60f4ae18255055ae3aa6e5d3b5cbbe01) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismAssemblyCategoryGroupResultRowTest.cs (.../FailureMechanismAssemblyCategoryGroupResultRowTest.cs) (revision 044ec12bd4756e37ad6ffa368f183af6d9d0fa9a) @@ -87,7 +87,7 @@ Assert.AreEqual(failureMechanismCode, row.Code); Assert.AreEqual(failureMechanismGroup, row.Group); Assert.AreEqual(failureMechanismAssemblyCategoryGroup, row.CategoryGroup); - Assert.IsNaN(row.Probablity); + Assert.IsNaN(row.Probability); mocks.VerifyAll(); } @@ -118,7 +118,7 @@ var row = new FailureMechanismAssemblyCategoryGroupResultRow(failureMechanism, getFailureMechanismAssembly); // Precondition - Assert.IsNaN(row.Probablity); + Assert.IsNaN(row.Probability); Assert.AreEqual(failureMechanismAssemblyCategoryGroup, row.CategoryGroup); // When @@ -129,7 +129,7 @@ Assert.AreEqual(exceptionMessage, row.ColumnStateDefinitions[categoryIndex].ErrorText); Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.None, row.CategoryGroup); - Assert.IsNaN(row.Probablity); + Assert.IsNaN(row.Probability); } [Test] Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismAssemblyResultRowBaseTest.cs =================================================================== diff -u -r3356463e60f4ae18255055ae3aa6e5d3b5cbbe01 -r044ec12bd4756e37ad6ffa368f183af6d9d0fa9a --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismAssemblyResultRowBaseTest.cs (.../FailureMechanismAssemblyResultRowBaseTest.cs) (revision 3356463e60f4ae18255055ae3aa6e5d3b5cbbe01) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismAssemblyResultRowBaseTest.cs (.../FailureMechanismAssemblyResultRowBaseTest.cs) (revision 044ec12bd4756e37ad6ffa368f183af6d9d0fa9a) @@ -75,7 +75,7 @@ TestHelper.AssertTypeConverter( - nameof(FailureMechanismAssemblyResultRowBase.Probablity)); + nameof(FailureMechanismAssemblyResultRowBase.Probability)); TestHelper.AssertTypeConverter( nameof(FailureMechanismAssemblyResultRowBase.CategoryGroup)); @@ -87,7 +87,7 @@ Assert.AreEqual(failureMechanismName, row.Name); Assert.AreEqual(failureMechanismCode, row.Code); Assert.AreEqual(failureMechanismGroup, row.Group); - Assert.AreEqual(0, row.Probablity); + Assert.AreEqual(0, row.Probability); Assert.AreEqual((FailureMechanismAssemblyCategoryGroup) 0, row.CategoryGroup); mocks.VerifyAll(); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismAssemblyResultRowTest.cs =================================================================== diff -u -ra693ebff454b14adc3890a2278448bf477d263ca -r044ec12bd4756e37ad6ffa368f183af6d9d0fa9a --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismAssemblyResultRowTest.cs (.../FailureMechanismAssemblyResultRowTest.cs) (revision a693ebff454b14adc3890a2278448bf477d263ca) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismAssemblyResultRowTest.cs (.../FailureMechanismAssemblyResultRowTest.cs) (revision 044ec12bd4756e37ad6ffa368f183af6d9d0fa9a) @@ -91,7 +91,7 @@ Assert.AreEqual(failureMechanismName, row.Name); Assert.AreEqual(failureMechanismCode, row.Code); Assert.AreEqual(failureMechanismGroup, row.Group); - Assert.AreEqual(failureMechanismAssembly.Probability, row.Probablity); + Assert.AreEqual(failureMechanismAssembly.Probability, row.Probability); Assert.AreEqual(failureMechanismAssembly.Group, row.CategoryGroup); mocks.VerifyAll(); @@ -124,7 +124,7 @@ var row = new FailureMechanismAssemblyResultRow(failureMechanism, getFailureMechanismAssembly); // Precondition - Assert.AreEqual(failureMechanismAssembly.Probability, row.Probablity); + Assert.AreEqual(failureMechanismAssembly.Probability, row.Probability); Assert.AreEqual(failureMechanismAssembly.Group, row.CategoryGroup); // When @@ -135,7 +135,7 @@ Assert.AreEqual(exceptionMessage, row.ColumnStateDefinitions[categoryIndex].ErrorText); Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.None, row.CategoryGroup); - Assert.IsNaN(row.Probablity); + Assert.IsNaN(row.Probability); } [Test] Index: Ringtoets/Migration/src/Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql =================================================================== diff -u -r2dae9254a8a2e4e49235932528a6626908014132 -r044ec12bd4756e37ad6ffa368f183af6d9d0fa9a --- Ringtoets/Migration/src/Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql (.../DatabaseStructure18.1.sql) (revision 2dae9254a8a2e4e49235932528a6626908014132) +++ Ringtoets/Migration/src/Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql (.../DatabaseStructure18.1.sql) (revision 044ec12bd4756e37ad6ffa368f183af6d9d0fa9a) @@ -803,7 +803,7 @@ 'FailureMechanismSectionEntityId' INTEGER NOT NULL, '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 + '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, Index: build/DatabaseStructure.sql =================================================================== diff -u -r2dae9254a8a2e4e49235932528a6626908014132 -r044ec12bd4756e37ad6ffa368f183af6d9d0fa9a --- build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 2dae9254a8a2e4e49235932528a6626908014132) +++ build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 044ec12bd4756e37ad6ffa368f183af6d9d0fa9a) @@ -803,7 +803,7 @@ 'FailureMechanismSectionEntityId' INTEGER NOT NULL, '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 + '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, Index: design/DatabaseDesign.eap =================================================================== diff -u -r2dae9254a8a2e4e49235932528a6626908014132 -r044ec12bd4756e37ad6ffa368f183af6d9d0fa9a Binary files differ