Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRow.cs =================================================================== diff -u -r59d6047874567940a36780cf0ede4087695fbda6 -r829ac59c188c3014f4e2f283db4959d3a493934f --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRow.cs (.../MacroStabilityOutwardsSectionResultRow.cs) (revision 59d6047874567940a36780cf0ede4087695fbda6) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRow.cs (.../MacroStabilityOutwardsSectionResultRow.cs) (revision 829ac59c188c3014f4e2f283db4959d3a493934f) @@ -338,7 +338,7 @@ SetColumnState(detailedAssessmentResultIndex, simpleAssessmentSufficient); SetColumnState(detailedAssessmentProbabilityIndex, simpleAssessmentSufficient || GetDetailedAssessmentResultIsNotProbability()); SetColumnState(tailorMadeAssessmentResultIndex, simpleAssessmentSufficient); - SetColumnState(tailorMadeAssessmentProbabilityIndex, simpleAssessmentSufficient); + SetColumnState(tailorMadeAssessmentProbabilityIndex, simpleAssessmentSufficient || GetTailorMadeAssessmentResultIsNotProbability()); } private void SetColumnState(int columnIndex, bool shouldDisable) Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRowTest.cs =================================================================== diff -u -r59d6047874567940a36780cf0ede4087695fbda6 -r829ac59c188c3014f4e2f283db4959d3a493934f --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRowTest.cs (.../MacroStabilityOutwardsSectionResultRowTest.cs) (revision 59d6047874567940a36780cf0ede4087695fbda6) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRowTest.cs (.../MacroStabilityOutwardsSectionResultRowTest.cs) (revision 829ac59c188c3014f4e2f283db4959d3a493934f) @@ -156,7 +156,7 @@ AssertColumnStateIsEnabled(columnStateDefinitions[ConstructionProperties.DetailedAssessmentResultIndex]); AssertColumnStateIsEnabled(columnStateDefinitions[ConstructionProperties.DetailedAssessmentProbabilityIndex]); AssertColumnStateIsEnabled(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentResultIndex]); - AssertColumnStateIsEnabled(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentProbabilityIndex]); + AssertColumnStateIsDisabled(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentProbabilityIndex]); AssertColumnStateIsEnabled(columnStateDefinitions[ConstructionProperties.SimpleAssemblyCategoryGroupIndex]); AssertColumnStateIsEnabled(columnStateDefinitions[ConstructionProperties.DetailedAssemblyCategoryGroupIndex]); AssertColumnStateIsEnabled(columnStateDefinitions[ConstructionProperties.TailorMadeAssemblyCategoryGroupIndex]); @@ -296,7 +296,8 @@ FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new MacroStabilityOutwardsFailureMechanismSectionResult(section) { - SimpleAssessmentResult = simpleAssessmentResult + SimpleAssessmentResult = simpleAssessmentResult, + TailorMadeAssessmentResult = TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.Probability }; using (new AssemblyToolCalculatorFactoryConfig()) @@ -320,7 +321,7 @@ [Test] [TestCase(DetailedAssessmentResultType.NotAssessed, false)] [TestCase(DetailedAssessmentResultType.Probability, true)] - public void Constructor_WithDetailedAssessmentSet_ExpectedColumnStates(DetailedAssessmentResultType detailedAssessmentResult, + public void Constructor_WithDetailedAssessmentResultSet_ExpectedColumnStates(DetailedAssessmentResultType detailedAssessmentResult, bool cellEnabled) { // Setup @@ -350,6 +351,43 @@ } } + [Test] + [TestCase(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.NotAssessed, false)] + [TestCase(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.Insufficient, false)] + [TestCase(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.None, false)] + [TestCase(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.Sufficient, false)] + [TestCase(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.Probability, true)] + public void Constructor_WithTailorMadeAssessmentResultSet_ExpectedColumnStates( + TailorMadeAssessmentProbabilityAndDetailedCalculationResultType tailorMadeAssessmentResult, + bool cellEnabled) + { + // Setup + var failureMechanism = new MacroStabilityOutwardsFailureMechanism(); + + var mocks = new MockRepository(); + IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); + mocks.ReplayAll(); + + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); + var result = new MacroStabilityOutwardsFailureMechanismSectionResult(section) + { + TailorMadeAssessmentResult = tailorMadeAssessmentResult + }; + + using (new AssemblyToolCalculatorFactoryConfig()) + { + // Call + var row = new MacroStabilityOutwardsSectionResultRow(result, failureMechanism, assessmentSection, + ConstructionProperties); + + // Assert + IDictionary columnStateDefinitions = row.ColumnStateDefinitions; + AssertColumnState(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentProbabilityIndex], cellEnabled); + + mocks.VerifyAll(); + } + } + private static void AssertColumnState(DataGridViewColumnStateDefinition columnStateDefinition, bool cellsEnabled) { if (cellsEnabled)