Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismResultView.cs =================================================================== diff -u -r278c97b8f6e81f18a15c4c851a8c2941a0947d8e -rf5e0ab14b71224218a3e19f4a8ccd44a7a463c32 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismResultView.cs (.../ClosingStructuresFailureMechanismResultView.cs) (revision 278c97b8f6e81f18a15c4c851a8c2941a0947d8e) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismResultView.cs (.../ClosingStructuresFailureMechanismResultView.cs) (revision f5e0ab14b71224218a3e19f4a8ccd44a7a463c32) @@ -119,7 +119,7 @@ DataGridViewControl.AddComboBoxColumn( nameof(ClosingStructuresFailureMechanismSectionResultRow.AssessmentLayerOne), - RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, + RingtoetsCommonFormsResources.FailureMechanismResultView_SimpleAssessmentResult_ColumnHeader, layerOneDataSource, nameof(EnumDisplayWrapper.Value), nameof(EnumDisplayWrapper.DisplayName)); @@ -132,6 +132,12 @@ RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three); } + private bool HasPassedSimpleAssessment(int rowIndex) + { + return (AssessmentLayerOneState) DataGridViewControl.GetCell(rowIndex, AssessmentLayerOneColumnIndex).Value + == AssessmentLayerOneState.Sufficient; + } + private void OnCellFormatting(object sender, DataGridViewCellFormattingEventArgs eventArgs) { if (eventArgs.ColumnIndex > AssessmentLayerOneColumnIndex) Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/FailureMechanismSectionResultRowHelper.cs =================================================================== diff -u -r00222c7af8dc4d159d2dfbff9c4a87ebce853782 -rf5e0ab14b71224218a3e19f4a8ccd44a7a463c32 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/FailureMechanismSectionResultRowHelper.cs (.../FailureMechanismSectionResultRowHelper.cs) (revision 00222c7af8dc4d159d2dfbff9c4a87ebce853782) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/FailureMechanismSectionResultRowHelper.cs (.../FailureMechanismSectionResultRowHelper.cs) (revision f5e0ab14b71224218a3e19f4a8ccd44a7a463c32) @@ -43,7 +43,8 @@ /// section result. May be null if the section result does not have a calculation set. /// Thrown when is null. public static void SetAssessmentLayerTwoAError(DataGridViewCell dataGridViewCell, - AssessmentLayerOneState passedAssessmentLayerOne, double assessmentLayerTwoA, + AssessmentLayerOneState passedAssessmentLayerOne, + double assessmentLayerTwoA, ICalculation normativeCalculation) { if (dataGridViewCell == null) Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -ra875e5fb4cd5e183164fc0bc9aa5376e7f40d71d -rf5e0ab14b71224218a3e19f4a8ccd44a7a463c32 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a875e5fb4cd5e183164fc0bc9aa5376e7f40d71d) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision f5e0ab14b71224218a3e19f4a8ccd44a7a463c32) @@ -1436,15 +1436,6 @@ } /// - /// Looks up a localized string similar to Eenvoudige toets. - /// - public static string FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one { - get { - return ResourceManager.GetString("FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Toets op maat. /// public static string FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three { @@ -1472,6 +1463,15 @@ } /// + /// Looks up a localized string similar to Eenvoudige toets. + /// + public static string FailureMechanismResultView_SimpleAssessmentResult_ColumnHeader { + get { + return ResourceManager.GetString("FailureMechanismResultView_SimpleAssessmentResult_ColumnHeader", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Eindpunt van het vak (X-coördinaat, Y-coördinaat).. /// public static string FailureMechanismSection_EndPoint_Description { Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx =================================================================== diff -u -ra875e5fb4cd5e183164fc0bc9aa5376e7f40d71d -rf5e0ab14b71224218a3e19f4a8ccd44a7a463c32 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision a875e5fb4cd5e183164fc0bc9aa5376e7f40d71d) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision f5e0ab14b71224218a3e19f4a8ccd44a7a463c32) @@ -217,7 +217,7 @@ ..\Resources\blue-document-list.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + Eenvoudige toets Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs =================================================================== diff -u -r7f80815f667036fe5000fb938d61aee1edd157e0 -rf5e0ab14b71224218a3e19f4a8ccd44a7a463c32 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs (.../FailureMechanismResultView.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs (.../FailureMechanismResultView.cs) (revision f5e0ab14b71224218a3e19f4a8ccd44a7a463c32) @@ -119,18 +119,6 @@ } /// - /// Finds out whether the assessment section which is represented by the row at index - /// has passed the simple assessment. - /// - /// The index of the row which has a section attached. - /// false if the simple assessment has passed, true otherwise. - protected bool HasPassedSimpleAssessment(int rowIndex) - { - return (AssessmentLayerOneState) DataGridViewControl.GetCell(rowIndex, AssessmentLayerOneColumnIndex).Value - == AssessmentLayerOneState.Sufficient; - } - - /// /// Updates the data source of the data grid view with the current known failure mechanism section results. /// protected void UpdateDataGridViewDataSource() Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs =================================================================== diff -u -ra116692d59b7634613a5a9e1ac9aeb80e0e126c5 -rf5e0ab14b71224218a3e19f4a8ccd44a7a463c32 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs (.../FailureMechanismResultViewTest.cs) (revision a116692d59b7634613a5a9e1ac9aeb80e0e126c5) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs (.../FailureMechanismResultViewTest.cs) (revision f5e0ab14b71224218a3e19f4a8ccd44a7a463c32) @@ -191,7 +191,7 @@ DataGridViewControl.AddComboBoxColumn( nameof(FailureMechanismSectionResultRow.AssessmentLayerOne), - Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, + Resources.FailureMechanismResultView_SimpleAssessmentResult_ColumnHeader, oneStateDataSource, nameof(EnumDisplayWrapper.Value), nameof(EnumDisplayWrapper.DisplayName)); Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionFailureMechanismResultView.cs =================================================================== diff -u -r4a6acca8c5bdf3ce0a0c7173fa36e0b15cf351fb -rf5e0ab14b71224218a3e19f4a8ccd44a7a463c32 --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionFailureMechanismResultView.cs (.../DuneErosionFailureMechanismResultView.cs) (revision 4a6acca8c5bdf3ce0a0c7173fa36e0b15cf351fb) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionFailureMechanismResultView.cs (.../DuneErosionFailureMechanismResultView.cs) (revision f5e0ab14b71224218a3e19f4a8ccd44a7a463c32) @@ -73,7 +73,7 @@ DataGridViewControl.AddComboBoxColumn( nameof(DuneErosionSectionResultRow.SimpleAssessmentInput), - RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, + RingtoetsCommonFormsResources.FailureMechanismResultView_SimpleAssessmentResult_ColumnHeader, simpleAssessmentDataSource, nameof(EnumDisplayWrapper.Value), nameof(EnumDisplayWrapper.DisplayName)); Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs =================================================================== diff -u -r00222c7af8dc4d159d2dfbff9c4a87ebce853782 -rf5e0ab14b71224218a3e19f4a8ccd44a7a463c32 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs (.../GrassCoverErosionInwardsFailureMechanismResultView.cs) (revision 00222c7af8dc4d159d2dfbff9c4a87ebce853782) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs (.../GrassCoverErosionInwardsFailureMechanismResultView.cs) (revision f5e0ab14b71224218a3e19f4a8ccd44a7a463c32) @@ -121,7 +121,7 @@ DataGridViewControl.AddComboBoxColumn( nameof(GrassCoverErosionInwardsFailureMechanismSectionResultRow.SimpleAssessmentResult), - RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, + RingtoetsCommonFormsResources.FailureMechanismResultView_SimpleAssessmentResult_ColumnHeader, simpleAssessmentDataSource, nameof(EnumDisplayWrapper.Value), nameof(EnumDisplayWrapper.DisplayName)); Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismResultView.cs =================================================================== diff -u -r1d71aee3723ff5b847caa193167583cffd985019 -rf5e0ab14b71224218a3e19f4a8ccd44a7a463c32 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismResultView.cs (.../GrassCoverErosionOutwardsFailureMechanismResultView.cs) (revision 1d71aee3723ff5b847caa193167583cffd985019) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismResultView.cs (.../GrassCoverErosionOutwardsFailureMechanismResultView.cs) (revision f5e0ab14b71224218a3e19f4a8ccd44a7a463c32) @@ -74,7 +74,7 @@ DataGridViewControl.AddComboBoxColumn( nameof(GrassCoverErosionOutwardsFailureMechanismSectionResultRow.SimpleAssessmentInput), - RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, + RingtoetsCommonFormsResources.FailureMechanismResultView_SimpleAssessmentResult_ColumnHeader, simpleAssessmentDataSource, nameof(EnumDisplayWrapper.Value), nameof(EnumDisplayWrapper.DisplayName)); Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs =================================================================== diff -u -r23a31dd663977ebcc7fcf4c330fc3d980c953624 -rf5e0ab14b71224218a3e19f4a8ccd44a7a463c32 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs (.../HeightStructuresFailureMechanismResultView.cs) (revision 23a31dd663977ebcc7fcf4c330fc3d980c953624) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs (.../HeightStructuresFailureMechanismResultView.cs) (revision f5e0ab14b71224218a3e19f4a8ccd44a7a463c32) @@ -123,7 +123,7 @@ DataGridViewControl.AddComboBoxColumn( nameof(HeightStructuresFailureMechanismSectionResultRow.AssessmentLayerOne), - RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, + RingtoetsCommonFormsResources.FailureMechanismResultView_SimpleAssessmentResult_ColumnHeader, layerOneDataSource, nameof(EnumDisplayWrapper.Value), nameof(EnumDisplayWrapper.DisplayName)); @@ -137,6 +137,12 @@ RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three); } + private bool HasPassedSimpleAssessment(int rowIndex) + { + return (AssessmentLayerOneState) DataGridViewControl.GetCell(rowIndex, AssessmentLayerOneColumnIndex).Value + == AssessmentLayerOneState.Sufficient; + } + private void DisableIrrelevantFieldsFormatting(object sender, DataGridViewCellFormattingEventArgs eventArgs) { if (eventArgs.ColumnIndex > AssessmentLayerOneColumnIndex) Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffInwardsResultView.cs =================================================================== diff -u -r89a833b45ef20d3cdcd4c1f50ed6dca8aa546137 -rf5e0ab14b71224218a3e19f4a8ccd44a7a463c32 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffInwardsResultView.cs (.../GrassCoverSlipOffInwardsResultView.cs) (revision 89a833b45ef20d3cdcd4c1f50ed6dca8aa546137) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffInwardsResultView.cs (.../GrassCoverSlipOffInwardsResultView.cs) (revision f5e0ab14b71224218a3e19f4a8ccd44a7a463c32) @@ -76,7 +76,7 @@ DataGridViewControl.AddComboBoxColumn( nameof(GrassCoverSlipOffInwardsSectionResultRow.SimpleAssessmentResult), - RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, + RingtoetsCommonFormsResources.FailureMechanismResultView_SimpleAssessmentResult_ColumnHeader, simpleAssessmentDataSource, nameof(EnumDisplayWrapper.Value), nameof(EnumDisplayWrapper.DisplayName)); Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultView.cs =================================================================== diff -u -r8d979ff353df477ff9b31a8c6d859e87703f7dcc -rf5e0ab14b71224218a3e19f4a8ccd44a7a463c32 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultView.cs (.../GrassCoverSlipOffOutwardsResultView.cs) (revision 8d979ff353df477ff9b31a8c6d859e87703f7dcc) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultView.cs (.../GrassCoverSlipOffOutwardsResultView.cs) (revision f5e0ab14b71224218a3e19f4a8ccd44a7a463c32) @@ -76,7 +76,7 @@ DataGridViewControl.AddComboBoxColumn( nameof(GrassCoverSlipOffOutwardsSectionResultRow.SimpleAssessmentResult), - RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, + RingtoetsCommonFormsResources.FailureMechanismResultView_SimpleAssessmentResult_ColumnHeader, simpleAssessmentDataSource, nameof(EnumDisplayWrapper.Value), nameof(EnumDisplayWrapper.DisplayName)); Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MacroStabilityOutwardsResultView.cs =================================================================== diff -u -r4a6acca8c5bdf3ce0a0c7173fa36e0b15cf351fb -rf5e0ab14b71224218a3e19f4a8ccd44a7a463c32 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MacroStabilityOutwardsResultView.cs (.../MacroStabilityOutwardsResultView.cs) (revision 4a6acca8c5bdf3ce0a0c7173fa36e0b15cf351fb) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MacroStabilityOutwardsResultView.cs (.../MacroStabilityOutwardsResultView.cs) (revision f5e0ab14b71224218a3e19f4a8ccd44a7a463c32) @@ -75,7 +75,7 @@ DataGridViewControl.AddComboBoxColumn( nameof(MacroStabilityOutwardsSectionResultRow.SimpleAssessmentInput), - RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, + RingtoetsCommonFormsResources.FailureMechanismResultView_SimpleAssessmentResult_ColumnHeader, simpleAssessmentDataSource, nameof(EnumDisplayWrapper.Value), nameof(EnumDisplayWrapper.DisplayName)); Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MicrostabilityResultView.cs =================================================================== diff -u -r726555f802c504759b15aeadf5672e4ec058ed71 -rf5e0ab14b71224218a3e19f4a8ccd44a7a463c32 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MicrostabilityResultView.cs (.../MicrostabilityResultView.cs) (revision 726555f802c504759b15aeadf5672e4ec058ed71) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MicrostabilityResultView.cs (.../MicrostabilityResultView.cs) (revision f5e0ab14b71224218a3e19f4a8ccd44a7a463c32) @@ -75,7 +75,7 @@ DataGridViewControl.AddComboBoxColumn( nameof(MicrostabilitySectionResultRow.SimpleAssessmentInput), - RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, + RingtoetsCommonFormsResources.FailureMechanismResultView_SimpleAssessmentResult_ColumnHeader, simpleAssessmentDataSource, nameof(EnumDisplayWrapper.Value), nameof(EnumDisplayWrapper.DisplayName)); Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/PipingStructureResultView.cs =================================================================== diff -u -r4c2e1c0b6b1b94e87695a1e439eedfc307f4d374 -rf5e0ab14b71224218a3e19f4a8ccd44a7a463c32 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/PipingStructureResultView.cs (.../PipingStructureResultView.cs) (revision 4c2e1c0b6b1b94e87695a1e439eedfc307f4d374) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/PipingStructureResultView.cs (.../PipingStructureResultView.cs) (revision f5e0ab14b71224218a3e19f4a8ccd44a7a463c32) @@ -75,7 +75,7 @@ DataGridViewControl.AddComboBoxColumn( nameof(PipingStructureSectionResultRow.SimpleAssessmentResult), - RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, + RingtoetsCommonFormsResources.FailureMechanismResultView_SimpleAssessmentResult_ColumnHeader, simpleAssessmentDataSource, nameof(EnumDisplayWrapper.Value), nameof(EnumDisplayWrapper.DisplayName)); Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultView.cs =================================================================== diff -u -r2ab8adc8de7120fa1a77593f22ac21571f3733ba -rf5e0ab14b71224218a3e19f4a8ccd44a7a463c32 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultView.cs (.../StrengthStabilityLengthwiseConstructionResultView.cs) (revision 2ab8adc8de7120fa1a77593f22ac21571f3733ba) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultView.cs (.../StrengthStabilityLengthwiseConstructionResultView.cs) (revision f5e0ab14b71224218a3e19f4a8ccd44a7a463c32) @@ -77,7 +77,7 @@ DataGridViewControl.AddComboBoxColumn( nameof(StrengthStabilityLengthwiseConstructionSectionResultRow.SimpleAssessmentResult), - RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, + RingtoetsCommonFormsResources.FailureMechanismResultView_SimpleAssessmentResult_ColumnHeader, simpleAssessmentDataSource, nameof(EnumDisplayWrapper.Value), nameof(EnumDisplayWrapper.DisplayName)); Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/TechnicalInnovationResultView.cs =================================================================== diff -u -r365b6aa8cc0ff51af4551cc4b540a65cb6247b93 -rf5e0ab14b71224218a3e19f4a8ccd44a7a463c32 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/TechnicalInnovationResultView.cs (.../TechnicalInnovationResultView.cs) (revision 365b6aa8cc0ff51af4551cc4b540a65cb6247b93) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/TechnicalInnovationResultView.cs (.../TechnicalInnovationResultView.cs) (revision f5e0ab14b71224218a3e19f4a8ccd44a7a463c32) @@ -75,7 +75,7 @@ DataGridViewControl.AddComboBoxColumn( nameof(TechnicalInnovationSectionResultRow.SimpleAssessmentResult), - RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, + RingtoetsCommonFormsResources.FailureMechanismResultView_SimpleAssessmentResult_ColumnHeader, simpleAssessmentDataSource, nameof(EnumDisplayWrapper.Value), nameof(EnumDisplayWrapper.DisplayName)); Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/WaterPressureAsphaltCoverResultView.cs =================================================================== diff -u -ra7241d8fc011e3126c36252ee5e677ed63330af0 -rf5e0ab14b71224218a3e19f4a8ccd44a7a463c32 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/WaterPressureAsphaltCoverResultView.cs (.../WaterPressureAsphaltCoverResultView.cs) (revision a7241d8fc011e3126c36252ee5e677ed63330af0) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/WaterPressureAsphaltCoverResultView.cs (.../WaterPressureAsphaltCoverResultView.cs) (revision f5e0ab14b71224218a3e19f4a8ccd44a7a463c32) @@ -77,7 +77,7 @@ DataGridViewControl.AddComboBoxColumn( nameof(WaterPressureAsphaltCoverSectionResultRow.SimpleAssessmentInput), - RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, + RingtoetsCommonFormsResources.FailureMechanismResultView_SimpleAssessmentResult_ColumnHeader, simpleAssessmentDataSource, nameof(EnumDisplayWrapper.Value), nameof(EnumDisplayWrapper.DisplayName)); Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismResultView.cs =================================================================== diff -u -r4a6acca8c5bdf3ce0a0c7173fa36e0b15cf351fb -rf5e0ab14b71224218a3e19f4a8ccd44a7a463c32 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismResultView.cs (.../MacroStabilityInwardsFailureMechanismResultView.cs) (revision 4a6acca8c5bdf3ce0a0c7173fa36e0b15cf351fb) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismResultView.cs (.../MacroStabilityInwardsFailureMechanismResultView.cs) (revision f5e0ab14b71224218a3e19f4a8ccd44a7a463c32) @@ -131,7 +131,7 @@ DataGridViewControl.AddComboBoxColumn( nameof(MacroStabilityInwardsFailureMechanismSectionResultRow.SimpleAssessmentInput), - RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, + RingtoetsCommonFormsResources.FailureMechanismResultView_SimpleAssessmentResult_ColumnHeader, simpleAssessmentDataSource, nameof(EnumDisplayWrapper.Value), nameof(EnumDisplayWrapper.DisplayName)); Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismResultView.cs =================================================================== diff -u -r4a6acca8c5bdf3ce0a0c7173fa36e0b15cf351fb -rf5e0ab14b71224218a3e19f4a8ccd44a7a463c32 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismResultView.cs (.../PipingFailureMechanismResultView.cs) (revision 4a6acca8c5bdf3ce0a0c7173fa36e0b15cf351fb) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismResultView.cs (.../PipingFailureMechanismResultView.cs) (revision f5e0ab14b71224218a3e19f4a8ccd44a7a463c32) @@ -132,7 +132,7 @@ DataGridViewControl.AddComboBoxColumn( nameof(PipingFailureMechanismSectionResultRow.SimpleAssessmentInput), - RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, + RingtoetsCommonFormsResources.FailureMechanismResultView_SimpleAssessmentResult_ColumnHeader, simpleAssessmentDataSource, nameof(EnumDisplayWrapper.Value), nameof(EnumDisplayWrapper.DisplayName)); Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs =================================================================== diff -u -rb4ff9985c6f91822918b2ea5c0484cd9d3cd7c30 -rf5e0ab14b71224218a3e19f4a8ccd44a7a463c32 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs (.../StabilityPointStructuresFailureMechanismResultView.cs) (revision b4ff9985c6f91822918b2ea5c0484cd9d3cd7c30) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs (.../StabilityPointStructuresFailureMechanismResultView.cs) (revision f5e0ab14b71224218a3e19f4a8ccd44a7a463c32) @@ -124,7 +124,7 @@ DataGridViewControl.AddComboBoxColumn( nameof(StabilityPointStructuresFailureMechanismSectionResultRow.AssessmentLayerOne), - RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, + RingtoetsCommonFormsResources.FailureMechanismResultView_SimpleAssessmentResult_ColumnHeader, layerOneDataSource, nameof(EnumDisplayWrapper.Value), nameof(EnumDisplayWrapper.DisplayName)); @@ -137,6 +137,12 @@ RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three); } + private bool HasPassedSimpleAssessment(int rowIndex) + { + return (AssessmentLayerOneState) DataGridViewControl.GetCell(rowIndex, AssessmentLayerOneColumnIndex).Value + == AssessmentLayerOneState.Sufficient; + } + private void DisableIrrelevantFieldsFormatting(object sender, DataGridViewCellFormattingEventArgs eventArgs) { if (eventArgs.ColumnIndex > AssessmentLayerOneColumnIndex) Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverResultView.cs =================================================================== diff -u -reba2e56d076ca33cff2a1cbfcaad5243adc93edb -rf5e0ab14b71224218a3e19f4a8ccd44a7a463c32 --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverResultView.cs (.../StabilityStoneCoverResultView.cs) (revision eba2e56d076ca33cff2a1cbfcaad5243adc93edb) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverResultView.cs (.../StabilityStoneCoverResultView.cs) (revision f5e0ab14b71224218a3e19f4a8ccd44a7a463c32) @@ -73,7 +73,7 @@ DataGridViewControl.AddComboBoxColumn( nameof(StabilityStoneCoverSectionResultRow.SimpleAssessmentInput), - RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, + RingtoetsCommonFormsResources.FailureMechanismResultView_SimpleAssessmentResult_ColumnHeader, simpleAssessmentDataSource, nameof(EnumDisplayWrapper.Value), nameof(EnumDisplayWrapper.DisplayName)); Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismResultView.cs =================================================================== diff -u -r75a049691c36f70d38684cf32c1c5a268b3fea7a -rf5e0ab14b71224218a3e19f4a8ccd44a7a463c32 --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismResultView.cs (.../WaveImpactAsphaltCoverFailureMechanismResultView.cs) (revision 75a049691c36f70d38684cf32c1c5a268b3fea7a) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismResultView.cs (.../WaveImpactAsphaltCoverFailureMechanismResultView.cs) (revision f5e0ab14b71224218a3e19f4a8ccd44a7a463c32) @@ -74,7 +74,7 @@ DataGridViewControl.AddComboBoxColumn( nameof(WaveImpactAsphaltCoverFailureMechanismSectionResultRow.SimpleAssessmentInput), - RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, + RingtoetsCommonFormsResources.FailureMechanismResultView_SimpleAssessmentResult_ColumnHeader, simpleAssessmentDataSource, nameof(EnumDisplayWrapper.Value), nameof(EnumDisplayWrapper.DisplayName));