Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.Data/AssessmentSectionAssemblyCategoryGroup.cs
===================================================================
diff -u -r04bef178c846add660097aeab97e3d35aefd939b -r87391c51bc397ae140d3aca7940b4f5ac80cad35
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.Data/AssessmentSectionAssemblyCategoryGroup.cs (.../AssessmentSectionAssemblyCategoryGroup.cs) (revision 04bef178c846add660097aeab97e3d35aefd939b)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.Data/AssessmentSectionAssemblyCategoryGroup.cs (.../AssessmentSectionAssemblyCategoryGroup.cs) (revision 87391c51bc397ae140d3aca7940b4f5ac80cad35)
@@ -29,19 +29,28 @@
///
public enum AssessmentSectionAssemblyCategoryGroup
{
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyCategoryGroup_None_DisplayName))]
+ None = 1,
+
[ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyCategoryGroup_APlus_DisplayName))]
- APlus = 1,
+ APlus = 2,
[ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyCategoryGroup_A_DisplayName))]
- A = 2,
+ A = 3,
[ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyCategoryGroup_B_DisplayName))]
- B = 3,
+ B = 4,
[ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyCategoryGroup_C_DisplayName))]
- C = 4,
+ C = 5,
[ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyCategoryGroup_D_DisplayName))]
- D = 5
+ D = 6,
+
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyCategoryGroup_NotApplicable_DisplayName))]
+ NotApplicable = 7,
+
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyCategoryGroup_NotAssessed_DisplayName))]
+ NotAssessed = 8
}
}
\ No newline at end of file
Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -r04bef178c846add660097aeab97e3d35aefd939b -r87391c51bc397ae140d3aca7940b4f5ac80cad35
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 04bef178c846add660097aeab97e3d35aefd939b)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 87391c51bc397ae140d3aca7940b4f5ac80cad35)
@@ -125,5 +125,32 @@
return ResourceManager.GetString("AssessmentSectionAssemblyCategoryGroup_D_DisplayName", resourceCulture);
}
}
+
+ ///
+ /// Looks up a localized string similar to .
+ ///
+ internal static string AssessmentSectionAssemblyCategoryGroup_None_DisplayName {
+ get {
+ return ResourceManager.GetString("AssessmentSectionAssemblyCategoryGroup_None_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to -.
+ ///
+ internal static string AssessmentSectionAssemblyCategoryGroup_NotApplicable_DisplayName {
+ get {
+ return ResourceManager.GetString("AssessmentSectionAssemblyCategoryGroup_NotApplicable_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to -.
+ ///
+ internal static string AssessmentSectionAssemblyCategoryGroup_NotAssessed_DisplayName {
+ get {
+ return ResourceManager.GetString("AssessmentSectionAssemblyCategoryGroup_NotAssessed_DisplayName", resourceCulture);
+ }
+ }
}
}
Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.Data/Properties/Resources.resx
===================================================================
diff -u -r04bef178c846add660097aeab97e3d35aefd939b -r87391c51bc397ae140d3aca7940b4f5ac80cad35
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.Data/Properties/Resources.resx (.../Resources.resx) (revision 04bef178c846add660097aeab97e3d35aefd939b)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.Data/Properties/Resources.resx (.../Resources.resx) (revision 87391c51bc397ae140d3aca7940b4f5ac80cad35)
@@ -132,4 +132,13 @@
D
+
+
+
+
+ -
+
+
+ -
+
\ No newline at end of file
Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreator.cs
===================================================================
diff -u -rb82f25d8b29f8e35766758d4c71851d32833f65b -r87391c51bc397ae140d3aca7940b4f5ac80cad35
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreator.cs (.../AssemblyCategoryCreator.cs) (revision b82f25d8b29f8e35766758d4c71851d32833f65b)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreator.cs (.../AssemblyCategoryCreator.cs) (revision 87391c51bc397ae140d3aca7940b4f5ac80cad35)
@@ -115,8 +115,12 @@
return AssessmentSectionAssemblyCategoryGroup.B;
case EAssessmentGrade.C:
return AssessmentSectionAssemblyCategoryGroup.C;
- case EAssessmentGrade.D:
- return AssessmentSectionAssemblyCategoryGroup.D;
+ case EAssessmentGrade.Gr:
+ return AssessmentSectionAssemblyCategoryGroup.None;
+ case EAssessmentGrade.Ngo:
+ return AssessmentSectionAssemblyCategoryGroup.NotAssessed;
+ case EAssessmentGrade.Nvt:
+ return AssessmentSectionAssemblyCategoryGroup.NotApplicable;
default:
throw new NotSupportedException();
}
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.Data.Test/AssessmentSectionAssemblyCategoryGroupTest.cs
===================================================================
diff -u -r04bef178c846add660097aeab97e3d35aefd939b -r87391c51bc397ae140d3aca7940b4f5ac80cad35
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.Data.Test/AssessmentSectionAssemblyCategoryGroupTest.cs (.../AssessmentSectionAssemblyCategoryGroupTest.cs) (revision 04bef178c846add660097aeab97e3d35aefd939b)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.Data.Test/AssessmentSectionAssemblyCategoryGroupTest.cs (.../AssessmentSectionAssemblyCategoryGroupTest.cs) (revision 87391c51bc397ae140d3aca7940b4f5ac80cad35)
@@ -35,20 +35,29 @@
return new Dictionary
{
{
- AssessmentSectionAssemblyCategoryGroup.APlus, 1
+ AssessmentSectionAssemblyCategoryGroup.None, 1
},
{
- AssessmentSectionAssemblyCategoryGroup.A, 2
+ AssessmentSectionAssemblyCategoryGroup.APlus, 2
},
{
- AssessmentSectionAssemblyCategoryGroup.B, 3
+ AssessmentSectionAssemblyCategoryGroup.A, 3
},
{
- AssessmentSectionAssemblyCategoryGroup.C, 4
+ AssessmentSectionAssemblyCategoryGroup.B, 4
},
{
- AssessmentSectionAssemblyCategoryGroup.D, 5
- }
+ AssessmentSectionAssemblyCategoryGroup.C, 5
+ },
+ {
+ AssessmentSectionAssemblyCategoryGroup.D, 6
+ },
+ {
+ AssessmentSectionAssemblyCategoryGroup.NotApplicable, 7
+ },
+ {
+ AssessmentSectionAssemblyCategoryGroup.NotAssessed, 8
+ },
};
}
}
@@ -60,6 +69,9 @@
return new Dictionary
{
{
+ AssessmentSectionAssemblyCategoryGroup.None, ""
+ },
+ {
AssessmentSectionAssemblyCategoryGroup.APlus, "A+"
},
{
@@ -73,7 +85,13 @@
},
{
AssessmentSectionAssemblyCategoryGroup.D, "D"
- }
+ },
+ {
+ AssessmentSectionAssemblyCategoryGroup.NotApplicable, "-"
+ },
+ {
+ AssessmentSectionAssemblyCategoryGroup.NotAssessed, "-"
+ },
};
}
}
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/AssemblyCategoryAssert.cs
===================================================================
diff -u -r038705e92738cd5d86e3aba9918a8dd749332e7c -r87391c51bc397ae140d3aca7940b4f5ac80cad35
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/AssemblyCategoryAssert.cs (.../AssemblyCategoryAssert.cs) (revision 038705e92738cd5d86e3aba9918a8dd749332e7c)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/AssemblyCategoryAssert.cs (.../AssemblyCategoryAssert.cs) (revision 87391c51bc397ae140d3aca7940b4f5ac80cad35)
@@ -83,6 +83,12 @@
return AssessmentSectionAssemblyCategoryGroup.C;
case EAssessmentGrade.D:
return AssessmentSectionAssemblyCategoryGroup.D;
+ case EAssessmentGrade.Gr:
+ return AssessmentSectionAssemblyCategoryGroup.None;
+ case EAssessmentGrade.Ngo:
+ return AssessmentSectionAssemblyCategoryGroup.NotAssessed;
+ case EAssessmentGrade.Nvt:
+ return AssessmentSectionAssemblyCategoryGroup.NotApplicable;
default:
throw new NotSupportedException();
}
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/AssemblyCategoryGroupColorHelper.cs
===================================================================
diff -u -rf147b624dadd780d3186ec19c301d9ed1634504e -r87391c51bc397ae140d3aca7940b4f5ac80cad35
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/AssemblyCategoryGroupColorHelper.cs (.../AssemblyCategoryGroupColorHelper.cs) (revision f147b624dadd780d3186ec19c301d9ed1634504e)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/AssemblyCategoryGroupColorHelper.cs (.../AssemblyCategoryGroupColorHelper.cs) (revision 87391c51bc397ae140d3aca7940b4f5ac80cad35)
@@ -61,6 +61,10 @@
return Color.FromArgb(255, 153, 0);
case AssessmentSectionAssemblyCategoryGroup.D:
return Color.FromArgb(255, 0, 0);
+ case AssessmentSectionAssemblyCategoryGroup.None:
+ case AssessmentSectionAssemblyCategoryGroup.NotApplicable:
+ case AssessmentSectionAssemblyCategoryGroup.NotAssessed:
+ return Color.White;
default:
throw new NotSupportedException();
}
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/AssemblyCategoryGroupTestHelperTest.cs
===================================================================
diff -u -rf147b624dadd780d3186ec19c301d9ed1634504e -r87391c51bc397ae140d3aca7940b4f5ac80cad35
--- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/AssemblyCategoryGroupTestHelperTest.cs (.../AssemblyCategoryGroupTestHelperTest.cs) (revision f147b624dadd780d3186ec19c301d9ed1634504e)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/AssemblyCategoryGroupTestHelperTest.cs (.../AssemblyCategoryGroupTestHelperTest.cs) (revision 87391c51bc397ae140d3aca7940b4f5ac80cad35)
@@ -71,7 +71,10 @@
new TestCaseData(AssessmentSectionAssemblyCategoryGroup.A, Color.FromArgb(118, 147, 60)),
new TestCaseData(AssessmentSectionAssemblyCategoryGroup.B, Color.FromArgb(255, 255, 0)),
new TestCaseData(AssessmentSectionAssemblyCategoryGroup.C, Color.FromArgb(255, 153, 0)),
- new TestCaseData(AssessmentSectionAssemblyCategoryGroup.D, Color.FromArgb(255, 0, 0))
+ new TestCaseData(AssessmentSectionAssemblyCategoryGroup.D, Color.FromArgb(255, 0, 0)),
+ new TestCaseData(AssessmentSectionAssemblyCategoryGroup.None, Color.White),
+ new TestCaseData(AssessmentSectionAssemblyCategoryGroup.NotAssessed, Color.White),
+ new TestCaseData(AssessmentSectionAssemblyCategoryGroup.NotApplicable, Color.White)
};
Assert.AreEqual(expectedCases.Length, testCases.Count());
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/AssemblyCategoryColorTestHelper.cs
===================================================================
diff -u -r6e0c3a3eec9feb30d964df279e76f2a8e6ae278f -r87391c51bc397ae140d3aca7940b4f5ac80cad35
--- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/AssemblyCategoryColorTestHelper.cs (.../AssemblyCategoryColorTestHelper.cs) (revision 6e0c3a3eec9feb30d964df279e76f2a8e6ae278f)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/AssemblyCategoryColorTestHelper.cs (.../AssemblyCategoryColorTestHelper.cs) (revision 87391c51bc397ae140d3aca7940b4f5ac80cad35)
@@ -64,6 +64,9 @@
yield return new TestCaseData(AssessmentSectionAssemblyCategoryGroup.B, Color.FromArgb(255, 255, 0));
yield return new TestCaseData(AssessmentSectionAssemblyCategoryGroup.C, Color.FromArgb(255, 153, 0));
yield return new TestCaseData(AssessmentSectionAssemblyCategoryGroup.D, Color.FromArgb(255, 0, 0));
+ yield return new TestCaseData(AssessmentSectionAssemblyCategoryGroup.None, Color.White);
+ yield return new TestCaseData(AssessmentSectionAssemblyCategoryGroup.NotAssessed, Color.White);
+ yield return new TestCaseData(AssessmentSectionAssemblyCategoryGroup.NotApplicable, Color.White);
}
}
}