Results.Entities.WaterMetrData.Medium added, woda zimna/goraca, ver. 2.18.876

Results/Entities/TestRslt.cs

@@ -305,7 +305,12 @@ namespace Results.Entities
         /// <summary> Wrapper </summary>
         public virtual string ErrorFlagsStr()
         {
-            return Utils.ErrorFlagsStr(ErrorFlags);
+            string eFlags = Utils.ErrorFlagsStr(ErrorFlags);
+#if LANG_PL
+            return string.IsNullOrEmpty(eFlags) ? "brak" : eFlags;
+#else
+            return eFlags;
+#endif
         }
 
         public override string ToString()

Results/Entities/WaterMeter.cs

@@ -145,6 +145,15 @@ namespace Results.Entities
 #endif      
         }
 
+#if LANG_PL
+        public virtual string PassedOrErrorFlagsStr()
+        {
+            ErrorFlagsMode errorFlagsMode;
+            string eFlags = Utils.ErrorFlagsStr(ErrorFlagsFromTestsAndWM(out errorFlagsMode));
+            return string.IsNullOrEmpty(eFlags) ? (WaterMeterData.Text4 + PassedColorStr()) : eFlags;
+        }
+#endif
+
         /// <summary>
         /// Convert failed tests and combined errorFlags of all tests to string
         /// </summary>
@@ -208,6 +217,8 @@ namespace Results.Entities
         }
 
 
+
+
 		///
 		/// Not mapped to the database
 		///

Results/Entities/WaterMeterData.cs

@@ -41,6 +41,8 @@ namespace Results.Entities
         public virtual string MetrologicalClassAux { get; set; }
         public virtual string ApprovalInfoAux { get; set; }
 
+        public virtual Config.Entities.Medium Medium { get; set; }
+
         public virtual string Text1 { get; set; }
         public virtual string Text2 { get; set; }
         public virtual string Text3 { get; set; }
@@ -96,6 +98,8 @@ namespace Results.Entities
             if (MetrologicalClassAux != wmd.MetrologicalClassAux) return false;
             if (ApprovalInfoAux != wmd.ApprovalInfoAux) return false;
 
+            if (Medium != wmd.Medium) return false;
+
             if (Text1 != wmd.Text1) return false;
             if (Text2 != wmd.Text2) return false;
             if (Text3 != wmd.Text3) return false;