Index: Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/InitialFailureMechanismResultType.cs =================================================================== diff -u -r76e2aaa10e1b43d0f775e813cde45d921bf21728 -r14af64bfe51815d160aabc39d4d62ea381d7c2ab --- Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/InitialFailureMechanismResultType.cs (.../InitialFailureMechanismResultType.cs) (revision 76e2aaa10e1b43d0f775e813cde45d921bf21728) +++ Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/InitialFailureMechanismResultType.cs (.../InitialFailureMechanismResultType.cs) (revision 14af64bfe51815d160aabc39d4d62ea381d7c2ab) @@ -19,6 +19,9 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using Core.Common.Util.Attributes; +using Riskeer.Common.Data.Properties; + namespace Riskeer.Common.Data.FailureMechanism { /// @@ -29,16 +32,19 @@ /// /// Adopt the result from the failure mechanism. /// + [ResourcesDisplayName(typeof(Resources), nameof(Resources.InitialFailureMechanismResultType_Adopt_DisplayName))] Adopt = 1, /// /// Manually fill in the result. /// + [ResourcesDisplayName(typeof(Resources), nameof(Resources.InitialFailureMechanismResultType_Manual_DisplayName))] Manual = 2, /// /// There is no failure probability for this result. /// + [ResourcesDisplayName(typeof(Resources), nameof(Resources.InitialFailureMechanismResultType_NoFailureProbability_DisplayName))] NoFailureProbability = 3 } } \ No newline at end of file Index: Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/ProbabilityRefinementType.cs =================================================================== diff -u -r69b061440a6d3bb64d89f04702e85f0c502fb97e -r14af64bfe51815d160aabc39d4d62ea381d7c2ab --- Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/ProbabilityRefinementType.cs (.../ProbabilityRefinementType.cs) (revision 69b061440a6d3bb64d89f04702e85f0c502fb97e) +++ Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/ProbabilityRefinementType.cs (.../ProbabilityRefinementType.cs) (revision 14af64bfe51815d160aabc39d4d62ea381d7c2ab) @@ -19,6 +19,9 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using Core.Common.Util.Attributes; +using Riskeer.Common.Data.Properties; + namespace Riskeer.Common.Data.FailureMechanism { /// @@ -29,16 +32,19 @@ /// /// Refine the probability for the profile. /// + [ResourcesDisplayName(typeof(Resources), nameof(Resources.ProbabilityRefinementType_Profile_DisplayName))] Profile = 1, /// /// Refine the probability for the section. /// + [ResourcesDisplayName(typeof(Resources), nameof(Resources.ProbabilityRefinementType_Section_DisplayName))] Section = 2, /// /// Refine the probability for both the profile and the section. /// + [ResourcesDisplayName(typeof(Resources), nameof(Resources.ProbabilityRefinementType_Both_DisplayName))] Both = 3 } } \ No newline at end of file Index: Riskeer/Common/src/Riskeer.Common.Data/Properties/Resources.Designer.cs =================================================================== diff -u -r014bf7a149c2dd08c905ccb9e18b7f776659cd04 -r14af64bfe51815d160aabc39d4d62ea381d7c2ab --- Riskeer/Common/src/Riskeer.Common.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 014bf7a149c2dd08c905ccb9e18b7f776659cd04) +++ Riskeer/Common/src/Riskeer.Common.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 14af64bfe51815d160aabc39d4d62ea381d7c2ab) @@ -1,4 +1,4 @@ -// Copyright (C) Stichting Deltares 2021. All rights reserved. +// Copyright (C) Stichting Deltares 2021. All rights reserved. // // This file is part of Riskeer. // @@ -537,6 +537,33 @@ } /// + /// Looks up a localized string similar to Overnemen. + /// + public static string InitialFailureMechanismResultType_Adopt_DisplayName { + get { + return ResourceManager.GetString("InitialFailureMechanismResultType_Adopt_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Handmatig invullen. + /// + public static string InitialFailureMechanismResultType_Manual_DisplayName { + get { + return ResourceManager.GetString("InitialFailureMechanismResultType_Manual_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Geen faalkans. + /// + public static string InitialFailureMechanismResultType_NoFailureProbability_DisplayName { + get { + return ResourceManager.GetString("InitialFailureMechanismResultType_NoFailureProbability_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Gemiddelde moet groter zijn dan 0.. /// public static string LogNormalDistribution_Mean_must_be_greater_than_zero { @@ -701,6 +728,33 @@ } /// + /// Looks up a localized string similar to Beide. + /// + public static string ProbabilityRefinementType_Both_DisplayName { + get { + return ResourceManager.GetString("ProbabilityRefinementType_Both_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Per doorsnede. + /// + public static string ProbabilityRefinementType_Profile_DisplayName { + get { + return ResourceManager.GetString("ProbabilityRefinementType_Profile_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Per vak. + /// + public static string ProbabilityRefinementType_Section_DisplayName { + get { + return ResourceManager.GetString("ProbabilityRefinementType_Section_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to id. /// public static string ProfileCollection_UniqueFeature_id_FeatureDescription { Index: Riskeer/Common/src/Riskeer.Common.Data/Properties/Resources.resx =================================================================== diff -u -r014bf7a149c2dd08c905ccb9e18b7f776659cd04 -r14af64bfe51815d160aabc39d4d62ea381d7c2ab --- Riskeer/Common/src/Riskeer.Common.Data/Properties/Resources.resx (.../Resources.resx) (revision 014bf7a149c2dd08c905ccb9e18b7f776659cd04) +++ Riskeer/Common/src/Riskeer.Common.Data/Properties/Resources.resx (.../Resources.resx) (revision 14af64bfe51815d160aabc39d4d62ea381d7c2ab) @@ -393,4 +393,22 @@ De waarde van de doelkans moet groter zijn dan 0 en kleiner dan of gelijk aan 0,1. + + Overnemen + + + Handmatig invullen + + + Geen faalkans + + + Per doorsnede + + + Per vak + + + Beide + \ No newline at end of file Index: Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/InitialFailureMechanismResultTypeTest.cs =================================================================== diff -u -r76e2aaa10e1b43d0f775e813cde45d921bf21728 -r14af64bfe51815d160aabc39d4d62ea381d7c2ab --- Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/InitialFailureMechanismResultTypeTest.cs (.../InitialFailureMechanismResultTypeTest.cs) (revision 76e2aaa10e1b43d0f775e813cde45d921bf21728) +++ Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/InitialFailureMechanismResultTypeTest.cs (.../InitialFailureMechanismResultTypeTest.cs) (revision 14af64bfe51815d160aabc39d4d62ea381d7c2ab) @@ -27,7 +27,7 @@ namespace Riskeer.Common.Data.Test.FailureMechanism { [TestFixture] - public class InitialFailureMechanismResultTypeTest : EnumValuesTestFixture + public class InitialFailureMechanismResultTypeTest : EnumWithResourcesDisplayNameTestFixture { protected override IDictionary ExpectedValueForEnumValues => new Dictionary @@ -42,5 +42,19 @@ InitialFailureMechanismResultType.NoFailureProbability, 3 } }; + + protected override IDictionary ExpectedDisplayNameForEnumValues => + new Dictionary + { + { + InitialFailureMechanismResultType.Adopt, "Overnemen" + }, + { + InitialFailureMechanismResultType.Manual, "Handmatig invullen" + }, + { + InitialFailureMechanismResultType.NoFailureProbability, "Geen faalkans" + } + }; } } \ No newline at end of file Index: Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/ProbabilityRefinementTypeTest.cs =================================================================== diff -u -r69b061440a6d3bb64d89f04702e85f0c502fb97e -r14af64bfe51815d160aabc39d4d62ea381d7c2ab --- Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/ProbabilityRefinementTypeTest.cs (.../ProbabilityRefinementTypeTest.cs) (revision 69b061440a6d3bb64d89f04702e85f0c502fb97e) +++ Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/ProbabilityRefinementTypeTest.cs (.../ProbabilityRefinementTypeTest.cs) (revision 14af64bfe51815d160aabc39d4d62ea381d7c2ab) @@ -27,7 +27,7 @@ namespace Riskeer.Common.Data.Test.FailureMechanism { [TestFixture] - public class ProbabilityRefinementTypeTest : EnumValuesTestFixture + public class ProbabilityRefinementTypeTest : EnumWithResourcesDisplayNameTestFixture { protected override IDictionary ExpectedValueForEnumValues => new Dictionary @@ -42,5 +42,19 @@ ProbabilityRefinementType.Both, 3 } }; + + protected override IDictionary ExpectedDisplayNameForEnumValues => + new Dictionary + { + { + ProbabilityRefinementType.Profile, "Per doorsnede" + }, + { + ProbabilityRefinementType.Section, "Per vak" + }, + { + ProbabilityRefinementType.Both, "Beide" + } + }; } } \ No newline at end of file