Index: Riskeer/Common/src/Riskeer.Common.Forms/Builders/FailureMechanismSectionResultViewColumnBuilder.cs =================================================================== diff -u -r004ce9eccef8c2262fa929d1284da3486508a803 -ra72b307db87c39742683f2d8b2b332c8ebcf273b --- Riskeer/Common/src/Riskeer.Common.Forms/Builders/FailureMechanismSectionResultViewColumnBuilder.cs (.../FailureMechanismSectionResultViewColumnBuilder.cs) (revision 004ce9eccef8c2262fa929d1284da3486508a803) +++ Riskeer/Common/src/Riskeer.Common.Forms/Builders/FailureMechanismSectionResultViewColumnBuilder.cs (.../FailureMechanismSectionResultViewColumnBuilder.cs) (revision a72b307db87c39742683f2d8b2b332c8ebcf273b) @@ -196,7 +196,7 @@ dataPropertyName, Resources.FailureMechanismResultView_FurtherAnalysisNeeded_DisplayName); } - + /// /// Adds a column to the showing a /// . @@ -225,7 +225,7 @@ nameof(EnumDisplayWrapper.Value), nameof(EnumDisplayWrapper.DisplayName)); } - + /// /// Adds a column to the showing the refined probability per profile. /// @@ -271,9 +271,107 @@ dataPropertyName, Resources.FailureMechanismResultView_RefinedSectionProbability_DisplayName); } - + #endregion + #region Assembly + + /// + /// Adds a column to the showing the probability per profile. + /// + /// The to add the column to. + /// The data property name of the column. + /// Thrown when any parameter is null. + public static void AddProfileProbabilityColumn(DataGridViewControl dataGridViewControl, string dataPropertyName) + { + if (dataGridViewControl == null) + { + throw new ArgumentNullException(nameof(dataGridViewControl)); + } + + if (dataPropertyName == null) + { + throw new ArgumentNullException(nameof(dataPropertyName)); + } + + dataGridViewControl.AddTextBoxColumn( + dataPropertyName, + Resources.FailureMechanismResultView_ProfileProbability_DisplayName); + } + + /// + /// Adds a column to the showing the probability per section. + /// + /// The to add the column to. + /// The data property name of the column. + /// Thrown when any parameter is null. + public static void AddSectionProbabilityColumn(DataGridViewControl dataGridViewControl, string dataPropertyName) + { + if (dataGridViewControl == null) + { + throw new ArgumentNullException(nameof(dataGridViewControl)); + } + + if (dataPropertyName == null) + { + throw new ArgumentNullException(nameof(dataPropertyName)); + } + + dataGridViewControl.AddTextBoxColumn( + dataPropertyName, + Resources.FailureMechanismResultView_SectionProbability_DisplayName); + } + + /// + /// Adds a column to the showing the section N. + /// + /// The to add the column to. + /// The data property name of the column. + /// Thrown when any parameter is null. + public static void AddSectionNColumn(DataGridViewControl dataGridViewControl, string dataPropertyName) + { + if (dataGridViewControl == null) + { + throw new ArgumentNullException(nameof(dataGridViewControl)); + } + + if (dataPropertyName == null) + { + throw new ArgumentNullException(nameof(dataPropertyName)); + } + + dataGridViewControl.AddTextBoxColumn( + dataPropertyName, + Resources.FailureMechanismResultView_SectionN_DisplayName); + } + + /// + /// Adds a column to the showing the assembly group. + /// + /// The to add the column to. + /// The data property name of the column. + /// Thrown when any parameter is null. + public static void AddAssemblyGroupColumn(DataGridViewControl dataGridViewControl, string dataPropertyName) + { + if (dataGridViewControl == null) + { + throw new ArgumentNullException(nameof(dataGridViewControl)); + } + + if (dataPropertyName == null) + { + throw new ArgumentNullException(nameof(dataPropertyName)); + } + + dataGridViewControl.AddTextBoxColumn( + dataPropertyName, + Resources.FailureMechanismResultView_AssemblyGroup_DisplayName); + } + + #endregion + + #region Old + #region Assessment /// @@ -876,5 +974,7 @@ } #endregion + + #endregion } } \ No newline at end of file Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r34ed39d44d950aa6b5ed13272555c86fc60f7df9 -ra72b307db87c39742683f2d8b2b332c8ebcf273b --- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 34ed39d44d950aa6b5ed13272555c86fc60f7df9) +++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a72b307db87c39742683f2d8b2b332c8ebcf273b) @@ -1663,6 +1663,15 @@ } /// + /// Looks up a localized string similar to Duidingsklasse. + /// + public static string FailureMechanismResultView_AssemblyGroup_DisplayName { + get { + return ResourceManager.GetString("FailureMechanismResultView_AssemblyGroup_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Toetsoordeel ///gecombineerd. /// @@ -1905,6 +1914,16 @@ } /// + /// Looks up a localized string similar to Rekenwaarde faalkans per doorsnede + ///[1/jaar]. + /// + public static string FailureMechanismResultView_ProfileProbability_DisplayName { + get { + return ResourceManager.GetString("FailureMechanismResultView_ProfileProbability_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Aangescherpte faalkans per doorsnede ///[1/jaar]. /// @@ -1925,6 +1944,26 @@ } /// + /// Looks up a localized string similar to Rekenwaarde Nvak + ///[-]. + /// + public static string FailureMechanismResultView_SectionN_DisplayName { + get { + return ResourceManager.GetString("FailureMechanismResultView_SectionN_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Rekenwaarde faalkans per vak + ///[1/jaar]. + /// + public static string FailureMechanismResultView_SectionProbability_DisplayName { + get { + return ResourceManager.GetString("FailureMechanismResultView_SectionProbability_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Toetsoordeel ///eenvoudige toets. /// Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx =================================================================== diff -u -r34ed39d44d950aa6b5ed13272555c86fc60f7df9 -ra72b307db87c39742683f2d8b2b332c8ebcf273b --- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 34ed39d44d950aa6b5ed13272555c86fc60f7df9) +++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision a72b307db87c39742683f2d8b2b332c8ebcf273b) @@ -1616,4 +1616,19 @@ Aangescherpte faalkans per vak [1/jaar] + + Rekenwaarde faalkans per doorsnede +[1/jaar] + + + Rekenwaarde faalkans per vak +[1/jaar] + + + Rekenwaarde Nvak +[-] + + + Duidingsklasse + \ No newline at end of file Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Builders/FailureMechanismSectionResultViewColumnBuilderTest.cs =================================================================== diff -u -r004ce9eccef8c2262fa929d1284da3486508a803 -ra72b307db87c39742683f2d8b2b332c8ebcf273b --- Riskeer/Common/test/Riskeer.Common.Forms.Test/Builders/FailureMechanismSectionResultViewColumnBuilderTest.cs (.../FailureMechanismSectionResultViewColumnBuilderTest.cs) (revision 004ce9eccef8c2262fa929d1284da3486508a803) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Builders/FailureMechanismSectionResultViewColumnBuilderTest.cs (.../FailureMechanismSectionResultViewColumnBuilderTest.cs) (revision a72b307db87c39742683f2d8b2b332c8ebcf273b) @@ -525,6 +525,208 @@ #endregion + #region Assembly + + [Test] + public void AddProfileProbabilityColumn_DataGridViewControlNull_ThrowsArgumentNullException() + { + // Call + void Call() => FailureMechanismSectionResultViewColumnBuilder.AddProfileProbabilityColumn(null, "property"); + + // Assert + var exception = Assert.Throws(Call); + Assert.AreEqual("dataGridViewControl", exception.ParamName); + } + + [Test] + public void AddProfileProbabilityColumn_DataPropertyNameNull_ThrowsArgumentNullException() + { + // Call + void Call() => FailureMechanismSectionResultViewColumnBuilder.AddProfileProbabilityColumn(new DataGridViewControl(), null); + + // Assert + var exception = Assert.Throws(Call); + Assert.AreEqual("dataPropertyName", exception.ParamName); + } + + [Test] + public void AddProfileProbabilityColumn_WithParameters_AddsColumnToDataGridViewControl() + { + // Setup + using (var form = new Form()) + using (var control = new DataGridViewControl()) + { + form.Controls.Add(control); + form.Show(); + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; + + // Precondition + Assert.AreEqual(0, dataGridView.ColumnCount); + + // Call + FailureMechanismSectionResultViewColumnBuilder.AddProfileProbabilityColumn(control, dataPropertyName); + + // Assert + Assert.AreEqual(1, dataGridView.ColumnCount); + + var columnData = (DataGridViewTextBoxColumn) dataGridView.Columns[0]; + Assert.AreEqual(dataPropertyName, columnData.DataPropertyName); + Assert.AreEqual("Rekenwaarde faalkans per doorsnede\r\n[1/jaar]", columnData.HeaderText); + Assert.IsFalse(columnData.ReadOnly); + } + } + + [Test] + public void AddSectionProbabilityColumn_DataGridViewControlNull_ThrowsArgumentNullException() + { + // Call + void Call() => FailureMechanismSectionResultViewColumnBuilder.AddSectionProbabilityColumn(null, "property"); + + // Assert + var exception = Assert.Throws(Call); + Assert.AreEqual("dataGridViewControl", exception.ParamName); + } + + [Test] + public void AddSectionProbabilityColumn_DataPropertyNameNull_ThrowsArgumentNullException() + { + // Call + void Call() => FailureMechanismSectionResultViewColumnBuilder.AddSectionProbabilityColumn(new DataGridViewControl(), null); + + // Assert + var exception = Assert.Throws(Call); + Assert.AreEqual("dataPropertyName", exception.ParamName); + } + + [Test] + public void AddSectionProbabilityColumn_WithParameters_AddsColumnToDataGridViewControl() + { + // Setup + using (var form = new Form()) + using (var control = new DataGridViewControl()) + { + form.Controls.Add(control); + form.Show(); + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; + + // Precondition + Assert.AreEqual(0, dataGridView.ColumnCount); + + // Call + FailureMechanismSectionResultViewColumnBuilder.AddSectionProbabilityColumn(control, dataPropertyName); + + // Assert + Assert.AreEqual(1, dataGridView.ColumnCount); + + var columnData = (DataGridViewTextBoxColumn) dataGridView.Columns[0]; + Assert.AreEqual(dataPropertyName, columnData.DataPropertyName); + Assert.AreEqual("Rekenwaarde faalkans per vak\r\n[1/jaar]", columnData.HeaderText); + Assert.IsFalse(columnData.ReadOnly); + } + } + + [Test] + public void AddSectionNColumn_DataGridViewControlNull_ThrowsArgumentNullException() + { + // Call + void Call() => FailureMechanismSectionResultViewColumnBuilder.AddSectionNColumn(null, "property"); + + // Assert + var exception = Assert.Throws(Call); + Assert.AreEqual("dataGridViewControl", exception.ParamName); + } + + [Test] + public void AddSectionNColumn_DataPropertyNameNull_ThrowsArgumentNullException() + { + // Call + void Call() => FailureMechanismSectionResultViewColumnBuilder.AddSectionNColumn(new DataGridViewControl(), null); + + // Assert + var exception = Assert.Throws(Call); + Assert.AreEqual("dataPropertyName", exception.ParamName); + } + + [Test] + public void AddSectionNColumn_WithParameters_AddsColumnToDataGridViewControl() + { + // Setup + using (var form = new Form()) + using (var control = new DataGridViewControl()) + { + form.Controls.Add(control); + form.Show(); + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; + + // Precondition + Assert.AreEqual(0, dataGridView.ColumnCount); + + // Call + FailureMechanismSectionResultViewColumnBuilder.AddSectionNColumn(control, dataPropertyName); + + // Assert + Assert.AreEqual(1, dataGridView.ColumnCount); + + var columnData = (DataGridViewTextBoxColumn) dataGridView.Columns[0]; + Assert.AreEqual(dataPropertyName, columnData.DataPropertyName); + Assert.AreEqual("Rekenwaarde Nvak\r\n[-]", columnData.HeaderText); + Assert.IsFalse(columnData.ReadOnly); + } + } + + [Test] + public void AddAssemblyGroupColumn_DataGridViewControlNull_ThrowsArgumentNullException() + { + // Call + void Call() => FailureMechanismSectionResultViewColumnBuilder.AddAssemblyGroupColumn(null, "property"); + + // Assert + var exception = Assert.Throws(Call); + Assert.AreEqual("dataGridViewControl", exception.ParamName); + } + + [Test] + public void AddAssemblyGroupColumn_DataPropertyNameNull_ThrowsArgumentNullException() + { + // Call + void Call() => FailureMechanismSectionResultViewColumnBuilder.AddAssemblyGroupColumn(new DataGridViewControl(), null); + + // Assert + var exception = Assert.Throws(Call); + Assert.AreEqual("dataPropertyName", exception.ParamName); + } + + [Test] + public void AddAssemblyGroupColumn_WithParameters_AddsColumnToDataGridViewControl() + { + // Setup + using (var form = new Form()) + using (var control = new DataGridViewControl()) + { + form.Controls.Add(control); + form.Show(); + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; + + // Precondition + Assert.AreEqual(0, dataGridView.ColumnCount); + + // Call + FailureMechanismSectionResultViewColumnBuilder.AddAssemblyGroupColumn(control, dataPropertyName); + + // Assert + Assert.AreEqual(1, dataGridView.ColumnCount); + + var columnData = (DataGridViewTextBoxColumn) dataGridView.Columns[0]; + Assert.AreEqual(dataPropertyName, columnData.DataPropertyName); + Assert.AreEqual("Duidingsklasse", columnData.HeaderText); + Assert.IsFalse(columnData.ReadOnly); + } + } + + #endregion + + #region Old + #region Simple Assessment [Test] @@ -1793,5 +1995,7 @@ } #endregion + + #endregion } } \ No newline at end of file