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

Results/Entities/MeterTestRslt.cs

@@ -75,19 +75,7 @@ namespace Results.Entities
 
 		public virtual string PassedColorStr()
         {
-#if PUCHONG_PT200
+            return Utils.PassedColorStr(Passed, Evaluate());
-			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
 		}
 
         public MeterTestRslt()

Results/Entities/WaterMeter.cs

@@ -173,15 +173,7 @@ namespace Results.Entities
 
         public virtual string PassedColorStr()
         {
-#if PUCHONG_PT200
+            return Utils.PassedColorStr(Passed, true);
-			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
         }
 
 

Results/ItemID.cs

@@ -193,21 +193,24 @@ namespace Results
 
         ResultOrErrorFlags,             /// 169, PL specific result
 
-        T_up_min,
+        T_up_min,                       /// 170
-        T_up_max,
+        T_up_max,                       /// 171
-        T_down_min,
+        T_down_min,                     /// 172
-        T_down_max,
+        T_down_max,                     /// 173
-        T_div_min,
+        T_div_min,                      /// 174
-        T_div_max,
+        T_div_max,                      /// 175
-        P_up_min,
+        P_up_min,                       /// 176
-        P_up_max,
+        P_up_max,                       /// 177
-        P_down_min,
+        P_down_min,                     /// 178
-        P_down_max,
+        P_down_max,                     /// 179
-        P_delta_min,
+        P_delta_min,                    /// 180
-        P_delta_max,
+        P_delta_max,                    /// 181
 
-        T_rho_0,
+        T_rho_0,                        /// 182
-        Rho_Wa_calc,
+        Rho_Wa_calc,                    /// 183
+
+        Formatted_WM_ID,                /// 184, Formated WM ID string:
+                                        ///      {0}=start DateTime {1}-end DateTime, {2}=batch nr., {3}=wm pos.(1..max), {4}=s/n string
 
         Count,
     }

Results/Utils.cs

@@ -156,5 +156,20 @@ namespace Results
             return sb.ToString().TrimEnd();
         }
 
+        public static string PassedColorStr(bool passed, bool useRedGreenColor)
+        {
+#if PUCHONG_PT200
+            return (useRedGreenColor) ? (passed ? "OK|Green" : "NG|Red")         : (passed ? "OK|White" : "NG|White");
+#elif BAHRAIN_50
+            return (useRedGreenColor) ? (passed ? "PASSED|Green" : "FAILED|Red") : (passed ? "PASSED|White" : "FAILED|White");
+#elif LANG_PL
+			return (useRedGreenColor) ? (passed ? "+|Green" : "-|Red")           : (passed ? "+|White" : "-|White");
+#elif LANG_RU
+            return (useRedGreenColor) ? (passed ? "годен|Green" : "негоден|Red") : (passed ? "годен|White" : "негоден|White");
+#else
+            return (useRedGreenColor) ? (passed ? "OK|Green" : "NOK|Red")        : (passed ? "OK|White" : "NOK|White");
+#endif
+        }
+
     }
 }

Results/WMeterRsltItemSpec.cs

@@ -321,6 +321,7 @@ namespace Results
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.Purchase_order,     Strings.PO,                     Quantity.String, ItemCategory.Other,       (w, t, u, f, p) => FormatStr(f, w.PurchaseOrder)));
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.Year_of_production, Strings.Year,                   Quantity.Number, ItemCategory.Other,       (w, t, u, f, p) => FormatInt(f, w.YearOfProduction)));
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.WM_Position,        Strings.Pos,                    Quantity.Number, ItemCategory.Other,       (w, t, u, f, p) => FormatInt(f, w.WMPosition)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Formatted_WM_ID,    "Formatted WM ID",              Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? string.Format("{0}-{1}", w.BatchNr(), w.WMPosition) : string.Format(f, w.StartTime(), w.EndTime(), w.BatchNr(), w.WMPosition, w.SerialNr)));
 
             /// Water meters results (single)
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.End_state,        Strings.End_state,          Quantity.String,      ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.EndState)));

TestBenchFramework/Forms/LoginDlgWithBenchSelection.cs

@@ -44,7 +44,7 @@ namespace TBF.Forms
         {
             benchName = predefinedBench;
 
-#if LANG_PL
+#if LANG_PL || BAHRAIN_50
             Height = 156;
             EnableAndPrepareLegalizatorCombo(legalizatorComboBox);
 #else

TestBenchFramework/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.17.760.0")]
+[assembly: AssemblyVersion("2.17.761.0")]
-[assembly: AssemblyFileVersion("2.17.760.0")]
+[assembly: AssemblyFileVersion("2.17.761.0")]