Index: Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/CombinedFailureMechanismSectionAssemblyResultFactory.cs =================================================================== diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -r61f6a9681ce4a10ec4acef50ac327e29ebc2eeae --- Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/CombinedFailureMechanismSectionAssemblyResultFactory.cs (.../CombinedFailureMechanismSectionAssemblyResultFactory.cs) (revision c36b47c2e1e8cf948767cca33f80ad735f370ad0) +++ Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/CombinedFailureMechanismSectionAssemblyResultFactory.cs (.../CombinedFailureMechanismSectionAssemblyResultFactory.cs) (revision 61f6a9681ce4a10ec4acef50ac327e29ebc2eeae) @@ -80,21 +80,13 @@ Piping = GetCategoryGroup(assessmentSection.Piping, failureMechanisms, failureMechanismResults), GrassCoverErosionInwards = GetCategoryGroup(assessmentSection.GrassCoverErosionInwards, failureMechanisms, failureMechanismResults), MacroStabilityInwards = GetCategoryGroup(assessmentSection.MacroStabilityInwards, failureMechanisms, failureMechanismResults), - MacroStabilityOutwards = GetCategoryGroup(assessmentSection.MacroStabilityOutwards, failureMechanisms, failureMechanismResults), - Microstability = GetCategoryGroup(assessmentSection.Microstability, failureMechanisms, failureMechanismResults), StabilityStoneCover = GetCategoryGroup(assessmentSection.StabilityStoneCover, failureMechanisms, failureMechanismResults), WaveImpactAsphaltCover = GetCategoryGroup(assessmentSection.WaveImpactAsphaltCover, failureMechanisms, failureMechanismResults), - WaterPressureAsphaltCover = GetCategoryGroup(assessmentSection.WaterPressureAsphaltCover, failureMechanisms, failureMechanismResults), GrassCoverErosionOutwards = GetCategoryGroup(assessmentSection.GrassCoverErosionOutwards, failureMechanisms, failureMechanismResults), - GrassCoverSlipOffOutwards = GetCategoryGroup(assessmentSection.GrassCoverSlipOffOutwards, failureMechanisms, failureMechanismResults), - GrassCoverSlipOffInwards = GetCategoryGroup(assessmentSection.GrassCoverSlipOffInwards, failureMechanisms, failureMechanismResults), HeightStructures = GetCategoryGroup(assessmentSection.HeightStructures, failureMechanisms, failureMechanismResults), ClosingStructures = GetCategoryGroup(assessmentSection.ClosingStructures, failureMechanisms, failureMechanismResults), - PipingStructure = GetCategoryGroup(assessmentSection.PipingStructure, failureMechanisms, failureMechanismResults), StabilityPointStructures = GetCategoryGroup(assessmentSection.StabilityPointStructures, failureMechanisms, failureMechanismResults), - StrengthStabilityLengthwiseConstruction = GetCategoryGroup(assessmentSection.StrengthStabilityLengthwiseConstruction, failureMechanisms, failureMechanismResults), - DuneErosion = GetCategoryGroup(assessmentSection.DuneErosion, failureMechanisms, failureMechanismResults), - TechnicalInnovation = GetCategoryGroup(assessmentSection.TechnicalInnovation, failureMechanisms, failureMechanismResults) + DuneErosion = GetCategoryGroup(assessmentSection.DuneErosion, failureMechanisms, failureMechanismResults) }; return constructionProperties; Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.cs =================================================================== diff -u -r149a6ea30952146f3ef7e513cedc5372f9e88495 -r61f6a9681ce4a10ec4acef50ac327e29ebc2eeae --- Riskeer/Integration/src/Riskeer.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.cs (.../AssessmentSectionMergeDataProviderDialog.cs) (revision 149a6ea30952146f3ef7e513cedc5372f9e88495) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.cs (.../AssessmentSectionMergeDataProviderDialog.cs) (revision 61f6a9681ce4a10ec4acef50ac327e29ebc2eeae) @@ -172,21 +172,13 @@ new FailureMechanismMergeDataRow(assessmentSection.Piping), new FailureMechanismMergeDataRow(assessmentSection.GrassCoverErosionInwards), new FailureMechanismMergeDataRow(assessmentSection.MacroStabilityInwards), - new FailureMechanismMergeDataRow(assessmentSection.MacroStabilityOutwards), - new FailureMechanismMergeDataRow(assessmentSection.Microstability), new FailureMechanismMergeDataRow(assessmentSection.StabilityStoneCover), new FailureMechanismMergeDataRow(assessmentSection.WaveImpactAsphaltCover), - new FailureMechanismMergeDataRow(assessmentSection.WaterPressureAsphaltCover), new FailureMechanismMergeDataRow(assessmentSection.GrassCoverErosionOutwards), - new FailureMechanismMergeDataRow(assessmentSection.GrassCoverSlipOffOutwards), - new FailureMechanismMergeDataRow(assessmentSection.GrassCoverSlipOffInwards), new FailureMechanismMergeDataRow(assessmentSection.HeightStructures), new FailureMechanismMergeDataRow(assessmentSection.ClosingStructures), - new FailureMechanismMergeDataRow(assessmentSection.PipingStructure), new FailureMechanismMergeDataRow(assessmentSection.StabilityPointStructures), - new FailureMechanismMergeDataRow(assessmentSection.StrengthStabilityLengthwiseConstruction), - new FailureMechanismMergeDataRow(assessmentSection.DuneErosion), - new FailureMechanismMergeDataRow(assessmentSection.TechnicalInnovation) + new FailureMechanismMergeDataRow(assessmentSection.DuneErosion) }; dataGridViewControl.SetDataSource(failureMechanismMergeDataRows); Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/AssessmentSectionCreateExtensions.cs =================================================================== diff -u -r149a6ea30952146f3ef7e513cedc5372f9e88495 -r61f6a9681ce4a10ec4acef50ac327e29ebc2eeae --- Riskeer/Storage/src/Riskeer.Storage.Core/Create/AssessmentSectionCreateExtensions.cs (.../AssessmentSectionCreateExtensions.cs) (revision 149a6ea30952146f3ef7e513cedc5372f9e88495) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/AssessmentSectionCreateExtensions.cs (.../AssessmentSectionCreateExtensions.cs) (revision 61f6a9681ce4a10ec4acef50ac327e29ebc2eeae) @@ -82,7 +82,6 @@ entity.FailureMechanismEntities.Add(section.Piping.Create(registry)); entity.FailureMechanismEntities.Add(section.GrassCoverErosionInwards.Create(registry)); entity.FailureMechanismEntities.Add(section.HeightStructures.Create(registry)); - entity.FailureMechanismEntities.Add(section.WaterPressureAsphaltCover.Create(registry)); entity.FailureMechanismEntities.Add(section.ClosingStructures.Create(registry)); entity.FailureMechanismEntities.Add(section.MacroStabilityInwards.Create(registry)); entity.FailureMechanismEntities.Add(section.WaveImpactAsphaltCover.Create(registry));