Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs =================================================================== diff -u -r614328833a209137c0428fea6eac17b4fd8e40f7 -r226c49888505e4302ce44f6f6603f3770520c096 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs (.../StabilityPointStructuresFailureMechanismResultView.cs) (revision 614328833a209137c0428fea6eac17b4fd8e40f7) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs (.../StabilityPointStructuresFailureMechanismResultView.cs) (revision 226c49888505e4302ce44f6f6603f3770520c096) @@ -143,6 +143,10 @@ FailureMechanismSectionResultViewColumnBuilder.AddCombinedAssemblyCategoryGroupColumn( DataGridViewControl, nameof(StabilityPointStructuresFailureMechanismSectionResultRow.CombinedAssemblyCategoryGroup)); + + FailureMechanismSectionResultViewColumnBuilder.AddCombinedAssemblyProbabilityColumn( + DataGridViewControl, + nameof(StabilityPointStructuresFailureMechanismSectionResultRow.CombinedAssemblyProbability)); } } } \ No newline at end of file Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs =================================================================== diff -u -r614328833a209137c0428fea6eac17b4fd8e40f7 -r226c49888505e4302ce44f6f6603f3770520c096 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs (.../StabilityPointStructuresFailureMechanismResultViewTest.cs) (revision 614328833a209137c0428fea6eac17b4fd8e40f7) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs (.../StabilityPointStructuresFailureMechanismResultViewTest.cs) (revision 226c49888505e4302ce44f6f6603f3770520c096) @@ -48,7 +48,8 @@ private const int detailedAssemblyCategoryGroupIndex = 7; private const int tailorMadeAssemblyCategoryGroupIndex = 8; private const int combinedAssemblyCategoryGroupIndex = 9; - private const int columnCount = 10; + private const int combinedAssemblyProbabilityIndex = 10; + private const int columnCount = 11; private Form testForm; @@ -124,6 +125,7 @@ Assert.IsInstanceOf(dataGridView.Columns[detailedAssemblyCategoryGroupIndex]); Assert.IsInstanceOf(dataGridView.Columns[tailorMadeAssemblyCategoryGroupIndex]); Assert.IsInstanceOf(dataGridView.Columns[combinedAssemblyCategoryGroupIndex]); + Assert.IsInstanceOf(dataGridView.Columns[combinedAssemblyProbabilityIndex]); Assert.AreEqual("Vak", dataGridView.Columns[nameColumnIndex].HeaderText); Assert.AreEqual("Eenvoudige toets", dataGridView.Columns[simpleAssessmentResultIndex].HeaderText); @@ -135,6 +137,7 @@ Assert.AreEqual("Assemblageresultaat\r\ngedetailleerde toets per vak", dataGridView.Columns[detailedAssemblyCategoryGroupIndex].HeaderText); Assert.AreEqual("Assemblageresultaat\r\ntoets op maat", dataGridView.Columns[tailorMadeAssemblyCategoryGroupIndex].HeaderText); Assert.AreEqual("Assemblageresultaat\r\ngecombineerd", dataGridView.Columns[combinedAssemblyCategoryGroupIndex].HeaderText); + Assert.AreEqual("Assemblageresultaat\r\ngecombineerde\r\nfaalkansschatting", dataGridView.Columns[combinedAssemblyProbabilityIndex].HeaderText); Assert.IsTrue(dataGridView.Columns[nameColumnIndex].ReadOnly); Assert.IsFalse(dataGridView.Columns[simpleAssessmentResultIndex].ReadOnly); @@ -146,6 +149,7 @@ Assert.IsTrue(dataGridView.Columns[detailedAssemblyCategoryGroupIndex].ReadOnly); Assert.IsTrue(dataGridView.Columns[tailorMadeAssemblyCategoryGroupIndex].ReadOnly); Assert.IsTrue(dataGridView.Columns[combinedAssemblyCategoryGroupIndex].ReadOnly); + Assert.IsTrue(dataGridView.Columns[combinedAssemblyProbabilityIndex].ReadOnly); Assert.AreEqual(DataGridViewAutoSizeColumnsMode.AllCells, dataGridView.AutoSizeColumnsMode); Assert.AreEqual(DataGridViewContentAlignment.MiddleCenter, dataGridView.ColumnHeadersDefaultCellStyle.Alignment); @@ -183,6 +187,7 @@ Assert.AreEqual("VIv", cells[detailedAssemblyCategoryGroupIndex].Value); Assert.AreEqual("VIv", cells[tailorMadeAssemblyCategoryGroupIndex].Value); Assert.AreEqual("VIv", cells[combinedAssemblyCategoryGroupIndex].Value); + Assert.AreEqual("1/1", cells[combinedAssemblyProbabilityIndex].FormattedValue); } }