ErrorFlagsEx water meter results item, ver. 2.18.864

2018-03-28 16:58:36 +02:00
parent dd8dce1d59
commit 701c2f33bb
6 changed files with 59 additions and 11 deletions
@@ -130,12 +130,38 @@ namespace Results.Entities
            return (errorFlagsMode != ErrorFlagsMode.Off) ? (eFlagsFromTests | ErrorFlags) : 0;
        }

-        public virtual string ErrorFlagstStr()
+        /// <summary>
+        /// Convert combined errorFlags of all tests to string
+        /// </summary>
+        /// <returns>ErrorFlags string</returns>
+        public virtual string ErrorFlagsStr()
        {
            ErrorFlagsMode errorFlagsMode;
            return Utils.ErrorFlagsStr(ErrorFlagsFromTestsAndWM(out errorFlagsMode));
        }

+        /// <summary>
+        /// Convert failed tests and combined errorFlags of all tests to string
+        /// </summary>
+        /// <returns>ErrorFlagsEx string</returns>
+        public virtual string ErrorFlagsStrEx()
+        {
+            StringBuilder errFlgsStr = new StringBuilder();
+            foreach (var mtr in MeterTestRslts)
+            {
+                if (mtr.Evaluate() && mtr.TestDone && !mtr.Passed)
+                {
+                    errFlgsStr.Append(mtr.Name());
+                    errFlgsStr.Append(" ");
+                }
+            }
+
+            ErrorFlagsMode errorFlagsMode;
+            errFlgsStr.Append(Utils.ErrorFlagsStr(ErrorFlagsFromTestsAndWM(out errorFlagsMode)));
+
+            return errFlgsStr.ToString();
+        }
+
        public virtual bool  PassedFromTests()
        {
            ErrorFlagsMode eFlagsMode;