Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r9dbf7bccb39f8f0516c34a816cdec5ad669d440f -re202c7be2e90175b21eaca4e7f04e8d56260603f
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9dbf7bccb39f8f0516c34a816cdec5ad669d440f)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision e202c7be2e90175b21eaca4e7f04e8d56260603f)
@@ -119,6 +119,33 @@
}
///
+ /// Looks up a localized string similar to Kilometrering tot [km].
+ ///
+ public static string AssemblyResultPerSectionView_GridColumn_SectionEnd {
+ get {
+ return ResourceManager.GetString("AssemblyResultPerSectionView_GridColumn_SectionEnd", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Kilometrering van [km].
+ ///
+ public static string AssemblyResultPerSectionView_GridColumn_SectionStart {
+ get {
+ return ResourceManager.GetString("AssemblyResultPerSectionView_GridColumn_SectionStart", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Totaal vakoordeel.
+ ///
+ public static string AssemblyResultPerSectionView_GridColumn_SectionTotalAssembly {
+ get {
+ return ResourceManager.GetString("AssemblyResultPerSectionView_GridColumn_SectionTotalAssembly", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Assemblageresultaat verversen.
///
public static string AssemblyResultTotalView_AssemblyResultTotalView_RefreshAssemblyResultsButton_Text {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx
===================================================================
diff -u -r9dbf7bccb39f8f0516c34a816cdec5ad669d440f -re202c7be2e90175b21eaca4e7f04e8d56260603f
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision 9dbf7bccb39f8f0516c34a816cdec5ad669d440f)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision e202c7be2e90175b21eaca4e7f04e8d56260603f)
@@ -384,4 +384,13 @@
Assemblageresultaat verversen
+
+ Kilometrering van [km]
+
+
+ Kilometrering tot [km]
+
+
+ Totaal vakoordeel
+
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultPerSectionView.cs
===================================================================
diff -u -rf70dad096ba08f8840ede4d9c6190c01e6032005 -re202c7be2e90175b21eaca4e7f04e8d56260603f
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultPerSectionView.cs (.../AssemblyResultPerSectionView.cs) (revision f70dad096ba08f8840ede4d9c6190c01e6032005)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultPerSectionView.cs (.../AssemblyResultPerSectionView.cs) (revision e202c7be2e90175b21eaca4e7f04e8d56260603f)
@@ -24,6 +24,17 @@
using Core.Common.Controls.Views;
using Ringtoets.Integration.Data;
using Ringtoets.Integration.Forms.Properties;
+using PipingDataResources = Ringtoets.Piping.Data.Properties.Resources;
+using GrassCoverErosionInwardsDataResources = Ringtoets.GrassCoverErosionInwards.Data.Properties.Resources;
+using MacroStabilityInwardsDataResources = Ringtoets.MacroStabilityInwards.Data.Properties.Resources;
+using IntegrationDataResources = Ringtoets.Integration.Data.Properties.Resources;
+using StabilityStoneCoverDataResources = Ringtoets.StabilityStoneCover.Data.Properties.Resources;
+using WaveImpactAsphaltCoverDataResources = Ringtoets.WaveImpactAsphaltCover.Data.Properties.Resources;
+using GrassCoverErosionOutwardsDataResources = Ringtoets.GrassCoverErosionOutwards.Data.Properties.Resources;
+using HeightStructuresDataResources = Ringtoets.HeightStructures.Data.Properties.Resources;
+using ClosingStructuresDataResources = Ringtoets.ClosingStructures.Data.Properties.Resources;
+using StabilityPointStructuresDataResources = Ringtoets.StabilityPointStructures.Data.Properties.Resources;
+using DuneErosionDataResources = Ringtoets.DuneErosion.Data.Properties.Resources;
namespace Ringtoets.Integration.Forms.Views
{
@@ -62,13 +73,81 @@
base.OnLoad(e);
LocalizeControl();
+ InitializeDataGridView();
}
private void LocalizeControl()
{
RefreshAssemblyResultsButton.Text = Resources.AssemblyResultTotalView_RefreshAssemblyResultsButton_Text;
}
+ private void InitializeDataGridView()
+ {
+ dataGridViewControl.AddTextBoxColumn("StartPoint",
+ Resources.AssemblyResultPerSectionView_GridColumn_SectionStart,
+ true);
+ dataGridViewControl.AddTextBoxColumn("EndPoint",
+ Resources.AssemblyResultPerSectionView_GridColumn_SectionEnd,
+ true);
+ dataGridViewControl.AddTextBoxColumn("TotalAssembly",
+ Resources.AssemblyResultPerSectionView_GridColumn_SectionTotalAssembly,
+ true);
+ dataGridViewControl.AddTextBoxColumn("Piping",
+ PipingDataResources.PipingFailureMechanism_DisplayCode,
+ true);
+ dataGridViewControl.AddTextBoxColumn("GrassCoverErosionInwards",
+ GrassCoverErosionInwardsDataResources.GrassCoverErosionInwardsFailureMechanism_DisplayCode,
+ true);
+ dataGridViewControl.AddTextBoxColumn("MacroStabilityInwards",
+ MacroStabilityInwardsDataResources.MacroStabilityInwardsFailureMechanism_Code,
+ true);
+ dataGridViewControl.AddTextBoxColumn("MacroStabilityOutwards",
+ IntegrationDataResources.MacroStabilityOutwardsFailureMechanism_Code,
+ true);
+ dataGridViewControl.AddTextBoxColumn("MicroStability",
+ IntegrationDataResources.MicrostabilityFailureMechanism_Code,
+ true);
+ dataGridViewControl.AddTextBoxColumn("StabilityStoneCover",
+ StabilityStoneCoverDataResources.StabilityStoneCoverFailureMechanism_Code,
+ true);
+ dataGridViewControl.AddTextBoxColumn("WaveImpactAsphaltCover",
+ WaveImpactAsphaltCoverDataResources.WaveImpactAsphaltCoverFailureMechanism_Code,
+ true);
+ dataGridViewControl.AddTextBoxColumn("WaterPressureAsphaltCover",
+ IntegrationDataResources.WaterPressureAsphaltCoverFailureMechanism_Code,
+ true);
+ dataGridViewControl.AddTextBoxColumn("GrassCoverErosionOutwards",
+ GrassCoverErosionOutwardsDataResources.GrassCoverErosionOutwardsFailureMechanism_Code,
+ true);
+ dataGridViewControl.AddTextBoxColumn("GrassCoverSlipOffOutwards",
+ IntegrationDataResources.GrassCoverSlipOffOutwardsFailureMechanism_Code,
+ true);
+ dataGridViewControl.AddTextBoxColumn("GrassCoverSlipOffInwards",
+ IntegrationDataResources.GrassCoverSlipOffInwardsFailureMechanism_Code,
+ true);
+ dataGridViewControl.AddTextBoxColumn("HeightStructures",
+ HeightStructuresDataResources.HeightStructuresFailureMechanism_Code,
+ true);
+ dataGridViewControl.AddTextBoxColumn("ClosingStructures",
+ ClosingStructuresDataResources.ClosingStructuresFailureMechanism_Code,
+ true);
+ dataGridViewControl.AddTextBoxColumn("PipingStructures",
+ IntegrationDataResources.PipingStructureFailureMechanism_Code,
+ true);
+ dataGridViewControl.AddTextBoxColumn("StabilityPointStructures",
+ StabilityPointStructuresDataResources.StabilityPointStructuresFailureMechanism_Code,
+ true);
+ dataGridViewControl.AddTextBoxColumn("StrengthStabilityLengthwise",
+ IntegrationDataResources.StrengthStabilityLengthwiseConstructionFailureMechanism_Code,
+ true);
+ dataGridViewControl.AddTextBoxColumn("DuneErosion",
+ DuneErosionDataResources.DuneErosionFailureMechanism_Code,
+ true);
+ dataGridViewControl.AddTextBoxColumn("TechnicalInnovation",
+ IntegrationDataResources.TechnicalInnovationFailureMechanism_Code,
+ true);
+ }
+
private void RefreshAssemblyResults_Click(object sender, EventArgs e) {}
}
}
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssemblyResultPerSectionViewTest.cs
===================================================================
diff -u -rf70dad096ba08f8840ede4d9c6190c01e6032005 -re202c7be2e90175b21eaca4e7f04e8d56260603f
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssemblyResultPerSectionViewTest.cs (.../AssemblyResultPerSectionViewTest.cs) (revision f70dad096ba08f8840ede4d9c6190c01e6032005)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssemblyResultPerSectionViewTest.cs (.../AssemblyResultPerSectionViewTest.cs) (revision e202c7be2e90175b21eaca4e7f04e8d56260603f)
@@ -34,6 +34,29 @@
[TestFixture]
public class AssemblyResultPerSectionViewTest
{
+ private const int sectionStartColumnIndex = 0;
+ private const int sectionEndColumnIndex = 1;
+ private const int sectionTotalAssemblyResultColumnIndex = 2;
+ private const int pipingColumnIndex = 3;
+ private const int grassCoverErosionInwardsColumnIndex = 4;
+ private const int macroStabilityInwardsColumnIndex = 5;
+ private const int macroStabilityOutwardsColumnIndex = 6;
+ private const int microStabilityColumnIndex = 7;
+ private const int stabilityStoneCoverColumnIndex = 8;
+ private const int waveImpactAsphaltCoverColumnIndex = 9;
+ private const int waterPressureAsphaltCoverColumnIndex = 10;
+ private const int grassCoverErosionOutwardsColumnIndex = 11;
+ private const int grassCoverSlipOffOutwardsColumnIndex = 12;
+ private const int grassCoverSlipOffInwardsColumnIndex = 13;
+ private const int heightStructuresColumnIndex = 14;
+ private const int closingStructures = 15;
+ private const int pipingStructures = 16;
+ private const int stabilityPointStructuresColumnIndex = 17;
+ private const int strengthStabilityLengthwiseColumnIndex = 18;
+ private const int duneErosionColumnIndex = 19;
+ private const int technicalInnovationColumnIndex = 20;
+ private const int expectedColumnCount = 21;
+
private Form testForm;
[SetUp]
@@ -67,8 +90,11 @@
var assessmentSection = new AssessmentSection(random.NextEnumValue());
// Call
- using (AssemblyResultPerSectionView view = ShowAssemblyResultPerSectionView(assessmentSection))
+ using (var view = new AssemblyResultPerSectionView(assessmentSection))
{
+ testForm.Controls.Add(view);
+ testForm.Show();
+
// Assert
Assert.AreEqual(2, view.Controls.Count);
@@ -83,8 +109,54 @@
}
}
- private AssemblyResultPerSectionView ShowAssemblyResultPerSectionView(AssessmentSection assessmentSection)
+ [Test]
+ public void GivenWithAssemblyResultTotalView_ThenExpectedColumnsAreVisible()
{
+ // Given
+ using (ShowAssemblyResultPerSectionView())
+ {
+ // Then
+ var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+ Assert.AreEqual(expectedColumnCount, dataGridView.ColumnCount);
+
+ DataGridViewColumnCollection dataGridViewColumns = dataGridView.Columns;
+
+ AssertColumn(dataGridViewColumns[sectionStartColumnIndex], "Kilometrering van [km]");
+ AssertColumn(dataGridViewColumns[sectionEndColumnIndex], "Kilometrering tot [km]");
+ AssertColumn(dataGridViewColumns[sectionTotalAssemblyResultColumnIndex], "Totaal vakoordeel");
+ AssertColumn(dataGridViewColumns[pipingColumnIndex], "STPH");
+ AssertColumn(dataGridViewColumns[grassCoverErosionInwardsColumnIndex], "GEKB");
+ AssertColumn(dataGridViewColumns[macroStabilityInwardsColumnIndex], "STBI");
+ AssertColumn(dataGridViewColumns[macroStabilityOutwardsColumnIndex], "STBU");
+ AssertColumn(dataGridViewColumns[microStabilityColumnIndex], "STMI");
+ AssertColumn(dataGridViewColumns[stabilityStoneCoverColumnIndex], "ZST");
+ AssertColumn(dataGridViewColumns[waveImpactAsphaltCoverColumnIndex], "AGK");
+ AssertColumn(dataGridViewColumns[waterPressureAsphaltCoverColumnIndex], "AWO");
+ AssertColumn(dataGridViewColumns[grassCoverErosionOutwardsColumnIndex], "GEBU");
+ AssertColumn(dataGridViewColumns[grassCoverSlipOffOutwardsColumnIndex], "GABU");
+ AssertColumn(dataGridViewColumns[grassCoverSlipOffInwardsColumnIndex], "GABI");
+ AssertColumn(dataGridViewColumns[heightStructuresColumnIndex], "HTKW");
+ AssertColumn(dataGridViewColumns[closingStructures], "BSKW");
+ AssertColumn(dataGridViewColumns[pipingStructures], "PKW");
+ AssertColumn(dataGridViewColumns[stabilityPointStructuresColumnIndex], "STKWp");
+ AssertColumn(dataGridViewColumns[strengthStabilityLengthwiseColumnIndex], "STKWl");
+ AssertColumn(dataGridViewColumns[duneErosionColumnIndex], "DA");
+ AssertColumn(dataGridViewColumns[technicalInnovationColumnIndex], "INN");
+ }
+ }
+
+ private static void AssertColumn(DataGridViewColumn column, string headerText)
+ {
+ Assert.IsInstanceOf(column);
+ Assert.AreEqual(headerText, column.HeaderText);
+ Assert.IsTrue(column.ReadOnly);
+ }
+
+ private AssemblyResultPerSectionView ShowAssemblyResultPerSectionView()
+ {
+ var random = new Random(21);
+ var assessmentSection = new AssessmentSection(random.NextEnumValue());
+
var view = new AssemblyResultPerSectionView(assessmentSection);
testForm.Controls.Add(view);
testForm.Show();