Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rffa34dc6feb3d5fdf246cb89f7e1c11990ccc960 -r860b842af2e04fa5ac9ceebd65dfbd8df7524c98
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision ffa34dc6feb3d5fdf246cb89f7e1c11990ccc960)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 860b842af2e04fa5ac9ceebd65dfbd8df7524c98)
@@ -453,7 +453,7 @@
}
///
- /// Looks up a localized string similar to Norm: 1 / {0}.
+ /// Looks up a localized string similar to Norm van het dijktraject: 1 / {0}.
///
public static string FailureMechanismContributionView_ReturnPeriodLabelText_Norm_is_one_over_ReturnPeriod_0_ {
get {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx
===================================================================
diff -u -rffa34dc6feb3d5fdf246cb89f7e1c11990ccc960 -r860b842af2e04fa5ac9ceebd65dfbd8df7524c98
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision ffa34dc6feb3d5fdf246cb89f7e1c11990ccc960)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision 860b842af2e04fa5ac9ceebd65dfbd8df7524c98)
@@ -280,7 +280,7 @@
De waarde voor de 'Norm (terugkeertijd)' moet in het bereik {0} liggen.
- Norm: 1 / {0}
+ Norm van het dijktraject: 1 / {0}
Trajecttype: {0}
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/ReferenceLineMetaSelectionDialog.resx
===================================================================
diff -u -rfc7a0f6e6581cc39c639713b1f2cb91a81500296 -r860b842af2e04fa5ac9ceebd65dfbd8df7524c98
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/ReferenceLineMetaSelectionDialog.resx (.../ReferenceLineMetaSelectionDialog.resx) (revision fc7a0f6e6581cc39c639713b1f2cb91a81500296)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/ReferenceLineMetaSelectionDialog.resx (.../ReferenceLineMetaSelectionDialog.resx) (revision 860b842af2e04fa5ac9ceebd65dfbd8df7524c98)
@@ -325,7 +325,7 @@
4
- Kies een normwaarde:
+ Kies de norm van het dijktraject:
groupBox1
@@ -369,9 +369,9 @@
<?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="SelectAssessmentSectionLabel" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="ReferenceLineMetaDataGridViewControl" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="groupBox1" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="flowLayoutPanel1" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100" /><Rows Styles="AutoSize,0,Percent,100,AutoSize,0,AutoSize,0" /></TableLayoutSettings>
-
+
True
-
+
6, 13
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.resx
===================================================================
diff -u -r68afc861805d7a9c281cc8fb42f4f85b8be61367 -r860b842af2e04fa5ac9ceebd65dfbd8df7524c98
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.resx (.../FailureMechanismContributionView.resx) (revision 68afc861805d7a9c281cc8fb42f4f85b8be61367)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.resx (.../FailureMechanismContributionView.resx) (revision 860b842af2e04fa5ac9ceebd65dfbd8df7524c98)
@@ -136,7 +136,7 @@
10
- Norm: 1 / jaar
+ Norm van het dijktraject: 1 / jaar
returnPeriodLabel
@@ -229,17 +229,17 @@
probabilityDistributionGrid
- Core.Common.Controls.DataGrid.DataGridViewControl, Core.Common.Controls, Version=16.4.1.7305, Culture=neutral, PublicKeyToken=null
+ Core.Common.Controls.DataGrid.DataGridViewControl, Core.Common.Controls, Version=17.2.1.11030, Culture=neutral, PublicKeyToken=null
$this
0
-
+
True
-
+
750, 420
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs
===================================================================
diff -u -r2c06b27dabc83beee23288eb5c6268847afa0a19 -r860b842af2e04fa5ac9ceebd65dfbd8df7524c98
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs (.../FailureMechanismContributionViewTest.cs) (revision 2c06b27dabc83beee23288eb5c6268847afa0a19)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs (.../FailureMechanismContributionViewTest.cs) (revision 860b842af2e04fa5ac9ceebd65dfbd8df7524c98)
@@ -137,7 +137,7 @@
var returnPeriodLabel = new ControlTester(returnPeriodLabelName);
int returnPeriod = Convert.ToInt32(1.0 / failureMechanismContribution.Norm);
- string expectedReturnPeriodLabel = $"Norm: 1 / {returnPeriod.ToString(CultureInfo.CurrentCulture)}";
+ string expectedReturnPeriodLabel = $"Norm van het dijktraject: 1 / {returnPeriod.ToString(CultureInfo.CurrentCulture)}";
Assert.AreEqual(expectedReturnPeriodLabel, returnPeriodLabel.Properties.Text);
}
mocks.VerifyAll();
@@ -272,15 +272,15 @@
var returnPeriodLabel = new ControlTester(returnPeriodLabelName);
// Precondition
- string initialReturnPeriodLabelText = $"Norm: 1 / {initialReturnPeriod.ToString(CultureInfo.CurrentCulture)}";
+ string initialReturnPeriodLabelText = $"Norm van het dijktraject: 1 / {initialReturnPeriod.ToString(CultureInfo.CurrentCulture)}";
Assert.AreEqual(initialReturnPeriodLabelText, returnPeriodLabel.Properties.Text);
// Call
distributionView.Data = newContribution;
distributionView.AssessmentSection = assessmentSection2;
// Assert
- string newReturnPeriodLabelText = $"Norm: 1 / {newReturnPeriod.ToString(CultureInfo.CurrentCulture)}";
+ string newReturnPeriodLabelText = $"Norm van het dijktraject: 1 / {newReturnPeriod.ToString(CultureInfo.CurrentCulture)}";
Assert.AreEqual(newReturnPeriodLabelText, returnPeriodLabel.Properties.Text);
}
@@ -320,15 +320,15 @@
var returnPeriodLabel = new ControlTester(returnPeriodLabelName);
// Precondition
- string initialReturnPeriodLabelText = $"Norm: 1 / {initialReturnPeriod.ToString(CultureInfo.CurrentCulture)}";
+ string initialReturnPeriodLabelText = $"Norm van het dijktraject: 1 / {initialReturnPeriod.ToString(CultureInfo.CurrentCulture)}";
Assert.AreEqual(initialReturnPeriodLabelText, returnPeriodLabel.Properties.Text);
// Call
contribution.LowerLimitNorm = 1.0 / newReturnPeriod;
contribution.NotifyObservers();
// Assert
- string newReturnPeriodLabelText = $"Norm: 1 / {newReturnPeriod.ToString(CultureInfo.CurrentCulture)}";
+ string newReturnPeriodLabelText = $"Norm van het dijktraject: 1 / {newReturnPeriod.ToString(CultureInfo.CurrentCulture)}";
Assert.AreEqual(newReturnPeriodLabelText, returnPeriodLabel.Properties.Text);
}