Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rc94701528c392fbac4fbf2bb2e2c0641735318fa -r783cff34ad1121a4898d0e9c1928d7397539f97d
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c94701528c392fbac4fbf2bb2e2c0641735318fa)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 783cff34ad1121a4898d0e9c1928d7397539f97d)
@@ -101,6 +101,15 @@
}
///
+ /// Looks up a localized string similar to Categoriegrenzen voor de gecombineerde toetssporen 1 en 2.
+ ///
+ public static string AssemblyResultCategories_DisplayName {
+ get {
+ return ResourceManager.GetString("AssemblyResultCategories_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Gecombineerd vakoordeel.
///
public static string AssemblyResultPerSection_DisplayName {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx
===================================================================
diff -u -rc94701528c392fbac4fbf2bb2e2c0641735318fa -r783cff34ad1121a4898d0e9c1928d7397539f97d
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision c94701528c392fbac4fbf2bb2e2c0641735318fa)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision 783cff34ad1121a4898d0e9c1928d7397539f97d)
@@ -388,4 +388,7 @@
Gecombineerde faalkansruimte
+
+ Categoriegrenzen voor de gecombineerde toetssporen 1 en 2
+
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj
===================================================================
diff -u -re165cd0a0f0be54799bd4657d83d255acb10c962 -r783cff34ad1121a4898d0e9c1928d7397539f97d
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj (.../Ringtoets.Integration.Forms.csproj) (revision e165cd0a0f0be54799bd4657d83d255acb10c962)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj (.../Ringtoets.Integration.Forms.csproj) (revision 783cff34ad1121a4898d0e9c1928d7397539f97d)
@@ -1,4 +1,4 @@
-
+
{AD0CDC89-0A00-4068-AEEC-9838863C2FE8}
@@ -327,6 +327,9 @@
ReferenceLineMetaSelectionDialog.cs
Designer
+
+ AssemblyResultCategoriesView.cs
+
AssemblyResultPerSectionView.cs
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultCategoriesView.Designer.cs
===================================================================
diff -u -re165cd0a0f0be54799bd4657d83d255acb10c962 -r783cff34ad1121a4898d0e9c1928d7397539f97d
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultCategoriesView.Designer.cs (.../AssemblyResultCategoriesView.Designer.cs) (revision e165cd0a0f0be54799bd4657d83d255acb10c962)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultCategoriesView.Designer.cs (.../AssemblyResultCategoriesView.Designer.cs) (revision 783cff34ad1121a4898d0e9c1928d7397539f97d)
@@ -19,6 +19,8 @@
// Stichting Deltares and remain full property of Stichting Deltares at all times.
// All rights reserved.
+using Ringtoets.AssemblyTool.Data;
+
namespace Ringtoets.Integration.Forms.Views
{
partial class AssemblyResultCategoriesView
@@ -49,10 +51,56 @@
///
private void InitializeComponent()
{
- components = new System.ComponentModel.Container();
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.assemblyCategoriesTable = new Ringtoets.Integration.Forms.Views.AssemblyCategoriesTable();
+ this.groupBoxPanel = new System.Windows.Forms.Panel();
+ this.groupBoxPanel.SuspendLayout();
+ this.groupBox = new System.Windows.Forms.GroupBox();
+ this.groupBox.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // failureMechanismAssemblyCategoriesTable
+ //
+ this.assemblyCategoriesTable.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.assemblyCategoriesTable.MultiSelect = true;
+ this.assemblyCategoriesTable.Name = "assemblyCategoriesTable";
+ this.assemblyCategoriesTable.Padding = new System.Windows.Forms.Padding(5);
+ this.assemblyCategoriesTable.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.RowHeaderSelect;
+ //
+ // groupBoxPanel
+ //
+ this.groupBoxPanel.Controls.Add(this.groupBox);
+ this.groupBoxPanel.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.groupBoxPanel.Name = "groupBoxPanel";
+ this.groupBoxPanel.Padding = new System.Windows.Forms.Padding(3);
+ //
+ // groupBox
+ //
+ this.groupBox.Controls.Add(assemblyCategoriesTable);
+ this.groupBox.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.groupBox.Location = new System.Drawing.Point(0, 0);
+ this.groupBox.Margin = new System.Windows.Forms.Padding(5);
+ this.groupBox.Name = "groupBox";
+ this.groupBox.Size = new System.Drawing.Size(150, 150);
+ this.groupBox.TabIndex = 0;
+ this.groupBox.TabStop = false;
+ this.groupBox.Text = global::Ringtoets.Integration.Forms.Properties.Resources.AssemblyResultCategories_DisplayName;
+ //
+ // AssemblyResultCategoriesView
+ //
+ this.Name = "AssemblyResultCategoriesView";
+ this.Controls.Add(this.groupBoxPanel);
+ this.Size = new System.Drawing.Size(750, 420);
+ this.AutoScrollMinSize = new System.Drawing.Size(400, 100);
+ this.groupBoxPanel.ResumeLayout(false);
+ this.groupBox.ResumeLayout(false);
+ this.ResumeLayout(false);
+
}
#endregion
+
+ private Ringtoets.Integration.Forms.Views.AssemblyCategoriesTable assemblyCategoriesTable;
+ private System.Windows.Forms.GroupBox groupBox;
+ private System.Windows.Forms.Panel groupBoxPanel;
}
}
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultCategoriesView.resx
===================================================================
diff -u
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultCategoriesView.resx (revision 0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultCategoriesView.resx (revision 783cff34ad1121a4898d0e9c1928d7397539f97d)
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssemblyResultCategoriesViewTest.cs
===================================================================
diff -u -r4f29c5e0442b0ab7f72ec2d3fd40759d33c77aea -r783cff34ad1121a4898d0e9c1928d7397539f97d
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssemblyResultCategoriesViewTest.cs (.../AssemblyResultCategoriesViewTest.cs) (revision 4f29c5e0442b0ab7f72ec2d3fd40759d33c77aea)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssemblyResultCategoriesViewTest.cs (.../AssemblyResultCategoriesViewTest.cs) (revision 783cff34ad1121a4898d0e9c1928d7397539f97d)
@@ -20,10 +20,13 @@
// All rights reserved.
using System;
+using System.Linq;
using System.Windows.Forms;
using Core.Common.Controls.Views;
using NUnit.Framework;
+using Ringtoets.AssemblyTool.Data;
using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Forms.TestUtil;
using Ringtoets.Integration.Data;
using Ringtoets.Integration.Forms.Views;
@@ -68,7 +71,28 @@
Assert.IsInstanceOf(view);
Assert.IsNull(view.Data);
Assert.AreSame(assessmentSection, view.AssessmentSection);
+
+ Assert.AreEqual(1, view.Controls.Count);
+
+ Panel groupBoxPanel = ControlTestHelper.GetControls(view, "groupBoxPanel").Single();
+ Assert.AreEqual(1, groupBoxPanel.Controls.Count);
+ Assert.AreEqual(DockStyle.Fill, groupBoxPanel.Dock);
+
+ GroupBox groupBox = ControlTestHelper.GetControls(groupBoxPanel, "groupBox").Single();
+ Assert.AreEqual(1, groupBox.Controls.Count);
+ Assert.AreEqual(DockStyle.Fill, groupBox.Dock);
+ Assert.AreEqual("Categoriegrenzen voor de gecombineerde toetssporen 1 en 2", groupBox.Text);
+
+ AssemblyCategoriesTable failureMechanismSectionCategoriesTable = GetFailureMechanismSectionCategoriesTable(view);
+ Assert.AreEqual(DockStyle.Fill, failureMechanismSectionCategoriesTable.Dock);
}
}
+
+ private static AssemblyCategoriesTable GetFailureMechanismSectionCategoriesTable(
+ AssemblyResultCategoriesView view)
+ {
+ return ControlTestHelper.GetControls>(
+ view, "assemblyCategoriesTable").Single();
+ }
}
}
\ No newline at end of file