Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.Designer.cs =================================================================== diff -u -rdbd81739c2ff026064cef6d9bda568d1f88e4df7 -reede17a57fa09638695df2321d547f290adbba4b --- Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision dbd81739c2ff026064cef6d9bda568d1f88e4df7) +++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision eede17a57fa09638695df2321d547f290adbba4b) @@ -70,6 +70,15 @@ } /// + /// Looks up a localized string similar to Traject {0}. + /// + public static string AssessmentSection_Id_0 { + get { + return ResourceManager.GetString("AssessmentSection_Id_0", resourceCulture); + } + } + + /// /// Looks up a localized string similar to BSKW. /// public static string ClosingStructureFailureMechanism_Code { Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.resx =================================================================== diff -u -rdbd81739c2ff026064cef6d9bda568d1f88e4df7 -reede17a57fa09638695df2321d547f290adbba4b --- Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.resx (.../Resources.resx) (revision dbd81739c2ff026064cef6d9bda568d1f88e4df7) +++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.resx (.../Resources.resx) (revision eede17a57fa09638695df2321d547f290adbba4b) @@ -216,4 +216,7 @@ Dijken en dammen - Wateroverdruk bij asfaltbekleding + + Traject {0} + \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Commands/AssessmentSectionFromFileCommandHandler.cs =================================================================== diff -u -r04b3bf69b0bba824416ecf11bd8e5b0200779736 -reede17a57fa09638695df2321d547f290adbba4b --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Commands/AssessmentSectionFromFileCommandHandler.cs (.../AssessmentSectionFromFileCommandHandler.cs) (revision 04b3bf69b0bba824416ecf11bd8e5b0200779736) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Commands/AssessmentSectionFromFileCommandHandler.cs (.../AssessmentSectionFromFileCommandHandler.cs) (revision eede17a57fa09638695df2321d547f290adbba4b) @@ -32,6 +32,7 @@ using Ringtoets.Common.IO; using Ringtoets.Common.IO.Exceptions; using Ringtoets.Integration.Data; +using IntegrationResources = Ringtoets.Integration.Data.Properties.Resources; using Ringtoets.Integration.Forms.Properties; using BaseResources = Core.Common.Base.Properties.Resources; @@ -177,6 +178,7 @@ CreateDikeAssessmentSection(settingOfSelectedAssessmentSection.N); } + assessmentSection.Name = string.Format(IntegrationResources.AssessmentSection_Id_0, selectedItem.AssessmentSectionId); assessmentSection.Id = selectedItem.AssessmentSectionId; if (!selectedItem.ReferenceLine.Points.Any()) Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Commands/AssessmentSectionFromFileCommandHandlerTest.cs =================================================================== diff -u -r47134c6560c0c969c184ab3bd3157fb06fb4d120 -reede17a57fa09638695df2321d547f290adbba4b --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Commands/AssessmentSectionFromFileCommandHandlerTest.cs (.../AssessmentSectionFromFileCommandHandlerTest.cs) (revision 47134c6560c0c969c184ab3bd3157fb06fb4d120) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Commands/AssessmentSectionFromFileCommandHandlerTest.cs (.../AssessmentSectionFromFileCommandHandlerTest.cs) (revision eede17a57fa09638695df2321d547f290adbba4b) @@ -264,13 +264,13 @@ SetShapeFileDirectory(assessmentSectionFromFile, pathValidFolder); project.AssessmentSections.Add(TestAssessmentSection1_2(true)); - var expectedAssessmentSectionName = NamingHelper.GetUniqueName(project.AssessmentSections, "1-2", a => a.Name); + var expectedAssessmentSectionName = NamingHelper.GetUniqueName(project.AssessmentSections, "Traject 1-2", a => a.Name); bool signallingValueRadioButtonSelected = false; DialogBoxHandler = (name, wnd) => { var selectionDialog = (ReferenceLineMetaSelectionDialog) new FormTester(name).TheObject; - var signallingValueRadioButton = (RadioButton)new RadioButtonTester("SignallingValueRadioButton", selectionDialog).TheObject; + var signallingValueRadioButton = (RadioButton) new RadioButtonTester("SignallingValueRadioButton", selectionDialog).TheObject; signallingValueRadioButtonSelected = signallingValueRadioButton.Checked; new ButtonTester("Ok", selectionDialog).Click(); }; @@ -310,7 +310,7 @@ DialogBoxHandler = (name, wnd) => { var selectionDialog = (ReferenceLineMetaSelectionDialog) new FormTester(name).TheObject; - var lowLimitValueRadioButton = (RadioButton)new RadioButtonTester("LowLimitValueRadioButton", selectionDialog).TheObject; + var lowLimitValueRadioButton = (RadioButton) new RadioButtonTester("LowLimitValueRadioButton", selectionDialog).TheObject; lowLimitValueRadioButton.Checked = true; new ButtonTester("Ok", selectionDialog).Click(); }; @@ -488,7 +488,7 @@ var expectedAssessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike) { - Id = "1-2", + Id = "1-2", Name = "Traject 1-2" }; expectedAssessmentSection.GrassCoverErosionInwards.GeneralInput.N = 2; expectedAssessmentSection.HeightStructures.GeneralInput.N = 2; @@ -525,6 +525,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike) { Id = "1-2", + Name = "Traject 1-2", FailureMechanismContribution = { Norm = (useSignalingValue) ? 3000 : 1000 @@ -547,6 +548,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dune) { Id = "2-1", + Name = "Traject 2-1", FailureMechanismContribution = { Norm = 300 @@ -569,6 +571,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike) { Id = "3-3", + Name = "Traject 3-3", FailureMechanismContribution = { Norm = 300 @@ -591,6 +594,7 @@ private static void AssertAssessmentSection(AssessmentSection expected, AssessmentSection actual) { Assert.AreEqual(expected.Id, actual.Id); + Assert.AreEqual(expected.Name, actual.Name); Assert.AreEqual(expected.FailureMechanismContribution.Norm, actual.FailureMechanismContribution.Norm); Assert.AreEqual(expected.Composition, actual.Composition);