Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs =================================================================== diff -u -r3a1246401dbe3ee905bc595a9e23e184fe8f4767 -re4493326e76838a769820463a71e14ede6c6351e --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs (.../StabilityPointStructuresFailureMechanismResultView.cs) (revision 3a1246401dbe3ee905bc595a9e23e184fe8f4767) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs (.../StabilityPointStructuresFailureMechanismResultView.cs) (revision e4493326e76838a769820463a71e14ede6c6351e) @@ -26,6 +26,7 @@ using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.Structures; +using Ringtoets.Common.Forms.Builders; using Ringtoets.Common.Forms.Views; using Ringtoets.Common.Primitives; using Ringtoets.StabilityPointStructures.Data; @@ -103,30 +104,21 @@ protected override void AddDataGridColumns() { - DataGridViewControl.AddTextBoxColumn( - nameof(StabilityPointStructuresFailureMechanismSectionResultRow.Name), - RingtoetsCommonFormsResources.Section_DisplayName, - true); + FailureMechanismSectionResultViewColumnBuilder.AddSectionNameColumn( + DataGridViewControl, + nameof(StabilityPointStructuresFailureMechanismSectionResultRow.Name)); - EnumDisplayWrapper[] simpleAssessmentResultDataSource = - Enum.GetValues(typeof(SimpleAssessmentResultValidityOnlyType)) - .OfType() - .Select(sa => new EnumDisplayWrapper(sa)) - .ToArray(); + FailureMechanismSectionResultViewColumnBuilder.AddSimpleAssessmentResultValidityOnlyColumn( + DataGridViewControl, + nameof(StabilityPointStructuresFailureMechanismSectionResultRow.SimpleAssessmentResult)); - DataGridViewControl.AddComboBoxColumn( - nameof(StabilityPointStructuresFailureMechanismSectionResultRow.SimpleAssessmentResult), - RingtoetsCommonFormsResources.FailureMechanismResultView_SimpleAssessmentResult_DisplayName, - simpleAssessmentResultDataSource, - nameof(EnumDisplayWrapper.Value), - nameof(EnumDisplayWrapper.DisplayName)); + FailureMechanismSectionResultViewColumnBuilder.AddDetailedAssessmentProbabilityColumn( + DataGridViewControl, + nameof(StabilityPointStructuresFailureMechanismSectionResultRow.DetailedAssessmentProbability)); - DataGridViewControl.AddTextBoxColumn( - nameof(StabilityPointStructuresFailureMechanismSectionResultRow.DetailedAssessmentProbability), - RingtoetsCommonFormsResources.FailureMechanismResultView_DetailedAssessmentResult_DisplayName); - DataGridViewControl.AddTextBoxColumn( - nameof(StabilityPointStructuresFailureMechanismSectionResultRow.TailorMadeAssessmentProbability), - RingtoetsCommonFormsResources.FailureMechanismResultView_TailorMadeAssessmentResult_DisplayName); + FailureMechanismSectionResultViewColumnBuilder.AddTailorMadeAssessmentProbabilityColumn( + DataGridViewControl, + nameof(StabilityPointStructuresFailureMechanismSectionResultRow.TailorMadeAssessmentProbability)); } } } \ No newline at end of file Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs =================================================================== diff -u -r4c1753252a3984c26f8d68d0a648f8206aa31536 -re4493326e76838a769820463a71e14ede6c6351e --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs (.../StabilityPointStructuresFailureMechanismResultViewTest.cs) (revision 4c1753252a3984c26f8d68d0a648f8206aa31536) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs (.../StabilityPointStructuresFailureMechanismResultViewTest.cs) (revision e4493326e76838a769820463a71e14ede6c6351e) @@ -45,8 +45,8 @@ { private const int nameColumnIndex = 0; private const int simpleAssessmentResultIndex = 1; - private const int detailedAssessmentIndex = 2; - private const int assessmentLayerThreeIndex = 3; + private const int detailedAssessmentProbabilityIndex = 2; + private const int tailorMadeAssessmentProbabilityIndex = 3; private Form testForm; @@ -114,18 +114,18 @@ Assert.IsInstanceOf(dataGridView.Columns[nameColumnIndex]); Assert.IsInstanceOf(dataGridView.Columns[simpleAssessmentResultIndex]); - Assert.IsInstanceOf(dataGridView.Columns[detailedAssessmentIndex]); - Assert.IsInstanceOf(dataGridView.Columns[assessmentLayerThreeIndex]); + Assert.IsInstanceOf(dataGridView.Columns[detailedAssessmentProbabilityIndex]); + Assert.IsInstanceOf(dataGridView.Columns[tailorMadeAssessmentProbabilityIndex]); Assert.AreEqual("Vak", dataGridView.Columns[nameColumnIndex].HeaderText); Assert.AreEqual("Eenvoudige toets", dataGridView.Columns[simpleAssessmentResultIndex].HeaderText); - Assert.AreEqual("Gedetailleerde toets per vak", dataGridView.Columns[detailedAssessmentIndex].HeaderText); - Assert.AreEqual("Toets op maat", dataGridView.Columns[assessmentLayerThreeIndex].HeaderText); + Assert.AreEqual("Gedetailleerde toets per vak\r\nfaalkans", dataGridView.Columns[detailedAssessmentProbabilityIndex].HeaderText); + Assert.AreEqual("Toets op maat\r\nfaalkans", dataGridView.Columns[tailorMadeAssessmentProbabilityIndex].HeaderText); Assert.IsTrue(dataGridView.Columns[nameColumnIndex].ReadOnly); Assert.IsFalse(dataGridView.Columns[simpleAssessmentResultIndex].ReadOnly); - Assert.IsTrue(dataGridView.Columns[detailedAssessmentIndex].ReadOnly); - Assert.IsFalse(dataGridView.Columns[assessmentLayerThreeIndex].ReadOnly); + Assert.IsTrue(dataGridView.Columns[detailedAssessmentProbabilityIndex].ReadOnly); + Assert.IsFalse(dataGridView.Columns[tailorMadeAssessmentProbabilityIndex].ReadOnly); Assert.AreEqual(DataGridViewAutoSizeColumnsMode.AllCells, dataGridView.AutoSizeColumnsMode); Assert.AreEqual(DataGridViewContentAlignment.MiddleCenter, dataGridView.ColumnHeadersDefaultCellStyle.Alignment); @@ -153,8 +153,8 @@ Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); Assert.AreEqual(SimpleAssessmentResultValidityOnlyType.None, cells[simpleAssessmentResultIndex].Value); - Assert.AreEqual("-", cells[detailedAssessmentIndex].FormattedValue); - Assert.AreEqual("-", cells[assessmentLayerThreeIndex].FormattedValue); + Assert.AreEqual("-", cells[detailedAssessmentProbabilityIndex].FormattedValue); + Assert.AreEqual("-", cells[tailorMadeAssessmentProbabilityIndex].FormattedValue); } }