Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Data/AssessmentSectionCategoryType.cs
===================================================================
diff -u -r2df335baa367fa7461bb95e898be6c8adc87d9a0 -r7f19a7a0a567621b19d20c888df142781ff702e1
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Data/AssessmentSectionCategoryType.cs (.../AssessmentSectionCategoryType.cs) (revision 2df335baa367fa7461bb95e898be6c8adc87d9a0)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Data/AssessmentSectionCategoryType.cs (.../AssessmentSectionCategoryType.cs) (revision 7f19a7a0a567621b19d20c888df142781ff702e1)
@@ -19,16 +19,26 @@
// Stichting Deltares and remain full property of Stichting Deltares at all times.
// All rights reserved.
+using Core.Common.Util.Attributes;
+using Ringtoets.Revetment.Data.Properties;
+
namespace Ringtoets.Revetment.Data
{
///
/// Enumeration that defines the possible assessment section categories.
///
public enum AssessmentSectionCategoryType
{
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionCategoryType_FactorizedSignalingNorm_DisplayName))]
FactorizedSignalingNorm,
+
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionCategoryType_SignalingNorm_DisplayName))]
SignalingNorm,
+
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionCategoryType_LowerLimitNorm_DisplayName))]
LowerLimitNorm,
+
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionCategoryType_FactorizedLowerLimitNorm_DisplayName))]
FactorizedLowerLimitNorm
}
}
\ No newline at end of file
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -r0ee0d86b58275264171be7f91afa87b7edd0d67a -r7f19a7a0a567621b19d20c888df142781ff702e1
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 0ee0d86b58275264171be7f91afa87b7edd0d67a)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 7f19a7a0a567621b19d20c888df142781ff702e1)
@@ -40,7 +40,7 @@
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
@@ -82,6 +82,42 @@
}
///
+ /// Looks up a localized string similar to C->D.
+ ///
+ internal static string AssessmentSectionCategoryType_FactorizedLowerLimitNorm_DisplayName {
+ get {
+ return ResourceManager.GetString("AssessmentSectionCategoryType_FactorizedLowerLimitNorm_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to A+->A.
+ ///
+ internal static string AssessmentSectionCategoryType_FactorizedSignalingNorm_DisplayName {
+ get {
+ return ResourceManager.GetString("AssessmentSectionCategoryType_FactorizedSignalingNorm_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to B->C.
+ ///
+ internal static string AssessmentSectionCategoryType_LowerLimitNorm_DisplayName {
+ get {
+ return ResourceManager.GetString("AssessmentSectionCategoryType_LowerLimitNorm_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to A->B.
+ ///
+ internal static string AssessmentSectionCategoryType_SignalingNorm_DisplayName {
+ get {
+ return ResourceManager.GetString("AssessmentSectionCategoryType_SignalingNorm_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to De bovengrens van de bekleding moet boven de ondergrens liggen..
///
internal static string WaveConditionsInput_ValidateRevetmentBoundaries_Upper_boundary_revetment_must_be_above_lower_boundary_revetment {
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Data/Properties/Resources.resx
===================================================================
diff -u -rbc2c76801e4edf104a1c5c17e5c8421f0f57e787 -r7f19a7a0a567621b19d20c888df142781ff702e1
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Data/Properties/Resources.resx (.../Resources.resx) (revision bc2c76801e4edf104a1c5c17e5c8421f0f57e787)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Data/Properties/Resources.resx (.../Resources.resx) (revision 7f19a7a0a567621b19d20c888df142781ff702e1)
@@ -132,4 +132,16 @@
2.0
+
+ C->D
+
+
+ A+->A
+
+
+ B->C
+
+
+ A->B
+
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/AssessmentSectionCategoryTypeTest.cs
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/AssessmentSectionCategoryTypeTest.cs (revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/AssessmentSectionCategoryTypeTest.cs (revision 7f19a7a0a567621b19d20c888df142781ff702e1)
@@ -0,0 +1,75 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+
+namespace Ringtoets.Revetment.Data.Test
+{
+ [TestFixture]
+ public class AssessmentSectionCategoryTypeTest : EnumWithDisplayNameTestFixture
+ {
+ protected override IDictionary ExpectedDisplayNameForEnumValues
+ {
+ get
+ {
+ return new Dictionary
+ {
+ {
+ AssessmentSectionCategoryType.FactorizedSignalingNorm, "A+->A"
+ },
+ {
+ AssessmentSectionCategoryType.SignalingNorm, "A->B"
+ },
+ {
+ AssessmentSectionCategoryType.LowerLimitNorm, "B->C"
+ },
+ {
+ AssessmentSectionCategoryType.FactorizedLowerLimitNorm, "C->D"
+ }
+ };
+ }
+ }
+
+ protected override IDictionary ExpectedValueForEnumValues
+ {
+ get
+ {
+ return new Dictionary
+ {
+ {
+ AssessmentSectionCategoryType.FactorizedSignalingNorm, 0
+ },
+ {
+ AssessmentSectionCategoryType.SignalingNorm, 1
+ },
+ {
+ AssessmentSectionCategoryType.LowerLimitNorm, 2
+ },
+ {
+ AssessmentSectionCategoryType.FactorizedLowerLimitNorm, 3
+ }
+ };
+ }
+ }
+ }
+}
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/Ringtoets.Revetment.Data.Test.csproj
===================================================================
diff -u -rf1e46aae678da8909452232be444b168589be84c -r7f19a7a0a567621b19d20c888df142781ff702e1
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/Ringtoets.Revetment.Data.Test.csproj (.../Ringtoets.Revetment.Data.Test.csproj) (revision f1e46aae678da8909452232be444b168589be84c)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/Ringtoets.Revetment.Data.Test.csproj (.../Ringtoets.Revetment.Data.Test.csproj) (revision 7f19a7a0a567621b19d20c888df142781ff702e1)
@@ -15,6 +15,7 @@
+