Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismResultView.cs =================================================================== diff -u -r7b6db7cc459f1427bb6e239591c9df86b6f573e0 -rce2380f19bfb4ee9e63613a57656418466ba4abf --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismResultView.cs (.../GrassCoverErosionOutwardsFailureMechanismResultView.cs) (revision 7b6db7cc459f1427bb6e239591c9df86b6f573e0) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismResultView.cs (.../GrassCoverErosionOutwardsFailureMechanismResultView.cs) (revision ce2380f19bfb4ee9e63613a57656418466ba4abf) @@ -19,16 +19,10 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; -using System.Linq; using Core.Common.Base; -using Core.Common.Util; -using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Forms.Builders; using Ringtoets.Common.Forms.Views; -using Ringtoets.Common.Primitives; using Ringtoets.GrassCoverErosionOutwards.Data; -using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; namespace Ringtoets.GrassCoverErosionOutwards.Forms.Views { @@ -58,7 +52,7 @@ DataGridViewControl, nameof(GrassCoverErosionOutwardsFailureMechanismSectionResultRow.Name)); - FailureMechanismSectionResultViewColumnBuilder.AddSimpleAssessmentValidityOnlyResultColumn( + FailureMechanismSectionResultViewColumnBuilder.AddSimpleAssessmentResultColumn( DataGridViewControl, nameof(GrassCoverErosionOutwardsFailureMechanismSectionResultRow.SimpleAssessmentResult)); @@ -101,6 +95,14 @@ FailureMechanismSectionResultViewColumnBuilder.AddCombinedAssemblyCategoryGroupColumn( DataGridViewControl, nameof(GrassCoverErosionOutwardsFailureMechanismSectionResultRow.CombinedAssemblyCategoryGroup)); + + FailureMechanismSectionResultViewColumnBuilder.AddUseManualAssemblyCategoryGroupColumn( + DataGridViewControl, + nameof(GrassCoverErosionOutwardsFailureMechanismSectionResultRow.UseManualAssemblyCategoryGroup)); + + FailureMechanismSectionResultViewColumnBuilder.AddManualAssemblyCategoryGroupColumn( + DataGridViewControl, + nameof(GrassCoverErosionOutwardsFailureMechanismSectionResultRow.ManualAssemblyCategoryGroup)); } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs =================================================================== diff -u -r7b6db7cc459f1427bb6e239591c9df86b6f573e0 -rce2380f19bfb4ee9e63613a57656418466ba4abf --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs) (revision 7b6db7cc459f1427bb6e239591c9df86b6f573e0) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs) (revision ce2380f19bfb4ee9e63613a57656418466ba4abf) @@ -47,7 +47,9 @@ private const int detailedAssemblyCategoryGroupIndex = 9; private const int tailorMadeAssemblyCategoryGroupIndex = 10; private const int combinedAssemblyCategoryGroupIndex = 11; - private const int columnCount = 12; + private const int useManualAssemblyCategoryGroupIndex = 12; + private const int manualAssemblyCategoryGroupIndex = 13; + private const int columnCount = 14; [Test] public void Constructor_ExpectedValues() @@ -98,6 +100,8 @@ Assert.IsInstanceOf(dataGridView.Columns[detailedAssemblyCategoryGroupIndex]); Assert.IsInstanceOf(dataGridView.Columns[tailorMadeAssemblyCategoryGroupIndex]); Assert.IsInstanceOf(dataGridView.Columns[combinedAssemblyCategoryGroupIndex]); + Assert.IsInstanceOf(dataGridView.Columns[useManualAssemblyCategoryGroupIndex]); + Assert.IsInstanceOf(dataGridView.Columns[manualAssemblyCategoryGroupIndex]); Assert.AreEqual("Eenvoudige toets", dataGridView.Columns[simpleAssessmentResultIndex].HeaderText); Assert.AreEqual("Gedetailleerde toets\r\nper vak\r\nCat. Iv - IIv", dataGridView.Columns[detailedAssessmentResultForFactorizedSignalingNormIndex].HeaderText); @@ -110,6 +114,8 @@ 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("Overschrijf\r\nassemblageresultaat", dataGridView.Columns[useManualAssemblyCategoryGroupIndex].HeaderText); + Assert.AreEqual("Assemblageresultaat\r\nhandmatig", dataGridView.Columns[manualAssemblyCategoryGroupIndex].HeaderText); Assert.AreEqual(DataGridViewAutoSizeColumnsMode.AllCells, dataGridView.AutoSizeColumnsMode); Assert.AreEqual(DataGridViewContentAlignment.MiddleCenter, dataGridView.ColumnHeadersDefaultCellStyle.Alignment); @@ -150,6 +156,8 @@ Assert.AreEqual("IIv", cells[detailedAssemblyCategoryGroupIndex].Value); Assert.AreEqual("Iv", cells[tailorMadeAssemblyCategoryGroupIndex].Value); Assert.AreEqual("Iv", cells[combinedAssemblyCategoryGroupIndex].Value); + Assert.AreEqual(false, cells[useManualAssemblyCategoryGroupIndex].Value); + Assert.AreEqual(SelectableFailureMechanismSectionAssemblyCategoryGroup.None, cells[manualAssemblyCategoryGroupIndex].Value); } } }