michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(1) Results.Utils.PassedColorStr() with PASSED/FAILED, (2) WMeterRsltsItemSpec: Formatted_WM_ID, (3) Legalizator for Bahrain, ver. 2.17.761

Browse Source
This commit is contained in:
Milan Hanajik
2017-12-06 09:58:57 +03:00
parent 88fc2d4951
commit a49a81cff7
7 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Results/Entities/MeterTestRslt.cs
+1 -13
View File
@@ -75,19 +75,7 @@ namespace Results.Entities
public virtual string PassedColorStr()
{
#if PUCHONG_PT200
if (!Evaluate()) return Passed ? "OK|White" : "NG|White";
else return Passed ? "OK|Green" : "NG|Red";
#elif LANG_PL
if (!Evaluate()) return Passed ? "+|White" : "-|White";
else return Passed ? "+|Green" : "-|Red";
#elif LANG_RU
if (!Evaluate()) return Passed ? "годен|White" : "негоден|White";
else return Passed ? "годен|Green" : "негоден|Red";
#else
if (!Evaluate()) return Passed ? "OK|White" : "NOK|White";
else return Passed ? "OK|Green" : "NOK|Red";
#endif
return Utils.PassedColorStr(Passed, Evaluate());
}
public MeterTestRslt()
Results/Entities/WaterMeter.cs
+1 -9
View File
@@ -173,15 +173,7 @@ namespace Results.Entities
public virtual string PassedColorStr()
{
#if PUCHONG_PT200
return Passed ? "OK|Green" : "NG|Red";
#elif LANG_PL
return Passed ? "+|Green" : "-|Red";
#elif LANG_RU
return Passed ? "годен|Green" : "негоден|Red";
#else
return Passed ? "OK|Green" : "NOK|Red";
#endif
return Utils.PassedColorStr(Passed, true);
}