Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Assembly/CombinedFailureMechanismSectionAssemblyResult.cs =================================================================== diff -u -rce91892912bd362656333b21a50132f98e5c3905 -rf240aa827e5fb4876c0e80fe113f239ff7a2c589 --- Ringtoets/Integration/src/Ringtoets.Integration.Data/Assembly/CombinedFailureMechanismSectionAssemblyResult.cs (.../CombinedFailureMechanismSectionAssemblyResult.cs) (revision ce91892912bd362656333b21a50132f98e5c3905) +++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Assembly/CombinedFailureMechanismSectionAssemblyResult.cs (.../CombinedFailureMechanismSectionAssemblyResult.cs) (revision f240aa827e5fb4876c0e80fe113f239ff7a2c589) @@ -64,7 +64,7 @@ GrassCoverSlipOffInwards = properties.GrassCoverSlipOffInwards; HeightStructures = properties.HeightStructures; ClosingStructures = properties.ClosingStructures; - PipingStructures = properties.PipingStructures; + PipingStructure = properties.PipingStructure; StabilityPointStructures = properties.StabilityPointStructures; StrengthStabilityLengthwise = properties.StrengthStabilityLengthwise; DuneErosion = properties.DuneErosion; @@ -154,9 +154,9 @@ public FailureMechanismSectionAssemblyCategoryGroup ClosingStructures { get; } /// - /// Gets the assembly result for piping structures. + /// Gets the assembly result for piping structure. /// - public FailureMechanismSectionAssemblyCategoryGroup PipingStructures { get; } + public FailureMechanismSectionAssemblyCategoryGroup PipingStructure { get; } /// /// Gets the assembly result for stability point structures. @@ -201,7 +201,7 @@ GrassCoverSlipOffInwards = FailureMechanismSectionAssemblyCategoryGroup.None; HeightStructures = FailureMechanismSectionAssemblyCategoryGroup.None; ClosingStructures = FailureMechanismSectionAssemblyCategoryGroup.None; - PipingStructures = FailureMechanismSectionAssemblyCategoryGroup.None; + PipingStructure = FailureMechanismSectionAssemblyCategoryGroup.None; StabilityPointStructures = FailureMechanismSectionAssemblyCategoryGroup.None; StrengthStabilityLengthwise = FailureMechanismSectionAssemblyCategoryGroup.None; DuneErosion = FailureMechanismSectionAssemblyCategoryGroup.None; @@ -274,9 +274,9 @@ public FailureMechanismSectionAssemblyCategoryGroup ClosingStructures { internal get; set; } /// - /// Gets or sets the assembly result for piping structures. + /// Gets or sets the assembly result for piping structure. /// - public FailureMechanismSectionAssemblyCategoryGroup PipingStructures { internal get; set; } + public FailureMechanismSectionAssemblyCategoryGroup PipingStructure { internal get; set; } /// /// Gets or sets the assembly result for stability point structures. Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultPerSectionView.cs =================================================================== diff -u -r9d9fe24bb03c02db89c1d9b7f24a5a97306eff51 -rf240aa827e5fb4876c0e80fe113f239ff7a2c589 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultPerSectionView.cs (.../AssemblyResultPerSectionView.cs) (revision 9d9fe24bb03c02db89c1d9b7f24a5a97306eff51) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultPerSectionView.cs (.../AssemblyResultPerSectionView.cs) (revision f240aa827e5fb4876c0e80fe113f239ff7a2c589) @@ -173,7 +173,7 @@ dataGridViewControl.AddTextBoxColumn(nameof(CombinedFailureMechanismSectionAssemblyResultRow.ClosingStructures), ClosingStructuresDataResources.ClosingStructuresFailureMechanism_Code, true); - dataGridViewControl.AddTextBoxColumn(nameof(CombinedFailureMechanismSectionAssemblyResultRow.PipingStructures), + dataGridViewControl.AddTextBoxColumn(nameof(CombinedFailureMechanismSectionAssemblyResultRow.PipingStructure), IntegrationDataResources.PipingStructureFailureMechanism_Code, true); dataGridViewControl.AddTextBoxColumn(nameof(CombinedFailureMechanismSectionAssemblyResultRow.StabilityPointStructures), @@ -248,7 +248,7 @@ GrassCoverSlipOffInwards = GetRandomFailureMechanismSectionAssemblyCategoryGroup(random), HeightStructures = GetRandomFailureMechanismSectionAssemblyCategoryGroup(random), ClosingStructures = GetRandomFailureMechanismSectionAssemblyCategoryGroup(random), - PipingStructures = GetRandomFailureMechanismSectionAssemblyCategoryGroup(random), + PipingStructure = GetRandomFailureMechanismSectionAssemblyCategoryGroup(random), StabilityPointStructures = GetRandomFailureMechanismSectionAssemblyCategoryGroup(random), StrengthStabilityLengthwise = GetRandomFailureMechanismSectionAssemblyCategoryGroup(random), DuneErosion = GetRandomFailureMechanismSectionAssemblyCategoryGroup(random), Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/CombinedFailureMechanismSectionAssemblyResultRow.cs =================================================================== diff -u -r3a6b8683163bfa83f5c62c1942d8e2e39316c888 -rf240aa827e5fb4876c0e80fe113f239ff7a2c589 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/CombinedFailureMechanismSectionAssemblyResultRow.cs (.../CombinedFailureMechanismSectionAssemblyResultRow.cs) (revision 3a6b8683163bfa83f5c62c1942d8e2e39316c888) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/CombinedFailureMechanismSectionAssemblyResultRow.cs (.../CombinedFailureMechanismSectionAssemblyResultRow.cs) (revision f240aa827e5fb4876c0e80fe113f239ff7a2c589) @@ -49,7 +49,7 @@ private const int grassCoverSlipOffInwardsIndex = 13; private const int heightStructuresIndex = 14; private const int closingStructuresIndex = 15; - private const int pipingStructuresIndex = 16; + private const int pipingStructureIndex = 16; private const int stabilityPointStructuresIndex = 17; private const int strengthStabilityLengthwiseIndex = 18; private const int duneErosionIndex = 19; @@ -258,13 +258,13 @@ } /// - /// Gets the assembly result for piping structures. + /// Gets the assembly result for piping structure. /// - public string PipingStructures + public string PipingStructure { get { - return FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayname(combinedFailureMechanismSectionAssemblyResult.PipingStructures); + return FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayname(combinedFailureMechanismSectionAssemblyResult.PipingStructure); } } @@ -330,7 +330,7 @@ ColumnStateDefinitions.Add(grassCoverSlipOffInwardsIndex, CreateDefaultDataGridViewColumnStateDefinition()); ColumnStateDefinitions.Add(heightStructuresIndex, CreateDefaultDataGridViewColumnStateDefinition()); ColumnStateDefinitions.Add(closingStructuresIndex, CreateDefaultDataGridViewColumnStateDefinition()); - ColumnStateDefinitions.Add(pipingStructuresIndex, CreateDefaultDataGridViewColumnStateDefinition()); + ColumnStateDefinitions.Add(pipingStructureIndex, CreateDefaultDataGridViewColumnStateDefinition()); ColumnStateDefinitions.Add(stabilityPointStructuresIndex, CreateDefaultDataGridViewColumnStateDefinition()); ColumnStateDefinitions.Add(strengthStabilityLengthwiseIndex, CreateDefaultDataGridViewColumnStateDefinition()); ColumnStateDefinitions.Add(duneErosionIndex, CreateDefaultDataGridViewColumnStateDefinition()); @@ -361,7 +361,7 @@ ColumnStateDefinitions[grassCoverSlipOffInwardsIndex].Style = CreateCellStyle(combinedFailureMechanismSectionAssemblyResult.GrassCoverSlipOffInwards); ColumnStateDefinitions[heightStructuresIndex].Style = CreateCellStyle(combinedFailureMechanismSectionAssemblyResult.HeightStructures); ColumnStateDefinitions[closingStructuresIndex].Style = CreateCellStyle(combinedFailureMechanismSectionAssemblyResult.ClosingStructures); - ColumnStateDefinitions[pipingStructuresIndex].Style = CreateCellStyle(combinedFailureMechanismSectionAssemblyResult.PipingStructures); + ColumnStateDefinitions[pipingStructureIndex].Style = CreateCellStyle(combinedFailureMechanismSectionAssemblyResult.PipingStructure); ColumnStateDefinitions[stabilityPointStructuresIndex].Style = CreateCellStyle(combinedFailureMechanismSectionAssemblyResult.StabilityPointStructures); ColumnStateDefinitions[strengthStabilityLengthwiseIndex].Style = CreateCellStyle(combinedFailureMechanismSectionAssemblyResult.StrengthStabilityLengthwise); ColumnStateDefinitions[duneErosionIndex].Style = CreateCellStyle(combinedFailureMechanismSectionAssemblyResult.DuneErosion); Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Assembly/CombinedFailureMechanismSectionAssemblyResultTest.cs =================================================================== diff -u -re6dce9f10ba6b2e89fa58977a50fb7e4c9ceb647 -rf240aa827e5fb4876c0e80fe113f239ff7a2c589 --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Assembly/CombinedFailureMechanismSectionAssemblyResultTest.cs (.../CombinedFailureMechanismSectionAssemblyResultTest.cs) (revision e6dce9f10ba6b2e89fa58977a50fb7e4c9ceb647) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Assembly/CombinedFailureMechanismSectionAssemblyResultTest.cs (.../CombinedFailureMechanismSectionAssemblyResultTest.cs) (revision f240aa827e5fb4876c0e80fe113f239ff7a2c589) @@ -75,7 +75,7 @@ Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.None, result.GrassCoverSlipOffInwards); Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.None, result.HeightStructures); Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.None, result.ClosingStructures); - Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.None, result.PipingStructures); + Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.None, result.PipingStructure); Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.None, result.StabilityPointStructures); Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.None, result.StrengthStabilityLengthwise); Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.None, result.DuneErosion); @@ -103,7 +103,7 @@ var grassCoverSlipOffInwardsResult = random.NextEnumValue(); var heightStructuresResult = random.NextEnumValue(); var closingStructuresResult = random.NextEnumValue(); - var pipingStructuresResult = random.NextEnumValue(); + var pipingStructureResult = random.NextEnumValue(); var stabilityPointStructuresResult = random.NextEnumValue(); var strengthStabilityLengthwiseResult = random.NextEnumValue(); var duneErosionResult = random.NextEnumValue(); @@ -126,7 +126,7 @@ GrassCoverSlipOffInwards = grassCoverSlipOffInwardsResult, HeightStructures = heightStructuresResult, ClosingStructures = closingStructuresResult, - PipingStructures = pipingStructuresResult, + PipingStructure = pipingStructureResult, StabilityPointStructures = stabilityPointStructuresResult, StrengthStabilityLengthwise = strengthStabilityLengthwiseResult, DuneErosion = duneErosionResult, @@ -150,7 +150,7 @@ Assert.AreEqual(grassCoverSlipOffInwardsResult, result.GrassCoverSlipOffInwards); Assert.AreEqual(heightStructuresResult, result.HeightStructures); Assert.AreEqual(closingStructuresResult, result.ClosingStructures); - Assert.AreEqual(pipingStructuresResult, result.PipingStructures); + Assert.AreEqual(pipingStructureResult, result.PipingStructure); Assert.AreEqual(stabilityPointStructuresResult, result.StabilityPointStructures); Assert.AreEqual(strengthStabilityLengthwiseResult, result.StrengthStabilityLengthwise); Assert.AreEqual(duneErosionResult, result.DuneErosion); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/CombinedFailureMechanismSectionAssemblyResultRowTest.cs =================================================================== diff -u -r3a6b8683163bfa83f5c62c1942d8e2e39316c888 -rf240aa827e5fb4876c0e80fe113f239ff7a2c589 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/CombinedFailureMechanismSectionAssemblyResultRowTest.cs (.../CombinedFailureMechanismSectionAssemblyResultRowTest.cs) (revision 3a6b8683163bfa83f5c62c1942d8e2e39316c888) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/CombinedFailureMechanismSectionAssemblyResultRowTest.cs (.../CombinedFailureMechanismSectionAssemblyResultRowTest.cs) (revision f240aa827e5fb4876c0e80fe113f239ff7a2c589) @@ -51,7 +51,7 @@ private const int grassCoverSlipOffInwardsIndex = 13; private const int heightStructuresIndex = 14; private const int closingStructuresIndex = 15; - private const int pipingStructuresIndex = 16; + private const int pipingStructureIndex = 16; private const int stabilityPointStructuresIndex = 17; private const int strengthStabilityLengthwiseIndex = 18; private const int duneErosionIndex = 19; @@ -96,7 +96,7 @@ DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnStateDefinition(columnStateDefinitions, grassCoverSlipOffInwardsIndex); DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnStateDefinition(columnStateDefinitions, heightStructuresIndex); DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnStateDefinition(columnStateDefinitions, closingStructuresIndex); - DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnStateDefinition(columnStateDefinitions, pipingStructuresIndex); + DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnStateDefinition(columnStateDefinitions, pipingStructureIndex); DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnStateDefinition(columnStateDefinitions, stabilityPointStructuresIndex); DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnStateDefinition(columnStateDefinitions, strengthStabilityLengthwiseIndex); DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnStateDefinition(columnStateDefinitions, duneErosionIndex); @@ -120,7 +120,7 @@ Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayname(result.GrassCoverSlipOffInwards), row.GrassCoverSlipOffInwards); Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayname(result.HeightStructures), row.HeightStructures); Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayname(result.ClosingStructures), row.ClosingStructures); - Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayname(result.PipingStructures), row.PipingStructures); + Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayname(result.PipingStructure), row.PipingStructure); Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayname(result.StabilityPointStructures), row.StabilityPointStructures); Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayname(result.StrengthStabilityLengthwise), row.StrengthStabilityLengthwise); Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayname(result.DuneErosion), row.DuneErosion); @@ -155,7 +155,7 @@ GrassCoverSlipOffInwards = categoryGroup, HeightStructures = categoryGroup, ClosingStructures = categoryGroup, - PipingStructures = categoryGroup, + PipingStructure = categoryGroup, StabilityPointStructures = categoryGroup, StrengthStabilityLengthwise = categoryGroup, DuneErosion = categoryGroup, @@ -182,7 +182,7 @@ DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnWithColorState(columnStateDefinitions[grassCoverSlipOffInwardsIndex], expectedBackgroundColor); DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnWithColorState(columnStateDefinitions[heightStructuresIndex], expectedBackgroundColor); DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnWithColorState(columnStateDefinitions[closingStructuresIndex], expectedBackgroundColor); - DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnWithColorState(columnStateDefinitions[pipingStructuresIndex], expectedBackgroundColor); + DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnWithColorState(columnStateDefinitions[pipingStructureIndex], expectedBackgroundColor); DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnWithColorState(columnStateDefinitions[stabilityPointStructuresIndex], expectedBackgroundColor); DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnWithColorState(columnStateDefinitions[strengthStabilityLengthwiseIndex], expectedBackgroundColor); DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnWithColorState(columnStateDefinitions[duneErosionIndex], expectedBackgroundColor); @@ -211,7 +211,7 @@ GrassCoverSlipOffInwards = random.NextEnumValue(), HeightStructures = random.NextEnumValue(), ClosingStructures = random.NextEnumValue(), - PipingStructures = random.NextEnumValue(), + PipingStructure = random.NextEnumValue(), StabilityPointStructures = random.NextEnumValue(), StrengthStabilityLengthwise = random.NextEnumValue(), DuneErosion = random.NextEnumValue(),