diff --git a/Results/Entities/MeterTestRslt.cs b/Results/Entities/MeterTestRslt.cs index 0cb17ae7f..f7238da70 100644 --- a/Results/Entities/MeterTestRslt.cs +++ b/Results/Entities/MeterTestRslt.cs @@ -64,9 +64,14 @@ namespace Results.Entities public virtual Batch Batch() { return WaterMeter.Batch; } public virtual string PassedColorStr() - { - if (!Evaluate()) return Passed ? "OK|White" : "NOK|White"; - else return Passed ? "OK|Green" : "NOK|Red"; + { +#if PUCHONG_PT200 + if (!Evaluate()) return Passed ? "OK|White" : "NG|White"; + else return Passed ? "OK|Green" : "NG|Red"; +#else + if (!Evaluate()) return Passed ? "OK|White" : "NOK|White"; + else return Passed ? "OK|Green" : "NOK|Red"; +#endif } public MeterTestRslt() diff --git a/Results/Properties/AssemblyInfo.cs b/Results/Properties/AssemblyInfo.cs index d3a725a66..c4d2931da 100644 --- a/Results/Properties/AssemblyInfo.cs +++ b/Results/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.8.308.0")] -[assembly: AssemblyFileVersion("2.8.308.0")] +[assembly: AssemblyVersion("2.8.315.0")] +[assembly: AssemblyFileVersion("2.8.315.0")] diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 7e709b084..3dd9d1596 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.8.314.1")] -[assembly: AssemblyFileVersion("2.8.314.1")] +[assembly: AssemblyVersion("2.8.315.1")] +[assembly: AssemblyFileVersion("2.8.315.1")]