Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.cs =================================================================== diff -u -r56e5b82cdb5b82c7957f1e43636e33a5069de2fc -r3572a31496e52519625d925c5ad6d6f670b182ae --- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.cs (.../GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.cs) (revision 56e5b82cdb5b82c7957f1e43636e33a5069de2fc) +++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.cs (.../GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.cs) (revision 3572a31496e52519625d925c5ad6d6f670b182ae) @@ -197,7 +197,7 @@ } return failureMechanismSectionResult.UseManualAssemblyCategoryGroup - ? failureMechanismSectionResult.ManualAssemblyCategoryGroup + ? ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(failureMechanismSectionResult.ManualAssemblyCategoryGroup) : AssembleCombinedAssessment(failureMechanismSectionResult); } Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/SectionResults/GrassCoverSlipOffInwardsFailureMechanismSectionResult.cs =================================================================== diff -u -rd3404f1930061f9fbf321c7ddb7f8a9e6fff4bc1 -r3572a31496e52519625d925c5ad6d6f670b182ae --- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/SectionResults/GrassCoverSlipOffInwardsFailureMechanismSectionResult.cs (.../GrassCoverSlipOffInwardsFailureMechanismSectionResult.cs) (revision d3404f1930061f9fbf321c7ddb7f8a9e6fff4bc1) +++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/SectionResults/GrassCoverSlipOffInwardsFailureMechanismSectionResult.cs (.../GrassCoverSlipOffInwardsFailureMechanismSectionResult.cs) (revision 3572a31496e52519625d925c5ad6d6f670b182ae) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using Ringtoets.AssemblyTool.Data; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Primitives; @@ -40,7 +39,7 @@ SimpleAssessmentResult = SimpleAssessmentResultType.None; DetailedAssessmentResult = DetailedAssessmentResultType.None; TailorMadeAssessmentResult = TailorMadeAssessmentResultType.None; - ManualAssemblyCategoryGroup = FailureMechanismSectionAssemblyCategoryGroup.None; + ManualAssemblyCategoryGroup = ManualFailureMechanismSectionAssemblyCategoryGroup.None; } /// @@ -66,6 +65,6 @@ /// /// Gets or sets the manually selected assembly category group. /// - public FailureMechanismSectionAssemblyCategoryGroup ManualAssemblyCategoryGroup { get; set; } + public ManualFailureMechanismSectionAssemblyCategoryGroup ManualAssemblyCategoryGroup { get; set; } } } \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultRows/GrassCoverSlipOffInwardsSectionResultRow.cs =================================================================== diff -u -r4613f112c78c8a1ea1c69d07a0e08e5a69b3689e -r3572a31496e52519625d925c5ad6d6f670b182ae --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultRows/GrassCoverSlipOffInwardsSectionResultRow.cs (.../GrassCoverSlipOffInwardsSectionResultRow.cs) (revision 4613f112c78c8a1ea1c69d07a0e08e5a69b3689e) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultRows/GrassCoverSlipOffInwardsSectionResultRow.cs (.../GrassCoverSlipOffInwardsSectionResultRow.cs) (revision 3572a31496e52519625d925c5ad6d6f670b182ae) @@ -22,7 +22,6 @@ using System; using Core.Common.Controls.DataGrid; using Ringtoets.AssemblyTool.Data; -using Ringtoets.AssemblyTool.Forms; using Ringtoets.Common.Data.Exceptions; using Ringtoets.Common.Forms.Helpers; using Ringtoets.Common.Forms.Views; @@ -185,8 +184,6 @@ /// /// Gets or sets the indicator whether the combined assembly should be overwritten by . /// - /// Thrown when - /// is a valid value, but unsupported. public bool UseManualAssemblyCategoryGroup { get @@ -203,17 +200,15 @@ /// /// Gets or sets the manually selected assembly category group. /// - /// Thrown when - /// is a valid value, but unsupported. - public SelectableFailureMechanismSectionAssemblyCategoryGroup ManualAssemblyCategoryGroup + public ManualFailureMechanismSectionAssemblyCategoryGroup ManualAssemblyCategoryGroup { get { - return SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertTo(SectionResult.ManualAssemblyCategoryGroup); + return SectionResult.ManualAssemblyCategoryGroup; } set { - SectionResult.ManualAssemblyCategoryGroup = SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertFrom(value); + SectionResult.ManualAssemblyCategoryGroup = value; UpdateInternalData(); } } Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffInwardsResultView.cs =================================================================== diff -u -r352b81d92f568dbe5e072a2c00b4e518ee1605d3 -r3572a31496e52519625d925c5ad6d6f670b182ae --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffInwardsResultView.cs (.../GrassCoverSlipOffInwardsResultView.cs) (revision 352b81d92f568dbe5e072a2c00b4e518ee1605d3) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffInwardsResultView.cs (.../GrassCoverSlipOffInwardsResultView.cs) (revision 3572a31496e52519625d925c5ad6d6f670b182ae) @@ -111,7 +111,7 @@ DataGridViewControl, nameof(GrassCoverSlipOffInwardsSectionResultRow.UseManualAssemblyCategoryGroup)); - FailureMechanismSectionResultViewColumnBuilder.AddSelectableAssemblyCategoryGroupColumn( + FailureMechanismSectionResultViewColumnBuilder.AddManualAssemblyCategoryGroupColumn( DataGridViewControl, nameof(GrassCoverSlipOffInwardsSectionResultRow.ManualAssemblyCategoryGroup)); } Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r9d464742b12df2c1a1779e74b8e289eed5045e91 -r3572a31496e52519625d925c5ad6d6f670b182ae --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismAssemblyFactoryTest.cs (.../GrassCoverSlipOffInwardsFailureMechanismAssemblyFactoryTest.cs) (revision 9d464742b12df2c1a1779e74b8e289eed5045e91) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismAssemblyFactoryTest.cs (.../GrassCoverSlipOffInwardsFailureMechanismAssemblyFactoryTest.cs) (revision 3572a31496e52519625d925c5ad6d6f670b182ae) @@ -475,15 +475,16 @@ var sectionResult = new GrassCoverSlipOffInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { UseManualAssemblyCategoryGroup = true, - ManualAssemblyCategoryGroup = new Random(39).NextEnumValue() + ManualAssemblyCategoryGroup = new Random(39).NextEnumValue() }; // Call FailureMechanismSectionAssemblyCategoryGroup categoryGroup = GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.GetSectionAssemblyCategoryGroup( sectionResult); // Assert - Assert.AreEqual(categoryGroup, sectionResult.ManualAssemblyCategoryGroup); + Assert.AreEqual(ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(sectionResult.ManualAssemblyCategoryGroup), + categoryGroup); } [Test] @@ -577,7 +578,7 @@ }); GrassCoverSlipOffInwardsFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single(); sectionResult.UseManualAssemblyCategoryGroup = true; - sectionResult.ManualAssemblyCategoryGroup = new Random(39).NextEnumValue(); + sectionResult.ManualAssemblyCategoryGroup = new Random(39).NextEnumValue(); using (new AssemblyToolCalculatorFactoryConfig()) { @@ -588,7 +589,8 @@ GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism); // Assert - Assert.AreEqual(sectionResult.ManualAssemblyCategoryGroup, calculator.FailureMechanismSectionCategories.Single()); + Assert.AreEqual(ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(sectionResult.ManualAssemblyCategoryGroup), + calculator.FailureMechanismSectionCategories.Single()); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/GrassCoverSlipOffInwardsFailureMechanismSectionResultTest.cs =================================================================== diff -u -r590e1aeba4a1e5a622c8e8d89270167907920b43 -r3572a31496e52519625d925c5ad6d6f670b182ae --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/GrassCoverSlipOffInwardsFailureMechanismSectionResultTest.cs (.../GrassCoverSlipOffInwardsFailureMechanismSectionResultTest.cs) (revision 590e1aeba4a1e5a622c8e8d89270167907920b43) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/GrassCoverSlipOffInwardsFailureMechanismSectionResultTest.cs (.../GrassCoverSlipOffInwardsFailureMechanismSectionResultTest.cs) (revision 3572a31496e52519625d925c5ad6d6f670b182ae) @@ -20,7 +20,6 @@ // All rights reserved. using NUnit.Framework; -using Ringtoets.AssemblyTool.Data; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Primitives; @@ -47,7 +46,7 @@ Assert.AreEqual(DetailedAssessmentResultType.None, result.DetailedAssessmentResult); Assert.AreEqual(TailorMadeAssessmentResultType.None, result.TailorMadeAssessmentResult); Assert.IsFalse(result.UseManualAssemblyCategoryGroup); - Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.None, result.ManualAssemblyCategoryGroup); + Assert.AreEqual(ManualFailureMechanismSectionAssemblyCategoryGroup.None, result.ManualAssemblyCategoryGroup); } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/GrassCoverSlipOffInwardsSectionResultRowTest.cs =================================================================== diff -u -r37d015e59a004f7deb5f1a9657016bd9c13c6539 -r3572a31496e52519625d925c5ad6d6f670b182ae --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/GrassCoverSlipOffInwardsSectionResultRowTest.cs (.../GrassCoverSlipOffInwardsSectionResultRowTest.cs) (revision 37d015e59a004f7deb5f1a9657016bd9c13c6539) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/GrassCoverSlipOffInwardsSectionResultRowTest.cs (.../GrassCoverSlipOffInwardsSectionResultRowTest.cs) (revision 3572a31496e52519625d925c5ad6d6f670b182ae) @@ -98,8 +98,7 @@ Assert.AreEqual(result.DetailedAssessmentResult, row.DetailedAssessmentResult); Assert.AreEqual(result.TailorMadeAssessmentResult, row.TailorMadeAssessmentResult); Assert.AreEqual(result.UseManualAssemblyCategoryGroup, row.UseManualAssemblyCategoryGroup); - Assert.AreEqual(SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertTo(result.ManualAssemblyCategoryGroup), - row.ManualAssemblyCategoryGroup); + Assert.AreEqual(result.ManualAssemblyCategoryGroup, row.ManualAssemblyCategoryGroup); IDictionary columnStateDefinitions = row.ColumnStateDefinitions; Assert.AreEqual(8, columnStateDefinitions.Count); @@ -217,7 +216,7 @@ mocks.ReplayAll(); var random = new Random(39); - var newValue = random.NextEnumValue(); + var newValue = random.NextEnumValue(); FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new GrassCoverSlipOffInwardsFailureMechanismSectionResult(section); @@ -231,8 +230,7 @@ row.ManualAssemblyCategoryGroup = newValue; // Assert - FailureMechanismSectionAssemblyCategoryGroup expectedCategoryGroup = SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertFrom(newValue); - Assert.AreEqual(expectedCategoryGroup, result.ManualAssemblyCategoryGroup); + Assert.AreEqual(newValue, result.ManualAssemblyCategoryGroup); mocks.VerifyAll(); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffInwardsResultViewTest.cs =================================================================== diff -u -r9d464742b12df2c1a1779e74b8e289eed5045e91 -r3572a31496e52519625d925c5ad6d6f670b182ae --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffInwardsResultViewTest.cs (.../GrassCoverSlipOffInwardsResultViewTest.cs) (revision 9d464742b12df2c1a1779e74b8e289eed5045e91) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffInwardsResultViewTest.cs (.../GrassCoverSlipOffInwardsResultViewTest.cs) (revision 3572a31496e52519625d925c5ad6d6f670b182ae) @@ -23,7 +23,6 @@ using Core.Common.Base; using NUnit.Extensions.Forms; using NUnit.Framework; -using Ringtoets.AssemblyTool.Forms; using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.Controls; @@ -160,7 +159,7 @@ Assert.AreEqual("IIv", cells[tailorMadeAssemblyCategoryGroupIndex].Value); Assert.AreEqual("IIv", cells[combinedAssemblyCategoryGroupIndex].Value); Assert.AreEqual(false, cells[useManualAssemblyCategoryGroupIndex].Value); - Assert.AreEqual(SelectableFailureMechanismSectionAssemblyCategoryGroup.None, cells[manualAssemblyCategoryGroupIndex].Value); + Assert.AreEqual(ManualFailureMechanismSectionAssemblyCategoryGroup.None, cells[manualAssemblyCategoryGroupIndex].Value); } } Index: Ringtoets/Migration/src/Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql =================================================================== diff -u -r7067c14b776869db0ee508758b5ebed71b06045c -r3572a31496e52519625d925c5ad6d6f670b182ae --- Ringtoets/Migration/src/Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql (.../DatabaseStructure18.1.sql) (revision 7067c14b776869db0ee508758b5ebed71b06045c) +++ Ringtoets/Migration/src/Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql (.../DatabaseStructure18.1.sql) (revision 3572a31496e52519625d925c5ad6d6f670b182ae) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 03-Aug-2018 13:15:35 */ +/* Created On : 03-Aug-2018 14:00:15 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -920,7 +920,7 @@ 'DetailedAssessmentResult' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = Sufficient, 3 = Insufficient, 4 = NotAssessed 'TailorMadeAssessmentResult' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = ProbabilityNegligible, 3 = Sufficient, 4 = Insufficient, 5 = NotAssessed 'UseManualAssemblyCategoryGroup' TINYINT (1) NOT NULL, -- true or false - 'ManualAssemblyCategoryGroup' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = NotApplicable, 3 = Iv, 4 = IIv, 5 = IIIv, 6 = IVv, 7 = Vv, 8 = VIv, 9 = VIIv + 'ManualAssemblyCategoryGroup' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = NotApplicable, 3 = Iv, 4 = IIv, 5 = Vv, 6 = VIIv CONSTRAINT 'FK_GrassCoverSlipOffInwardsSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade ) ; Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/GrassCoverSlipOffInwardsSectionResultEntityReadExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -r3572a31496e52519625d925c5ad6d6f670b182ae --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/GrassCoverSlipOffInwardsSectionResultEntityReadExtensions.cs (.../GrassCoverSlipOffInwardsSectionResultEntityReadExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/GrassCoverSlipOffInwardsSectionResultEntityReadExtensions.cs (.../GrassCoverSlipOffInwardsSectionResultEntityReadExtensions.cs) (revision 3572a31496e52519625d925c5ad6d6f670b182ae) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Ringtoets.AssemblyTool.Data; using Ringtoets.Common.Primitives; using Ringtoets.Integration.Data.StandAlone.SectionResults; using Ringtoets.Storage.Core.DbContext; @@ -56,7 +55,7 @@ sectionResult.DetailedAssessmentResult = (DetailedAssessmentResultType) entity.DetailedAssessmentResult; sectionResult.TailorMadeAssessmentResult = (TailorMadeAssessmentResultType) entity.TailorMadeAssessmentResult; sectionResult.UseManualAssemblyCategoryGroup = Convert.ToBoolean(entity.UseManualAssemblyCategoryGroup); - sectionResult.ManualAssemblyCategoryGroup = (FailureMechanismSectionAssemblyCategoryGroup) entity.ManualAssemblyCategoryGroup; + sectionResult.ManualAssemblyCategoryGroup = (ManualFailureMechanismSectionAssemblyCategoryGroup) entity.ManualAssemblyCategoryGroup; } } } \ No newline at end of file Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverSlipOffInwards/GrassCoverSlipOffInwardsFailureMechanismSectionResultCreateExtensionsTest.cs =================================================================== diff -u -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60 -r3572a31496e52519625d925c5ad6d6f670b182ae --- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverSlipOffInwards/GrassCoverSlipOffInwardsFailureMechanismSectionResultCreateExtensionsTest.cs (.../GrassCoverSlipOffInwardsFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverSlipOffInwards/GrassCoverSlipOffInwardsFailureMechanismSectionResultCreateExtensionsTest.cs (.../GrassCoverSlipOffInwardsFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 3572a31496e52519625d925c5ad6d6f670b182ae) @@ -22,7 +22,6 @@ using System; using Core.Common.TestUtil; using NUnit.Framework; -using Ringtoets.AssemblyTool.Data; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Primitives; using Ringtoets.Integration.Data.StandAlone.SectionResults; @@ -54,7 +53,7 @@ var detailedAssessmentResult = random.NextEnumValue(); var tailorMadeAssessmentResult = random.NextEnumValue(); bool useManualAssemblyCategoryGroup = random.NextBoolean(); - var manualAssemblyCategoryGroup = random.NextEnumValue(); + var manualAssemblyCategoryGroup = random.NextEnumValue(); var sectionResult = new GrassCoverSlipOffInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/GrassCoverSlipOffInwardsSectionResultEntityReadExtensionsTest.cs =================================================================== diff -u -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60 -r3572a31496e52519625d925c5ad6d6f670b182ae --- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/GrassCoverSlipOffInwardsSectionResultEntityReadExtensionsTest.cs (.../GrassCoverSlipOffInwardsSectionResultEntityReadExtensionsTest.cs) (revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/GrassCoverSlipOffInwardsSectionResultEntityReadExtensionsTest.cs (.../GrassCoverSlipOffInwardsSectionResultEntityReadExtensionsTest.cs) (revision 3572a31496e52519625d925c5ad6d6f670b182ae) @@ -71,7 +71,7 @@ var detailedAssessmentResult = random.NextEnumValue(); var tailorMadeAssessmentResult = random.NextEnumValue(); bool useManualAssemblyCategoryGroup = random.NextBoolean(); - var manualAssemblyCategoryGroup = random.NextEnumValue(); + var manualAssemblyCategoryGroup = random.NextEnumValue(); var entity = new GrassCoverSlipOffInwardsSectionResultEntity { Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/RingtoetsProjectTestHelper.cs =================================================================== diff -u -r7067c14b776869db0ee508758b5ebed71b06045c -r3572a31496e52519625d925c5ad6d6f670b182ae --- Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 7067c14b776869db0ee508758b5ebed71b06045c) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 3572a31496e52519625d925c5ad6d6f670b182ae) @@ -259,7 +259,7 @@ sectionResult.DetailedAssessmentResult = random.NextEnumValue(); sectionResult.TailorMadeAssessmentResult = random.NextEnumValue(); sectionResult.UseManualAssemblyCategoryGroup = random.NextBoolean(); - sectionResult.ManualAssemblyCategoryGroup = random.NextEnumValue(); + sectionResult.ManualAssemblyCategoryGroup = random.NextEnumValue(); } } Index: build/DatabaseStructure.sql =================================================================== diff -u -r7067c14b776869db0ee508758b5ebed71b06045c -r3572a31496e52519625d925c5ad6d6f670b182ae --- build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 7067c14b776869db0ee508758b5ebed71b06045c) +++ build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 3572a31496e52519625d925c5ad6d6f670b182ae) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 03-Aug-2018 13:15:35 */ +/* Created On : 03-Aug-2018 14:00:15 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -920,7 +920,7 @@ 'DetailedAssessmentResult' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = Sufficient, 3 = Insufficient, 4 = NotAssessed 'TailorMadeAssessmentResult' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = ProbabilityNegligible, 3 = Sufficient, 4 = Insufficient, 5 = NotAssessed 'UseManualAssemblyCategoryGroup' TINYINT (1) NOT NULL, -- true or false - 'ManualAssemblyCategoryGroup' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = NotApplicable, 3 = Iv, 4 = IIv, 5 = IIIv, 6 = IVv, 7 = Vv, 8 = VIv, 9 = VIIv + 'ManualAssemblyCategoryGroup' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = NotApplicable, 3 = Iv, 4 = IIv, 5 = Vv, 6 = VIIv CONSTRAINT 'FK_GrassCoverSlipOffInwardsSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade ) ; Index: design/DatabaseDesign.eap =================================================================== diff -u -r7067c14b776869db0ee508758b5ebed71b06045c -r3572a31496e52519625d925c5ad6d6f670b182ae Binary files differ