Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r198dd4cc1bb36a6a5b1f6eb9d007b270e476e348 -r8a6f4f697dcba5ca1e83f794ff8a5625f5719909 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 198dd4cc1bb36a6a5b1f6eb9d007b270e476e348) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 8a6f4f697dcba5ca1e83f794ff8a5625f5719909) @@ -145,6 +145,15 @@ } /// + /// Looks up a localized string similar to Samenvatting resultaten per faalmechanisme:. + /// + public static string AssemblyResultTotalView_Results_per_failureMechanism { + get { + return ResourceManager.GetString("AssemblyResultTotalView_Results_per_failureMechanism", resourceCulture); + } + } + + /// /// Looks up a localized string similar to De resultaten zijn verouderd. Druk op de "Resultaten verversen" knop om opnieuw te berekenen.. /// public static string AssemblyResultView_RefreshAssemblyResultsButton_Warning_Result_is_outdated_Press_Refresh_button_to_recalculate { Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx =================================================================== diff -u -r198dd4cc1bb36a6a5b1f6eb9d007b270e476e348 -r8a6f4f697dcba5ca1e83f794ff8a5625f5719909 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision 198dd4cc1bb36a6a5b1f6eb9d007b270e476e348) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision 8a6f4f697dcba5ca1e83f794ff8a5625f5719909) @@ -404,4 +404,7 @@ - + + Samenvatting resultaten per faalmechanisme: + \ No newline at end of file Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.Designer.cs =================================================================== diff -u -r8cb7e247bda5a165e866932d7b4a3abcb9bbac24 -r8a6f4f697dcba5ca1e83f794ff8a5625f5719909 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.Designer.cs (.../AssemblyResultTotalView.Designer.cs) (revision 8cb7e247bda5a165e866932d7b4a3abcb9bbac24) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.Designer.cs (.../AssemblyResultTotalView.Designer.cs) (revision 8a6f4f697dcba5ca1e83f794ff8a5625f5719909) @@ -21,6 +21,7 @@ using System.Windows.Forms; using Riskeer.Integration.Forms.Controls; +using Riskeer.Integration.Forms.Properties; namespace Riskeer.Integration.Forms.Views { @@ -33,20 +34,21 @@ #region Component Designer generated code - /// - /// Required method for Designer support - do not modify + /// + /// Required method for Designer support - do not modify /// the contents of this method with the code editor. /// private void InitializeComponent() { this.components = new System.ComponentModel.Container(); this.dataGridViewControl = new Core.Common.Controls.DataGrid.DataGridViewControl(); this.refreshAssemblyResultsButton = new Core.Common.Controls.Forms.EnhancedButton(); - this.assessmentSectionAssemblyControl = new AssessmentSectionAssemblyResultControl(); + this.assessmentSectionAssemblyControl = new Riskeer.Integration.Forms.Controls.AssessmentSectionAssemblyResultControl(); this.refreshButtonPanel = new System.Windows.Forms.Panel(); this.warningProvider = new System.Windows.Forms.ErrorProvider(this.components); + this.label = new System.Windows.Forms.Label(); this.refreshButtonPanel.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.warningProvider)).BeginInit(); + ((System.ComponentModel.ISupportInitialize) (this.warningProvider)).BeginInit(); this.SuspendLayout(); // // dataGridViewControl @@ -99,29 +101,42 @@ this.warningProvider.Icon = Core.Gui.Properties.Resources.warning; this.warningProvider.SetIconPadding(this.refreshAssemblyResultsButton, 4); // + // label + // + this.label.Dock = System.Windows.Forms.DockStyle.Top; + this.label.Location = new System.Drawing.Point(0, 77); + this.label.Margin = new System.Windows.Forms.Padding(3); + this.label.Name = "label"; + this.label.Padding = new System.Windows.Forms.Padding(5); + this.label.Size = new System.Drawing.Size(789, 25); + this.label.TabIndex = 4; + this.label.Text = global::Riskeer.Integration.Forms.Properties.Resources.AssemblyResultTotalView_Results_per_failureMechanism; + // // AssemblyResultTotalView // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScrollMinSize = new System.Drawing.Size(350, 250); this.Controls.Add(this.dataGridViewControl); + this.Controls.Add(this.label); this.Controls.Add(this.assessmentSectionAssemblyControl); this.Controls.Add(this.refreshButtonPanel); this.Name = "AssemblyResultTotalView"; this.Size = new System.Drawing.Size(789, 416); this.refreshButtonPanel.ResumeLayout(false); this.refreshButtonPanel.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.warningProvider)).EndInit(); + ((System.ComponentModel.ISupportInitialize) (this.warningProvider)).EndInit(); this.ResumeLayout(false); - + this.PerformLayout(); } #endregion private Core.Common.Controls.DataGrid.DataGridViewControl dataGridViewControl; private Core.Common.Controls.Forms.EnhancedButton refreshAssemblyResultsButton; - private Controls.AssessmentSectionAssemblyResultControl assessmentSectionAssemblyControl; + private Riskeer.Integration.Forms.Controls.AssessmentSectionAssemblyResultControl assessmentSectionAssemblyControl; private System.Windows.Forms.Panel refreshButtonPanel; private System.Windows.Forms.ErrorProvider warningProvider; + private System.Windows.Forms.Label label; } } Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultTotalViewTest.cs =================================================================== diff -u -r19e6d4ac96b28f25e8f2a5c0f164118dd0a05c0d -r8a6f4f697dcba5ca1e83f794ff8a5625f5719909 --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultTotalViewTest.cs (.../AssemblyResultTotalViewTest.cs) (revision 19e6d4ac96b28f25e8f2a5c0f164118dd0a05c0d) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultTotalViewTest.cs (.../AssemblyResultTotalViewTest.cs) (revision 8a6f4f697dcba5ca1e83f794ff8a5625f5719909) @@ -107,7 +107,7 @@ testForm.Show(); // Assert - Assert.AreEqual(3, view.Controls.Count); + Assert.AreEqual(4, view.Controls.Count); Button button = GetRefreshAssemblyResultButtonTester().Properties; Assert.AreEqual("Resultaten verversen", button.Text); @@ -116,6 +116,9 @@ var assemblyResultControl = (AssessmentSectionAssemblyResultControl) new ControlTester("assessmentSectionAssemblyControl").TheObject; Assert.AreEqual(DockStyle.Top, assemblyResultControl.Dock); + var label = (Label) new ControlTester("label").TheObject; + Assert.AreEqual("Samenvatting resultaten per faalmechanisme:", label.Text); + var dataGridViewControl = (DataGridViewControl) new ControlTester("dataGridViewControl").TheObject; Assert.AreEqual(DockStyle.Fill, dataGridViewControl.Dock);