Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -rbae13ff476bcb31e6406a81d7176c546a0edbb03 -r11faaf2149d31eb83bcb32b8be0e989b477d3c83 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision bae13ff476bcb31e6406a81d7176c546a0edbb03) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 11faaf2149d31eb83bcb32b8be0e989b477d3c83) @@ -101,6 +101,15 @@ } /// + /// Looks up a localized string similar to Gecombineerd vakoordeel. + /// + public static string AssemblyResultPerSection_DisplayName { + get { + return ResourceManager.GetString("AssemblyResultPerSection_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Kilometrering* tot [km]. /// public static string AssemblyResultPerSectionView_GridColumn_SectionEnd { @@ -119,15 +128,6 @@ } /// - /// Looks up a localized string similar to Totaal vakoordeel. - /// - public static string AssemblyResultPerSectionView_GridColumn_SectionTotalAssembly { - get { - return ResourceManager.GetString("AssemblyResultPerSectionView_GridColumn_SectionTotalAssembly", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Gecombineerd toetsoordeel. /// public static string AssemblyResultTotalView_AssemblyResultGroupBox_Text { Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx =================================================================== diff -u -rbae13ff476bcb31e6406a81d7176c546a0edbb03 -r11faaf2149d31eb83bcb32b8be0e989b477d3c83 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision bae13ff476bcb31e6406a81d7176c546a0edbb03) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision 11faaf2149d31eb83bcb32b8be0e989b477d3c83) @@ -342,9 +342,6 @@ Kilometrering* tot [km] - - Totaal vakoordeel - Toetsoordeel is verouderd. Druk op de "Toetsoordeel verversen" knop om opnieuw te berekenen. @@ -376,4 +373,7 @@ Hydraulische belastingen op trajectniveau worden altijd samengevoegd. Daarbij gaan de huidige berekeningsresultaten voor belastingen op trajectniveau niet verloren. + + Gecombineerd vakoordeel + \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultPerSectionView.cs =================================================================== diff -u -re039977dbf303e5ac66362e92e63b172f045b3df -r11faaf2149d31eb83bcb32b8be0e989b477d3c83 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultPerSectionView.cs (.../AssemblyResultPerSectionView.cs) (revision e039977dbf303e5ac66362e92e63b172f045b3df) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultPerSectionView.cs (.../AssemblyResultPerSectionView.cs) (revision 11faaf2149d31eb83bcb32b8be0e989b477d3c83) @@ -128,7 +128,7 @@ Resources.AssemblyResultPerSectionView_GridColumn_SectionEnd, true); dataGridViewControl.AddTextBoxColumn(nameof(CombinedFailureMechanismSectionAssemblyResultRow.TotalResult), - Resources.AssemblyResultPerSectionView_GridColumn_SectionTotalAssembly, + Resources.AssemblyResultPerSection_DisplayName, true); dataGridViewControl.AddTextBoxColumn(nameof(CombinedFailureMechanismSectionAssemblyResultRow.Piping), PipingDataResources.PipingFailureMechanism_DisplayCode, Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs =================================================================== diff -u -r42ccb27c17f0f563790a5e209b8cb91dcd26c60b -r11faaf2149d31eb83bcb32b8be0e989b477d3c83 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 42ccb27c17f0f563790a5e209b8cb91dcd26c60b) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 11faaf2149d31eb83bcb32b8be0e989b477d3c83) @@ -119,15 +119,6 @@ } /// - /// Looks up a localized string similar to Gecombineerd vakoordeel. - /// - public static string AssemblyResultPerSection_DisplayName { - get { - return ResourceManager.GetString("AssemblyResultPerSection_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Assemblage. /// public static string AssemblyResultsCategoryTreeFolder_DisplayName { Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx =================================================================== diff -u -r42ccb27c17f0f563790a5e209b8cb91dcd26c60b -r11faaf2149d31eb83bcb32b8be0e989b477d3c83 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 42ccb27c17f0f563790a5e209b8cb91dcd26c60b) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 11faaf2149d31eb83bcb32b8be0e989b477d3c83) @@ -176,9 +176,6 @@ ..\Resources\AssemblyResultPerSection.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Gecombineerd vakoordeel - ..\Resources\AssemblyResultTotal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -rfd449c3c338407f419fbc0a3ad4c1ec29e56a18b -r11faaf2149d31eb83bcb32b8be0e989b477d3c83 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision fd449c3c338407f419fbc0a3ad4c1ec29e56a18b) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 11faaf2149d31eb83bcb32b8be0e989b477d3c83) @@ -607,7 +607,7 @@ yield return new ViewInfo { - GetViewName = (view, context) => Resources.AssemblyResultPerSection_DisplayName, + GetViewName = (view, context) => RingtoetsFormsResources.AssemblyResultPerSection_DisplayName, Image = Resources.AssemblyResultPerSection, CloseForData = CloseAssemblyResultPerSectionViewForData, CreateInstance = context => new AssemblyResultPerSectionView(context.WrappedData) @@ -1072,7 +1072,7 @@ yield return new TreeNodeInfo { - Text = context => Resources.AssemblyResultPerSection_DisplayName, + Text = context => RingtoetsFormsResources.AssemblyResultPerSection_DisplayName, Image = context => Resources.AssemblyResultPerSection, ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) .AddOpenItem() Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssemblyResultPerSectionViewTest.cs =================================================================== diff -u -r1edd1f9c6ff092aacca8ee4712515c05af923938 -r11faaf2149d31eb83bcb32b8be0e989b477d3c83 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssemblyResultPerSectionViewTest.cs (.../AssemblyResultPerSectionViewTest.cs) (revision 1edd1f9c6ff092aacca8ee4712515c05af923938) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssemblyResultPerSectionViewTest.cs (.../AssemblyResultPerSectionViewTest.cs) (revision 11faaf2149d31eb83bcb32b8be0e989b477d3c83) @@ -160,7 +160,7 @@ AssertColumn(dataGridViewColumns[sectionStartColumnIndex], "Kilometrering* van [km]"); AssertColumn(dataGridViewColumns[sectionEndColumnIndex], "Kilometrering* tot [km]"); - AssertColumn(dataGridViewColumns[sectionTotalAssemblyResultColumnIndex], "Totaal vakoordeel"); + AssertColumn(dataGridViewColumns[sectionTotalAssemblyResultColumnIndex], "Gecombineerd vakoordeel"); AssertColumn(dataGridViewColumns[pipingColumnIndex], "STPH"); AssertColumn(dataGridViewColumns[grassCoverErosionInwardsColumnIndex], "GEKB"); AssertColumn(dataGridViewColumns[macroStabilityInwardsColumnIndex], "STBI");