Puchong PT200: NOK --> NG in all protocols, ver. 2.8.315

This commit is contained in:
Milan Hanajik 2016-06-27 16:47:23 +02:00
parent 8a3a0ca6ef
commit 91dff782a3
3 changed files with 12 additions and 7 deletions

View File

@ -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()

View File

@ -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")]

View File

@ -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")]