Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs =================================================================== diff -u -r38b3c47ce8e923eb52cfd6f0987cfb1d028164dd -r3dd641f989b1ae4b18cf430c2b60cceacc1bed6f --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs (.../AssessmentSectionMergeHandler.cs) (revision 38b3c47ce8e923eb52cfd6f0987cfb1d028164dd) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs (.../AssessmentSectionMergeHandler.cs) (revision 3dd641f989b1ae4b18cf430c2b60cceacc1bed6f) @@ -75,6 +75,11 @@ MergeHydraulicBoundaryLocations(targetAssessmentSection, sourceAssessmentSection); } + private void BeforeMerge(AssessmentSection assessmentSection) + { + viewCommands.RemoveAllViewsForItem(assessmentSection); + } + private void MergeHydraulicBoundaryLocations(AssessmentSection targetAssessmentSection, AssessmentSection sourceAssessmentSection) { for (var i = 0; i < targetAssessmentSection.HydraulicBoundaryDatabase.Locations.Count; i++) @@ -84,6 +89,7 @@ if (ShouldMerge(targetCalculation, sourceCalculation)) { + targetCalculation.InputParameters.ShouldIllustrationPointsBeCalculated = sourceCalculation.InputParameters.ShouldIllustrationPointsBeCalculated; targetCalculation.Output = sourceCalculation.Output; } } @@ -94,7 +100,7 @@ bool targetCalculationHasOutput = targetCalculation.HasOutput; bool sourceCalculationHasOutput = sourceCalculation.HasOutput; - if (!targetCalculationHasOutput && !sourceCalculationHasOutput + if (!targetCalculationHasOutput && !sourceCalculationHasOutput || targetCalculationHasOutput && !sourceCalculationHasOutput || targetCalculationHasOutput && targetCalculation.Output.HasGeneralResult && !sourceCalculation.Output.HasGeneralResult) { @@ -103,10 +109,5 @@ return true; } - - private void BeforeMerge(AssessmentSection assessmentSection) - { - viewCommands.RemoveAllViewsForItem(assessmentSection); - } } } \ No newline at end of file